Merge "CEC Fuzzer Fix" into main