Merge branch 'mg/reflog-with-options' into maint