VID-2089 responding to code review