Merge with 3.2 #12510