Merge branch 'mh/refs-have-new'