Merge branch 'jk/subtree-do-not-push-if-split-fails' into maint