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