Merge branch 'ae/better-template-failure-report'