Merge branch 'mh/lockfile-retry'