VID-1308 comments