Upgrade to SNAPSHOT 1.2.1