VID-1655 comment