NXP-13403: update Derby support