VID-1364 Address feedback from @jsutterfield