ENGINE-1766 fix merge
ENGINE-1765: Fix exception and oracle column format