Merge pull request #11067 from MegaphoneJon/resource-url-check