Merge with 3.2 #10365