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