VID-1976 adding comments