Ensure the url is changed when the domain is updated
Merge branch '4.2'