Revert "Revert "Merge branch 'upstream'""

This reverts commit 756a23c6c0f38f4e151a433709d0a2c96e3560e2.
Merge branch 'upstream'