Merge branch 'ab/reflog-prep'