Issue #12102: Merge with 3.2.