[cec] missing commits from #2386