Merge "Graceful handling of missing extractor metadata" into sc-dev