Merge branch 'jc/merge-reduce-parents-early' into maint