Merge branch 'sg/reflog-past-root' into maint