VID-1627 CR changes