[cec] missing commits from #2386

@davilla probably forgot to push, sorry