Modified for 2.0.RC1 release.