Merge branch 'jk/reflog-walk-maint'