Merge branch 'sm/branch-broken-ref'