VID-1783 Address feedback
CC @saipetch @jsutterfield