Merge branch 'hotfix/resolve-project-create-error'
lanxi: placeholder
Merge branch 'master' into develop