Merge branch 'mh/replace-refs'