VID-2074 Code review update