- Upstream fix of codec negotiation
