[master] Merge in changes from contact, everdale, and spyro.