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