#11843: Merge with 3.2.