Merge branch 'mg/rebase-i-onto-reflog-in-full' into maint-1.7.11