VID-1767 Code review changes