Codec Fun

Conflict in merging from upstream