Merge branch 'io-threads'