Merge "Disable URL overriding on redirects"