#11885: Merge with 3.2.