Merge branch 'mh/ref-locking-fix'