Fix lock file location
Merge branch 'sync' into sync-hunter-test