VID-1315 whitespace changes