Merge branch 'jc/reopen-lock-file'