Merge branch 'hotfix/setup'
php syntax error
Merge branch 'hotfix/php_syntax_errror' into develop