Merge branch 'sb/ref-lock-lose-lock-fd'