VID-1296 Code Review changes