Merge pull request #17754 from demeritcowboy/resourceurl-check