VID-1778 Code review changes