Fix phpcs
Merge branch 'master' into PIM-1850