Merge branch 'mh/expire-updateref-fixes'