Issue #12885: Merge 3.4