Merge branch 'mh/ref-api-less-extra-refs'