Merge branch 'ioat' into fixes