Merge "Minor HTML Gen improvments"