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