Merge "specials: Cleanup and fix PHPDoc comments"