[master] Merge in Spyro changes.