Update to 2.2.1.Final and fix SAVARA-383