diff --git a/analysis.json b/analysis.json
index a6be375c..1e946448 100644
--- a/analysis.json
+++ b/analysis.json
@@ -241,11 +241,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1102,
+              "line": 1107,
               "column": 2
             },
             "end": {
-              "line": 1109,
+              "line": 1114,
               "column": 3
             }
           },
@@ -259,11 +259,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 965,
+              "line": 970,
               "column": 2
             },
             "end": {
-              "line": 967,
+              "line": 972,
               "column": 3
             }
           },
@@ -279,11 +279,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 975,
+              "line": 980,
               "column": 2
             },
             "end": {
-              "line": 979,
+              "line": 984,
               "column": 3
             }
           },
@@ -305,11 +305,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 990,
+              "line": 995,
               "column": 2
             },
             "end": {
-              "line": 994,
+              "line": 999,
               "column": 3
             }
           },
@@ -331,11 +331,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 999,
+              "line": 1004,
               "column": 2
             },
             "end": {
-              "line": 1001,
+              "line": 1006,
               "column": 3
             }
           },
@@ -351,11 +351,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1020,
+              "line": 1025,
               "column": 2
             },
             "end": {
-              "line": 1086,
+              "line": 1091,
               "column": 3
             }
           },
@@ -377,11 +377,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1119,
+              "line": 1124,
               "column": 2
             },
             "end": {
-              "line": 1130,
+              "line": 1135,
               "column": 3
             }
           },
@@ -400,11 +400,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1091,
+              "line": 1096,
               "column": 2
             },
             "end": {
-              "line": 1093,
+              "line": 1098,
               "column": 3
             }
           },
@@ -423,11 +423,11 @@
       "metadata": {},
       "sourceRange": {
         "start": {
-          "line": 944,
+          "line": 949,
           "column": 0
         },
         "end": {
-          "line": 1131,
+          "line": 1136,
           "column": 1
         }
       },
@@ -446,11 +446,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1102,
+              "line": 1107,
               "column": 2
             },
             "end": {
-              "line": 1109,
+              "line": 1114,
               "column": 3
             }
           },
@@ -464,11 +464,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1479,
+              "line": 1484,
               "column": 4
             },
             "end": {
-              "line": 1479,
+              "line": 1484,
               "column": 17
             }
           },
@@ -481,11 +481,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1489,
+              "line": 1494,
               "column": 4
             },
             "end": {
-              "line": 1489,
+              "line": 1494,
               "column": 15
             }
           },
@@ -498,11 +498,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1501,
+              "line": 1506,
               "column": 4
             },
             "end": {
-              "line": 1501,
+              "line": 1506,
               "column": 18
             }
           },
@@ -516,11 +516,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 965,
+              "line": 970,
               "column": 2
             },
             "end": {
-              "line": 967,
+              "line": 972,
               "column": 3
             }
           },
@@ -537,11 +537,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1693,
+              "line": 1698,
               "column": 2
             },
             "end": {
-              "line": 1701,
+              "line": 1706,
               "column": 3
             }
           },
@@ -569,11 +569,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 990,
+              "line": 995,
               "column": 2
             },
             "end": {
-              "line": 994,
+              "line": 999,
               "column": 3
             }
           },
@@ -596,11 +596,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 999,
+              "line": 1004,
               "column": 2
             },
             "end": {
-              "line": 1001,
+              "line": 1006,
               "column": 3
             }
           },
@@ -617,11 +617,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1020,
+              "line": 1025,
               "column": 2
             },
             "end": {
-              "line": 1086,
+              "line": 1091,
               "column": 3
             }
           },
@@ -644,11 +644,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1119,
+              "line": 1124,
               "column": 2
             },
             "end": {
-              "line": 1130,
+              "line": 1135,
               "column": 3
             }
           },
@@ -666,11 +666,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1513,
+              "line": 1518,
               "column": 2
             },
             "end": {
-              "line": 1577,
+              "line": 1582,
               "column": 3
             }
           },
@@ -687,11 +687,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1589,
+              "line": 1594,
               "column": 2
             },
             "end": {
-              "line": 1594,
+              "line": 1599,
               "column": 3
             }
           },
@@ -713,11 +713,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1601,
+              "line": 1606,
               "column": 2
             },
             "end": {
-              "line": 1603,
+              "line": 1608,
               "column": 3
             }
           },
@@ -734,11 +734,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1724,
+              "line": 1729,
               "column": 2
             },
             "end": {
-              "line": 1808,
+              "line": 1813,
               "column": 3
             }
           },
@@ -765,11 +765,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1821,
+              "line": 1826,
               "column": 2
             },
             "end": {
-              "line": 1846,
+              "line": 1851,
               "column": 3
             }
           },
@@ -790,11 +790,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1848,
+              "line": 1853,
               "column": 2
             },
             "end": {
-              "line": 1868,
+              "line": 1873,
               "column": 3
             }
           },
@@ -811,11 +811,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1870,
+              "line": 1875,
               "column": 2
             },
             "end": {
-              "line": 1877,
+              "line": 1882,
               "column": 3
             }
           },
@@ -832,11 +832,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1879,
+              "line": 1884,
               "column": 2
             },
             "end": {
-              "line": 1944,
+              "line": 1949,
               "column": 3
             }
           },
@@ -853,11 +853,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1946,
+              "line": 1951,
               "column": 2
             },
             "end": {
-              "line": 1958,
+              "line": 1963,
               "column": 3
             }
           },
@@ -883,11 +883,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1960,
+              "line": 1965,
               "column": 2
             },
             "end": {
-              "line": 1968,
+              "line": 1973,
               "column": 3
             }
           },
@@ -913,11 +913,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1970,
+              "line": 1975,
               "column": 2
             },
             "end": {
-              "line": 1977,
+              "line": 1982,
               "column": 3
             }
           },
@@ -937,11 +937,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1979,
+              "line": 1984,
               "column": 2
             },
             "end": {
-              "line": 1981,
+              "line": 1986,
               "column": 3
             }
           },
@@ -958,11 +958,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1983,
+              "line": 1988,
               "column": 2
             },
             "end": {
-              "line": 1997,
+              "line": 2002,
               "column": 3
             }
           },
@@ -985,11 +985,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1999,
+              "line": 2004,
               "column": 2
             },
             "end": {
-              "line": 2003,
+              "line": 2008,
               "column": 3
             }
           },
@@ -1010,11 +1010,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2005,
+              "line": 2010,
               "column": 2
             },
             "end": {
-              "line": 2014,
+              "line": 2019,
               "column": 3
             }
           },
