Merge branch 'rr/forbid-bs-in-ref'