sync media_codex with upstream