Issue #12885: Merge with 3.4, retaining commits reverted there.