changes for 2.1-RC2