VID-1963 Update with comments from PR