Merge branch 'ds/do-not-call-bug-on-bad-refs'