joint 2.1 release
moved to 2.2-SNAPSHOT (jointly)