First draft of 1.0.0rc.7