NXP-11030: fix auto-generated key return for Oracle