Merge "PHPCS lint fixes"