VID-1271 Saipetch imposed formatting!