Merge "Fix extractor plugin parameter handling" into sc-dev