Merge "HtmlFormatter fixes"