Revert the commit of "Merge develop branch"

Revert the commit of "Merge develop branch"