#11435: Merge with 3.2