Merge with 3.2 #15660