(QENG-1000) added oracle support to this fix