Revert "Revert "Merge branch 'master' into Updates""

This reverts commit 07956bb62e962b645c318655dbd7e43f1980cb09.