Preparing 2.1 release