[master] Merge in changes from spyro and contact.