Merge branch 'ma/lockfile-cleanup'