[cec] rebased PR1794 + fixes for Frodo
Merge pull request #2387 from opdenkamp/pr1794_frodo

[cec] rebased PR1794 + fix for Frodo