VID-1082 Changes following code review