Merge "CCodec: convert dataspace to V0" into main