Merge branch 'mh/lockfile-stdio'