VID-1499 Code Review changes