Added oracle date/long conversion support
Merge remote-tracking branch 'origin/develop' into develop