VID-1832 comments