Merge "Fix extractor creation" into rvc-dev