Updated templates, ready for review

[#60056030]