Merge branch 'aw/gc-lockfile-fscanf-fix'