update branch back to 2.1-SNAPSHOT