Merge with 3.2 #10635 whitespace