Merge branch '1901_php_syntax_optimization'