upstream merges

Playing catch up