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