Merge branch 'hotfix/project_page'
Update project page
Merge branch 'hotfix/project_page' into develop