VID-1976 responding to code review
Merge branch 'VID-1976' into VID-1976-unit-tests