I think the upgrade of Derby vesion has to be done in a separate issue/commit