Merge rick's bio_read_write branch