Fix checkstyle and phpdoc
Fix checkstyle
Merge branch 'master' into PIM-2266