#11565: Merge with 3.1.