Merge branch 'jk/reflog-walk' into maint