Merge: Codec refactor