VID-1773 Code Review changes