Merge "Change extraction tool to vendor_available"