#11840: Merge with 3.1.