VID-1739 Code Review changes