Merge branch 'mh/update-ref-verify'