Issue #8847: Merge with 3.2