Merge "Pass phpcs-strict on maintenance/ (1/8)"