VID-1213 update based on CR comments