#11515: Merge with 3.1.