[master] Merge in spyro and contact changes.