Fix style and phpdoc
Merge branch 'master' into refactor/catalog_context