Issue #10747: Merge with 3.4