Change in master
Merge branch 'master' into branch3
Merge master -> branch 3
Revert "Merge master -> branch 3"

This reverts commit 7245ff2b38536612b0fc6d25f79b1fcf13655966.