Merge "RELAND CCodec: simplify format change logic" into sc-dev