Merge branch 'sp/reflog' into next