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