Swap 861 new template from subtemplate form

Merge request reports