Merge "include actual codec used"