cdc:  patches from mbm in userspace