Merge branch 'master' into develop
fixed cleanvar namespace error
Merge branch 'develop'