VID-1767 Add comments