Revert "Merge branch 'dev' into 'dev'"

This reverts merge request !2 (merged) Running source extractor in service mode do not works anymore with the changes.