Merge "Fix CFI issues with extractor threading" into main