Merge branch 'stable-3.9' into stable-3.10 * stable-3.9: Improve the wording to explain url matching Release-Notes: skip Change-Id: Ie8ac890468c101ea9f4658ad7f9792ca838e7594