Merge "More specific types in doc tags in the Html class"