Merge branch 'pw/t5800-import-race-fix'