#11565: Merge with 3.2.