First draft for 1.0.0rc.6