Update to version 2.1.0.Final