Merge branch 'rh/template-updates'