[master] Merge in spyro changes.