Merge branch 'jc/reopen-lock-file' into next