#11845: Merge with 3.2.