Merge "Fix PHPCS warnings in includes/specials/"