Prepared for 1.0-RC1