Merge pull request #5961 from dstftw/force-generic-extractor