Merge "Use a more-specific heuristic to detect mirrored/virtual inset providers" into rvc-dev