Merge remote-tracking branch 'upstream/patch_customizable_default_url_type' into...