The patch applies clean and fixes all phpcs issues. Marking RTBC!