Merge "fix: NCs in mediaextractor" into oc-dev