Merge branch 'hotfix/fix-template-merge-artifact'