WIP Update cori device to match all BroadComCM devices