[cec] rebased PR1794 for Frodo