Merge branch 'mh/replace-refs-variable-rename'