Merge branch 'develop' into master

Finish performance optimization and code simplification