Merge branch 'mh/lockfile'