Revert "Merge branch 'master' into Dev"

This reverts commit f77a2de31df8e092c12df5b761f87bba7e675214, reversing
changes made to 89ee39a16bf2181d091a80ec59083419ee78d04d.