Merge branch 'jc/lockfile' into next