Merge "CCodec: fix wrapping logic"