Merge branch 'jc/lockfile'