Merge in CTDBP-NO driver for release