VID-1308 code review feedback