Update to official 2.1.0