Merge pull request #9483 from neheb/fio1