Apply phpcs fixes
Merge commit '32585ea10effb3de33aa7136424364359c199969'