Whitespace
Back-port a bunch of stuff form production code