@@ -1037,11 +1037,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2016,
+              "line": 2021,
               "column": 2
             },
             "end": {
-              "line": 2032,
+              "line": 2037,
               "column": 3
             }
           },
@@ -1061,11 +1061,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2034,
+              "line": 2039,
               "column": 2
             },
             "end": {
-              "line": 2072,
+              "line": 2077,
               "column": 3
             }
           },
@@ -1088,11 +1088,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2074,
+              "line": 2079,
               "column": 2
             },
             "end": {
-              "line": 2080,
+              "line": 2085,
               "column": 3
             }
           },
@@ -1108,11 +1108,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2082,
+              "line": 2087,
               "column": 2
             },
             "end": {
-              "line": 2088,
+              "line": 2093,
               "column": 3
             }
           },
@@ -1128,11 +1128,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2090,
+              "line": 2095,
               "column": 2
             },
             "end": {
-              "line": 2116,
+              "line": 2121,
               "column": 3
             }
           },
@@ -1155,11 +1155,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2118,
+              "line": 2123,
               "column": 2
             },
             "end": {
-              "line": 2131,
+              "line": 2136,
               "column": 3
             }
           },
@@ -1179,11 +1179,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2133,
+              "line": 2138,
               "column": 2
             },
             "end": {
-              "line": 2155,
+              "line": 2160,
               "column": 3
             }
           },
@@ -1200,11 +1200,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2163,
+              "line": 2168,
               "column": 2
             },
             "end": {
-              "line": 2165,
+              "line": 2170,
               "column": 3
             }
           },
@@ -1220,11 +1220,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2171,
+              "line": 2176,
               "column": 2
             },
             "end": {
-              "line": 2173,
+              "line": 2178,
               "column": 3
             }
           },
@@ -1240,11 +1240,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2175,
+              "line": 2180,
               "column": 2
             },
             "end": {
-              "line": 2183,
+              "line": 2188,
               "column": 3
             }
           },
@@ -1264,11 +1264,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2224,
+              "line": 2229,
               "column": 2
             },
             "end": {
-              "line": 2232,
+              "line": 2237,
               "column": 3
             }
           },
@@ -1295,11 +1295,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2245,
+              "line": 2250,
               "column": 2
             },
             "end": {
-              "line": 2250,
+              "line": 2255,
               "column": 3
             }
           },
@@ -1328,11 +1328,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1091,
+              "line": 1096,
               "column": 2
             },
             "end": {
-              "line": 1093,
+              "line": 1098,
               "column": 3
             }
           },
@@ -1353,11 +1353,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2201,
+              "line": 2206,
               "column": 2
             },
             "end": {
-              "line": 2203,
+              "line": 2208,
               "column": 3
             }
           },
@@ -1379,11 +1379,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2263,
+              "line": 2268,
               "column": 2
             },
             "end": {
-              "line": 2268,
+              "line": 2273,
               "column": 3
             }
           },
@@ -1413,11 +1413,11 @@
       "metadata": {},
       "sourceRange": {
         "start": {
-          "line": 1443,
+          "line": 1448,
           "column": 0
         },
         "end": {
-          "line": 2269,
+          "line": 2274,
           "column": 1
         }
       },
diff --git a/docs/vaadin-router/analysis.json b/docs/vaadin-router/analysis.json
index a6be375c..1e946448 100644
--- a/docs/vaadin-router/analysis.json
+++ b/docs/vaadin-router/analysis.json
@@ -241,11 +241,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1102,
+              "line": 1107,
               "column": 2
             },
             "end": {
-              "line": 1109,
+              "line": 1114,
               "column": 3
             }
           },
@@ -259,11 +259,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 965,
+              "line": 970,
               "column": 2
             },
             "end": {
-              "line": 967,
+              "line": 972,
               "column": 3
             }
           },
@@ -279,11 +279,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 975,
+              "line": 980,
               "column": 2
             },
             "end": {
-              "line": 979,
+              "line": 984,
               "column": 3
             }
           },
@@ -305,11 +305,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 990,
+              "line": 995,
               "column": 2
             },
             "end": {
-              "line": 994,
+              "line": 999,
               "column": 3
             }
           },
@@ -331,11 +331,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 999,
+              "line": 1004,
               "column": 2
             },
             "end": {
-              "line": 1001,
+              "line": 1006,
               "column": 3
             }
           },
@@ -351,11 +351,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1020,
+              "line": 1025,
               "column": 2
             },
             "end": {
-              "line": 1086,
+              "line": 1091,
               "column": 3
             }
           },
@@ -377,11 +377,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1119,
+              "line": 1124,
               "column": 2
             },
             "end": {
-              "line": 1130,
+              "line": 1135,
               "column": 3
             }
           },
@@ -400,11 +400,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1091,
+              "line": 1096,
               "column": 2
             },
             "end": {
-              "line": 1093,
+              "line": 1098,
               "column": 3
             }
           },
@@ -423,11 +423,11 @@
       "metadata": {},
       "sourceRange": {
         "start": {
-          "line": 944,
+          "line": 949,
           "column": 0
         },
         "end": {
-          "line": 1131,
+          "line": 1136,
           "column": 1
         }
       },
@@ -446,11 +446,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1102,
+              "line": 1107,
               "column": 2
             },
             "end": {
-              "line": 1109,
+              "line": 1114,
               "column": 3
             }
           },
@@ -464,11 +464,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1479,
+              "line": 1484,
               "column": 4
             },
             "end": {
-              "line": 1479,
+              "line": 1484,
               "column": 17
             }
           },
@@ -481,11 +481,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1489,
+              "line": 1494,
               "column": 4
             },
             "end": {
-              "line": 1489,
+              "line": 1494,
               "column": 15
             }
           },
@@ -498,11 +498,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1501,
+              "line": 1506,
               "column": 4
             },
             "end": {
-              "line": 1501,
+              "line": 1506,
               "column": 18
             }
           },
@@ -516,11 +516,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 965,
+              "line": 970,
               "column": 2
             },
             "end": {
-              "line": 967,
+              "line": 972,
               "column": 3
             }
           },
@@ -537,11 +537,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1693,
+              "line": 1698,
               "column": 2
             },
             "end": {
-              "line": 1701,
+              "line": 1706,
               "column": 3
             }
           },
