Created MR that fixes all phpcs issues reported.