cdc drivers: incorporate some MBM changes