Merge cdr_adaptive_odbc from developer branch