Merged in work for the I/O layer being updated