Merge branch 'mh/war-on-extra-refs' into next