Merge branch 'ps/lockfile-cleanup-fix'