Merge remote-tracking branch 'sstabellini/disk_io' into staging