#11515: Merge with 3.2.