Merge branch 'sg/reflog-past-root'