Merge branch 'jc/match-refs-clarify'