VID-1907 CR fixes