Merge branch 'mh/shorten-unambigous-ref'