VID-2017 code review changes