Merge "Fix UrlInsteadOf to handle multiple strings"