#11865: Merge with 3.1.