Merge branch 'nio'
fix this up for the new architecture
Merge branch 'master' into nio