Merge with 3.2 #964437