Updating with latest 2.1.0-pre