Merge branch 'jk/maint-reflog-bottom' into next