Merge branch 'master' into optimize
Merge branch 'master' into optimize
changes in beta