Merge "CEC: Fixes bugs in routing control" into lmp-dev