Merge "Revert^2 "Codec2Client: add support to ApexCodec"" into main