Merge "Format the template using HTML tags." into nyc-dev