@@ -569,11 +569,11 @@
           "privacy": "protected",
           "sourceRange": {
             "start": {
-              "line": 990,
+              "line": 995,
               "column": 2
             },
             "end": {
-              "line": 994,
+              "line": 999,
               "column": 3
             }
           },
@@ -596,11 +596,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 999,
+              "line": 1004,
               "column": 2
             },
             "end": {
-              "line": 1001,
+              "line": 1006,
               "column": 3
             }
           },
@@ -617,11 +617,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1020,
+              "line": 1025,
               "column": 2
             },
             "end": {
-              "line": 1086,
+              "line": 1091,
               "column": 3
             }
           },
@@ -644,11 +644,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1119,
+              "line": 1124,
               "column": 2
             },
             "end": {
-              "line": 1130,
+              "line": 1135,
               "column": 3
             }
           },
@@ -666,11 +666,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1513,
+              "line": 1518,
               "column": 2
             },
             "end": {
-              "line": 1577,
+              "line": 1582,
               "column": 3
             }
           },
@@ -687,11 +687,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1589,
+              "line": 1594,
               "column": 2
             },
             "end": {
-              "line": 1594,
+              "line": 1599,
               "column": 3
             }
           },
@@ -713,11 +713,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1601,
+              "line": 1606,
               "column": 2
             },
             "end": {
-              "line": 1603,
+              "line": 1608,
               "column": 3
             }
           },
@@ -734,11 +734,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 1724,
+              "line": 1729,
               "column": 2
             },
             "end": {
-              "line": 1808,
+              "line": 1813,
               "column": 3
             }
           },
@@ -765,11 +765,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1821,
+              "line": 1826,
               "column": 2
             },
             "end": {
-              "line": 1846,
+              "line": 1851,
               "column": 3
             }
           },
@@ -790,11 +790,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1848,
+              "line": 1853,
               "column": 2
             },
             "end": {
-              "line": 1868,
+              "line": 1873,
               "column": 3
             }
           },
@@ -811,11 +811,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1870,
+              "line": 1875,
               "column": 2
             },
             "end": {
-              "line": 1877,
+              "line": 1882,
               "column": 3
             }
           },
@@ -832,11 +832,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1879,
+              "line": 1884,
               "column": 2
             },
             "end": {
-              "line": 1944,
+              "line": 1949,
               "column": 3
             }
           },
@@ -853,11 +853,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1946,
+              "line": 1951,
               "column": 2
             },
             "end": {
-              "line": 1958,
+              "line": 1963,
               "column": 3
             }
           },
@@ -883,11 +883,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1960,
+              "line": 1965,
               "column": 2
             },
             "end": {
-              "line": 1968,
+              "line": 1973,
               "column": 3
             }
           },
@@ -913,11 +913,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1970,
+              "line": 1975,
               "column": 2
             },
             "end": {
-              "line": 1977,
+              "line": 1982,
               "column": 3
             }
           },
@@ -937,11 +937,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1979,
+              "line": 1984,
               "column": 2
             },
             "end": {
-              "line": 1981,
+              "line": 1986,
               "column": 3
             }
           },
@@ -958,11 +958,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1983,
+              "line": 1988,
               "column": 2
             },
             "end": {
-              "line": 1997,
+              "line": 2002,
               "column": 3
             }
           },
@@ -985,11 +985,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1999,
+              "line": 2004,
               "column": 2
             },
             "end": {
-              "line": 2003,
+              "line": 2008,
               "column": 3
             }
           },
@@ -1010,11 +1010,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2005,
+              "line": 2010,
               "column": 2
             },
             "end": {
-              "line": 2014,
+              "line": 2019,
               "column": 3
             }
           },
@@ -1037,11 +1037,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2016,
+              "line": 2021,
               "column": 2
             },
             "end": {
-              "line": 2032,
+              "line": 2037,
               "column": 3
             }
           },
@@ -1061,11 +1061,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2034,
+              "line": 2039,
               "column": 2
             },
             "end": {
-              "line": 2072,
+              "line": 2077,
               "column": 3
             }
           },
@@ -1088,11 +1088,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2074,
+              "line": 2079,
               "column": 2
             },
             "end": {
-              "line": 2080,
+              "line": 2085,
               "column": 3
             }
           },
@@ -1108,11 +1108,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2082,
+              "line": 2087,
               "column": 2
             },
             "end": {
-              "line": 2088,
+              "line": 2093,
               "column": 3
             }
           },
@@ -1128,11 +1128,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2090,
+              "line": 2095,
               "column": 2
             },
             "end": {
-              "line": 2116,
+              "line": 2121,
               "column": 3
             }
           },
@@ -1155,11 +1155,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2118,
+              "line": 2123,
               "column": 2
             },
             "end": {
-              "line": 2131,
+              "line": 2136,
               "column": 3
             }
           },
@@ -1179,11 +1179,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2133,
+              "line": 2138,
               "column": 2
             },
             "end": {
-              "line": 2155,
+              "line": 2160,
               "column": 3
             }
           },
@@ -1200,11 +1200,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2163,
+              "line": 2168,
               "column": 2
             },
             "end": {
-              "line": 2165,
+              "line": 2170,
               "column": 3
             }
           },
@@ -1220,11 +1220,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2171,
+              "line": 2176,
               "column": 2
             },
             "end": {
-              "line": 2173,
+              "line": 2178,
               "column": 3
             }
           },
@@ -1240,11 +1240,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 2175,
+              "line": 2180,
               "column": 2
             },
             "end": {
-              "line": 2183,
+              "line": 2188,
               "column": 3
             }
           },
@@ -1264,11 +1264,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2224,
+              "line": 2229,
               "column": 2
             },
             "end": {
-              "line": 2232,
+              "line": 2237,
               "column": 3
             }
           },
@@ -1295,11 +1295,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2245,
+              "line": 2250,
               "column": 2
             },
             "end": {
-              "line": 2250,
+              "line": 2255,
               "column": 3
             }
           },
@@ -1328,11 +1328,11 @@
           "privacy": "private",
           "sourceRange": {
             "start": {
-              "line": 1091,
+              "line": 1096,
               "column": 2
             },
             "end": {
-              "line": 1093,
+              "line": 1098,
               "column": 3
             }
           },
@@ -1353,11 +1353,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2201,
+              "line": 2206,
               "column": 2
             },
             "end": {
-              "line": 2203,
+              "line": 2208,
               "column": 3
             }
           },
