VID-1582 Updated for code review comments