Merge branch 'hotfix/php_syntax_errror'
syntax again
Merge branch 'hotfix/syntax_again' into develop