VID-1829 Code review changes