Merged r10071:10164 from features/cppdb-test into trunk. Implements the fully native...