#11902: Merge with 3.2.