Revert ""

This reverts commit 3893ba116e70f557b2caaf14c958fd6e21c81f68.
Merge SF_GIT/master