Merge branch 'mh/ref-lock-entry'