Merge pull request #23920 from MegaphoneJon/url-validation-regression