VID-1327 Minor design review adjustments