[update hotfix]finished this.
Merge branch 'hotfix/project_test_beta3' into develop