VID-1156 template change