Merge "improvements of CBR on compainion devices" into sc-dev