CON-1379 | Handlebars fixes