Merge "ACodec Fix."