Upgrade dev environment to 2.1.1