Merge pull request #5396 from diizzyy/utils-fio