VID-814 Changes from Saipetch code review