VID-2079 updating comments