Catching up to meta

Catching up with meta's recent commits during summer.