Merge from 1.0
Don't do post-prepare phase on I/O thread
Merge branch '1.0' into 2.0