Merge "CEC: Fix two bugs" into lmp-dev