Merge branch 'master' into develop
fix exception in debug mode
Merge branch 'develop'