@@ -1379,11 +1379,11 @@
           "privacy": "public",
           "sourceRange": {
             "start": {
-              "line": 2263,
+              "line": 2268,
               "column": 2
             },
             "end": {
-              "line": 2268,
+              "line": 2273,
               "column": 3
             }
           },
@@ -1413,11 +1413,11 @@
       "metadata": {},
       "sourceRange": {
         "start": {
-          "line": 1443,
+          "line": 1448,
           "column": 0
         },
         "end": {
-          "line": 2269,
+          "line": 2274,
           "column": 1
         }
       },
diff --git a/docs/vaadin-router/demo/demo-shell.html b/docs/vaadin-router/demo/demo-shell.html
index 06860533..12dcfa55 100644
--- a/docs/vaadin-router/demo/demo-shell.html
+++ b/docs/vaadin-router/demo/demo-shell.html
@@ -6624,18 +6624,7 @@
    * @memberof Vaadin
    */Vaadin.ThemePropertyMixin=function(superClass){return(/*#__PURE__*/function(_superClass){babelHelpers.inherits(VaadinThemePropertyMixin,_superClass);function VaadinThemePropertyMixin(){babelHelpers.classCallCheck(this,VaadinThemePropertyMixin);return babelHelpers.possibleConstructorReturn(this,babelHelpers.getPrototypeOf(VaadinThemePropertyMixin).apply(this,arguments))}babelHelpers.createClass(VaadinThemePropertyMixin,[{key:"attributeChangedCallback",/** @protected */value:function attributeChangedCallback(name,oldValue,newValue){babelHelpers.get(babelHelpers.getPrototypeOf(VaadinThemePropertyMixin.prototype),"attributeChangedCallback",this).call(this,name,oldValue,newValue);if("theme"===name){this._setTheme(newValue)}}}],[{key:"properties",get:function get(){return{/**
          * Helper property with theme attribute value facilitating propagation
-         * in shadow DOM.
-         *
-         * Enables the component implementation to propagate the `theme`
-         * attribute value to the subcomponents in Shadow DOM by binding
-         * the subcomponent’s "theme" attribute to the `theme` property of
-         * the host.
-         *
-         * **NOTE:** Extending the mixin only provides the property for binding,
-         * and does not make the propagation alone.
-         *
-         * See [Theme Attribute and Subcomponents](https://github.com/vaadin/vaadin-themable-mixin/wiki/5.-Theme-Attribute-and-Subcomponents).
-         * page for more information.
+         * in shadow DOM. Allows using `theme$="[[theme]]"` in the template.
          *
          * @protected
          */theme:{type:String,readOnly:!0}}}}]);return VaadinThemePropertyMixin}(superClass))};</script><script>/**
@@ -6643,7 +6632,6 @@
    */window.Vaadin=window.Vaadin||{};/**
    * @polymerMixin
    * @memberof Vaadin
-   * @mixes Vaadin.ThemePropertyMixin
    */Vaadin.ThemableMixin=function(superClass){return(/*#__PURE__*/function(_Vaadin$ThemeProperty){babelHelpers.inherits(VaadinThemableMixin,_Vaadin$ThemeProperty);function VaadinThemableMixin(){babelHelpers.classCallCheck(this,VaadinThemableMixin);return babelHelpers.possibleConstructorReturn(this,babelHelpers.getPrototypeOf(VaadinThemableMixin).apply(this,arguments))}babelHelpers.createClass(VaadinThemableMixin,null,[{key:"finalize",/** @protected */value:function finalize(){var _this=this;babelHelpers.get(babelHelpers.getPrototypeOf(VaadinThemableMixin),"finalize",this).call(this);var template=this.prototype._template,hasOwnTemplate=this.template&&this.template.parentElement&&this.template.parentElement.id===this.is,inheritedTemplate=Object.getPrototypeOf(this.prototype)._template;if(inheritedTemplate&&!hasOwnTemplate){// The element doesn't define its own template -> include the theme modules from the inherited template
 Array.from(inheritedTemplate.content.querySelectorAll("style[include]")).forEach(function(s){_this._includeStyle(s.getAttribute("include"),template)})}this._includeMatchingThemes(template)}/** @protected */},{key:"_includeMatchingThemes",value:function _includeMatchingThemes(template){var _this2=this,domModule=Polymer.DomModule,modules=domModule.prototype.modules,hasThemes=!1,defaultModuleName=this.is+"-default-theme";Object.keys(modules).sort(function(moduleNameA,moduleNameB){var vaadinA=0===moduleNameA.indexOf("vaadin-"),vaadinB=0===moduleNameB.indexOf("vaadin-"),vaadinThemePrefixes=["lumo-","material-"],vaadinThemeA=0<vaadinThemePrefixes.filter(function(prefix){return 0===moduleNameA.indexOf(prefix)}).length,vaadinThemeB=0<vaadinThemePrefixes.filter(function(prefix){return 0===moduleNameB.indexOf(prefix)}).length;if(vaadinA!==vaadinB){// Include vaadin core styles first
 return vaadinA?-1:1}else if(vaadinThemeA!==vaadinThemeB){// Include vaadin theme styles after that
@@ -6713,7 +6701,7 @@
       h4,
       h5,
       h6{color:var(--lumo-header-text-color);}a{color:var(--lumo-primary-text-color);}blockquote{color:var(--lumo-secondary-text-color);}code,
-      pre{background-color:var(--lumo-contrast-10pct);border-radius:var(--lumo-border-radius-m);}</style></template></dom-module><dom-module id="lumo-color-legacy" assetpath="../../vaadin-lumo-styles/"><template><style include="lumo-color">:host{color:var(--lumo-body-text-color) !important;background-color:var(--lumo-base-color) !important;}</style></template></dom-module><dom-module id="vaadin-router-demo-shared-styles"><template><style>.note{background-color:#24c0ea;padding:1em;color:white;border-radius:4px;}</style></template></dom-module><dom-module id="vaadin-router-demo-nested-styles"><template><style>:host{display:flex;flex-direction:column;background:#ddd;padding:5px;min-height:100vh;}main{margin-top:10px;padding:5px;background:#fff;flex:1 0 auto;min-height:80px;}</style></template></dom-module><script>(function(global,factory){"object"===("undefined"===typeof exports?"undefined":babelHelpers.typeof(exports))&&"undefined"!==typeof module?factory(exports):"function"===typeof define&&define.amd?define(["exports"],factory):(global=global||self,factory(global.Vaadin=global.Vaadin||{}))})(this,function(exports){'use strict';function _typeof(obj){if("function"===typeof Symbol&&"symbol"===babelHelpers.typeof(Symbol.iterator)){_typeof=function _typeof(obj){return babelHelpers.typeof(obj)}}else{_typeof=function _typeof(obj){return obj&&"function"===typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":babelHelpers.typeof(obj)}}return _typeof(obj)}function _classCallCheck(instance,Constructor){if(!babelHelpers.instanceof(instance,Constructor)){throw new TypeError("Cannot call a class as a function")}}function _defineProperties(target,props){for(var i=0,descriptor;i<props.length;i++){descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1;descriptor.configurable=!0;if("value"in descriptor)descriptor.writable=!0;Object.defineProperty(target,descriptor.key,descriptor)}}function _createClass(Constructor,protoProps,staticProps){if(protoProps)_defineProperties(Constructor.prototype,protoProps);if(staticProps)_defineProperties(Constructor,staticProps);return Constructor}function _inherits(subClass,superClass){if("function"!==typeof superClass&&null!==superClass){throw new TypeError("Super expression must either be null or a function")}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,writable:!0,configurable:!0}});if(superClass)_setPrototypeOf(subClass,superClass)}function _getPrototypeOf(o){_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function _getPrototypeOf(o){return o.__proto__||Object.getPrototypeOf(o)};return _getPrototypeOf(o)}function _setPrototypeOf(o,p){_setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(o,p){o.__proto__=p;return o};return _setPrototypeOf(o,p)}function _assertThisInitialized(self){if(void 0===self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return self}function _possibleConstructorReturn(self,call){if(call&&("object"===babelHelpers.typeof(call)||"function"===typeof call)){return call}return _assertThisInitialized(self)}function _superPropBase(object,property){while(!Object.prototype.hasOwnProperty.call(object,property)){object=_getPrototypeOf(object);if(null===object)break}return object}function _get(target,property,receiver){if("undefined"!==typeof Reflect&&Reflect.get){_get=Reflect.get}else{_get=function _get(target,property,receiver){var base=_superPropBase(target,property);if(!base)return;var desc=Object.getOwnPropertyDescriptor(base,property);if(desc.get){return desc.get.call(receiver)}return desc.value}}return _get(target,property,receiver||target)}function _toConsumableArray(arr){return _arrayWithoutHoles(arr)||_iterableToArray(arr)||_nonIterableSpread()}function _arrayWithoutHoles(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i]}return arr2}}function _iterableToArray(iter){if(Symbol.iterator in Object(iter)||"[object Arguments]"===Object.prototype.toString.call(iter))return Array.from(iter)}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function toArray(objectOrArray){objectOrArray=objectOrArray||[];return Array.isArray(objectOrArray)?objectOrArray:[objectOrArray]}function log(msg){return"[Vaadin.Router] ".concat(msg)}function logValue(value){if("object"!==_typeof(value)){return value+""}var stringType=Object.prototype.toString.call(value).match(/ (.*)\]$/)[1];if("Object"===stringType||"Array"===stringType){return"".concat(stringType," ").concat(JSON.stringify(value))}else{return stringType}}var MODULE="module",NOMODULE="nomodule",bundleKeys=[MODULE,NOMODULE];function ensureBundle(src){if(!src.match(/.+\.[m]?js$/)){throw new Error(log("Unsupported type for bundle \"".concat(src,"\": .js or .mjs expected.")))}}function ensureRoute(route){if(!route||!isString(route.path)){throw new Error(log("Expected route config to be an object with a \"path\" string property, or an array of such objects"))}var bundle=route.bundle,stringKeys=["component","redirect","bundle"];if(!isFunction(route.action)&&!Array.isArray(route.children)&&!isFunction(route.children)&&!isObject(bundle)&&!stringKeys.some(function(key){return isString(route[key])})){throw new Error(log("Expected route config \"".concat(route.path,"\" to include either \"").concat(stringKeys.join("\", \""),"\" ")+"or \"action\" function but none found."))}if(bundle){if(isString(bundle)){ensureBundle(bundle)}else if(!bundleKeys.some(function(key){return key in bundle})){throw new Error(log("Expected route bundle to include either \""+NOMODULE+"\" or \""+MODULE+"\" keys, or both"))}else{bundleKeys.forEach(function(key){return key in bundle&&ensureBundle(bundle[key])})}}if(route.redirect){["bundle","component"].forEach(function(overriddenProp){if(overriddenProp in route){console.warn(log("Route config \"".concat(route.path,"\" has both \"redirect\" and \"").concat(overriddenProp,"\" properties, ")+"and \"redirect\" will always override the latter. Did you mean to only use \"".concat(overriddenProp,"\"?")))}})}}function ensureRoutes(routes){toArray(routes).forEach(function(route){return ensureRoute(route)})}function loadScript(src,key){var script=document.head.querySelector("script[src=\""+src+"\"][async]");if(!script){script=document.createElement("script");script.setAttribute("src",src);if(key===MODULE){script.setAttribute("type",MODULE)}else if(key===NOMODULE){script.setAttribute(NOMODULE,"")}script.async=!0}return new Promise(function(resolve,reject){script.onreadystatechange=script.onload=function(e){script.__dynamicImportLoaded=!0;resolve(e)};script.onerror=function(e){if(script.parentNode){script.parentNode.removeChild(script)}reject(e)};if(null===script.parentNode){document.head.appendChild(script)}else if(script.__dynamicImportLoaded){resolve()}})}function loadBundle(bundle){if(isString(bundle)){return loadScript(bundle)}else{return Promise.race(bundleKeys.filter(function(key){return key in bundle}).map(function(key){return loadScript(bundle[key],key)}))}}function fireRouterEvent(type,detail){return!window.dispatchEvent(new CustomEvent("vaadin-router-".concat(type),{cancelable:"go"===type,detail:detail}))}function isObject(o){// guard against null passing the typeof check
+      pre{background-color:var(--lumo-contrast-10pct);border-radius:var(--lumo-border-radius-m);}</style></template></dom-module><dom-module id="lumo-color-legacy" assetpath="../../vaadin-lumo-styles/"><template><style include="lumo-color">:host{color:var(--lumo-body-text-color) !important;background-color:var(--lumo-base-color) !important;}</style></template></dom-module><dom-module id="vaadin-router-demo-shared-styles"><template><style>.note{background-color:#24c0ea;padding:1em;color:white;border-radius:4px;}</style></template></dom-module><dom-module id="vaadin-router-demo-nested-styles"><template><style>:host{display:flex;flex-direction:column;background:#ddd;padding:5px;min-height:100vh;}main{margin-top:10px;padding:5px;background:#fff;flex:1 0 auto;min-height:80px;}</style></template></dom-module><dom-module id="vaadin-demo-snippet-no-renderer-theme" theme-for="vaadin-demo-snippet"><template><style include="vaadin-demo-snippet-default-theme">:host([theme~="no-renderer"]) #demo{display:none;}</style></template></dom-module><script>(function(global,factory){"object"===("undefined"===typeof exports?"undefined":babelHelpers.typeof(exports))&&"undefined"!==typeof module?factory(exports):"function"===typeof define&&define.amd?define(["exports"],factory):(global=global||self,factory(global.Vaadin=global.Vaadin||{}))})(this,function(exports){'use strict';function _typeof(obj){if("function"===typeof Symbol&&"symbol"===babelHelpers.typeof(Symbol.iterator)){_typeof=function _typeof(obj){return babelHelpers.typeof(obj)}}else{_typeof=function _typeof(obj){return obj&&"function"===typeof Symbol&&obj.constructor===Symbol&&obj!==Symbol.prototype?"symbol":babelHelpers.typeof(obj)}}return _typeof(obj)}function _classCallCheck(instance,Constructor){if(!babelHelpers.instanceof(instance,Constructor)){throw new TypeError("Cannot call a class as a function")}}function _defineProperties(target,props){for(var i=0,descriptor;i<props.length;i++){descriptor=props[i];descriptor.enumerable=descriptor.enumerable||!1;descriptor.configurable=!0;if("value"in descriptor)descriptor.writable=!0;Object.defineProperty(target,descriptor.key,descriptor)}}function _createClass(Constructor,protoProps,staticProps){if(protoProps)_defineProperties(Constructor.prototype,protoProps);if(staticProps)_defineProperties(Constructor,staticProps);return Constructor}function _inherits(subClass,superClass){if("function"!==typeof superClass&&null!==superClass){throw new TypeError("Super expression must either be null or a function")}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,writable:!0,configurable:!0}});if(superClass)_setPrototypeOf(subClass,superClass)}function _getPrototypeOf(o){_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function _getPrototypeOf(o){return o.__proto__||Object.getPrototypeOf(o)};return _getPrototypeOf(o)}function _setPrototypeOf(o,p){_setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(o,p){o.__proto__=p;return o};return _setPrototypeOf(o,p)}function _assertThisInitialized(self){if(void 0===self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return self}function _possibleConstructorReturn(self,call){if(call&&("object"===babelHelpers.typeof(call)||"function"===typeof call)){return call}return _assertThisInitialized(self)}function _superPropBase(object,property){while(!Object.prototype.hasOwnProperty.call(object,property)){object=_getPrototypeOf(object);if(null===object)break}return object}function _get(target,property,receiver){if("undefined"!==typeof Reflect&&Reflect.get){_get=Reflect.get}else{_get=function _get(target,property,receiver){var base=_superPropBase(target,property);if(!base)return;var desc=Object.getOwnPropertyDescriptor(base,property);if(desc.get){return desc.get.call(receiver)}return desc.value}}return _get(target,property,receiver||target)}function _toConsumableArray(arr){return _arrayWithoutHoles(arr)||_iterableToArray(arr)||_nonIterableSpread()}function _arrayWithoutHoles(arr){if(Array.isArray(arr)){for(var i=0,arr2=Array(arr.length);i<arr.length;i++){arr2[i]=arr[i]}return arr2}}function _iterableToArray(iter){if(Symbol.iterator in Object(iter)||"[object Arguments]"===Object.prototype.toString.call(iter))return Array.from(iter)}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance")}function toArray(objectOrArray){objectOrArray=objectOrArray||[];return Array.isArray(objectOrArray)?objectOrArray:[objectOrArray]}function log(msg){return"[Vaadin.Router] ".concat(msg)}function logValue(value){if("object"!==_typeof(value)){return value+""}var stringType=Object.prototype.toString.call(value).match(/ (.*)\]$/)[1];if("Object"===stringType||"Array"===stringType){return"".concat(stringType," ").concat(JSON.stringify(value))}else{return stringType}}var MODULE="module",NOMODULE="nomodule",bundleKeys=[MODULE,NOMODULE];function ensureBundle(src){if(!src.match(/.+\.[m]?js$/)){throw new Error(log("Unsupported type for bundle \"".concat(src,"\": .js or .mjs expected.")))}}function ensureRoute(route){if(!route||!isString(route.path)){throw new Error(log("Expected route config to be an object with a \"path\" string property, or an array of such objects"))}var bundle=route.bundle,stringKeys=["component","redirect","bundle"];if(!isFunction(route.action)&&!Array.isArray(route.children)&&!isFunction(route.children)&&!isObject(bundle)&&!stringKeys.some(function(key){return isString(route[key])})){throw new Error(log("Expected route config \"".concat(route.path,"\" to include either \"").concat(stringKeys.join("\", \""),"\" ")+"or \"action\" function but none found."))}if(bundle){if(isString(bundle)){ensureBundle(bundle)}else if(!bundleKeys.some(function(key){return key in bundle})){throw new Error(log("Expected route bundle to include either \""+NOMODULE+"\" or \""+MODULE+"\" keys, or both"))}else{bundleKeys.forEach(function(key){return key in bundle&&ensureBundle(bundle[key])})}}if(route.redirect){["bundle","component"].forEach(function(overriddenProp){if(overriddenProp in route){console.warn(log("Route config \"".concat(route.path,"\" has both \"redirect\" and \"").concat(overriddenProp,"\" properties, ")+"and \"redirect\" will always override the latter. Did you mean to only use \"".concat(overriddenProp,"\"?")))}})}}function ensureRoutes(routes){toArray(routes).forEach(function(route){return ensureRoute(route)})}function loadScript(src,key){var script=document.head.querySelector("script[src=\""+src+"\"][async]");if(!script){script=document.createElement("script");script.setAttribute("src",src);if(key===MODULE){script.setAttribute("type",MODULE)}else if(key===NOMODULE){script.setAttribute(NOMODULE,"")}script.async=!0}return new Promise(function(resolve,reject){script.onreadystatechange=script.onload=function(e){script.__dynamicImportLoaded=!0;resolve(e)};script.onerror=function(e){if(script.parentNode){script.parentNode.removeChild(script)}reject(e)};if(null===script.parentNode){document.head.appendChild(script)}else if(script.__dynamicImportLoaded){resolve()}})}function loadBundle(bundle){if(isString(bundle)){return loadScript(bundle)}else{return Promise.race(bundleKeys.filter(function(key){return key in bundle}).map(function(key){return loadScript(bundle[key],key)}))}}function fireRouterEvent(type,detail){return!window.dispatchEvent(new CustomEvent("vaadin-router-".concat(type),{cancelable:"go"===type,detail:detail}))}function isObject(o){// guard against null passing the typeof check
 return"object"===_typeof(o)&&!!o}function isFunction(f){return"function"===typeof f}function isString(s){return"string"===typeof s}function getNotFoundError(context){var error=new Error(log("Page not found (".concat(context.pathname,")")));error.context=context;error.code=404;return error}var notFoundResult=new function NotFoundResult(){_classCallCheck(this,NotFoundResult)};/* istanbul ignore next: coverage is calculated in Chrome, this code is for IE */function getAnchorOrigin(anchor){// IE11: on HTTP and HTTPS the default port is not included into
 // window.location.origin, so won't include it here either.
 var port=anchor.port,protocol=anchor.protocol,defaultHttp="http:"===protocol&&"80"===port,defaultHttps="https:"===protocol&&"443"===port,host=defaultHttp||defaultHttps?anchor.hostname// does not include the port number (e.g. www.example.org)
@@ -6730,7 +6718,8 @@
 for(var anchor=event.target,path=event.composedPath?event.composedPath():event.path||[],i=0,target;i<path.length;i++){target=path[i];if(target.nodeName&&"a"===target.nodeName.toLowerCase()){anchor=target;break}}while(anchor&&"a"!==anchor.nodeName.toLowerCase()){anchor=anchor.parentNode}// ignore the click if not at an <a> element
 if(!anchor||"a"!==anchor.nodeName.toLowerCase()){return}// ignore the click if the <a> element has a non-default target
 if(anchor.target&&"_self"!==anchor.target.toLowerCase()){return}// ignore the click if the <a> element has the 'download' attribute
-if(anchor.hasAttribute("download")){return}// ignore the click if the target URL is a fragment on the current page
+if(anchor.hasAttribute("download")){return}// ignore the click if the <a> element has the 'router-ignore' attribute
+if(anchor.hasAttribute("router-ignore")){return}// ignore the click if the target URL is a fragment on the current page
 if(anchor.pathname===window.location.pathname&&""!==anchor.hash){return}// ignore the click if the target is external to the app
 // In IE11 HTMLAnchorElement does not have the `origin` property
 var origin=anchor.origin||getAnchorOrigin(anchor);if(origin!==window.location.origin){return}// if none of the above, convert the click into a navigation event
@@ -7436,6 +7425,10 @@
       value: function getUsedVaadinElements(elements) {
         var version = getPolymerVersion();
         var elementClasses = void 0;
+        // NOTE: In case you edit the code here, YOU MUST UPDATE any statistics reporting code in Flow.
+        // Check all locations calling the method getEntries() in
+        // https://github.com/vaadin/flow/blob/master/flow-server/src/main/java/com/vaadin/flow/internal/UsageStatistics.java#L106
+        // Currently it is only used by BootstrapHandler.
         if (version && version.indexOf('2') === 0) {
           // Polymer 2: components classes are stored in window.Vaadin
           elementClasses = Object.keys(window.Vaadin).map(function (c) {
@@ -7645,7 +7638,7 @@
     }, {
       key: 'lottery',
       value: function lottery() {
-        return Math.random() <= 0.05;
+        return true;
       }
     }, {
       key: 'currentMonth',
@@ -7699,7 +7692,7 @@
     }], [{
       key: 'version',
       get: function get$1() {
-        return '2.0.10';
+        return '2.1.0';
       }
     }, {
       key: 'firstUseKey',
@@ -7727,7 +7720,7 @@
     // Intentionally ignored as this is not a problem in the app being developed
     }
     }());
-     vaadin-dev-mode:end **/}var usageStatistics=function usageStatistics(){if("function"===typeof runIfDevelopmentMode){return runIfDevelopmentMode(maybeGatherAndSendStats)}};window.Vaadin=window.Vaadin||{};window.Vaadin.registrations=window.Vaadin.registrations||[];window.Vaadin.registrations.push({is:"@vaadin/router",version:"1.5.1"});usageStatistics();Router.NavigationTrigger={POPSTATE:POPSTATE,CLICK:CLICK};var isUrlAvailable,urlDocument,urlBase,urlAnchor;Resolver.__ensureUrlAvailableOrPolyfilled=function(){if(isUrlAvailable===void 0){try{var url=new URL("b","http://a");url.pathname="c";isUrlAvailable="http://a/c"===url.href}catch(e){isUrlAvailable=!1}if(!isUrlAvailable){// The URL constructor is not available in IE11. Polyfill it by creating
+     vaadin-dev-mode:end **/}var usageStatistics=function usageStatistics(){if("function"===typeof runIfDevelopmentMode){return runIfDevelopmentMode(maybeGatherAndSendStats)}};window.Vaadin=window.Vaadin||{};window.Vaadin.registrations=window.Vaadin.registrations||[];window.Vaadin.registrations.push({is:"@vaadin/router",version:"1.6.0"});usageStatistics();Router.NavigationTrigger={POPSTATE:POPSTATE,CLICK:CLICK};var isUrlAvailable,urlDocument,urlBase,urlAnchor;Resolver.__ensureUrlAvailableOrPolyfilled=function(){if(isUrlAvailable===void 0){try{var url=new URL("b","http://a");url.pathname="c";isUrlAvailable="http://a/c"===url.href}catch(e){isUrlAvailable=!1}if(!isUrlAvailable){// The URL constructor is not available in IE11. Polyfill it by creating
 // an HTMLAnchorElement in an in-memory HTML document.
 urlDocument=document.implementation.createHTMLDocument("url");urlBase=urlDocument.createElement("base");urlDocument.head.appendChild(urlBase);urlAnchor=urlDocument.createElement("a");if(!urlAnchor.origin){// IE11: HTMLAnchorElement does not have the `origin` property
 Object.defineProperty(urlAnchor,"origin",{get:function get(){// IE11: on HTTP and HTTPS the default port is not included into
diff --git a/docs/vaadin-router/demo/vaadin-router-getting-started-demos.html b/docs/vaadin-router/demo/vaadin-router-getting-started-demos.html
index 149a0e61..456d231e 100644
--- a/docs/vaadin-router/demo/vaadin-router-getting-started-demos.html
+++ b/docs/vaadin-router/demo/vaadin-router-getting-started-demos.html
@@ -245,9 +245,62 @@ <h3>Base URL</h3>
         </script>
       </template>
     </vaadin-demo-snippet>
+
+    <h3>Excluded links</h3>
+    <p>When some <code>&lt;a&gt;</code> links are external for the app, Vaadin
+      Router can be configured to ignore them and let the browser handle these
+      links in the default way:
+      <code></code></p><pre><code>&lt;a href="/users" <b>router-ignore</b>&gt;Users&lt;/a&gt;</code></pre>
+    <p></p>
+    <vaadin-demo-snippet id="vaadin-router-getting-started-demo-ignore" iframe-src="iframe.html">
+      <template preserve-content="">
+        <nav>
+          <a href="/">Home</a>
+          <!-- ignored by Vaadin Router, triggers a full page reload -->
+          <a href="/users" router-ignore="">Users</a>
+        </nav>
+
+        <main></main>
+
+        <script>
+          // import {Router} from '@vaadin/router'; // for Webpack / Polymer CLI
+          // const Router = Vaadin.Router; // for vaadin-router.umd.js
+
+          const router = new Router(document.querySelector('main'));
+          router.setRoutes([
+            {path: '/', component: 'x-home-view'},
+          ]);
+        </script>
+      </template>
+    </vaadin-demo-snippet>
+
+    <p>When an large set of URLs needs to be ignored (e.g. all URLs starting
+      with <code>/external</code>), it may be impractical to add the
+      <code>router-ignore</code> attribute to each link separately.
+      For such cases a more practical approach would be to add a special route
+      to the top of the router config:
+    </p>
+    <vaadin-demo-snippet theme="no-renderer" id="vaadin-router-getting-started-demo-ignore-bulk">
+      <template preserve-content="">
+        <script>
+          /* eslint-disable-next-line */
+          var routes = [
+            // this would be the first route in the config
+            {
+              path: '/external/(.*)',
+              action: (ctx, commands) => {
+                window.location.pathname = ctx.pathname;
+              }
+            },
+          ];
+        </script>
+      </template>
+    </vaadin-demo-snippet>
   </template>
   <script>var VaadinRouterGettingStartedDemos=/*#__PURE__*/function(_DemoReadyEventEmitte){babelHelpers.inherits(VaadinRouterGettingStartedDemos,_DemoReadyEventEmitte);function VaadinRouterGettingStartedDemos(){babelHelpers.classCallCheck(this,VaadinRouterGettingStartedDemos);return babelHelpers.possibleConstructorReturn(this,babelHelpers.getPrototypeOf(VaadinRouterGettingStartedDemos).apply(this,arguments))}babelHelpers.createClass(VaadinRouterGettingStartedDemos,[{key:"ready",value:function ready(){babelHelpers.get(babelHelpers.getPrototypeOf(VaadinRouterGettingStartedDemos.prototype),"ready",this).call(this);// The base URL demo should '/ui/' initially instead of the default '/'
 // TODO(platosha): Remove the workaround below after)
 // https://github.com/vaadin/vaadin-demo-helpers/issues/60 is fixed
-var baseUrlDemoSnippet=this.$["vaadin-router-getting-started-demo-base-url"],origShowDemo=baseUrlDemoSnippet._showDemo;baseUrlDemoSnippet._showDemo=function(){origShowDemo.apply(this,arguments);var iframeDemoRenderer=baseUrlDemoSnippet.$.demo.firstElementChild;iframeDemoRenderer.__iframeReady.then(function(){iframeDemoRenderer.url="/ui/";iframeDemoRenderer._postIframeMessage({type:"set-url",url:"/ui/"})})}}}],[{key:"is",get:function get(){return"vaadin-router-getting-started-demos"}}]);return VaadinRouterGettingStartedDemos}(DemoReadyEventEmitter(ElementDemo(Polymer.Element)));customElements.define(VaadinRouterGettingStartedDemos.is,VaadinRouterGettingStartedDemos);</script>
+var baseUrlDemoSnippet=this.$["vaadin-router-getting-started-demo-base-url"],origShowDemo=baseUrlDemoSnippet._showDemo;baseUrlDemoSnippet._showDemo=function(){origShowDemo.apply(this,arguments);var iframeDemoRenderer=baseUrlDemoSnippet.$.demo.firstElementChild;iframeDemoRenderer.__iframeReady.then(function(){iframeDemoRenderer.url="/ui/";iframeDemoRenderer._postIframeMessage({type:"set-url",url:"/ui/"})})};// TODO(vlukashov): Remove the workaround, and implement the feature in
+// https://github.com/vaadin/vaadin-demo-helpers
+var bulkIgnoreDemoSnippet=this.$["vaadin-router-getting-started-demo-ignore-bulk"],orig=bulkIgnoreDemoSnippet._showDemo;bulkIgnoreDemoSnippet._showDemo=function(){orig.apply(this,arguments);this._markdown=this._markdown.replace(/\n\s*\/\* eslint-.*\*\/\n/g,"\n")}}}],[{key:"is",get:function get(){return"vaadin-router-getting-started-demos"}}]);return VaadinRouterGettingStartedDemos}(DemoReadyEventEmitter(ElementDemo(Polymer.Element)));customElements.define(VaadinRouterGettingStartedDemos.is,VaadinRouterGettingStartedDemos);</script>
 </dom-module>
diff --git a/docs/vaadin-router/demo/vaadin-router-navigation-trigger-demos.html b/docs/vaadin-router/demo/vaadin-router-navigation-trigger-demos.html
index 01551cb8..28787427 100644
--- a/docs/vaadin-router/demo/vaadin-router-navigation-trigger-demos.html
+++ b/docs/vaadin-router/demo/vaadin-router-navigation-trigger-demos.html
@@ -79,7 +79,8 @@ <h3><code>NavigationTrigger.CLICK</code></h3>
       <code>&lt;a&gt;</code> elements on the the page and converts them into
       navigation events for Vaadin Router if they refer to a
       location within the app. That allows using regular <code>&lt;a&gt;</code>
-      link elements for in-app navigation.
+      link elements for in-app navigation. You can use <code>router-ignore</code>
+      attribute to have the router ignore the link.
     </p>
     <vaadin-demo-snippet id="vaadin-router-navigation-trigger-demo-2" iframe-src="iframe.html">
       <template preserve-content="">