Merge "Stop using invalid URL to prevent unexpected crash" into sc-dev