The patch resolves all phpcs issues. Marking RTBC!