Merge "New uid for extractor process"