Fix of HLT and migration of 721patch1 templates

Fix of HLT and migration of 721patch1 templates.