Merge branch 'rr/rebase-checkout-reflog'