Revert "Merge branch 'master' into staging"

This reverts commit 06068eea087ffebeeddcf34b3162cad91080e647, reversing
changes made to 40ec40f40de002dc2b123a3cbdc4ba88c71e41f2.
Revert "Revert "Merge branch 'master' into staging""

This reverts commit a05c4f507e5ad5d61a595019f2450795c83c04bb.