Prepare release 2.1