INTTEMPLATES-19 - War Template Polishing