[cec] missing commits from #2386
Merge pull request #2413 from opdenkamp/meh

[cec] missing commits from #2386