VID-1156 normalizing templates