Merge "Step version to 2.1.0 on master"