Fix style and phpdoc
Merge branch 'master' into PIM-2272