Merge "Fix and make some types in PHPDoc and JSDoc tags more specific"