VID-1976 responding to code review feedback
VID-1976 responding to more code review feedback
VID-1976 responding to more code review feedback
VID-1976 fixing unit tests
VID-1976 responding to more code review feedback
Merge branch 'VID-1976' into VID-2005