VID-1286 Updates based on second design review round