#11848: Merge with 3.2.