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