Revert "Merge origin/master"

This reverts commit 4c96caa5ca44d9c526eec65f4a83804271cb610e.
Merge origin/master
Merge origin/master
Merge origin/master