Merge "Pass phpcs-strict on includes/specials/ (3/3)"