Merge "Remove fixed phpcs:ignore"