Update to 2.2.2.Final and fix SAVARA-385 and SAVARA-384