Prepared for 2.x release cycle