Update to 2.1.0 branch