Merge branch 'mz/rebase-abort-reflog-fix' into maint