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