VID-1788 code review changes