Merge branch 'mh/retire-ref-fetch-rules'