Merged 1.0 timeout before read then write fix