Merge branch 'jk/maint-reflog-walk-count-vs-time' (early part) into next