Merge branch 'jk/incore-lockfile-removal'