Merge branch 'uk/checkout-ambiguous-ref' into next