diff --git a/pom.xml b/pom.xml
index 440292eee6ce..6ca93f175a92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.commons</groupId>
     <artifactId>xwiki-commons-pom</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
     <!-- Note: Do NOT set the <relativePath> tag here as this can cause issues. For example imagine you're using
          Jenkins and you have the following directory structure:
              workspace/xwiki-commons
@@ -41,7 +41,7 @@
   <artifactId>xwiki-platform</artifactId>
   <name>XWiki Platform - Parent POM</name>
   <packaging>pom</packaging>
-  <version>16.1.0-SNAPSHOT</version>
+  <version>16.2.0-SNAPSHOT</version>
   <description>XWiki Platform - Parent POM</description>
   <properties>
     <!-- Useful for external Maven projects that extend the Platform POM. Must not be used by Platform project! -->
diff --git a/xwiki-platform-core/pom.xml b/xwiki-platform-core/pom.xml
index f9d92a43e7a9..f1c2a2f43612 100644
--- a/xwiki-platform-core/pom.xml
+++ b/xwiki-platform-core/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-core</artifactId>
   <name>XWiki Platform - Core - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
index ffc89a2197dc..d23af4d6e3e1 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2</artifactId>
   <name>XWiki Platform - Active Installs 2 - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
index 12ec727b7437..638de08b5fb9 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-activeinstalls2</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2-api</artifactId>
   <name>XWiki Platform - Active Installs 2 - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
index a44699ab3b6d..86c1629866d4 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-activeinstalls2</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2-test</artifactId>
   <name>XWiki Platform - Active Installs 2 - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
index 6734b31a10ab..43fb8f5da8e1 100644
--- a/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-activeinstalls2/xwiki-platform-activeinstalls2-test/xwiki-platform-activeinstalls2-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-activeinstalls2-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-activeinstalls2-test-docker</artifactId>
   <name>XWiki Platform - Active Installs 2 - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/pom.xml b/xwiki-platform-core/xwiki-platform-administration/pom.xml
index 9d3e87aaa64f..45f9d875cc90 100644
--- a/xwiki-platform-core/xwiki-platform-administration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration</artifactId>
   <name>XWiki Platform - Administration - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
index a8bd29723919..317c7a32010d 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-test</artifactId>
   <name>XWiki Platform - Administration - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
index f56f138f2b65..19ea451b68ef 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-test-docker</artifactId>
   <name>XWiki Platform - Administration - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
index 8397f1b268b8..869ab9fa3eda 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-test/xwiki-platform-administration-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-test-pageobjects</artifactId>
   <name>XWiki Platform - Administration - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
index b72c1b1e47e1..41bb1e2cd3b1 100644
--- a/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-administration/xwiki-platform-administration-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-administration</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-administration-ui</artifactId>
   <name>XWiki Platform - Administration - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-alerts/pom.xml b/xwiki-platform-core/xwiki-platform-alerts/pom.xml
index e800226c2e30..6098ff6e7014 100644
--- a/xwiki-platform-core/xwiki-platform-alerts/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-alerts/pom.xml
@@ -25,10 +25,10 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-alerts</artifactId>
-  <version>16.1.0-SNAPSHOT</version>
+  <version>16.2.0-SNAPSHOT</version>
   <name>XWiki Platform - Alerts - Parent POM</name>
   <packaging>pom</packaging>
   <description>Application that adds an "alert" menu in the skin.</description>
diff --git a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
index 16f702428745..46f3a1f752e4 100644
--- a/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-alerts/xwiki-platform-alerts-ui/pom.xml
@@ -25,10 +25,10 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-alerts</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-alerts-ui</artifactId>
-  <version>16.1.0-SNAPSHOT</version>
+  <version>16.2.0-SNAPSHOT</version>
   <name>XWiki Platform - Alerts - UI</name>
   <packaging>xar</packaging>
   <properties>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/pom.xml
index e98344bb854b..1fdfaf4c9bfc 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation</artifactId>
   <name>XWiki Platform - Annotations - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
index 088b495acbd2..6901be48240c 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-core</artifactId>
   <name>XWiki Platform - Annotations - Core Services</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
index e755aebd69f0..41f7a7fb9a75 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-io/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-io</artifactId>
   <name>XWiki Platform - Annotations - XWiki Storage Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
index 20fb07ea354e..eace6402fbe0 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-maintainer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-maintainer</artifactId>
   <name>XWiki Platform - Annotations - Maintainer</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
index 8603200b2d49..77de6d3cf2a1 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-reference/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-reference</artifactId>
   <name>XWiki Platform - Annotations - References Manipulation</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
index 8aecc2235cd4..d3a64b74eb60 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-rest</artifactId>
   <name>XWiki Platform - Annotations - REST Services</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml
index 7940b05044d3..06c8c6c0f1a9 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-scripting/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-scripting</artifactId>
   <name>XWiki Platform - Annotations - Scripting APIs</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml
index 271c887380f7..d57e8d0581fd 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-test</artifactId>
   <name>XWiki Platform - Annotations - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml
index cbe0ab37f592..2422de2fe566 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-test-docker</artifactId>
   <name>XWiki Platform - Annotation - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml
index dd9ac82424ec..d931f6c75018 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-test/xwiki-platform-annotation-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-test-pageobjects</artifactId>
   <name>XWiki Platform - Annotations - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml
index ab5cac75e85f..613c9546f712 100644
--- a/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-annotation/xwiki-platform-annotation-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-annotation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-annotation-ui</artifactId>
   <name>XWiki Platform - Annotations - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/pom.xml b/xwiki-platform-core/xwiki-platform-application/pom.xml
index ed124517df10..30c6ff249157 100644
--- a/xwiki-platform-core/xwiki-platform-application/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application</artifactId>
   <name>XWiki Platform - Application - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml
index 0ad9cd101f85..0a64e39808c4 100644
--- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-application</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application-test</artifactId>
   <name>XWiki Platform - Application - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml
index a014ce70677c..4beb32933235 100644
--- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-test/xwiki-platform-application-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-application-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application-test-pageobjects</artifactId>
   <name>XWiki Platform - Application - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml
index 0cd6aeccd445..eba1337856cd 100644
--- a/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-application/xwiki-platform-application-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-application</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-application-ui</artifactId>
   <name>XWiki Platform - Application - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml
index 0a57dd2bc107..f11101fd0a37 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes</artifactId>
   <name>XWiki Platform - App Within Minutes</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml
index a62bf31b3a73..9eccb4d3d29e 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-test</artifactId>
   <name>XWiki Platform - App Within Minutes - Test - Parent</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml
index 50364c8a1cfa..c6a3238c1145 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-test-docker</artifactId>
   <name>XWiki Platform - AppWithinMinutes - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml
index fec9a5633271..6113eeccad2d 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-test/xwiki-platform-appwithinminutes-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-test-pageobjects</artifactId>
   <name>XWiki Platform - App Within Minutes - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml
index a64a5a726854..3994ca546bb0 100644
--- a/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-appwithinminutes/xwiki-platform-appwithinminutes-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-appwithinminutes</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-appwithinminutes-ui</artifactId>
   <name>XWiki Platform - App Within Minutes - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/pom.xml
index c5c2b8aeffe3..866ceef9f693 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment</artifactId>
   <name>XWiki Platform - Attachment - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml
index 7facc08ab7e5..ce8fab375e11 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-api</artifactId>
   <name>XWiki Platform - Attachment - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml
index ba90fc21e332..b019f30c44c2 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker</artifactId>
   <name>XWiki Platform - Attachment - Picker - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml
index ac2bf7db5188..2b0c4d421ca2 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-attachment-picker-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml
index fe1d757be4f4..c85011478e88 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-test</artifactId>
   <name>XWiki Platform - Attachment - Picker - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml
index 6d64147f6f86..189447247ce7 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-test-docker</artifactId>
   <name>XWiki Platform - Attachment - Picker - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml
index 15daea9364d7..bc8a1da4834b 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-test/xwiki-platform-attachment-picker-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-test-pageobjects</artifactId>
   <name>XWiki Platform - Attachment - Picker - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml
index 8d95bd7559ce..ecc2b71e46ae 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-picker-ui</artifactId>
   <name>XWiki Platform - Attachment - Picker - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml
index 500aa6b1ad59..21e95e2c4c67 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-picker/xwiki-platform-attachment-picker-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-picker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-attachment-picker-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml
index 5034b4edbe5c..c6a5914a6e25 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-test</artifactId>
   <name>XWiki Platform - Attachment - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml
index 10c402a8b2fc..cc5c661d80b4 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-test-docker</artifactId>
   <name>XWiki Platform - Attachment - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml
index e86ff137eff9..4e8305d53f7d 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-test/xwiki-platform-attachment-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-test-pageobjects</artifactId>
   <name>XWiki Platform - Attachment - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml
index fa3df41180b2..cde9a54fa70f 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-ui</artifactId>
   <name>XWiki Platform - Attachment - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml
index b405eea34757..b831ca91ea8c 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation</artifactId>
   <name>XWiki Platform - Attachment - Validation - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml
index 2daf1484667f..70cba2bd3c1e 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-api</artifactId>
   <name>XWiki Platform - Attachment - Validation - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
index 06b871d3f5dc..295abe9eafd9 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-default</artifactId>
   <name>XWiki Platform - Attachment - Validation - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml
index 345928ac5ad6..5f37d449db06 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-test</artifactId>
   <name>XWiki Platform - Attachment - Validation - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml
index 20576d9c2e73..f782a27f44b4 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-test-docker</artifactId>
   <name>XWiki Platform - Attachment - Validation - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml
index f0d8153e2b4e..3ac596984497 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-test/xwiki-platform-attachment-validation-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-test-pageobjects</artifactId>
   <name>XWiki Platform - Attachment - Validation - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml
index 99d128742234..66e50036b037 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-validation/xwiki-platform-attachment-validation-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-attachment-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-attachment-validation-ui</artifactId>
   <name>XWiki Platform - Attachment - Validation - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-bridge/pom.xml b/xwiki-platform-core/xwiki-platform-bridge/pom.xml
index fcbcfb259f8d..8aec73d27123 100644
--- a/xwiki-platform-core/xwiki-platform-bridge/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-bridge/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-bridge</artifactId>
   <name>XWiki Platform - Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/pom.xml
index 5dbfc0572262..83c343691148 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha</artifactId>
   <name>XWiki Platform - CAPTCHA - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml
index 8c5df9a7f529..0ec0ef7aed60 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-api</artifactId>
   <name>XWiki Platform - CAPTCHA - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml
index 38159faa5518..c297b74700f3 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-default/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-default</artifactId>
   <name>XWiki Platform - CAPTCHA - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml
index 4c0769b85bce..0ba728471572 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
   <name>XWiki Platform - CAPTCHA - JCaptcha - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml
index 4c9d0d83202e..f2f42aa57236 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-jcaptcha-api</artifactId>
   <name>XWiki Platform - CAPTCHA - JCaptcha - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml
index e551ef751aa0..09b29b852851 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-jcaptcha-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml
index db00c335066c..e320d7dce415 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-jcaptcha/xwiki-platform-captcha-jcaptcha-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha-jcaptcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-captcha-jcaptcha-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml
index b470ddb7a362..d44288e898ea 100644
--- a/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-captcha/xwiki-platform-captcha-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-captcha</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-captcha-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-chart/pom.xml b/xwiki-platform-core/xwiki-platform-chart/pom.xml
index dc5648fa7d25..eba94fdbccb8 100644
--- a/xwiki-platform-core/xwiki-platform-chart/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-chart/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-chart</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml
index 3cad312a9878..9885ccfce88d 100644
--- a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
     <relativePath>../../xwiki-platform-rendering/xwiki-platform-rendering-macros</relativePath>
   </parent>
   <artifactId>xwiki-platform-chart-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml
index a221701a067c..ca08b17128ff 100644
--- a/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-chart/xwiki-platform-chart-renderer/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-chart</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-chart-renderer</artifactId>
   <name>XWiki Platform - Chart - Rendering</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml
index 7c9c43b2dfce..46dff79628c3 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
index a670b473dbfa..d025f697aafa 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-ckeditor-plugins</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml
index 3c89ee513a78..0fbebfb95dad 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-test</artifactId>
   <name>XWiki Platform - CKEditor - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml
index 7addaecf0df2..af3648adaab7 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-test-docker</artifactId>
   <name>XWiki Platform - CKEditor - Tests - Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml
index eb43ab36b56b..1f917f262df0 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-test-pageobjects</artifactId>
   <name>XWiki Platform - CKEditor - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
index db37ca4067dd..e80c947a56b8 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ckeditor-ui</artifactId>
   <name>XWiki Platform - CKEditor - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
index e9ea8299c252..40a308fc9a11 100644
--- a/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ckeditor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-ckeditor-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/pom.xml
index 07c0770bf727..bc91c276d112 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader</artifactId>
   <name>XWiki Platform - ClassLoader - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml
index c81bdf7c5d9a..59e6f4bf50f0 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-classloader</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader-protocols</artifactId>
   <name>XWiki Platform - ClassLoader - Protocols - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml
index 57f529e455ed..a774af177cdd 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-protocols/xwiki-platform-classloader-protocol-attachmentjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-classloader-protocols</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader-protocol-attachmentjar</artifactId>
   <name>XWiki Platform - ClassLoader - Protocols - Attachment JAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml
index 27e5f6ed8752..479ca76d54a8 100644
--- a/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-classloader/xwiki-platform-classloader-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-classloader</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-classloader-xwiki</artifactId>
   <name>XWiki Platform - Classloader - XWiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/pom.xml b/xwiki-platform-core/xwiki-platform-component/pom.xml
index abe99a3aa676..db996b03376f 100644
--- a/xwiki-platform-core/xwiki-platform-component/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component</artifactId>
   <name>XWiki Platform - Component - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml
index afbb0efb8c26..419831a93380 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-multi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-component</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component-multi</artifactId>
   <name>XWiki Platform - Component - Multi</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml
index c1d7dc09aa16..069461d58af5 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-component</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component-script</artifactId>
   <name>XWiki Platform - Component - Script Service</name>
diff --git a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml
index f1d67d8f9e58..7c5f0b893440 100644
--- a/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-component/xwiki-platform-component-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-component</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-component-wiki</artifactId>
   <name>XWiki Platform - Component - Wiki Components</name>
diff --git a/xwiki-platform-core/xwiki-platform-configuration/pom.xml b/xwiki-platform-core/xwiki-platform-configuration/pom.xml
index d019cade9e6d..87c559bbd1a0 100644
--- a/xwiki-platform-core/xwiki-platform-configuration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-configuration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-configuration</artifactId>
   <name>XWiki Platform - Configuration - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml
index 948742438f7d..af9666071837 100644
--- a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-configuration</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-configuration-api</artifactId>
   <name>XWiki Platform - Configuration - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml
index b216c12d68a5..46b0c3815bf1 100644
--- a/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-configuration/xwiki-platform-configuration-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-configuration</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-configuration-default</artifactId>
   <name>XWiki Platform - Configuration - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/pom.xml b/xwiki-platform-core/xwiki-platform-container/pom.xml
index 6d8c73586fed..e738ba76b3ed 100644
--- a/xwiki-platform-core/xwiki-platform-container/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container</artifactId>
   <name>XWiki Platform - Containers - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml
index 3684676ebc7c..0f7f6bd76e83 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-container</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container-api</artifactId>
   <name>XWiki Platform - Containers - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml
index 0f68531ebed1..c505bc194b6c 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-portlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-container</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container-portlet</artifactId>
   <name>XWiki Platform - Containers - Portlet</name>
diff --git a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml
index 6a1b5495101d..135a042af54a 100644
--- a/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-container/xwiki-platform-container-servlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-container</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-container-servlet</artifactId>
   <name>XWiki Platform - Containers - Servlet</name>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/pom.xml
index 06848443e8b5..a7d858f1faa7 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-crypto</artifactId>
   <name>XWiki Platform - Cryptographic Services</name>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml
index 29795ecc5173..5de49ea0508a 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-script/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-crypto</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-crypto-script</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml
index 43a3b8860cfe..800ff2912cc1 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-crypto</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-crypto-store</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml
index ff70e3b1dcff..5ecc6d11b3e2 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-crypto-store</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-crypto-store-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml
index 5a2b082d7117..409fa1062f1a 100644
--- a/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-crypto/xwiki-platform-crypto-store/xwiki-platform-crypto-store-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-crypto-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-crypto-store-wiki</artifactId>
   <name>XWiki Platform - Cryptographic Services - Storage - Wiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-csrf/pom.xml b/xwiki-platform-core/xwiki-platform-csrf/pom.xml
index 6fce33da0f12..5cbe6462984f 100644
--- a/xwiki-platform-core/xwiki-platform-csrf/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-csrf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-csrf</artifactId>
   <name>XWiki Platform - CSRF</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/pom.xml
index 0f8e34054a9d..af51fc9c7e48 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard</artifactId>
   <name>XWiki Platform - Dashboard - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml
index 0858332559f7..73a9e0920168 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-macro</artifactId>
   <name>XWiki Platform - Dashboard - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml
index afbaaf54bb92..b9c63dcfa3de 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-test</artifactId>
   <name>XWiki Platform - Dashboard - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml
index 8798a3713def..7cfa21cb5109 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-test-docker</artifactId>
   <name>XWiki Platform - Dashboard - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml
index ffd054733a20..89c010ad1b6b 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-test/xwiki-platform-dashboard-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-test-pageobjects</artifactId>
   <name>XWiki Platform - Dashboard - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml
index 0a5720093b24..7e08cb4f8a03 100644
--- a/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-dashboard/xwiki-platform-dashboard-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-dashboard</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-dashboard-ui</artifactId>
   <name>XWiki Platform - Dashboard - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-date/pom.xml b/xwiki-platform-core/xwiki-platform-date/pom.xml
index df21389e3533..dace1142cbec 100644
--- a/xwiki-platform-core/xwiki-platform-date/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-date/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-date</artifactId>
   <name>XWiki Platform - Date</name>
diff --git a/xwiki-platform-core/xwiki-platform-diff/pom.xml b/xwiki-platform-core/xwiki-platform-diff/pom.xml
index 05d296327aa7..66b12d4e7153 100644
--- a/xwiki-platform-core/xwiki-platform-diff/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-diff/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-diff</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml b/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml
index 9a59af4c9539..a9eb6d1231c1 100644
--- a/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-diff/xwiki-platform-diff-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-diff</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-diff-xml</artifactId>
   <name>XWiki Platform - Diff - XML</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/pom.xml b/xwiki-platform-core/xwiki-platform-display/pom.xml
index 98d2f7a92a97..a30417445fd2 100644
--- a/xwiki-platform-core/xwiki-platform-display/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display</artifactId>
   <name>XWiki Platform - Display</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml
index 98d819f2fd3e..7ebc1a175ef8 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-display</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display-api</artifactId>
   <name>XWiki Platform - Display - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml
index 9ef761d3d033..dfcb189b767f 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-html/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-display</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display-html</artifactId>
   <name>XWiki Platform - Display - HTML</name>
diff --git a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml
index f2d3f75820e2..f6b44847795f 100644
--- a/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-display</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-display-macro</artifactId>
   <name>XWiki Platform - Display - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/pom.xml b/xwiki-platform-core/xwiki-platform-edit/pom.xml
index 30932fcfcf42..32af23e33bec 100644
--- a/xwiki-platform-core/xwiki-platform-edit/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit</artifactId>
   <name>XWiki Platform - Edit</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml
index d6b0884799b5..642cc74478c1 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-api</artifactId>
   <name>XWiki Platform - Edit - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml
index dec90bc5afb0..63d2b5bf9e12 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-default</artifactId>
   <name>XWiki Platform - Edit - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml
index 20113ee72fb8..d5cc1ff137e2 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-test</artifactId>
   <name>XWiki Platform - Edit - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml
index c86313627d26..eaf4dc0b05c4 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-test-docker</artifactId>
   <name>XWiki Platform - Edit - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml
index 81272180981e..39758feb54fc 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-test-pageobjects</artifactId>
   <name>XWiki Platform - Edit - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml
index 220680a74e97..d1c92afeceee 100644
--- a/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-edit</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-edit-ui</artifactId>
   <name>XWiki Platform - Edit - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/pom.xml
index 8788a5d16763..f9a19f09ffce 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream</artifactId>
   <name>XWiki Platform - Event Stream - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml
index 424fdcc46299..4b2ab5a9e940 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-api</artifactId>
   <name>XWiki Platform - Event Stream - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml
index ae2f3ff0dd94..1dc09aaab7cb 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-default</artifactId>
   <name>XWiki Platform - Event Stream - Default Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml
index be056295c13b..519af93132e6 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-stores</artifactId>
   <name>XWiki Platform - Event Stream - Stores</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml
index c7ac2ecc2398..630725f61ccd 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream-stores</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-store-common</artifactId>
   <name>XWiki Platform - Event Stream - Store - Common</name>
diff --git a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml
index 773e3b9688e9..e793a4977295 100644
--- a/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-eventstream/xwiki-platform-eventstream-stores/xwiki-platform-eventstream-store-solr/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-eventstream-stores</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-eventstream-store-solr</artifactId>
   <name>XWiki Platform - Event Stream - Store - Solr</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/pom.xml b/xwiki-platform-core/xwiki-platform-export/pom.xml
index 5445eb0a191b..29e3f735abc8 100644
--- a/xwiki-platform-core/xwiki-platform-export/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export</artifactId>
   <name>XWiki Platform - Export</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml
index 0b49da57a814..9c039888fbf1 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-api</artifactId>
   <name>XWiki Platform - Export - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml
index 33fb84dbbec6..7fbe8b779c05 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf</artifactId>
   <name>XWiki Platform - Export - PDF</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml
index 1dc4899589fd..94690f4a9e3a 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-api</artifactId>
   <name>XWiki Platform - Export - PDF - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml
index 80153317d79d..69bda9563a94 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-default</artifactId>
   <name>XWiki Platform - Export - PDF - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml
index 7f17742f74a1..1c6739c2079c 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml
index 03045fcce70f..2280b755a3a5 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-content/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test-content</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Content</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
index 70133083f16f..f2e220ad0e4b 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test-docker</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml
index 27e82cc60bd4..c378907901f2 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-test/xwiki-platform-export-pdf-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-test-pageobjects</artifactId>
   <name>XWiki Platform - Export - PDF - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml
index b53bc7b7737f..e9f538890a3f 100644
--- a/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-export/xwiki-platform-export-pdf/xwiki-platform-export-pdf-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-export-pdf</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-export-pdf-ui</artifactId>
   <name>XWiki Platform - Export - PDF - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/pom.xml b/xwiki-platform-core/xwiki-platform-extension/pom.xml
index af149d270274..8aa92287cdd1 100644
--- a/xwiki-platform-core/xwiki-platform-extension/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension</artifactId>
   <name>XWiki Platform - Extension - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml
index 92c3cc0a0e45..1024a03650a9 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-api</artifactId>
   <name>XWiki Platform - Extension - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml
index 273f71ebacf9..3ca5d83ac462 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-cluster/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-cluster</artifactId>
   <name>XWiki Platform - Extension - Cluster</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml
index 3a60c5d3fb2f..dc2913d64a84 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-distribution/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-distribution</artifactId>
   <name>XWiki Platform - Extension - Distribution</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml
index feaf8b73ae3b..d7f276250746 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-handlers</artifactId>
   <name>XWiki Platform - Extension - Handler - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml
index 2184e0c826c5..cc204b799983 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-jar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-handlers</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-handler-jar</artifactId>
   <name>XWiki Platform - Extension - Handler - JAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml
index 5b1527d497e7..aa12978458c0 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-handlers/xwiki-platform-extension-handler-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-handlers</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-handler-xar</artifactId>
   <name>XWiki Platform - Extension - Handler - XAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml
index 6730897e9319..c2290dbad775 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-index/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-index</artifactId>
   <name>XWiki Platform - Extension - Index</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml
index c5525255d0e1..57519254b88c 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-script</artifactId>
   <name>XWiki Platform - Extension - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml
index d99805b38333..a7861b1bc312 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security</artifactId>
   <name>XWiki Platform - Extension - Security - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml
index 11d6e0f8bc3d..17c1c4922ab6 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-api</artifactId>
   <name>XWiki Platform - Extension - Security - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml
index b7e9e9791213..168edbf0c760 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-index/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-index</artifactId>
   <name>XWiki Platform - Extension - Security - Index</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml
index 3977705154d5..a238b80ceaec 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-notifications/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-notifications</artifactId>
   <name>XWiki Platform - Extension - Security - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml
index e29bc8fd9014..3af0094970f9 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-test</artifactId>
   <name>XWiki Platform - Extension - Security - Test - Root POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml
index 006a1db3e1fb..b99cec547bca 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <name>XWiki Platform - Extension - Security - Test - Functional Docker Tests</name>
   <artifactId>xwiki-platform-extension-security-test-docker</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml
index e12574e97360..722b7124c566 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-test/xwiki-platform-extension-security-test-pageobjects/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-test-pageobjects</artifactId>
   <name>XWiki Platform - Extension - Security - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml
index 5b2c06d9b150..b14cfc45e499 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-security/xwiki-platform-extension-security-ui/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-security-ui</artifactId>
   <name>XWiki Platform - Extension - Security - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml
index 7ef8d6c8d294..3e36d7c2c0e5 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test</artifactId>
   <name>XWiki Platform - Extension - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml
index 272121a5aef2..6ad9f6c71998 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test-pageobjects</artifactId>
   <name>XWiki Platform - Extension - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml
index 82401b8b5d66..89d1b3efdf7f 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test-tests</artifactId>
   <name>XWiki Platform - Extension - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml
index 00ed51f0fb18..2581771b81f4 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-test/xwiki-platform-extension-test-utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-test-utils</artifactId>
   <name>XWiki Platform - Extension - Tests - Utils</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml
index 202c7147aa07..fdfc90ee8689 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-extension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-extension-ui</artifactId>
   <name>XWiki Platform - Extension - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml
index 594c3d2d0ab2..16f981b0a43a 100644
--- a/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-extension/xwiki-platform-extension-versioncheck/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-extension</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
+        <version>16.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>xwiki-platform-extension-versioncheck</artifactId>
     <name>XWiki Platform - Extension - Version Check</name>
diff --git a/xwiki-platform-core/xwiki-platform-feed/pom.xml b/xwiki-platform-core/xwiki-platform-feed/pom.xml
index d4f653ca4832..8703fe5447e3 100644
--- a/xwiki-platform-core/xwiki-platform-feed/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-feed/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-feed</artifactId>
   <name>XWiki Platform - Feed - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml b/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml
index 042be955b600..848ea8d89b33 100644
--- a/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-feed/xwiki-platform-feed-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-feed</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-feed-api</artifactId>
   <name>XWiki Platform - Feed - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/pom.xml b/xwiki-platform-core/xwiki-platform-filter/pom.xml
index f0f3d7a6a578..bcb54c5d2436 100644
--- a/xwiki-platform-core/xwiki-platform-filter/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml
index 51b0d4633612..fed7ac2a62e3 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-events</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml
index 0136829080db..63cfd3b92436 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-events</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-event-model</artifactId>
   <name>XWiki Platform - Filter - Event - Model</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml
index 223b3fe9d7c8..9dc9db0c2d2a 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-events</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-event-user</artifactId>
   <name>XWiki Platform - Filter - Event - User</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml
index ece500a676a7..27b7b76e692b 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-events/xwiki-platform-filter-event-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-events</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-event-xwiki</artifactId>
   <name>XWiki Platform - Filter - Event - XWiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml
index 178876b2200c..bb8ef002cb82 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml
index e7b45f7709fc..e5eb00163e99 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-api</artifactId>
   <name>XWiki Platform - Filter - Instance - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml
index 099ecb690f1b..7316cd498dbf 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-document/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-document</artifactId>
   <name>XWiki Platform - Filter - Instance - Document</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml
index 991ccb754ae4..3551f7db739a 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-extension/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-extension</artifactId>
   <name>XWiki Platform - Filter - Instance - Extension</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml
index 7894ceebcc91..53850b60014f 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-instance/xwiki-platform-filter-instance-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-instance</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-instance-script</artifactId>
   <name>XWiki Platform - Filter - Instance - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml
index 85993e2cf3c1..8439cf2b9555 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-script</artifactId>
   <name>XWiki Platform - Filter - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml
index 0b057e4e0f99..17e1c53bbbdb 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-streams</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml
index d5d6b322eba5..9b8b4633c633 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-streams/xwiki-platform-filter-stream-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-streams</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-stream-xar</artifactId>
   <name>XWiki Platform - Filter - XAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml
index b803353b6f97..2fc167aed6e4 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-test</artifactId>
   <name>XWiki Platform - Filter - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml
index 9f600c64a9a2..e277c40357be 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-test/xwiki-platform-filter-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-test-tests</artifactId>
   <name>XWiki Platform - Filter - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml
index 1b25bca876f5..17c788ec6243 100644
--- a/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-filter/xwiki-platform-filter-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-filter</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-filter-ui</artifactId>
   <name>XWiki Platform - Filter - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/pom.xml
index 264568c97e08..76c556b51cbf 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo</artifactId>
   <name>XWiki Platform - Flamingo - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml
index 85d56f94a56d..09ccc695e781 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml
index d639718ec26b..8cfd61810c58 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-resources</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Resources</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less
index b32151f90d26..855c74ebd962 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/messages.less
@@ -2,49 +2,10 @@
 // Messages
 // --------------------------------------------------
 
-// Used by: Inline boxes
-span.successmessage, span.errormessage, span.warningmessage, span.infomessage {
-  padding: 0 floor(@font-size-base * 0.2);
-  border: none;
-  box-shadow: none;
-  & > img {
-    // Style the silk icons
-    margin: 0 .6rem 0 .2rem;
-    vertical-align: sub;
-  }
-
-  & > span.fa {
-    // Style the font awesome icons
-    margin: 0 .6rem 0 .2rem;
-  }
-}
-
-// Used by: message boxes
-div.successmessage, div.errormessage, div.warningmessage, div.infomessage {
-  display: flex;
-  gap: 2rem;
-  justify-content: left;
-  align-items: baseline;
-  padding: 2rem;
-  border: none;
-  border-left: 4px solid;
-  box-shadow: none;
-
-  & > img {
-    // Improve alignment for silk icons
-    align-self: flex-start;
-  }
-
-  & > div > .box-title,
-  & > div > .xwiki-metadata-container[data-xwiki-parameter-name="title"] {
-    font-weight: bold;
-  }
-
-  // Main message content
-  & > div > p,
-  & > div > [data-cke-display-name="$content"] {
-    margin: 0;
-  }
+.successmessage, .errormessage, .warningmessage, .infomessage,
+span.successmessage, span.errormessage, span.warningmessage, span.infomessage, 
+span.box { // Used by: Inline boxes and messages
+  padding: floor(@font-size-base * 0.2);
 }
 
 .box, .plainmessage, // Used by: Code Macro, Success Macro, etc.
@@ -66,26 +27,18 @@ fieldset.xwikimessage { // Used by: Login form, Delete messages
 
 .successmessage {
   .alert-success;
-  background-color: @state-success-bg;
-  border-color: @brand-success;
 }
 
 .errormessage {
   .alert-danger;
-  background-color: @state-danger-bg;
-  border-color: @brand-danger;
 }
 
 .warningmessage {
   .alert-warning;
-  background-color: @state-warning-bg;
-  border-color: @brand-warning;
 }
 
 .infomessage {
   .alert-info;
-  background-color: @state-info-bg;
-  border-color: @brand-primary;
 }
 
 // --------------------------------------------------
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
index 143432181c38..332fe36912c8 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/variablesInit.vm
@@ -265,9 +265,10 @@
   ## from an orangish yellow to complete brown. Instead, we change the text color to black.
   @btn-warning-color:                   #000;
   ## The boxes should have enough contrast by default, we make it lighter than bootstrap.
-  @state-danger-bg:                     #f8ecec;
-  @state-success-bg:                    #e5f3df;
-  @state-info-bg:                       #e1f1f9;
+  ## @alert-warning-bg default value from bootstrap does not pose contrast issues, so we don't override it.
+  @alert-danger-bg:                     #f8ecec;
+  @alert-success-bg:                    #e5f3df;
+  @alert-info-bg:                       #e1f1f9;
   ## We override the @brand-danger value from bootstrap as it does not pass contrast checks on #fff
   @brand-danger:                        #cc3333;
 #end
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml
index 4e10f6455816..cfe4ceeeb227 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml
index 784c72ee2440..2e8757c6dd73 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-test-docker</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml
index e811ef734814..1dbd704ce4e5 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-pageobjects/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml
index 6f5f283c3c28..a1412155f603 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-skin-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-skin-test-tests</artifactId>
   <name>XWiki Platform - Flamingo - Skin - Test - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml
index 166699b23d35..bc68deb1fb70 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml
index bec18a6c216a..abcd342aeee0 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-bootswatch/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-bootswatch</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml
index 12b4addadf5c..ab46db0bdd35 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-test</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml
index 3bc9918cc093..72ab219627b4 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-test-docker</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Tests  - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml
index 3a82835eca87..2a5304a68623 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-test/xwiki-platform-flamingo-theme-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-test-pageobjects</artifactId>
   <name>XWiki Platform - Flamingo - Theme - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml
index e42223854230..7263d2e9f379 100644
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-theme/xwiki-platform-flamingo-theme-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flamingo-theme</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flamingo-theme-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-flavor/pom.xml b/xwiki-platform-core/xwiki-platform-flavor/pom.xml
index ee0280fd8b95..3a83aa79ac20 100644
--- a/xwiki-platform-core/xwiki-platform-flavor/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flavor/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flavor</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml b/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml
index c3d817010853..6e3d5ec1f5c8 100644
--- a/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-flavor/xwiki-platform-flavor-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-flavor-api</artifactId>
   <name>XWiki Platform - Flavor - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-groovy/pom.xml b/xwiki-platform-core/xwiki-platform-groovy/pom.xml
index 847b23b3c3db..47b1b90fea99 100644
--- a/xwiki-platform-core/xwiki-platform-groovy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-groovy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-groovy</artifactId>
   <name>XWiki Platform - Groovy</name>
diff --git a/xwiki-platform-core/xwiki-platform-help/pom.xml b/xwiki-platform-core/xwiki-platform-help/pom.xml
index 73b9cd5207ef..dbc21eeead3e 100644
--- a/xwiki-platform-core/xwiki-platform-help/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-help</artifactId>
   <name>XWiki Platform - Help - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml
index 2ad4f95c91c4..d692efcb2161 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-help</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-help-test</artifactId>
   <name>XWiki Platform - Panels - Help - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml
index 6af01ac20d95..1e5ba1cc39e0 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-test/xwiki-platform-help-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-help-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-help-test-docker</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml
index 4a78ec040809..7965982db436 100644
--- a/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-help/xwiki-platform-help-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-help</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-help-ui</artifactId>
   <name>XWiki Platform - Help - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/pom.xml b/xwiki-platform-core/xwiki-platform-icon/pom.xml
index dcfe4747b814..52d61d85a83d 100644
--- a/xwiki-platform-core/xwiki-platform-icon/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon</artifactId>
   <name>XWiki Platform - Icon - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml
index d10cb9298a4d..31bdb719c43b 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-api</artifactId>
   <name>XWiki Platform - Icon - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml
index 7f560d5e3c61..fc5484bc1418 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-default</artifactId>
   <name>XWiki Platform - Icon - Default implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
index 626f9ba71a08..f64de9baccd0 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-icon</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-fontawesome</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml
index cd4c127930ad..e275d6dacaac 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-fontawesome/src/main/resources/IconThemes/FontAwesome.xml
@@ -288,8 +288,7 @@ disk = floppy-o
 drink = glass
 drive = hdd-o
 email = envelope-o
-emoticon_smile= smile-o
-emoticon_unhappy = frown-o
+emoticon_smile=smile-o
 error = exclamation-triangle
 exclamation = exclamation-circle
 eye = eye
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml
index 2549e58ea003..1404968fd39c 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-macro</artifactId>
   <name>XWiki Platform - Icon - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml
index a8e553cdd562..1afa4fe29238 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-rest</artifactId>
   <name>XWiki Platform - Icon - REST - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
index 298c7ceb6b41..9b06557a205c 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-rest-api</artifactId>
   <name>XWiki Platform - Icon - REST - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml
index 039967a50541..fb2b255270a7 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-rest/xwiki-platform-icon-rest-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-rest-default</artifactId>
   <name>XWiki Platform - Icon - REST - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml
index d2b20a043033..20e721d399d4 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-script</artifactId>
   <name>XWiki Platform - Icon - Script services</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml
index a3e4125e1dac..b778fd685067 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-test</artifactId>
   <name>XWiki Platform - Icon - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml
index 920e955b91e2..0968c63aa8de 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-test/xwiki-platform-icon-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-test-docker</artifactId>
   <name>XWiki Platform - Icon - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml
index b1f6f2e6d578..ad6f57f85460 100644
--- a/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-icon/xwiki-platform-icon-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-icon</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-icon-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-image/pom.xml b/xwiki-platform-core/xwiki-platform-image/pom.xml
index 1bf060a1f88c..aed0c82e6aea 100644
--- a/xwiki-platform-core/xwiki-platform-image/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image</artifactId>
   <name>XWiki Platform - Image - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml
index caa66ff6e8a3..0e02bcb06eca 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox</artifactId>
   <name>XWiki Platform - Image - Lightbox - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml
index 47bb08febea4..80a4b9e10ddf 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-test</artifactId>
   <name>XWiki Platform - Image - Lightbox - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml
index dcdee0e7af91..bb83925394bc 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-test-docker</artifactId>
   <name>XWiki Platform - Image - Lightbox - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml
index a82199f5d129..bbd6e47fcc84 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-test/xwiki-platform-image-lightbox-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-test-pageobjects</artifactId>
   <name>XWiki Platform - Image - Lightbox - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml
index 1ac03d1e8599..7bbe58a35b9c 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-lightbox-ui</artifactId>
   <name>XWiki Platform - Image - Lightbox - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml
index 8fc852989b1f..3638e31e2d31 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-lightbox/xwiki-platform-image-lightbox-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-lightbox</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-image-lightbox-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml
index a6b10f7acb27..4426d4880b4d 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-processing</artifactId>
   <name>XWiki Platform - Image - Processing - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml
index 386b85f372cd..0322851a184b 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-processing</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-processing-api</artifactId>
   <name>XWiki Platform - Image - Processing - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml
index 107e339e8f8f..b5fd83ebfd12 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-processing</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-processing-plugin</artifactId>
   <name>XWiki Platform - Image - Processing - Plugin</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml
index d57eadabcc53..c5c0dde25949 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style</artifactId>
   <name>XWiki Platform - Image - Style - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml
index 56912b3a81b1..304d5942b16e 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-api</artifactId>
   <name>XWiki Platform - Image - Style - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml
index ae5239f73f6b..7588db4e7c88 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-model</artifactId>
   <name>XWiki Platform - Image - Style - Model</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
index f2dd4163d393..41408dce61f2 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-rest</artifactId>
   <name>XWiki Platform - Image - Style - Rest</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml
index ca8319f6bb90..daa07cbe49bc 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-test</artifactId>
   <name>XWiki Platform - Image - Style - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml
index 5cc6a7748454..6fd0d9e6887f 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-test-docker</artifactId>
   <name>XWiki Platform - Image - Style - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml
index a3e54531edc6..448bba6798bb 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-test/xwiki-platform-image-style-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-test-pageobjects</artifactId>
   <name>XWiki Platform - Image - Style - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml
index 49e4dc743100..7d0a45b98842 100644
--- a/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-style/xwiki-platform-image-style-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-image-style</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-image-style-ui</artifactId>
   <name>XWiki Platform - Image - Style - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/pom.xml b/xwiki-platform-core/xwiki-platform-index/pom.xml
index 755435466ffd..d4e91f915911 100644
--- a/xwiki-platform-core/xwiki-platform-index/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index</artifactId>
   <name>XWiki Platform - Index - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml
index 0b114d1ac46c..5a314bf033fb 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-api</artifactId>
   <name>XWiki Platform - Index - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml
index c1130f69eec2..3277960749b7 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-default</artifactId>
   <name>XWiki Platform - Index - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml
index 791570135eb9..85eca345bbfc 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test</artifactId>
   <name>XWiki Platform - Index - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
index 5969c0ab7ccc..3d70015a4c0f 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test-docker</artifactId>
   <name>XWiki Platform - Index - Tests - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml
index 166e4a3a9392..85fc71ec7e05 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test-pageobjects</artifactId>
   <name>XWiki Platform - Index - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
index abac096c8c02..7cb8c18a19b9 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-test/xwiki-platform-index-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-test-tests</artifactId>
   <name>XWiki Platform - Index - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml
index 0eb4fcdfd434..de6efe41f7fc 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree</artifactId>
   <name>XWiki Platform - Index - Tree - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml
index 3c5de104e0ad..596e63d444b9 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-api</artifactId>
   <name>XWiki Platform - Index - Tree - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml
index 879c351186f8..3c7c5b134616 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-macro</artifactId>
   <name>XWiki Platform - Index - Tree - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml
index 5ff41ef4b1e0..e998a2200647 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-test</artifactId>
   <name>XWiki Platform - Index - Tree - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
index 6c3e01cc3c47..60a9f606b641 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-test/xwiki-platform-index-tree-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-test-pageobjects</artifactId>
   <name>XWiki Platform - Index - Tree - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml
index 6584f892969f..3e4a6ef6d74d 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-tree/xwiki-platform-index-tree-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-tree-war</artifactId>
   <name>XWiki Platform - Index - Tree - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml
index 276946723168..3ccc37750d04 100644
--- a/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-index/xwiki-platform-index-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-index</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-index-ui</artifactId>
   <name>XWiki Platform - Index - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-instance/pom.xml b/xwiki-platform-core/xwiki-platform-instance/pom.xml
index 00070a539a88..bd2715293a92 100644
--- a/xwiki-platform-core/xwiki-platform-instance/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-instance/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-instance</artifactId>
   <name>XWiki Platform - Instance</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/pom.xml
index 2b874563ca28..3190c7de35e2 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation</artifactId>
   <name>XWiki Platform - Invitation</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml
index 8d0668ef90c9..445dd0cab980 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-test</artifactId>
   <name>XWiki Platform - Invitation - Test</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml
index 970b3dc799af..94777983ffee 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-test-docker</artifactId>
   <name>XWiki Platform - Invitation - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml
index 31aad95f8e56..bddec17ca9be 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-test/xwiki-platform-invitation-test-pageobject/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-test-pageobject</artifactId>
   <name>XWiki Platform - Invitation - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml
index c5e879559dc3..213964e222cb 100644
--- a/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-invitation/xwiki-platform-invitation-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-invitation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-invitation-ui</artifactId>
   <name>XWiki Platform - Invitation - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/pom.xml b/xwiki-platform-core/xwiki-platform-job/pom.xml
index 841a5d2ba454..f1f472ef8e37 100644
--- a/xwiki-platform-core/xwiki-platform-job/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-job</artifactId>
   <name>XWiki Platform - Job - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml
index a77c26768d04..07bb4c1d4ab9 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>xwiki-platform-job-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml
index 9fd942a7dc3a..34eff3773b81 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-handler/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-job-handler</artifactId>
   <name>XWiki Platform - Job - Handler</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml
index 1d3fd20d75ea..1015afafa973 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-job-script</artifactId>
   <name>XWiki Platform - Job - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml
index 13da1642029d..2e4c46a5bd8a 100644
--- a/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-job/xwiki-platform-job-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-job</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-job-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-jodatime/pom.xml b/xwiki-platform-core/xwiki-platform-jodatime/pom.xml
index 64d137dc135a..fe6915de8cd7 100644
--- a/xwiki-platform-core/xwiki-platform-jodatime/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-jodatime/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-jodatime</artifactId>
   <name>XWiki Platform - Joda Time</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/pom.xml
index 8359d564f772..d036eed67b00 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy</artifactId>
   <name>XWiki Platform - Legacy</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml
index 88b0743150f0..9b6d53960a06 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-annotation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-annotation</artifactId>
   <name>XWiki Platform - Legacy - Annotation</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml
index 77ad9e2e09da..c1d0a4a01364 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-events-hibernate</artifactId>
   <name>XWiki Platform - Legacy - Events Hibernate</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml
index e18c65937087..69347ac3e8b8 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-api/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-legacy-events-hibernate</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
+        <version>16.2.0-SNAPSHOT</version>
     </parent>
     <artifactId>xwiki-platform-legacy-events-hibernate-api</artifactId>
     <name>XWiki Platform - Legacy - Events Hibernate - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml
index afb750c8ed0c..fe8b6c6634c4 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-events-hibernate/xwiki-platform-legacy-events-hibernate-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-events-hibernate</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-events-hibernate-ui</artifactId>
   <name>XWiki Platform - Legacy - Events Hibernate - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml
index a6d13f91c5e7..08c30100b6c8 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-extension-handler-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-extension-handler-xar</artifactId>
   <name>XWiki Platform - Legacy - Extension Handler XAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml
index fc48c6877636..59b5e6fa4233 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-instance/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-instance</artifactId>
   <name>XWiki Platform - Legacy - Instance</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml
index 312fff3b8a6d..580c6e604498 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail</artifactId>
   <name>XWiki Platform - Legacy - Mail</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml
index 20d24f0b4ddf..3dbc70335713 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail-send</artifactId>
   <name>XWiki Platform - Legacy - Mail - Send</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml
index 40b08674fc2f..bc03e547471b 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-mail-send</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail-send-default</artifactId>
   <name>XWiki Platform - Legacy - Mail - Send - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml
index dec612b2dae7..988eb1ac784d 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-mail/xwiki-platform-legacy-mail-send/xwiki-platform-legacy-mail-send-storage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-mail-send</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-mail-send-storage</artifactId>
   <name>XWiki Platform - Legacy - Mail - Send - Storage</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml
index fc591c5a56f8..d904aabcfe46 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-model-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-model-api</artifactId>
   <name>XWiki Platform - Legacy - Model API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml
index 515325345d1d..56d5ebc27e6d 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications</artifactId>
   <name>XWiki Platform - Legacy - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml
index 601c300f9f2e..19a03a6fda70 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notification-activitymacro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notification-activitymacro</artifactId>
   <name>XWiki Platform - Legacy - Notification Activity Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml
index df3be8d655ee..c283d7d122a1 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-api</artifactId>
   <name>XWiki Platform - Legacy - Notifications - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml
index 57b8b7b4acec..16062d894ecc 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-filters</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Filters</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml
index 90f8a4bb9c1e..a340f22b8e35 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-filters/xwiki-platform-legacy-notifications-filters-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications-filters</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-filters-api</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Filters - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml
index b49961adee0d..55f41553cc7d 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-notifiers</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Notifiers</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml
index cc64144c46fa..5e71d54fe0d0 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications-notifiers</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-notifiers-api</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Notifiers - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml
index ba3713396155..fc7e229a1df4 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-notifiers/xwiki-platform-legacy-notifications-notifiers-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications-notifiers</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-notifiers-default</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Notifiers - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml
index f2a32abfb149..71d3c9c3f114 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-notifications/xwiki-platform-legacy-notifications-sources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-notifications-sources</artifactId>
   <name>XWiki Platform - Legacy - Notifications - Sources</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml
index 1adfc56ab928..8ab7f8e5297f 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-observation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-observation</artifactId>
   <name>XWiki Platform - Legacy - Observation</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml
index 2ed98816c674..e2c44c981ff5 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-office</artifactId>
   <name>XWiki Platform - Legacy - Office</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml
index 4f3ac2718a48..b6388271e88e 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-importer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-office-importer</artifactId>
   <name>XWiki Platform - Legacy - Office Importer</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml
index 8e2bb763d26b..a7fb4b7a7307 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-office/xwiki-platform-legacy-office-viewer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-office-viewer</artifactId>
   <name>XWiki Platform - Legacy - Office Viewer</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml
index eb7f9cfa4ed2..e66ee3a2c832 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-oldcore</artifactId>
   <name>XWiki Platform - Legacy - Old Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml
index 486a49fa49b1..d2c27ebab6f2 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-legacy</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-legacy-refactoring</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml
index 22199ac55d79..7116d08e98e4 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-refactoring/xwiki-platform-legacy-refactoring-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-legacy-refactoring</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-legacy-refactoring-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml
index c4ad28d0d325..7773f94160fa 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml
index afe6db468641..a1234b464e7f 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-macros</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Macros - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml
index 1502465e1de3..084b60895fb2 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-macros/xwiki-platform-legacy-rendering-macro-include/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-macro-include</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Macros - Include Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml
index 89cca1bb5aac..eeb01b1aaca9 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-wikimacro</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Wiki Macro Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml
index 3de753d6896a..5efd89b888ef 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering-wikimacro</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-wikimacro-api</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Wiki Macro Bridge - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml
index 536171fa302e..c29bf29ad07b 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-rendering/xwiki-platform-legacy-rendering-wikimacro/xwiki-platform-legacy-rendering-wikimacro-store/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-rendering-wikimacro</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-rendering-wikimacro-store</artifactId>
   <name>XWiki Platform - Legacy - Rendering - Wiki Macro Bridge - Store</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml
index 491f8bea25cc..0f716384ca76 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-legacy</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-legacy-resource</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml
index e0b9a7e59433..484396c3667a 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-resource/xwiki-platform-legacy-resource-temporary/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-resource</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-resource-temporary</artifactId>
   <name>XWiki Platform - Legacy - Resource - Temporary</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml
index 01baeb9bb2ff..1414bb20a8f9 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-security</artifactId>
   <name>XWiki Platform - Legacy - Security</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml
index f4472fd0e0ef..443dec6ea65b 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-security-authentication</artifactId>
   <name>XWiki Platform - Legacy - Security - Authentication</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml
index 4338d4924cbe..a97e79529bca 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-security/xwiki-platform-legacy-security-authentication/xwiki-platform-legacy-security-authentication-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy-security-authentication</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-security-authentication-api</artifactId>
   <name>XWiki Platform - Legacy - Security - Authentication - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml
index c335fb7932fe..d0572707f044 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-url/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-url</artifactId>
   <name>XWiki Platform - Legacy - URL</name>
diff --git a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml
index 70b1e4fa86d5..7a4a2a901c10 100644
--- a/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-legacy/xwiki-platform-legacy-web/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-legacy</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-legacy-web</artifactId>
   <name>XWiki Platform - Legacy - Web Resources</name>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/pom.xml
index 00911e1feb1c..e272b456642d 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml
index 691493a11bb8..7b47c1956038 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-lesscss</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss-api</artifactId>
   <name>XWiki Platform - LESS CSS - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml
index 709e0d9ba6cc..2034f028ce51 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-lesscss</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss-default</artifactId>
   <name>XWiki Platform - LESS CSS - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml
index 535dc662838f..43bd494fb39d 100644
--- a/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-lesscss</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-lesscss-script</artifactId>
   <name>XWiki Platform - LESS CSS - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/pom.xml b/xwiki-platform-core/xwiki-platform-like/pom.xml
index aa3a3886d381..db6b66fb94ff 100644
--- a/xwiki-platform-core/xwiki-platform-like/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like</artifactId>
   <name>XWiki Platform - Like - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml
index 78e4a2712a88..b08caae67109 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-api</artifactId>
   <name>XWiki Platform - Like - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml
index 1d7de45a2415..aea4e2307b47 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-notifications</artifactId>
   <name>XWiki Platform - Like - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml
index 2d7199ce25c4..2cdaaecaf908 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-test</artifactId>
   <name>XWiki Platform - Like - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml
index 2b1457a04051..0d4a3737b6d3 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-docker/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-test-docker</artifactId>
   <name>XWiki Platform - Like - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml
index 9f35a830dbd9..caf3c046ae23 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-test/xwiki-platform-like-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-test-pageobjects</artifactId>
   <name>XWiki Platform - Like - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml
index 7c22f8f56a20..1329a247e5c7 100644
--- a/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-like/xwiki-platform-like-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-like</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-like-ui</artifactId>
   <name>XWiki Platform - Like - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-link/pom.xml b/xwiki-platform-core/xwiki-platform-link/pom.xml
index ff2bef28923f..fc486a976c66 100644
--- a/xwiki-platform-core/xwiki-platform-link/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-link/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-link</artifactId>
   <name>XWiki Platform - Link</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml
index e32cae2d6e45..db32e8c42a09 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker</artifactId>
   <name>XWiki Platform - LinkChecker - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml
index 43aed0989720..f1e2aafab105 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-api</artifactId>
   <name>XWiki Platform - LinkChecker - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml
index bb03b35e3315..e175f6ebfe5b 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-test</artifactId>
   <name>XWiki Platform - LinkChecker - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml
index 3b146797328e..8b90cbf8bd24 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-test-pageobjects</artifactId>
   <name>XWiki Platform - LinkChecker - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
index b69423434959..53f0ef1fa931 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-test/xwiki-platform-linkchecker-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-test-tests</artifactId>
   <name>XWiki Platform - LinkChecker - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml
index c7b54e460a61..7d4cff008ae4 100644
--- a/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-linkchecker/xwiki-platform-linkchecker-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-linkchecker</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-linkchecker-ui</artifactId>
   <name>XWiki Platform - LinkChecker - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/pom.xml
index a92491f6a702..541c270b4b1a 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata</artifactId>
   <name>XWiki Platform - Live Data</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml
index a95e2d158871..d4604307d1e0 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml
index 4c3a6646c3c7..858f2f60c4ef 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-livetable</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataEntryStore.java b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataEntryStore.java
index e35e21c97952..79c10f308722 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataEntryStore.java
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-livetable/src/main/java/org/xwiki/livedata/internal/livetable/LiveTableLiveDataEntryStore.java
@@ -50,7 +50,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.xpn.xwiki.XWikiException;
 
 /**
@@ -104,7 +103,7 @@ public LiveData get(LiveDataQuery query) throws LiveDataException
             // instead of serializing a map.
             ObjectMapper objectMapper =
                 JsonMapper.builder().enable(JsonReadFeature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER).build();
-            ObjectNode liveTableResults = getLiveTableResultsJSON(query, objectMapper);
+            JsonNode liveTableResults = getLiveTableResultsJSON(query, objectMapper);
             LiveData liveData = new LiveData();
             liveData.setCount(liveTableResults.path("totalrows").asLong());
             JsonNode rows = liveTableResults.path("rows");
@@ -117,7 +116,7 @@ public LiveData get(LiveDataQuery query) throws LiveDataException
         }
     }
 
-    private ObjectNode getLiveTableResultsJSON(LiveDataQuery query, ObjectMapper objectMapper) throws Exception
+    private JsonNode getLiveTableResultsJSON(LiveDataQuery query, ObjectMapper objectMapper) throws Exception
     {
         // Merge the parameters of this live data source with the parameters from the given query.
         Source originalSource = query.getSource();
@@ -139,7 +138,8 @@ private ObjectNode getLiveTableResultsJSON(LiveDataQuery query, ObjectMapper obj
                 liveTableResultsJSON =
                     this.resultsRenderer.getLiveTableResultsFromPage("XWiki.LiveTableResults", query);
             }
-            return (ObjectNode) objectMapper.readTree(liveTableResultsJSON);
+
+            return objectMapper.readTree(liveTableResultsJSON);
         } finally {
             // Restore the original query source.
             query.setSource(originalSource);
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml
index 1ef419ab749e..caa5aae85c9d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
index b3d61a55e596..b6bab1f260ea 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-livedata-rest</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml
index 162978b61522..dacd0b5fc5b7 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-test</artifactId>
   <name>XWiki Platform - Live Data - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml
index 16e553532c49..438fc637a430 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-test-docker</artifactId>
   <name>XWiki Platform - Live Data - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml
index 63a2409a2ed7..558d85b8be21 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-test/xwiki-platform-livedata-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-test-pageobjects</artifactId>
   <name>XWiki Platform - Live Data - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml
index 2d143b4498ec..4b01fd4efd2d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livedata-war</artifactId>
   <name>XWiki Platform - Live Data - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
index bd62452b050d..36524a758883 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livedata</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-livedata-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/displayers/displayerTestsHelper.js b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/displayers/displayerTestsHelper.js
index 363060490487..3e83b354b13d 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/displayers/displayerTestsHelper.js
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/tests/unit/displayers/displayerTestsHelper.js
@@ -97,9 +97,7 @@ export function initWrapper(displayer, {props, logic, editBus, mocks})
 
   // Vue2TouchEvents needs to be explicitly registered because otherwise it is initialize by a parent component, hence
   // not initialized for the tests.
-  Vue.use(Vue2TouchEvents, {
-    disableClick: true
-  })
+  Vue.use(Vue2TouchEvents)
 
   return mount(displayer, {
     attachTo: elem,
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/XWikiLivedata.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/XWikiLivedata.vue
index f72d93d3477e..e07f035ae085 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/XWikiLivedata.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/XWikiLivedata.vue
@@ -66,9 +66,7 @@ Vue.use(VueTippy, {
   theme: 'light',
 });
 
-Vue.use(Vue2TouchEvents, {
-  disableClick: true
-})
+Vue.use(Vue2TouchEvents)
 
 
 
diff --git a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/displayers/BaseDisplayer.vue b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/displayers/BaseDisplayer.vue
index b64053d2c0fd..d2e759c4ed11 100644
--- a/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/displayers/BaseDisplayer.vue
+++ b/xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/vue/displayers/BaseDisplayer.vue
@@ -231,7 +231,6 @@ export default {
       // If the touched element is a link and/or is editable, we display the popover.
       // If the touch element is a link, we get its target and display a following link action to its target.
       if(this.interceptTouch && this.isView && !this.duringEditing) {
-        e.preventDefault();
         const targetsLink = e.target.tagName.toLowerCase() === 'a';
         if (targetsLink) {
           this.href = e.target.getAttribute('href');
@@ -239,7 +238,8 @@ export default {
           this.href = undefined;
         }
 
-        if (this.isEditable || targetsLink) {
+        if (this.isEditable && targetsLink) {
+          e.preventDefault();
           this.$refs.tippy.tip.show();
         }
       }
diff --git a/xwiki-platform-core/xwiki-platform-livetable/pom.xml b/xwiki-platform-core/xwiki-platform-livetable/pom.xml
index ab8dd02c105c..09b76d63ce82 100644
--- a/xwiki-platform-core/xwiki-platform-livetable/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livetable/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livetable</artifactId>
   <name>XWiki Platform - Livetable</name>
diff --git a/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml b/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml
index f6b0dd234a82..ebb6ee269b0b 100644
--- a/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-livetable/xwiki-platform-livetable-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-livetable</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-livetable-ui</artifactId>
   <name>XWiki Platform - Livetable - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/pom.xml b/xwiki-platform-core/xwiki-platform-localization/pom.xml
index 11266332b232..de83b8e3fdf2 100644
--- a/xwiki-platform-core/xwiki-platform-localization/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization</artifactId>
   <name>XWiki Platform - Localization - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml
index 45efab4fd40a..64a3af755302 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-api</artifactId>
   <name>XWiki Platform - Localization - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml
index 284fd266e87b..ca9e175c05c6 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-macro</artifactId>
   <name>XWiki Platform - Localization - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml
index 01082716becf..ba66691777c6 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-rest</artifactId>
   <name>XWiki Platform - Localization - REST - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
index 6c8ec1601eb7..d6861738fd00 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-rest-api</artifactId>
   <name>XWiki Platform - Localization - REST - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml
index 1a62871f635b..d07a2a454fda 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-rest/xwiki-platform-localization-rest-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-rest-default</artifactId>
   <name>XWiki Platform - Localization - REST - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml
index 28892a21445b..04cd689098f6 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-script</artifactId>
   <name>XWiki Platform - Localization - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml
index 80077a12d8c1..cf0da0ae99fe 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-sources</artifactId>
   <name>XWiki Platform - Localization - Sources Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml
index 950c11f4c50a..6e6fb5dc2d9e 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-jar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-sources</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-source-jar</artifactId>
   <name>XWiki Platform - Localization - Source - JAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml
index 3abe0cefbdf8..5ab3e3537a45 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-legacy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-sources</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-source-legacy</artifactId>
   <name>XWiki Platform - Localization - Source - Legacy</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml
index ed15ad9662ea..4333f63d7c79 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-sources/xwiki-platform-localization-source-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-sources</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-source-wiki</artifactId>
   <name>XWiki Platform - Localization - Source - Wiki</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml
index 265aa100eab3..215077750999 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-syntaxes</artifactId>
   <name>XWiki Platform - Localization - Syntaxes Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml
index 327cc5a75519..572d30636d51 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-syntaxes/xwiki-platform-localization-syntax-messagetool/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-syntaxes</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-syntax-messagetool</artifactId>
   <name>XWiki Platform - Localization - Syntax - MessageTool</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml
index 421dea5f657f..927013bace86 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-test</artifactId>
   <name>XWiki Platform - Localization - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml
index e0c83776fbd3..32fc7c84a42b 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-test/xwiki-platform-localization-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-localization-test-docker</artifactId>
   <name>XWiki Platform - Localization - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml
index 69f9794a64d7..de786bdf657d 100644
--- a/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-localization/xwiki-platform-localization-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-localization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-localization-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-logging/pom.xml b/xwiki-platform-core/xwiki-platform-logging/pom.xml
index 1f524f9f45fc..72533b318187 100644
--- a/xwiki-platform-core/xwiki-platform-logging/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-logging/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-logging</artifactId>
   <name>XWiki Platform - Loggging</name>
diff --git a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml
index 4af21835c7b4..8a9fa9480b8c 100644
--- a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-logging</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-logging-script</artifactId>
   <name>XWiki Platform - Logging - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml
index 4372b78c9aba..673d87067b89 100644
--- a/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-logging/xwiki-platform-logging-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-logging</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-logging-ui</artifactId>
   <name>XWiki Platform - Logging - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/pom.xml b/xwiki-platform-core/xwiki-platform-mail/pom.xml
index 9a3c134f6a08..77f229a90b0a 100644
--- a/xwiki-platform-core/xwiki-platform-mail/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>xwiki-platform-mail</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml
index d068fbf2be31..cdf9caf9e43d 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml
index 6213088a6048..776748c3dcdb 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-general/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-general</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml
index ad2568c699d8..08e033290b21 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-resender-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>xar</packaging>
   <artifactId>xwiki-platform-mail-resender-ui</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml
index 8ffc21d9ec2e..ae10205c822f 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-script</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml
index 2935edabd697..563aeebba298 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <artifactId>xwiki-platform-mail-send</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml
index 7b34e06b63ee..b136a0c20e92 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-send</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-send-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml
index 3070f6214710..f829693e953e 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-send</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-send-default</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml
index 15f02838cd38..7f1a6a9e538f 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-send/xwiki-platform-mail-send-storage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-send</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <artifactId>xwiki-platform-mail-send-storage</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml
index 5a167b902328..b4aca2141477 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mail-test</artifactId>
   <name>XWiki Platform - Mail - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml
index 80057a5e5a43..c8db2cd5127d 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mail-test-docker</artifactId>
   <name>XWiki Platform - Mail - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml
index 8b05e7dc5905..8805dbfbff0d 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-test/xwiki-platform-mail-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mail-test-pageobjects</artifactId>
   <name>XWiki Platform - Mail - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml
index 4bd3a905acf5..24eeac83b2b4 100644
--- a/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mail/xwiki-platform-mail-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mail</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>xar</packaging>
   <artifactId>xwiki-platform-mail-ui</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mailsender/pom.xml b/xwiki-platform-core/xwiki-platform-mailsender/pom.xml
index be31a42181e3..c47160c11866 100644
--- a/xwiki-platform-core/xwiki-platform-mailsender/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mailsender/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mailsender</artifactId>
   <name>XWiki Platform - Mail Sender</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/pom.xml
index 68e4b7aa31cb..152e5ed5237e 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions</artifactId>
   <name>XWiki Platform - Mentions - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml
index 742dbb8ebb34..7f7f218eedee 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-api</artifactId>
   <name>XWiki Platform - Mentions - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml
index eec592077751..73790d3000e4 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-default/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-mentions-default</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml
index 49fbdc657721..b6a0cca0f175 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-notifications</artifactId>
   <name>XWiki Platform - Mentions - Notifications</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml
index 3b00a19897c2..babe3f439147 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-test</artifactId>
   <name>XWiki Platform - Mentions - Test - POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml
index 497afbca0efc..79099b82f296 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-docker/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-test-docker</artifactId>
   <name>XWiki Platform - Mentions - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml
index 60cf379b2ea5..4ccbee4d1cb6 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-test/xwiki-platform-mentions-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-mentions-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-test-pageobjects</artifactId>
   <name>XWiki Platform - Mentions - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml
index bdf279aa6da5..26bcc26966f0 100644
--- a/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-mentions/xwiki-platform-mentions-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-mentions</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-mentions-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-menu/pom.xml b/xwiki-platform-core/xwiki-platform-menu/pom.xml
index 97982871ce81..60e677d8e696 100644
--- a/xwiki-platform-core/xwiki-platform-menu/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu</artifactId>
   <name>XWiki Platform - Menu</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml
index 04260cf63230..43f6ebbab7a7 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-test</artifactId>
   <name>XWiki Platform - Menu - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml
index 6948f07a60a8..676c0ee2b083 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-test-docker</artifactId>
   <name>XWiki Platform - Menu - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml
index d0a31a42f66d..f512ee0bf656 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-test/xwiki-platform-menu-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-test-pageobjects</artifactId>
   <name>XWiki Platform - Menu - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml
index 442e2e00906a..3a525f2a517b 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-menu</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-menu-ui</artifactId>
   <name>XWiki Platform - Menu - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml
index a4d720184d73..fd97728a1ae6 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml
@@ -853,10 +853,17 @@ require(['jquery','xwiki-l10n!menu-ui-translation-keys'], function($, l10n) {
               }
             }
             /* When in dropdown we also have a link, reset the duplicated padding */
-            &amp; &gt; span &gt; a {
+            &amp; &gt; .xDropdown-header &gt; span &gt; a {
               padding: 0;
               display: inherit;
             }
+            /* Reposition the toggle when in a dropdown of fixed size
+              to avoid eating away at the bit of space we have for the text. */
+            &amp; &gt; .xDropdown-header &gt; .xDropdown-header-toggle {
+              position: absolute;
+              right: 0;
+              top: 0;
+            }
           }
           /* Separator horizontal inside menu */
           &amp;:empty {
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/pom.xml
index d138f1b64cfc..be9d0fc4d660 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream</artifactId>
   <name>XWiki Platform - Message Stream - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml
index 0b7e80d4c433..d2b9981a64f7 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-api</artifactId>
   <name>XWiki Platform - Message Stream - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml
index 10c9dd75f1f7..4d4f7a1b52d3 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-test</artifactId>
   <name>XWiki Platform - Message Stream - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml
index 0ff71348f7a0..034b8258f4ed 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-test/xwiki-platform-messagestream-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-test-tests</artifactId>
   <name>XWiki Platform - Message Stream - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml
index 831b97a2339c..5a3e648d785f 100644
--- a/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-messagestream/xwiki-platform-messagestream-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-messagestream</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-messagestream-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml b/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml
index 7213b5bdefac..76d91cd795fa 100644
--- a/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-minimaldependencies/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-minimaldependencies</artifactId>
   <name>XWiki Platform - Minimal WAR Dependencies</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/pom.xml b/xwiki-platform-core/xwiki-platform-model/pom.xml
index 21cbbc6bbebf..73d8e2834528 100644
--- a/xwiki-platform-core/xwiki-platform-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model</artifactId>
   <name>XWiki Platform - Model - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml
index d9cd946d1731..a7d4e31224ac 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-api</artifactId>
   <name>XWiki Platform - Model - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml
index be18354d68ab..69d217d7f65b 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation</artifactId>
   <name>XWiki Platform - Model - Validation - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml
index 57fd60bf663a..98132dc7ea79 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation-api</artifactId>
   <name>XWiki Platform - Model - Validation - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml
index 5209811852e7..9d0e93a48a0c 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-default/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation-default</artifactId>
   <name>XWiki Platform - Model - Validation - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml
index c5f9ed5d86a1..a3cb6088ee90 100644
--- a/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-model/xwiki-platform-model-validation/xwiki-platform-model-validation-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-model-validation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-model-validation-ui</artifactId>
   <name>XWiki Platform - Model - Validation - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/pom.xml b/xwiki-platform-core/xwiki-platform-netflux/pom.xml
index 698716f1c9ad..c63935430774 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-netflux/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-netflux</artifactId>
   <name>XWiki Platform - Netflux</name>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml
index 91f9a1ce3379..8cbd66409ee2 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-netflux</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-netflux-api</artifactId>
   <name>XWiki Platform - Netflux - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
index 8e475a395778..480d9b875c60 100644
--- a/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-netflux</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-netflux-rest</artifactId>
   <name>XWiki Platform - Netflux - REST</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/pom.xml
index cd510f1de19d..40106441ed53 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications</artifactId>
   <name>XWiki Platform - Notifications - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml
index aee0d71c61f1..540d4a7361ea 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-api</artifactId>
   <name>XWiki Platform - Notifications - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/src/main/java/org/xwiki/notifications/CompositeEvent.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/src/main/java/org/xwiki/notifications/CompositeEvent.java
index d9062b8c34fd..853b47b5dda9 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/src/main/java/org/xwiki/notifications/CompositeEvent.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-api/src/main/java/org/xwiki/notifications/CompositeEvent.java
@@ -22,8 +22,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -173,7 +173,9 @@ public DocumentReference getDocument()
      */
     public Set<DocumentReference> getUsers()
     {
-        Set<DocumentReference> users = new HashSet();
+        // Use a linked hash set to follow the order in which events were added:
+        // this avoids problems when testing
+        Set<DocumentReference> users = new LinkedHashSet<>();
         for (Event event : events) {
             users.add(event.getUser());
         }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
index eccfd1b9dbaa..ef18985ed3e6 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters</artifactId>
   <name>XWiki Platform - Notifications - Filters - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml
index 587cf188d68c..b403794b8d0d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-filters</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters-api</artifactId>
   <name>XWiki Platform - Notifications - Filters - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationState.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationState.java
index 2cf8ca1c5bc5..7efd88c05724 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationState.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/main/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationState.java
@@ -51,7 +51,15 @@ public WatchedLocationState(boolean isWatched)
     public WatchedLocationState(boolean isWatched, Date startingDate)
     {
         this.isWatched = isWatched;
-        this.startingDate = startingDate;
+        if (startingDate != null) {
+            this.startingDate = truncateMilliseconds(startingDate);
+        }
+    }
+
+    private Date truncateMilliseconds(Date startingDate)
+    {
+        long dateValue = startingDate.getTime() / 1000;
+        return new Date(dateValue * 1000);
     }
 
     /**
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/ScopeNotificationFilterTest.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/ScopeNotificationFilterTest.java
index c305075b3ef7..9c47e0cc11c2 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/ScopeNotificationFilterTest.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/ScopeNotificationFilterTest.java
@@ -269,7 +269,7 @@ void withTopLevelInclusiveFilters() throws Exception
         NotificationFilterPreference prefζ = mockNotificationFilterPreference("wikiA:SpaceM.DocumentN",
                 documentReference, NotificationFilterType.INCLUSIVE, null);
         when(prefζ.getProviderHint()).thenReturn("userProfile");
-        when(prefζ.getStartingDate()).thenReturn(new Date(99));
+        when(prefζ.getStartingDate()).thenReturn(new Date(99000));
 
         Collection<NotificationFilterPreference> filterPreferences = Sets.newSet(prefγ, prefζ);
 
@@ -283,42 +283,42 @@ void withTopLevelInclusiveFilters() throws Exception
         // Test with wikiA:SpaceE (filtered by γ & ζ)
         Event event1 = mock(Event.class);
         when(event1.getSpace()).thenReturn(new SpaceReference("SpaceE", wikiReference));
-        when(event1.getDate()).thenReturn(new Date(100));
+        when(event1.getDate()).thenReturn(new Date(100000));
         assertEquals(NotificationFilter.FilterPolicy.FILTER,
                 this.scopeNotificationFilter.filterEvent(event1, user, filterPreferences, NotificationFormat.ALERT));
 
         // Test with wikiA:SpaceB.DocumentJ (kept by γ)
         Event event2 = mock(Event.class);
         when(event2.getDocument()).thenReturn(new DocumentReference("wikiA", "SpaceB", "DocumentJ"));
-        when(event2.getDate()).thenReturn(new Date(100));
+        when(event2.getDate()).thenReturn(new Date(100000));
         assertEquals(NotificationFilter.FilterPolicy.NO_EFFECT,
                 this.scopeNotificationFilter.filterEvent(event2, user, filterPreferences, NotificationFormat.ALERT));
 
         // Test with wikiB:SpaceK.DocumentL (filtered by γ & ζ)
         Event event3 = mock(Event.class);
         when(event3.getDocument()).thenReturn(new DocumentReference("wikiB", "SpaceK", "DocumentL"));
-        when(event3.getDate()).thenReturn(new Date(100));
+        when(event3.getDate()).thenReturn(new Date(100000));
         assertEquals(NotificationFilter.FilterPolicy.FILTER,
                 this.scopeNotificationFilter.filterEvent(event3, user, filterPreferences, NotificationFormat.ALERT));
 
         // Test with wikiA:SpaceM.DocumentN (kept by ζ)
         Event event4 = mock(Event.class);
         when(event4.getDocument()).thenReturn(new DocumentReference("wikiA", "SpaceM", "DocumentN"));
-        when(event4.getDate()).thenReturn(new Date(100));
+        when(event4.getDate()).thenReturn(new Date(100000));
         assertEquals(NotificationFilter.FilterPolicy.NO_EFFECT,
                 this.scopeNotificationFilter.filterEvent(event4, user, filterPreferences, NotificationFormat.ALERT));
 
         // Test with wikiA:SpaceM.DocumentN sent before ζ has been created
         Event event5 = mock(Event.class);
         when(event5.getDocument()).thenReturn(new DocumentReference("wikiA", "SpaceM", "DocumentN"));
-        when(event5.getDate()).thenReturn(new Date(98));
+        when(event5.getDate()).thenReturn(new Date(98000));
         assertEquals(NotificationFilter.FilterPolicy.FILTER,
             this.scopeNotificationFilter.filterEvent(event5, user, filterPreferences, NotificationFormat.ALERT));
 
         // Test with wikiA:SpaceM.DocumentN sent at the date ζ has been created
         Event event6 = mock(Event.class);
         when(event6.getDocument()).thenReturn(new DocumentReference("wikiA", "SpaceM", "DocumentN"));
-        when(event6.getDate()).thenReturn(new Date(99));
+        when(event6.getDate()).thenReturn(new Date(99000));
         assertEquals(NotificationFilter.FilterPolicy.NO_EFFECT,
             this.scopeNotificationFilter.filterEvent(event6, user, filterPreferences, NotificationFormat.ALERT));
     }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationStateTest.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationStateTest.java
new file mode 100644
index 000000000000..3a1228e20af4
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-api/src/test/java/org/xwiki/notifications/filters/internal/scope/WatchedLocationStateTest.java
@@ -0,0 +1,50 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.xwiki.notifications.filters.internal.scope;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class WatchedLocationStateTest
+{
+    @Test
+    void getStartingDate()
+    {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(0);
+        calendar.set(2024, Calendar.FEBRUARY, 16, 15, 52, 53);
+        long timeInMillis = calendar.getTimeInMillis();
+
+        Date expectedDate = calendar.getTime();
+
+        for (int i = 1; i < 999; i++) {
+            Date startingDate = new Date(timeInMillis + i);
+            assertNotEquals(expectedDate, startingDate);
+            Date obtainedStartingDate = new WatchedLocationState(false, startingDate).getStartingDate();
+            assertEquals(expectedDate, obtainedStartingDate,
+                String.format("Expected [%s] and got [%s]", expectedDate.getTime(), obtainedStartingDate.getTime()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
index 3c8901b01490..9eac320c7f98 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-filters</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters-default</artifactId>
   <name>XWiki Platform - Notifications - Filters - Default implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml
index 145aa6ee6e29..b7498aca463e 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-filters</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-filters-watch</artifactId>
   <name>XWiki Platform - Notifications - Filters - Watch</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml
index 5d6a09ab485c..5ca3e2ecc77f 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <name>XWiki Platform - Notifications - Macro - Parent POM</name>
   <artifactId>xwiki-platform-notifications-macro</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml
index 4efaaed4d8ce..0540f0dbb73f 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-macro/xwiki-platform-notifications-macro-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-macro</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <name>XWiki Platform - Notifications - Macro - UI</name>
   <artifactId>xwiki-platform-notifications-macro-ui</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml
index 751e377a6522..eb0ed30787e0 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-notifiers</artifactId>
   <name>XWiki Platform - Notifications - Notifiers - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml
index 085f41b34316..86279b3cb4a6 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-notifiers</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-notifiers-api</artifactId>
   <name>XWiki Platform - Notifications - Notifiers - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/internal/DefaultNotificationCacheManager.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/internal/DefaultNotificationCacheManager.java
index f10e52a8b877..d2141a7f954e 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/internal/DefaultNotificationCacheManager.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-api/src/main/java/org/xwiki/notifications/notifiers/internal/DefaultNotificationCacheManager.java
@@ -29,7 +29,6 @@
 import org.xwiki.cache.CacheManager;
 import org.xwiki.cache.config.LRUCacheConfiguration;
 import org.xwiki.component.annotation.Component;
-import org.xwiki.component.manager.ComponentLifecycleException;
 import org.xwiki.component.phase.Disposable;
 import org.xwiki.component.phase.Initializable;
 import org.xwiki.component.phase.InitializationException;
@@ -203,18 +202,22 @@ public void setInCache(String cacheKey, List<Object> events, boolean count, bool
      */
     public void flushLongCache()
     {
-        this.longEventCache.removeAll();
-        this.longIndividualEventCountCache.removeAll();
-        this.longCompositeEventCache.removeAll();
-        this.longCompositeEventCountCache.removeAll();
+        if (this.configuration.isRestCacheEnabled()) {
+            this.longEventCache.removeAll();
+            this.longIndividualEventCountCache.removeAll();
+            this.longCompositeEventCache.removeAll();
+            this.longCompositeEventCountCache.removeAll();
+        }
     }
 
     @Override
-    public void dispose() throws ComponentLifecycleException
+    public void dispose()
     {
-        this.longIndividualEventCountCache.dispose();
-        this.longEventCache.dispose();
-        this.longCompositeEventCache.dispose();
-        this.longCompositeEventCountCache.dispose();
+        if (this.configuration.isRestCacheEnabled()) {
+            this.longIndividualEventCountCache.dispose();
+            this.longEventCache.dispose();
+            this.longCompositeEventCache.dispose();
+            this.longCompositeEventCountCache.dispose();
+        }
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml
index d69e8c2e9545..a43ffca1b4e5 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-notifiers/xwiki-platform-notifications-notifiers-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-notifiers</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-notifiers-default</artifactId>
   <name>XWiki Platform - Notifications - Notifiers - Default bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml
index 5f3e4e4dcc26..bb953af9902f 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-preferences</artifactId>
   <name>XWiki Platform - Notifications - Preferences - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml
index e56093be374b..13a32f72e46d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-preferences</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-preferences-api</artifactId>
   <name>XWiki Platform - Notifications - Preferences - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml
index f482aa8448c2..baccd2ded373 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-preferences/xwiki-platform-notifications-preferences-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-preferences</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-preferences-default</artifactId>
   <name>XWiki Platform - Notifications - Preferences - Default bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml
index 8a295fef157e..b2f1b44ce0e2 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-rest</artifactId>
   <name>XWiki Platform - Notifications - REST</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml
index 7f183e8d1187..ac6096b2e8c5 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-script</artifactId>
   <name>XWiki Platform - Notifications - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml
index a461d302c741..2b01f16a3e0d 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-sources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-sources</artifactId>
   <name>XWiki Platform - Notifications - Sources</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml
index 4c04e77ab705..589b4dbd4c28 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-test</artifactId>
   <name>XWiki Platform - Notifications - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
index 7e071cc0d9cc..5d1a9384880c 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-test-docker</artifactId>
   <name>XWiki Platform - Notifications - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsIT.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsIT.java
index 6ec469030951..c193cbdd00cb 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsIT.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsIT.java
@@ -398,6 +398,9 @@ void ownEventNotifications(TestUtils setup, TestReference testReference) throws
             p.setApplicationState(SYSTEM, "alert", BootstrapSwitch.State.ON);
             assertEquals("Own Events Filter", preferences.get(2).getFilterName());
             preferences.get(2).setEnabled(false);
+            setup.gotoPage(page2);
+            p = NotificationsUserProfilePage.gotoPage(FIRST_USER_NAME);
+            assertFalse(p.getSystemNotificationFilterPreferences().get(2).isEnabled());
 
             // Watch the entire wiki so that we receive notifications
             NotificationsTrayPage tray = new NotificationsTrayPage();
@@ -430,8 +433,8 @@ void ownEventNotifications(TestUtils setup, TestReference testReference) throws
             assertEquals(testReference.getLastSpaceReference().getName(), notificationsTrayPage.getNotificationPage(0));
         } finally {
             // Clean up
-            setup.rest().deletePage(testReference.getLastSpaceReference().getName(), testReference.getName());
-            setup.rest().deletePage(testReference.getLastSpaceReference().getName(), "page2");
+            setup.rest().delete(testReference);
+            setup.rest().delete(page2);
         }
     }
 
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
index 187a9ba457c0..61e2cbfd0cfe 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-test-pageobjects</artifactId>
   <name>XWiki Platform - Notifications - Test - Page Objects</name>
@@ -53,5 +53,11 @@
       <artifactId>xwiki-platform-livedata-test-pageobjects</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!-- Required to perform REST requests against the notifications rest API. -->
+    <dependency>
+      <groupId>org.xwiki.platform</groupId>
+      <artifactId>xwiki-platform-notifications-rest</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java
index b74d781d881c..ca82a70b8300 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/NotificationsTrayPage.java
@@ -19,23 +19,35 @@
  */
 package org.xwiki.platform.notifications.test.po;
 
-import java.util.ArrayList;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
+import javax.ws.rs.core.UriBuilder;
+
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.io.IOUtils;
 import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.NoSuchElementException;
 import org.openqa.selenium.TimeoutException;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
+import org.xwiki.notifications.rest.NotificationsResource;
+import org.xwiki.test.ui.TestUtils;
 import org.xwiki.test.ui.po.BootstrapSwitch;
 import org.xwiki.test.ui.po.ViewPage;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 /**
  * Represents the user Notifications tab.
- * 
+ *
  * @version $Id$
  * @since 9.4RC1
  */
@@ -75,9 +87,9 @@ public NotificationsTrayPage()
     }
 
     /**
-     * Wait until the given number of unread notification is received.
-     * This method uses an AJAX request to the REST notification endpoint to compute how many unread notification
-     * the given user has on the given wiki, using user preferences.
+     * Wait until the given number of unread notification is received. This method uses a request to the REST
+     * notification endpoint to compute how many unread notifications the given user has on the given wiki, using user
+     * preferences.
      *
      * @param userId the serialized user reference for which to get notifications
      * @param wiki the wiki on which to get notifications
@@ -86,58 +98,72 @@ public NotificationsTrayPage()
      */
     public static void waitOnNotificationCount(String userId, String wiki, int expectedUnread)
     {
-        // TODO: Wait twice the default timeout since it seems that the REST endpoint for notifications count can take
-        // a lot of time on slow CI agents, leading to flickers. We need to check if there's a performance issue at
-        // heart.
-        waitOnNotificationCount(userId, wiki, expectedUnread, getUtil().getDriver().getTimeout() * 2);
+        URI baseNotificationResourcesURI = getUtil().rest().createUri(NotificationsResource.class, Map.of());
+        // Note: This number of attempts should be enough, with 10 seconds of delay between the first and the last
+        // attempt.
+        int maxAttempts = 10;
+        boolean success = false;
+        long lastCount = -1;
+        for (int attempt = 0; attempt < maxAttempts; attempt++) {
+            Optional<Long> optionalCount = attemptCount(userId, wiki, baseNotificationResourcesURI, getUtil());
+            if (optionalCount.isPresent()) {
+                Long count = optionalCount.get();
+                lastCount = count;
+                if (count == expectedUnread) {
+                    success = true;
+                    break;
+                }
+            }
+            try {
+                // A delay before the next attempt, to leave server-side processing the notifications asynchronously.
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        // Throw an exception if despite all attempts, the expected notifications count is never reached.
+        if (!success) {
+            throw new TimeoutException(
+                String.format("Failed after [%s] attempts. Expected: [%s] - Latest value received: [%s].", maxAttempts,
+                    expectedUnread, lastCount));
+        }
+        // Ensure to refresh the page after calling this wait, so the notification tray is updated.
+        getUtil().getDriver().navigate().refresh();
     }
 
-    /**
-     * Wait until the given number of unread notification is received.
-     * This method uses an AJAX request to the REST notification endpoint to compute how many unread notification
-     * the given user has on the given wiki, using user preferences.
-     *
-     * @param userId the serialized user reference for which to get notifications
-     * @param wiki the wiki on which to get notifications
-     * @param expectedUnread the number of expected unread notifications to wait for
-     * @param timeout the time delay in seconds before stopping the notifications count
-     * @since 12.8RC1
-     */
-    public static void waitOnNotificationCount(String userId, String wiki, int expectedUnread, int timeout)
+    private static Optional<Long> attemptCount(String userId, String wiki, URI uri, TestUtils testUtils)
     {
-        String notificationCountAjaxURL = String.format("/xwiki/rest/notifications/count?media=json&userId=%s"
-            + "&useUserPreferences=true&currentWiki=%s&async=true", userId, wiki);
-
-        final List<Object> responses = new ArrayList<>();
+        URI attemptURI = UriBuilder.fromUri(uri)
+            .segment("count")
+            .queryParam("media", "json")
+            .queryParam("userId", userId)
+            .queryParam("useUserPreferences", Boolean.TRUE.toString())
+            .queryParam("currentWiki", wiki)
+            .queryParam("async", Boolean.FALSE.toString())
+            .queryParam("_", System.currentTimeMillis())
+            .build();
         try {
-            getUtil().getDriver().waitUntilCondition(driver -> {
-                // Execute AJAX request to wait until the number of unread notification match the expectation.
-                Object response = ((JavascriptExecutor) driver).executeAsyncScript(
-                    "var callback = arguments[arguments.length - 1];"
-                        + "new Ajax.Request('" + notificationCountAjaxURL
-                        + "&_='+new Date().getTime(), {method: 'GET', "
-                        + "   onSuccess: function(response) {"
-                        + "      callback(response.responseJSON.unread);"
-                        + "   },"
-                        + "   onFailure: function(response) { console.error(response); callback(-1); }"
-                        + "});");
-                responses.add(response);
-                return response != null && Integer.valueOf(response.toString()).equals(expectedUnread);
-            }, timeout);
-        } catch (TimeoutException e) {
-            String latestResponse = null;
-            if (!responses.isEmpty()) {
-                Object response = responses.get(responses.size() - 1);
-                if (response != null) {
-                    latestResponse = response.toString();
-                }
+            GetMethod getMethod = testUtils.rest().executeGet(attemptURI);
+            if (Set.of(200, 202).contains(getMethod.getStatusCode())) {
+                String responseBody = IOUtils.toString(getMethod.getResponseBodyAsStream(), UTF_8);
+                Map<?, ?> map = new ObjectMapper().readValue(responseBody, Map.class);
+                return getOptionalLong(String.valueOf(map.get("unread")), responseBody);
+            } else {
+                return Optional.empty();
             }
-            throw new TimeoutException(String.format(
-                "Timeout while waiting [%s] sec on notification count. Expected: [%s] - Latest value received: [%s].",
-                timeout, expectedUnread, latestResponse), e);
+        } catch (Exception e) {
+            return Optional.empty();
+        }
+    }
+
+    private static Optional<Long> getOptionalLong(String str, String responseBody)
+    {
+        try {
+            return Optional.of(Long.parseLong(str));
+        } catch (NumberFormatException e) {
+            return Optional.empty();
         }
-        // Ensure to refresh the page after calling this wait, so the notification tray is updated.
-        getUtil().getDriver().navigate().refresh();
     }
 
     /**
@@ -164,7 +190,7 @@ public boolean isNotificationMenuVisible()
 
     /**
      * Test if the text "No notification available!" is displayed in the notification tray.
-     * 
+     *
      * @return true if the text is not displayed
      */
     public boolean areNotificationsAvailable()
@@ -176,7 +202,7 @@ public boolean areNotificationsAvailable()
 
     /**
      * Get the number of available notifications.
-     * 
+     *
      * @return Number of unread notifications, 0 if no notification available and MAX_INT if 20+ notifications
      */
     public int getNotificationsCount()
@@ -216,7 +242,7 @@ public void clearAllNotifications()
             getDriver().waitUntilElementIsVisible(By.className("xdialog-content"));
             // Enter is like clicking on "yes"
             WebElement yesButton = getDriver().findElement(
-                    By.cssSelector(".xdialog-content input.button[value='Yes']"));
+                By.cssSelector(".xdialog-content input.button[value='Yes']"));
             yesButton.click();
             this.waitForNotificationSuccessMessage("Notifications have been cleared");
         }
@@ -277,7 +303,7 @@ private List<WebElement> getNotifications()
     public int getUnreadNotificationsCount()
     {
         return getDriver().findElementsWithoutWaiting(By.cssSelector(
-                "li#tmNotifications div.notification-event-unread")).size();
+            "li#tmNotifications div.notification-event-unread")).size();
     }
 
     /**
@@ -288,7 +314,7 @@ public int getUnreadNotificationsCount()
     public int getReadNotificationsCount()
     {
         return getDriver().findElementsWithoutWaiting(By.cssSelector(
-                "li#tmNotifications div.notification-event:not(.notification-event-unread)")).size();
+            "li#tmNotifications div.notification-event:not(.notification-event-unread)")).size();
     }
 
     /**
@@ -329,7 +355,7 @@ public String getNotificationContent(int notificationNumber)
         }
 
         return this.getNotifications().get(notificationNumber).findElement(
-                By.cssSelector(".notification-content")).getText();
+            By.cssSelector(".notification-content")).getText();
     }
 
     /**
@@ -345,7 +371,7 @@ public String getNotificationPage(int notificationNumber)
         }
 
         return this.getNotifications().get(notificationNumber).findElement(
-                By.cssSelector(".notification-page")).getText();
+            By.cssSelector(".notification-page")).getText();
     }
 
     /**
@@ -361,7 +387,7 @@ public String getNotificationDescription(int notificationNumber)
         }
 
         return this.getNotifications().get(notificationNumber).findElement(
-                By.cssSelector(".notification-description")).getText();
+            By.cssSelector(".notification-description")).getText();
     }
 
     /**
@@ -400,7 +426,6 @@ public void markAsRead(int notificationNumber)
 
     /**
      * @return either or not the page is watched
-     *
      * @since 10.8RC1
      * @since 9.11.8
      */
@@ -412,7 +437,6 @@ public boolean isPageOnlyWatched()
 
     /**
      * @return either or not the "space" is watched
-     *
      * @since 10.8RC1
      * @since 9.11.8
      */
@@ -424,7 +448,6 @@ public boolean arePageAndChildrenWatched()
 
     /**
      * @return either or not the wiki is watched
-     *
      * @since 10.8RC1
      * @since 9.11.8
      */
@@ -434,11 +457,11 @@ public boolean isWikiWatched()
         return wikiWatchedSwitch.getState() == BootstrapSwitch.State.ON;
     }
 
-    private void waitUntilWatchedStateAreSaved()
+    private void waitUntilWatchedStateAreSaved() throws InterruptedException
     {
         waitForNotificationSuccessMessage("Saved!");
         getDriver().waitUntilCondition(driver ->
-                pageOnlyWatchedSwitch.isEnabled()
+            pageOnlyWatchedSwitch.isEnabled()
                 && pageAndChildrenWatchedSwitch.isEnabled()
                 && wikiWatchedSwitch.isEnabled()
         );
@@ -446,9 +469,9 @@ private void waitUntilWatchedStateAreSaved()
 
     /**
      * Watch or unwatch the current page.
+     *
      * @param watched the desired state
      * @throws Exception if the expected state cannot be set
-     *
      * @since 10.8RC1
      * @since 9.11.8
      */
@@ -461,9 +484,9 @@ public void setPageOnlyWatchedState(boolean watched) throws Exception
 
     /**
      * Watch or unwatch the current "space".
+     *
      * @param watched the desired state
      * @throws Exception if the expected state cannot be set
-     *
      * @since 10.8RC1
      * @since 9.11.8
      */
@@ -476,9 +499,9 @@ public void setPageAndChildrenWatchedState(boolean watched) throws Exception
 
     /**
      * Watch or unwatch the current wiki.
+     *
      * @param watched the desired state
      * @throws Exception if the expected state cannot be set
-     *
      * @since 10.8RC1
      * @since 9.11.8
      */
@@ -504,7 +527,6 @@ public NotificationsRSS getNotificationRSS(String username, String password)
     }
 
     /**
-     *
      * @return The tray notification button.
      * @since 12.8RC1
      */
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
index 5cfc761af920..b0f6552ad412 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-test/xwiki-platform-notifications-test-pageobjects/src/main/java/org/xwiki/platform/notifications/test/po/preferences/filters/AbstractNotificationFilterPreference.java
@@ -40,6 +40,8 @@
  */
 public abstract class AbstractNotificationFilterPreference
 {
+    private final XWikiWebDriver webDriver;
+
     private AbstractNotificationsSettingsPage parentPage;
 
     private WebElement row;
@@ -68,6 +70,7 @@ public AbstractNotificationFilterPreference(AbstractNotificationsSettingsPage pa
         for (WebElement format : formatElements) {
             this.formats.add(format.getText());
         }
+        this.webDriver = webDriver;
         this.enabledSwitch = new BootstrapSwitch(getBootstrapSwitchElement(row), webDriver);
     }
 
@@ -93,6 +96,7 @@ private WebElement getFormatsElement(WebElement row)
      */
     private WebElement getBootstrapSwitchElement(WebElement row)
     {
+        this.webDriver.waitUntilElementIsVisible(row, By.cssSelector(".displayer-toggle .bootstrap-switch"));
         return row.findElement(By.className("displayer-toggle")).findElement(By.className("bootstrap-switch"));
     }
 
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
index dfb24ffbd8ff..5229ef59bec9 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-notifications-ui</artifactId>
   <name>XWiki Platform - Notifications - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml
index a418383804c8..f5cfaa28fbfb 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-ui/src/main/resources/XWiki/Notifications/Code/Translations.ru.xml
@@ -97,6 +97,7 @@ notifications.settings.filters.preferences.system.table.name=Название
 notifications.settings.filters.preferences.system.table.filterType=Описание
 notifications.settings.filters.preferences.system.table.notificationFormats=Форматы
 notifications.settings.filters.preferences.system.table.isEnabled=Включено?
+notifications.settings.filters.preferences.system.table.description=В этой таблице перечислены все системные фильтры, зарегистрированные в вики.
 
 ## Custom Filter preferences settings
 notifications.settings.filters.preferences.custom.title=Пользовательские фильтры
@@ -108,6 +109,7 @@ notifications.settings.filters.preferences.custom.table.eventTypes=Событи
 notifications.settings.filters.preferences.custom.table.notificationFormats=Форматы
 notifications.settings.filters.preferences.custom.table.isEnabled=Включено?
 notifications.settings.filters.preferences.custom.table._actions=Действия
+notifications.settings.filters.preferences.custom.table.description=В этой таблице перечислены все пользовательские фильтры, зарегистрированные для данного пользователя или текущей вики.
 notifications.filters.type.custom.inclusive=Уведомить о событии
 notifications.filters.type.custom.exclusive=Игнорировать событие
 notifications.settings.addFilter=Добавить фильтр
diff --git a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
index 885b4bcb7d1c..f994ae4fa9d4 100644
--- a/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-notifications</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-notifications-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-observation/pom.xml b/xwiki-platform-core/xwiki-platform-observation/pom.xml
index ea123a067c86..85fb07451fc3 100644
--- a/xwiki-platform-core/xwiki-platform-observation/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation</artifactId>
   <name>XWiki Platform - Observation - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml
index ed3356105a15..43012ce07940 100644
--- a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-remote/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-observation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation-remote</artifactId>
   <name>XWiki Platform - Observation - Remote</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml
index 3df32216baa9..9a954533506d 100644
--- a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-observation</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation-test</artifactId>
   <name>XWiki Platform - Observation - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml
index 1c287277e2c4..1f288056b76f 100644
--- a/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-observation/xwiki-platform-observation-test/xwiki-platform-observation-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-observation-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-observation-test-tests</artifactId>
   <name>XWiki Platform - Observation - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/pom.xml b/xwiki-platform-core/xwiki-platform-office/pom.xml
index 865fc624bb50..b05655af2abd 100644
--- a/xwiki-platform-core/xwiki-platform-office/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office</artifactId>
   <name>XWiki Platform - Office - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml
index 7f2859a89eec..0c6248613e98 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-importer/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-importer</artifactId>
   <name>XWiki Platform - Office - Importer</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml
index c697aed5028f..0716c672cdc1 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-macro</artifactId>
   <name>XWiki Platform - Office - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml
index fd64b9c0d267..e68c6e1ce96e 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-test</artifactId>
   <name>XWiki Platform - Office - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml
index c7022ff18db0..6f77cde36ca7 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-test-docker</artifactId>
   <properties>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml
index ac2b95540b6e..9812d46c70ae 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-test/xwiki-platform-office-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-test-pageobjects</artifactId>
   <name>XWiki Platform - Office - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml
index 18052b97d1a1..ecddb31a51c4 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml
index 9656e53e390d..341945ddaf8d 100644
--- a/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-office/xwiki-platform-office-viewer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-office</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-office-viewer</artifactId>
   <name>XWiki Platform - Office - Viewer</name>
diff --git a/xwiki-platform-core/xwiki-platform-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
index 4b0f0d2f178a..ff86ef128c80 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-oldcore</artifactId>
   <name>XWiki Platform - Old Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/pom.xml b/xwiki-platform-core/xwiki-platform-panels/pom.xml
index c7739da0b5c6..46f55ed34d4a 100644
--- a/xwiki-platform-core/xwiki-platform-panels/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels</artifactId>
   <name>XWiki Platform - Panels</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml
index b5c34c87b64f..27ec9df437e3 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-api</artifactId>
   <name>XWiki Platform - Panels - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml
index 1472bcd70a28..348d686db514 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test</artifactId>
   <name>XWiki Platform - Panels - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml
index aad232589fa5..856d64bca19d 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-content/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test-content</artifactId>
   <name>XWiki Platform - Panels - Tests - Content</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml
index 29aacbb3df47..824758cbb5cf 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-panels-test</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-panels-test-docker</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml
index 05961288b726..cea31c3bd8df 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test-pageobjects</artifactId>
   <name>XWiki Platform - Panels - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml
index fd87e049bc98..ebcb7189ce13 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-test/xwiki-platform-panels-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-test-tests</artifactId>
   <name>XWiki Platform - Panels - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml
index 9d1a199caf07..d6d5b79ba176 100644
--- a/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-panels/xwiki-platform-panels-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-panels</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-panels-ui</artifactId>
   <name>XWiki Platform - Panels - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/pom.xml b/xwiki-platform-core/xwiki-platform-query/pom.xml
index d8695cedc59b..4aec443da4f7 100644
--- a/xwiki-platform-core/xwiki-platform-query/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query</artifactId>
   <name>XWiki Platform - Query - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
index e617c1e7f3bc..bef74b9c58bb 100644
--- a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-jpql-parser/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-query</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query-jpql-parser</artifactId>
   <name>XWiki Platform - Query - JPQL Parser</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml
index 41a83868e9e0..2227cf3f266a 100644
--- a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-manager/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-query</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query-manager</artifactId>
   <name>XWiki Platform - Query - Manager</name>
diff --git a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml
index a09150d5036c..c0aa82c50538 100644
--- a/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-query/xwiki-platform-query-xwql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-query</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-query-xwql</artifactId>
   <name>XWiki Platform - Query - XWQL</name>
diff --git a/xwiki-platform-core/xwiki-platform-ratings/pom.xml b/xwiki-platform-core/xwiki-platform-ratings/pom.xml
index f51d17aa540e..9b20bd4613ff 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ratings/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ratings</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml
index c5e115623a6c..abc43874375a 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ratings</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ratings-api</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml
index 27aea6743c97..b393dbfe8397 100644
--- a/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-ratings/xwiki-platform-ratings-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-ratings</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-ratings-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/pom.xml
index 47d699c79758..18379f4cae50 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime</artifactId>
   <name>XWiki Platform - Realtime - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml
index 7d8e944ac534..9ccc13af24db 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-ui</artifactId>
   <name>XWiki Platform - Realtime - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml
index a972c857463b..9e3b3c7652da 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-realtime-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml
index adb0f79f5f5f..e132321ccec6 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml
index 211b5c3e142b..7baf152632ff 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-test</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml
index 0009f7fac1ee..cbfe6cb42c77 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-test-docker</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Test - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml
index b70cfcd10ba4..5d997803d0db 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-test-pageobjects</artifactId>
   <name>XWiki Platform - Realtime - Wiki - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml
index 83c88296b9cc..85add5f6ca14 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wiki-ui</artifactId>
   <name>XWiki Platform - Realtime - Wiki - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml
index 65d9a769cd46..3ec9becc7461 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-realtime-wiki-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml
index 4be99d8d857a..bfc9fd21a078 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml
index 513973011d28..d71acce8d535 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-test</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Test - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
index 224cb049d3c1..59f3cc7d7448 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-test-docker</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Test - Functional Tests in Docker</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml
index a1e7cf7b6c3e..e6eefe7a036e 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-test-pageobjects</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - Test - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml
index 8d4b64500346..263a2acd7004 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-realtime-wysiwyg-ui</artifactId>
   <name>XWiki Platform - Realtime - WYSIWYG - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml
index 061784ecea9d..fa5a1f0c621a 100644
--- a/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-realtime-wysiwyg</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-realtime-wysiwyg-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/pom.xml
index 6231dd05ee04..0d16048501a5 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring</artifactId>
   <name>XWiki Platform - Refactoring - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml
index b7b215d0f8b5..756ea21b679e 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-refactoring</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring-api</artifactId>
   <name>XWiki Platform - Refactoring - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml
index 405c6e89fa6f..9ed99a7c5fab 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-refactoring</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring-default</artifactId>
   <name>XWiki Platform - Refactoring - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml
index dc438680819a..6a1f3a93890c 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-refactoring</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-refactoring-ui</artifactId>
   <name>XWiki Platform - Refactoring - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/pom.xml b/xwiki-platform-core/xwiki-platform-release/pom.xml
index c1f932c43657..3bc8177edac9 100644
--- a/xwiki-platform-core/xwiki-platform-release/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release</artifactId>
   <name>XWiki Platform - Release</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml
index 45567bbb7fe3..8ef42c77a72b 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-test</artifactId>
   <name>XWiki Platform - Release - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml
index d7d2524c5d8b..e4c53a52fa57 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-test-docker</artifactId>
   <name>XWiki Platform - Release - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml
index 79a2af5ad620..0c5165b225f2 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-test/xwiki-platform-release-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-test-pageobjects</artifactId>
   <name>XWiki Platform - Release - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml
index 201efe21242b..94e454559662 100644
--- a/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-release/xwiki-platform-release-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-release</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-release-ui</artifactId>
   <name>XWiki Platform - Release - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/pom.xml
index 67533f1f65e8..b755c4f5eec9 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering</artifactId>
   <name>XWiki Platform - Rendering - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml
index 61ae1b2dc9bb..906f59b5dd5c 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async</artifactId>
   <name>XWiki Platform - Rendering - Async - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml
index 07151cff11e4..6a3c491de496 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-async</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async-api</artifactId>
   <name>XWiki Platform - Rendering - Async - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml
index ec9b96a2316f..2c93e3aa5b3a 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-async</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async-default</artifactId>
   <name>XWiki Platform - Rendering - Async - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml
index 7906b5abd533..464393f24ae9 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-async/xwiki-platform-rendering-async-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-async</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-async-macro</artifactId>
   <name>XWiki Platform - Rendering - Async - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml
index 79a87ae57e6e..df20470ad574 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-configuration</artifactId>
   <name>XWiki Platform - Rendering - Configuration - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml
index a2cad2a68934..6a667a27a5e0 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-configuration</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-configuration-api</artifactId>
   <name>XWiki Platform - Rendering - Configuration - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml
index 4165e6c46c4e..f8ac0fe2f5d2 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-configuration/xwiki-platform-rendering-configuration-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-configuration</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-configuration-default</artifactId>
   <name>XWiki Platform - Rendering - Configuration - Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml
index 6227396242fc..e1b91fbba374 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macros</artifactId>
   <name>XWiki Platform - Rendering - Macros - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml
index 06d392b92bdb..0e47448fdf56 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-cache/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-cache</artifactId>
   <name>XWiki Platform - Rendering - Macro - Cache</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml
index 1e7c2da481e0..562f941839a2 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-code-oldcore</artifactId>
   <name>XWiki Platform - Rendering - Macro - Code Oldcore</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml
index 02143b1f6d05..d408cdfe7370 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-code/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-code</artifactId>
   <name>XWiki Platform - Rendering - Macro - Code</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml
index 54dd7b017684..1b1a614975f0 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-container/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-container</artifactId>
   <name>XWiki Platform - Rendering - Macro - Container</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml
index e748c6f8885c..e3e7bab722d4 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-context/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-context</artifactId>
   <name>XWiki Platform - Rendering - Macro - Context</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml
index d4b00d717d34..58c1dd5544e6 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-gallery/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-gallery</artifactId>
   <name>XWiki Platform - Rendering - Macro - Gallery</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml
index 31bc9539d817..17b38a2149fb 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-groovy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-groovy</artifactId>
   <name>XWiki Platform - Rendering - Macro - Groovy</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml
index bb146297e0cb..74f95609c3e6 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-include</artifactId>
   <name>XWiki Platform - Rendering - Macro - Include</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml
index 07df34159df5..309bd0315796 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-python/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-python</artifactId>
   <name>XWiki Platform - Rendering - Macro - Python</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml
index bf02bc110c27..73e55fc25d5d 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-script</artifactId>
   <name>XWiki Platform - Rendering - Macro - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml
index 82bca18c01b7..a8bdef14083e 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-toc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-toc</artifactId>
   <name>XWiki Platform - Rendering - Macro - Toc</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml
index b94dddd249b1..72ebd4c1ff79 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-useravatar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-useravatar</artifactId>
   <name>XWiki Platform - Rendering - Macro - User Avatar</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml
index eb7e99488801..49183be606a4 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-velocity/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-macros</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-macro-velocity</artifactId>
   <name>XWiki Platform - Rendering - Macro - Velocity</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml
index 8d2c09f555d5..643c42794c28 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-parser/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-parser</artifactId>
   <name>XWiki Platform - Rendering - Parser</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml
index e33f9940c7ad..414f7ad6d0d5 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-signature/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-rendering</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-signature</artifactId>
   <name>XWiki Platform - Rendering - Signature</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml
index 5e0303757f06..b1f7756c971b 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformations</artifactId>
   <name>XWiki Platform - Rendering - Transformations - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml
index 5389d260ace7..0be63b37ef8d 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-transformations</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformation-api</artifactId>
   <name>XWiki Platform - Rendering - Transformations - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml
index 6e30329e8572..eed49f70b138 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-icon/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-transformations</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformation-icon</artifactId>
   <name>XWiki Platform - Rendering - Transformations - Icon</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml
index 67b1a27e6fce..1621e51c4364 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-transformations/xwiki-platform-rendering-transformation-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-transformations</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-transformation-macro</artifactId>
   <name>XWiki Platform - Rendering - Transformations - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml
index 6a356b74e900..f752fd2ed4eb 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-ui</artifactId>
   <name>XWiki Platform - Rendering - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml
index bb97b23f1b82..d472189dbaa4 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-wikimacro</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml
index 209e7de22738..7c687bb03b0f 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-wikimacro</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-wikimacro-api</artifactId>
   <name>XWiki Platform - Rendering - Wiki Macro Bridge - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml
index 674cf6466a5b..d30c41e88935 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-wikimacro/xwiki-platform-rendering-wikimacro-store/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering-wikimacro</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-wikimacro-store</artifactId>
   <name>XWiki Platform - Rendering - Wiki Macro Bridge - Store</name>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml
index 6eca438898a3..07ff7ca9f113 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rendering</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rendering-xwiki</artifactId>
   <name>XWiki Platform - Rendering - XWiki-specific Implementation</name>
@@ -108,16 +108,6 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-icon-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.xwiki.platform</groupId>
-      <artifactId>xwiki-platform-localization-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <!--dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/util/XWikiIconProvider.java b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/util/XWikiIconProvider.java
deleted file mode 100644
index 89abd57a1e0b..000000000000
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/java/org/xwiki/rendering/internal/util/XWikiIconProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * See the NOTICE file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.xwiki.rendering.internal.util;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import org.xwiki.component.annotation.Component;
-import org.xwiki.icon.IconException;
-import org.xwiki.icon.IconRenderer;
-import org.xwiki.icon.IconSet;
-import org.xwiki.icon.IconSetManager;
-import org.xwiki.localization.ContextualLocalizationManager;
-import org.xwiki.rendering.block.Block;
-import org.xwiki.rendering.block.CompositeBlock;
-import org.xwiki.rendering.block.FormatBlock;
-import org.xwiki.rendering.block.RawBlock;
-import org.xwiki.rendering.block.WordBlock;
-import org.xwiki.rendering.listener.Format;
-import org.xwiki.rendering.syntax.Syntax;
-
-import java.util.List;
-
-/**
- * Component to use the icon theme to provide a proper block for displaying an icon.
- *
- * @version $Id$
- * @since 15.10.6
- * @since 16.1.0RC1
- */
-@Component
-@Singleton
-public class XWikiIconProvider extends DefaultIconProvider
-{
-    @Inject
-    private IconSetManager iconSetManager;
-    @Inject
-    private IconRenderer iconRenderer;
-    @Inject
-    private ContextualLocalizationManager l10n;
-
-    /**
-     * Uses the icon theme to provide the right block for displaying an icon.
-     * @param iconName the name of the icon to display
-     * @return the block containing an icon.
-     */
-    @Override
-    public Block get(String iconName)
-    {
-        IconSet iconSet = null;
-        try {
-            iconSet = getIconSet(iconName);
-            String iconContent = this.iconRenderer.renderHTML(iconName, iconSet);
-            Block iconAlternative;
-            try {
-                // Try to retrieve a translation for the icon.
-                iconAlternative = new FormatBlock(List.of(l10n.getTranslation(
-                    String.format("rendering.icon.provider.icon.alternative.%s", iconName)).render()), Format.NONE);
-            } catch (Exception e) {
-                // As a fallback, we just get the english name of the icon as an alternative.
-                iconAlternative = new FormatBlock(List.of(new WordBlock(iconName)), Format.NONE);
-            }
-            iconAlternative.setParameter("class", "sr-only");
-            Block iconRaw = new RawBlock(iconContent, Syntax.HTML_5_0);
-            // We return a combination of the icon itself and its text alternative.
-            return new CompositeBlock(List.of(iconRaw, iconAlternative));
-        } catch (IconException e) {
-            return super.get(iconName);
-        }
-    }
-
-    private IconSet getIconSet(String iconName) throws IconException
-    {
-        IconSet iconSet = this.iconSetManager.getCurrentIconSet();
-        if (iconSet == null || !iconSet.hasIcon(iconName)) {
-            iconSet = this.iconSetManager.getDefaultIconSet();
-        }
-        return iconSet;
-    }
-}
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources.properties
index 104501738873..a9311eca90b0 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources.properties
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/ApplicationResources.properties
@@ -42,12 +42,6 @@
 #     old.key.name=Some translation
 ###############################################################################
 
-# Those entries are used to label the message boxes of different types.
-rendering.icon.provider.icon.alternative.information=Information
-rendering.icon.provider.icon.alternative.accept=Success
-rendering.icon.provider.icon.alternative.error=Warning
-rendering.icon.provider.icon.alternative.exclamation=Error
-
 rendering.error.causedBy=Cause: [{0}].
 rendering.error.click=Click on this message for details.
 rendering.macro.rawMacroRequiredRights=Using the raw macro for HTML content requires script right.
diff --git a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/META-INF/components.txt b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/META-INF/components.txt
index a1627d0569eb..235f63519a7b 100644
--- a/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/META-INF/components.txt
+++ b/xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-xwiki/src/main/resources/META-INF/components.txt
@@ -1,7 +1,6 @@
 500:org.xwiki.rendering.internal.renderer.XWikiAttachmentURILabelGenerator
 500:org.xwiki.rendering.internal.renderer.XWikiLinkLabelGenerator
 500:org.xwiki.rendering.internal.renderer.XWikiPageAttachmentURILabelGenerator
-500:org.xwiki.rendering.internal.util.XWikiIconProvider
 500:org.xwiki.rendering.internal.util.XWikiErrorBlockGenerator
 500:org.xwiki.rendering.internal.wiki.XWikiWikiModel
 500:org.xwiki.rendering.internal.macro.XWikiHTMLRawBlockFilter
diff --git a/xwiki-platform-core/xwiki-platform-repository/pom.xml b/xwiki-platform-core/xwiki-platform-repository/pom.xml
index d0952e113518..27e963f5c186 100644
--- a/xwiki-platform-core/xwiki-platform-repository/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository</artifactId>
   <name>XWiki Platform - Repository</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
index c859db97be8e..ab6c5fbe9401 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-server-api</artifactId>
   <name>XWiki Platform - Repository - Server API</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml
index 7d721e291f5a..214b70bb2cbd 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-server-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-server-ui</artifactId>
   <name>XWiki Platform - Repository - Server UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml
index f986d91de2a6..3258130b392e 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test</artifactId>
   <name>XWiki Platform - Repository - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml
index 1a43bed842e8..b5ee5a02db2f 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test-pageobjects</artifactId>
   <name>XWiki Platform - Repository - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml
index feb99006e046..f9dfd40c1202 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test-tests</artifactId>
   <name>XWiki Platform - Repository - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml
index bf759be91196..0bbcb516aac2 100644
--- a/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-repository/xwiki-platform-repository-test/xwiki-platform-repository-test-utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-repository-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-repository-test-utils</artifactId>
   <name>XWiki Platform - Repository - Tests - Utils</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/pom.xml b/xwiki-platform-core/xwiki-platform-resource/pom.xml
index a345215c7b23..5fd5811ad044 100644
--- a/xwiki-platform-core/xwiki-platform-resource/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource</artifactId>
   <name>XWiki Platform - Resource - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml
index ce0f585027dc..eb86b807785d 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-api</artifactId>
   <name>XWiki Platform - Resource - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml
index 7bd5b3855ab2..321f9c791288 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-default</artifactId>
   <name>XWiki Platform - Resource - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml
index 8c2c08abf6e7..23604e352d83 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-servlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-servlet</artifactId>
   <name>XWiki Platform - Resource - Servlet</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml
index 4519a00755dc..154c012b6717 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-temporary/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-temporary</artifactId>
   <name>XWiki Platform - Resource - Temporary</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml
index 5bc27bae634c..677b9ce9feaa 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-test</artifactId>
   <name>XWiki Platform - Resource - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml
index 124ba8bca523..64c7829643ce 100644
--- a/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-resource/xwiki-platform-resource-test/xwiki-platform-resource-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-resource-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-resource-test-tests</artifactId>
   <name>XWiki Platform - Resource - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-rest/pom.xml b/xwiki-platform-core/xwiki-platform-rest/pom.xml
index d1781fee5cd8..2312ebeb23e8 100644
--- a/xwiki-platform-core/xwiki-platform-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
index 57c1df7678c8..08375ba075f7 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-api</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml
index 0e22c844f070..250c45004c62 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-model</artifactId>
   <name>XWiki Platform - REST - Model</name>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
index e0f82b91b1a9..03bdaa2a7215 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-server</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml
index 70c59bf0e10f..41d4805b04f6 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-test</artifactId>
   <name>XWiki Platform - REST - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml
index bfc8bae9c901..34a712be4bf8 100644
--- a/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-rest-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-rest-test-tests</artifactId>
   <name>XWiki Platform - REST - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-sandbox/pom.xml b/xwiki-platform-core/xwiki-platform-sandbox/pom.xml
index 6fbf16504daa..0fb050fe33b5 100644
--- a/xwiki-platform-core/xwiki-platform-sandbox/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sandbox/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sandbox</artifactId>
   <name>XWiki Platform - Sandbox Application</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/pom.xml
index cf59156b8816..40ab64141822 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler</artifactId>
   <name>XWiki Platform - Scheduler - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml
index c9d3f3a8e9ae..bf5301172db2 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-api</artifactId>
   <name>XWiki Platform - Scheduler - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml
index bed6c112807c..8436d7deb6c1 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-test</artifactId>
   <name>XWiki Platform - Scheduler - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml
index ab5e9233b9bd..8b3e5b230306 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-test-docker</artifactId>
   <name>XWiki Platform - Scheduler - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml
index e3aa1a5d3e06..cdf961c136b9 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-test/xwiki-platform-scheduler-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-test-pageobjects</artifactId>
   <name>XWiki Platform - Scheduler - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml
index ef8abbb9e833..0710fb9d5422 100644
--- a/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-scheduler/xwiki-platform-scheduler-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-scheduler</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-scheduler-ui</artifactId>
   <name>XWiki Platform - Scheduler - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/pom.xml b/xwiki-platform-core/xwiki-platform-search/pom.xml
index d45524cc9960..7251504ff5f5 100644
--- a/xwiki-platform-core/xwiki-platform-search/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search</artifactId>
   <name>XWiki Platform - Search - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml
index 3ea0f24ca0d6..2a71c966bf03 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-api</artifactId>
   <name>XWiki Platform - Search - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml
index 75ca7f0f6deb..8704e6a3f20b 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-search</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
index 28609beeaadb..98f1143ddae0 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-api</artifactId>
   <name>XWiki Platform - Search - Solr - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml
index 10075c8514f2..b03dc46d74b9 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-query/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-search-solr</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-query</artifactId>
   <packaging>jar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml
index e200765f291c..9fe716198a73 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-rest</artifactId>
   <name>XWiki Platform - Search - SOLR - REST</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
index d5f614c4bcc8..c33cae77c26a 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server</artifactId>
   <name>XWiki Platform - Search - SOLR - Server</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml
index 4bea8c712c59..50eb80c460a2 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core-minimal/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-server</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
   <name>XWiki Platform - Search - SOLR - Server - Minimal Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
index 1448d646a2c3..4142e95907b0 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-server</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server-core</artifactId>
   <name>XWiki Platform - Search - SOLR - Server - Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml
index 2e183b390201..2879cd2996b5 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-server/xwiki-platform-search-solr-server-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-server</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-server-plugin</artifactId>
   <name>XWiki Platform - Search - Solr - Server - Plugin</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml
index 19fda8210c2d..746d6237678f 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml
index 447423c43cde..9a6e6c092119 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-docker/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test-docker</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml
index 17042e5b96a3..71a30fa5cd7a 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-pageobjects/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test-pageobjects</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml
index 32b0897e4b05..abdbbebc9587 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-test/xwiki-platform-search-solr-test-utils/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-test-utils</artifactId>
   <name>XWiki Platform - Search - Solr - Tests - Utils</name>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml
index f41da06943e3..622d6fb8ef4f 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-solr/xwiki-platform-search-solr-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-solr-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml
index f0d3c125d057..8ce65bac25d1 100644
--- a/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-search/xwiki-platform-search-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-search</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-search-ui</artifactId>
   <name>XWiki Platform - Search - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/pom.xml b/xwiki-platform-core/xwiki-platform-security/pom.xml
index 600670057892..ecff5d0df08f 100644
--- a/xwiki-platform-core/xwiki-platform-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security</artifactId>
   <name>XWiki Platform - Security - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml
index 88feda9f48df..22044ed0a902 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-api</artifactId>
   <name>XWiki Platform - Security - Generic Security API</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
index f241410c7b36..20c46e08b6c3 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>xwiki-platform-security</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml
index 5d3a5c1fedfe..babfd473b721 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authentication</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-security-authentication-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/src/main/java/org/xwiki/security/authentication/RegistrationConfiguration.java b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/src/main/java/org/xwiki/security/authentication/RegistrationConfiguration.java
index 4c2928c8ea04..7822994a21a4 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/src/main/java/org/xwiki/security/authentication/RegistrationConfiguration.java
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-api/src/main/java/org/xwiki/security/authentication/RegistrationConfiguration.java
@@ -58,7 +58,7 @@ enum PasswordRules
         /**
          * When one symbol character is mandatory.
          */
-        ONE_SYMBOL_CHARACTER(".*(_\\W)+.*"),
+        ONE_SYMBOL_CHARACTER(".*[_\\W]+.*"),
 
         /**
          * When one number character is mandatory.
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml
index c6ef8bdb5e63..933cec8a9f42 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authentication</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-security-authentication-default</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/src/test/java/org/xwiki/security/authentication/internal/DefaultResetPasswordManagerTest.java b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/src/test/java/org/xwiki/security/authentication/internal/DefaultResetPasswordManagerTest.java
index d26c8c4bbde0..33b8e5dbd27b 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/src/test/java/org/xwiki/security/authentication/internal/DefaultResetPasswordManagerTest.java
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-default/src/test/java/org/xwiki/security/authentication/internal/DefaultResetPasswordManagerTest.java
@@ -519,6 +519,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
         String symbolNumberNoSpace6Chars = "_/3434";
         String onlyUpper3Chars = "FOO";
         String onlyUpper6Chars = "FOOOOO";
+        String isolatedSymbol = "bar@bar";
 
         return Stream.of(
             // Length 3, no rules
@@ -536,6 +537,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(3, noRules, symbolNumberNoSpace6Chars, true),
             Arguments.of(3, noRules, onlyUpper3Chars, true),
             Arguments.of(3, noRules, onlyUpper6Chars, true),
+            Arguments.of(3, noRules, isolatedSymbol, true),
             // length 6, no rules
             Arguments.of(6, noRules, onlyLower3Chars, false),
             Arguments.of(6, noRules, onlyLower6Chars, true),
@@ -551,6 +553,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, noRules, symbolNumberNoSpace6Chars, true),
             Arguments.of(6, noRules, onlyUpper3Chars, false),
             Arguments.of(6, noRules, onlyUpper6Chars, true),
+            Arguments.of(6, noRules, isolatedSymbol, true),
             // length 6, lower mandatory
             Arguments.of(6, lowerMandatory, onlyLower3Chars, false),
             Arguments.of(6, lowerMandatory, onlyLower6Chars, true),
@@ -566,6 +569,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, lowerMandatory, symbolNumberNoSpace6Chars, false),
             Arguments.of(6, lowerMandatory, onlyUpper3Chars, false),
             Arguments.of(6, lowerMandatory, onlyUpper6Chars, false),
+            Arguments.of(6, lowerMandatory, isolatedSymbol, true),
             // length 6, upper mandatory
             Arguments.of(6, upperMandatory, onlyLower3Chars, false),
             Arguments.of(6, upperMandatory, onlyLower6Chars, false),
@@ -581,6 +585,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, upperMandatory, symbolNumberNoSpace6Chars, false),
             Arguments.of(6, upperMandatory, onlyUpper3Chars, false),
             Arguments.of(6, upperMandatory, onlyUpper6Chars, true),
+            Arguments.of(6, upperMandatory, isolatedSymbol, false),
             // length 6, number mandatory
             Arguments.of(6, numberMandatory, onlyLower3Chars, false),
             Arguments.of(6, numberMandatory, onlyLower6Chars, false),
@@ -596,6 +601,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, numberMandatory, symbolNumberNoSpace6Chars, true),
             Arguments.of(6, numberMandatory, onlyUpper3Chars, false),
             Arguments.of(6, numberMandatory, onlyUpper6Chars, false),
+            Arguments.of(6, numberMandatory, isolatedSymbol, false),
             // length 6, symbol mandatory
             Arguments.of(6, symbolMandatory, onlyLower3Chars, false),
             Arguments.of(6, symbolMandatory, onlyLower6Chars, false),
@@ -611,6 +617,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, symbolMandatory, symbolNumberNoSpace6Chars, true),
             Arguments.of(6, symbolMandatory, onlyUpper3Chars, false),
             Arguments.of(6, symbolMandatory, onlyUpper6Chars, false),
+            Arguments.of(6, symbolMandatory, isolatedSymbol, true),
             // length 6, upper and number mandatory
             Arguments.of(6, upperAndNumberMandatory, onlyLower3Chars, false),
             Arguments.of(6, upperAndNumberMandatory, onlyLower6Chars, false),
@@ -626,6 +633,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, upperAndNumberMandatory, symbolNumberNoSpace6Chars, false),
             Arguments.of(6, upperAndNumberMandatory, onlyUpper3Chars, false),
             Arguments.of(6, upperAndNumberMandatory, onlyUpper6Chars, false),
+            Arguments.of(6, upperAndNumberMandatory, isolatedSymbol, false),
             // length 6, upper and lower mandatory
             Arguments.of(6, lowerAndUpperMandatory, onlyLower3Chars, false),
             Arguments.of(6, lowerAndUpperMandatory, onlyLower6Chars, false),
@@ -641,6 +649,7 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, lowerAndUpperMandatory, symbolNumberNoSpace6Chars, false),
             Arguments.of(6, lowerAndUpperMandatory, onlyUpper3Chars, false),
             Arguments.of(6, lowerAndUpperMandatory, onlyUpper6Chars, false),
+            Arguments.of(6, lowerAndUpperMandatory, isolatedSymbol, false),
             // length 6, all rules
             Arguments.of(6, allRules, onlyLower3Chars, false),
             Arguments.of(6, allRules, onlyLower6Chars, false),
@@ -656,9 +665,11 @@ private static Stream<Arguments> provideArgumentsForIsPasswordCompliantWithRegis
             Arguments.of(6, allRules, symbolNumberNoSpace6Chars, false),
             Arguments.of(6, allRules, onlyUpper3Chars, false),
             Arguments.of(6, allRules, onlyUpper6Chars, false),
+            Arguments.of(6, allRules, isolatedSymbol, false),
             // length 13, all rules
             Arguments.of(13, allRules, lowerUpperSymbolNumberSpace12Chars, false),
-            Arguments.of(13, allRules, lowerUpperSymbolNumberSpaceAccents14Chars, true)
+            Arguments.of(13, allRules, lowerUpperSymbolNumberSpaceAccents14Chars, true),
+            Arguments.of(13, allRules, isolatedSymbol, false)
         );
     }
 }
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml
index 0a1cc2f672f3..ae46c6690dd6 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-script/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>xwiki-platform-security-authentication</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-security-authentication-script</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml
index 05f29a59594c..3a8c87dd90c5 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authentication/xwiki-platform-security-authentication-ui/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authentication</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authentication-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml
index c83fcf57b30d..a809e1474636 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml
index eafe3245933f..a0ba50403352 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authorization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization-api</artifactId>
   <name>XWiki Platform - Security - Authorization - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml
index 9b395c5c950e..d8a3d17288ba 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-bridge/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authorization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization-bridge</artifactId>
   <name>XWiki Platform - Security - Authorization - Bridge</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml
index fe72106798d3..62af21047736 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-authorization/xwiki-platform-security-authorization-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-authorization</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-authorization-script</artifactId>
   <name>XWiki Platform - Security - Authorization - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml
index b17aee1a5463..c2ae28735df4 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml
index 2d35508a9ed2..d816e7c84009 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-api</artifactId>
   <name>XWiki Platform - Security - Required Rights - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
index 98ce498ea9e6..623de71e176d 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-default/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-default</artifactId>
   <name>XWiki Platform - Security - Required Rights - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml
index 4771b4f86cc7..c51d1114c421 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-macro/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-macro</artifactId>
   <name>XWiki Platform - Security - Required Rights - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml
index c88a95db8cce..b614e35e7616 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-test</artifactId>
   <name>XWiki Platform - Security - Required Rights - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml
index 630f6464c435..7a091228b0b5 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-test-docker</artifactId>
   <name>XWiki Platform - Security - Required Rights - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml
index 5729559a4ba2..50807b40e75e 100644
--- a/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-security/xwiki-platform-security-requiredrights/xwiki-platform-security-requiredrights-test/xwiki-platform-security-requiredrights-test-pageobjects/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-security-requiredrights-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-security-requiredrights-test-pageobjects</artifactId>
   <name>XWiki Platform - Security - Required Rights - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/pom.xml
index ae2ca2dec844..c58a22f097df 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage</artifactId>
   <name>XWiki Platform - Share Page - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml
index 390042cb7c31..783722ca985c 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-api</artifactId>
   <name>XWiki Platform - Share Page - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml
index be6f6e7fced5..02a475222f03 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-test</artifactId>
   <name>XWiki Platform - Share Page - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml
index fecfe4d4f8e9..965cb2d35fb9 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-test-docker</artifactId>
   <name>XWiki Platform - Share Page - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml
index fe5af22ff284..811c38138e72 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-test/xwiki-platform-sharepage-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-test-pageobjects</artifactId>
   <name>XWiki Platform - Share Page - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml
index 504b51af2ee4..531e3d7153ec 100644
--- a/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sharepage/xwiki-platform-sharepage-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sharepage</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sharepage-ui</artifactId>
   <name>XWiki Platform - Share Page - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-sheet/pom.xml b/xwiki-platform-core/xwiki-platform-sheet/pom.xml
index 59fffdbcf696..f79d875e1391 100644
--- a/xwiki-platform-core/xwiki-platform-sheet/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sheet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sheet</artifactId>
   <name>XWiki Platform - Sheet - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml
index 6223c46808ed..69aab1b443d4 100644
--- a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sheet</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sheet-api</artifactId>
   <name>XWiki Platform - Sheet - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml
index 7d2bd8e81bf4..70e84721e1c7 100644
--- a/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-sheet/xwiki-platform-sheet-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-sheet</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-sheet-ui</artifactId>
   <name>XWiki Platform - Sheet - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/pom.xml b/xwiki-platform-core/xwiki-platform-skin/pom.xml
index d2b0b17d15eb..d4e726c27d7b 100644
--- a/xwiki-platform-core/xwiki-platform-skin/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin</artifactId>
   <name>XWiki Platform - Skin - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml
index f961fbfa326d..0d1e1f7585fb 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-api</artifactId>
   <name>XWiki Platform - Skin - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml
index 65aad8108221..4391cb4d4b1c 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-skinx/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-skinx</artifactId>
   <name>XWiki Platform - Skin - Skin Extensions</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml
index d89d60ef1ef8..157e2a3761de 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-test</artifactId>
   <name>XWiki Platform - Skin - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml
index 6f051efbfaee..ed57ab27dd11 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-test-docker</artifactId>
   <name>XWiki Platform - Skin - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml
index 4c47a7c816c9..69a8ec5af031 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-test/xwiki-platform-skin-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-test-pageobjects</artifactId>
   <name>XWiki Platform - Skin - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml
index 6c24aca8386e..67a04222b4fc 100644
--- a/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-skin/xwiki-platform-skin-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-skin</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-skin-ui</artifactId>
   <name>XWiki Platform - Skin - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-statistics/pom.xml b/xwiki-platform-core/xwiki-platform-statistics/pom.xml
index a3ec984384b5..102a77abff30 100644
--- a/xwiki-platform-core/xwiki-platform-statistics/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-statistics/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-statistics</artifactId>
   <name>XWiki Platform - Statistics</name>
diff --git a/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml b/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml
index 8fd2915e6b93..253a8dd74a9f 100644
--- a/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-statistics/xwiki-platform-statistics-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-statistics</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-statistics-ui</artifactId>
   <name>XWiki Platform - Statistics - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/pom.xml b/xwiki-platform-core/xwiki-platform-store/pom.xml
index 9a5ec4ce3483..33c52e85a665 100644
--- a/xwiki-platform-core/xwiki-platform-store/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store</artifactId>
   <name>XWiki Platform - Store - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml
index efeb9f9505b5..4dd5e965db89 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-api</artifactId>
   <name>XWiki Platform - Store - Api</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml
index 93c58dc29072..f6981885ff31 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-filesystem-oldcore</artifactId>
   <name>XWiki Platform - Store - Filesystem - Old Core</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml
index f0c304c9acc8..14296ccfb7e3 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-filesystem/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-filesystem</artifactId>
   <name>XWiki Platform - Store - Filesystem</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml
index f886dbf2f051..9ffba5e47994 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-locks/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-locks</artifactId>
   <name>XWiki Platform - Store - Locks</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
index fd03b812096f..d0ba0763b122 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-store</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-store-merge</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml
index b2b40ec41656..51787255d9ba 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-store-merge</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>xwiki-platform-store-merge-api</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml
index bd8a27e16f8d..1529b5794725 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-merge/xwiki-platform-store-merge-default/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>xwiki-platform-store-merge</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml
index a4a39f3b4a90..d1f973e5b50d 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-serialization/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-serialization</artifactId>
   <name>XWiki Platform - Store - Serialization</name>
diff --git a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml
index a5436d8e8b2c..c95899d42d58 100644
--- a/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-store/xwiki-platform-store-transaction/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-store</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-store-transaction</artifactId>
   <name>XWiki Platform - Store - Transaction</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/pom.xml b/xwiki-platform-core/xwiki-platform-tag/pom.xml
index 1b1c74c2f333..b2a1ed2e2245 100644
--- a/xwiki-platform-core/xwiki-platform-tag/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag</artifactId>
   <name>XWiki Platform - Tag - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml
index 1777bfd9675c..5dc22089149d 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-api</artifactId>
   <name>XWiki Platform - Tag - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml
index 6b0a7eee228e..dde1ecd999a9 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-test</artifactId>
   <name>XWiki Platform - Tag - Test - POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml
index 9dcd48ca7dee..614a6242dcde 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-test-docker</artifactId>
   <name>XWiki Platform - Tag - Test - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml
index e75e2f37519e..929de6f458ab 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-test/xwiki-platform-tag-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-test-pageobjects</artifactId>
   <name>XWiki Platform - Tag - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml
index 6104e49e97f7..b6a69c053879 100644
--- a/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tag/xwiki-platform-tag-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tag</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tag-ui</artifactId>
   <name>XWiki Platform - Tag - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-template/pom.xml b/xwiki-platform-core/xwiki-platform-template/pom.xml
index 8480c1b8089d..308dd86342a8 100644
--- a/xwiki-platform-core/xwiki-platform-template/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-template/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-template</artifactId>
   <name>XWiki Platform - Template - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml b/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml
index 1aa26df5c9c4..ead596fb2d5a 100644
--- a/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-template/xwiki-platform-template-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-template</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-template-api</artifactId>
   <name>XWiki Platform - Template - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/pom.xml b/xwiki-platform-core/xwiki-platform-test/pom.xml
index af9a041b2abd..e03323030df0 100644
--- a/xwiki-platform-core/xwiki-platform-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test</artifactId>
   <name>XWiki Platform - Test - Parent POM</name>
   <packaging>pom</packaging>
   <description>XWiki Platform - Test - Parent POM</description>
   <properties>
-    <selenium.version>4.17.0</selenium.version>
+    <selenium.version>4.18.1</selenium.version>
     <!-- Don't run backward-compatibility checks in test modules since we don't consider them as public APIs -->
     <xwiki.revapi.skip>true</xwiki.revapi.skip>
   </properties>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml
index 7e447a567b61..46bcb76c5014 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-checker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-checker</artifactId>
   <name>XWiki Platform - Test - Runtime Checker Tools</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
index 48e074636aba..7dc4d2e1bb8e 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-docker</artifactId>
   <name>XWiki Platform - Test - Docker UI Test Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/AbstractContainerExecutor.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/AbstractContainerExecutor.java
index f0946763599c..94cba1b24721 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/AbstractContainerExecutor.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/AbstractContainerExecutor.java
@@ -70,9 +70,10 @@ protected void mountFromHostToContainer(GenericContainer<?> container, String so
         // Note 1: File mounting is awfully slow on Mac OSX. For example starting Tomcat with XWiki mounted takes
         // 45s+, while doing a COPY first and then starting Tomcat takes 8s (+5s for the copy).
         // Note 2: For the DOOD use case, we also do the copy instead of the volume mounting since that would require
-        // to have the sourceDirectory path mounted from the host and this would put and leave files on the host which
-        // would not work with parallel executions (think about multiple CI jobs executing in parallel on the same host)
-        // and would also not be clean.
+        // to have the sourceDirectory path mounted from the host, and this is not possible since the Jenkins workspace
+        // directory doesn't exist on the host (it's created only inside the agent, i.e. inside the xwiki docker build
+        // container). Even if it were possible, it would prevent being able to have several builds in parallel on the
+        // same host.
         String osName = System.getProperty("os.name").toLowerCase();
         if (isInAContainer() || osName.startsWith("mac os x")) {
             MountableFile mountableDirectory = MountableFile.forHostPath(sourceDirectory);
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiDockerExtension.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiDockerExtension.java
index 9e97f4a920b6..b87f38556942 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiDockerExtension.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiDockerExtension.java
@@ -278,7 +278,11 @@ public void afterEach(ExtensionContext extensionContext)
     public void handleTestExecutionException(ExtensionContext extensionContext, Throwable throwable)
         throws Throwable
     {
-        saveScreenshotAndVideo(extensionContext);
+        try {
+            saveScreenshotAndVideo(extensionContext);
+        } catch (Exception e) {
+            LOGGER.error("Failed to save the video", e);
+        }
 
         // Display the current jenkins agent name to have debug information printed in the Jenkins page for the test.
         displayAgentName();
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiGenericContainer.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiGenericContainer.java
new file mode 100644
index 000000000000..45ba95112745
--- /dev/null
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiGenericContainer.java
@@ -0,0 +1,110 @@
+/*
+ * See the NOTICE file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.xwiki.test.docker.internal.junit5;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.Future;
+
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.testcontainers.DockerClientFactory;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.images.builder.Transferable;
+
+/**
+ * To be used instead of {@link GenericContainer} to fix an OOM issue on TC side, see
+ * <a href="https://github.com/testcontainers/testcontainers-java/issues/4203">issue 4203</a>.
+ *
+ * @param <T> the type of container
+ * @version $Id$
+ * @since 16.1.0RC1
+ */
+// TODO: Remove this class when https://github.com/testcontainers/testcontainers-java/issues/4203 is fixed
+public class XWikiGenericContainer<T extends GenericContainer<T>> extends GenericContainer<T>
+{
+    /**
+     * @see GenericContainer#GenericContainer(String)
+     *
+     * @param dockerImageName the name of the docker image to start a container from
+     */
+    public XWikiGenericContainer(String dockerImageName)
+    {
+        super(dockerImageName);
+    }
+
+    /**
+     * @see GenericContainer#GenericContainer(Future)
+     *
+     * @param image the image to start a container from
+     */
+    public XWikiGenericContainer(Future<String> image)
+    {
+        super(image);
+    }
+
+    /**
+     * Copies a file to the container, using a temporary TAR file to avoid keeping the whole content in memory. The
+     * code applies the patch provided in
+     * <a href="https://github.com/testcontainers/testcontainers-java/pull/2864/files#">issue 2864</a>.
+     *
+     * @param transferable file which is copied into the container
+     * @param containerPath destination path inside the container
+     */
+    @Override
+    public void copyFileToContainer(Transferable transferable, String containerPath)
+    {
+        if (!isCreated()) {
+            throw new IllegalStateException("copyFileToContainer can only be used with created / running container");
+        }
+        try {
+            Path targetDirectory = Path.of("target");
+            Path tarFile = Files.createTempFile(targetDirectory, "tc-tar-tmp", ".tar");
+            try {
+                copyFileToContainer(transferable, containerPath, tarFile);
+            } finally {
+                Files.delete(tarFile);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(String.format("Failed to copy [%s] to [%s]", transferable, containerPath), e);
+        }
+    }
+
+    private void copyFileToContainer(Transferable transferable, String containerPath, Path tarFile) throws IOException
+    {
+        try (OutputStream outputStream = Files.newOutputStream(tarFile);
+            TarArchiveOutputStream tarArchive = new TarArchiveOutputStream(outputStream))
+        {
+            tarArchive.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);
+            tarArchive.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_POSIX);
+            transferable.transferTo(tarArchive, containerPath);
+            tarArchive.finish();
+        }
+        try (InputStream inputStream = Files.newInputStream(tarFile)) {
+            DockerClientFactory.instance().client()
+                .copyArchiveToContainerCmd(getContainerId())
+                .withTarInputStream(inputStream)
+                .withRemotePath("/")
+                .exec();
+        }
+    }
+}
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiLocalGenericContainer.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiLocalGenericContainer.java
index 46535d990c09..b048d5aaf173 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiLocalGenericContainer.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/XWikiLocalGenericContainer.java
@@ -31,7 +31,7 @@
  * @version $Id$
  * @since 11.10
  */
-public class XWikiLocalGenericContainer<T extends GenericContainer<T>> extends GenericContainer<T>
+public class XWikiLocalGenericContainer<T extends XWikiGenericContainer<T>> extends XWikiGenericContainer<T>
 {
     /**
      * @see GenericContainer#GenericContainer(String)
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/configuration/ConfigurationFilesGenerator.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/configuration/ConfigurationFilesGenerator.java
index 9ccba8429428..91cf81d37d26 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/configuration/ConfigurationFilesGenerator.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/configuration/ConfigurationFilesGenerator.java
@@ -128,9 +128,9 @@ public void generate(File configurationFileTargetDirectory, String version, Arti
         }
 
         // Copy a logback config file for testing. This allows putting overrides in it that are needed only for the
-        // tests. Only do this in the CI for now (or if debug is true) since this is currently used for debugging
+        // tests. Only do this in the CI for now (or if verbose is true) since this is currently used for debugging
         // problems.
-        if (DockerTestUtils.isInAContainer() || this.testConfiguration.isDebug()) {
+        if (DockerTestUtils.isInAContainer() || this.testConfiguration.isVerbose()) {
             copyLogbackConfigFile(configurationFileTargetDirectory);
         }
     }
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/servletengine/ServletContainerExecutor.java b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/servletengine/ServletContainerExecutor.java
index a9f7dc73423e..9e2f70a9c3df 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/servletengine/ServletContainerExecutor.java
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-docker/src/main/java/org/xwiki/test/docker/internal/junit5/servletengine/ServletContainerExecutor.java
@@ -39,6 +39,7 @@
 import org.testcontainers.images.builder.ImageFromDockerfile;
 import org.xwiki.test.docker.internal.junit5.AbstractContainerExecutor;
 import org.xwiki.test.docker.internal.junit5.DockerTestUtils;
+import org.xwiki.test.docker.internal.junit5.XWikiGenericContainer;
 import org.xwiki.test.docker.internal.junit5.XWikiLocalGenericContainer;
 import org.xwiki.test.docker.junit5.TestConfiguration;
 import org.xwiki.test.docker.junit5.database.Database;
@@ -404,7 +405,7 @@ private GenericContainer<?> createServletContainer() throws Exception
                 container = new XWikiLocalGenericContainer<>(imageName);
             }
         } else {
-            container = new GenericContainer<>(baseImageName);
+            container = new XWikiGenericContainer<>(baseImageName);
         }
 
         return container;
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
index cdbfc8caeb47..d1bb947fcd78 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-integration/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-integration</artifactId>
   <name>XWiki Platform - Test - Integration Tests Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml
index 1419cc991df7..8c44e72e9d3a 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-oldcore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-oldcore</artifactId>
   <name>XWiki Platform - Test - Oldcore</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml
index fc254d8a0231..f3dd88c1c473 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-page/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-page</artifactId>
   <name>XWiki Platform - Test - Page Tests Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
index a04f5b9422e8..027e9e64a47b 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-rest/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-rest</artifactId>
   <name>XWiki Platform - Test - Rest</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
index 4aa2e5e35ab4..a070e899bd08 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-ui</artifactId>
   <name>XWiki Platform - Test - UI Tests Framework</name>
diff --git a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml
index d75f69246e91..f943c432c484 100644
--- a/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-test/xwiki-platform-test-upgrade/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-test-upgrade</artifactId>
   <name>XWiki Platform - Test - Distribution Upgrade</name>
diff --git a/xwiki-platform-core/xwiki-platform-tika/pom.xml b/xwiki-platform-core/xwiki-platform-tika/pom.xml
index b7d05179bcaf..ede59b9a3adb 100644
--- a/xwiki-platform-core/xwiki-platform-tika/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tika/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tika</artifactId>
   <name>XWiki Platform - Tika - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml
index 3391fd7f59a9..1fbed23f27cc 100644
--- a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-detect/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tika</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tika-detect</artifactId>
   <name>XWiki Platform - Tika - Detect</name>
diff --git a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml
index 2683feb3cbf5..ce1857eb25b1 100644
--- a/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tika/xwiki-platform-tika-parsers/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tika</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tika-parsers</artifactId>
   <name>XWiki Platform - Tika - Parsers</name>
diff --git a/xwiki-platform-core/xwiki-platform-tour/pom.xml b/xwiki-platform-core/xwiki-platform-tour/pom.xml
index c9f5d9aea163..121528474342 100644
--- a/xwiki-platform-core/xwiki-platform-tour/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
index a968dbcadbee..7554438217ab 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-test</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml
index 0975f731b67f..085a32f79eb2 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-test-docker</artifactId>
   <name>XWiki Platform - Tour - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml
index bf767b5a041f..8d44631b55ae 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-test/xwiki-platform-tour-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-test-pageobjects</artifactId>
   <name>XWiki Platform - Tour - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml
index 1f8fc2014377..03661e04dce6 100644
--- a/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tour/xwiki-platform-tour-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tour</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tour-ui</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-tree/pom.xml b/xwiki-platform-core/xwiki-platform-tree/pom.xml
index 2e223b65604c..2fc1808444cd 100644
--- a/xwiki-platform-core/xwiki-platform-tree/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree</artifactId>
   <name>XWiki Platform - Tree - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml
index f0a7a371ba1b..71273eba4707 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-api</artifactId>
   <name>XWiki Platform - Tree - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml
index f4b3a8fc1684..b0b3013b980a 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-macro/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-macro</artifactId>
   <name>XWiki Platform - Tree - Macro</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml
index 59696f585ae7..5d0be325c882 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-test-pageobjects</artifactId>
   <name>XWiki Platform - Tree - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml
index e186cb4aff8f..528d1938783c 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tree-war</artifactId>
   <name>XWiki Platform - Tree - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
index b391d65bf15f..e1f00461f81a 100644
--- a/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-tree/xwiki-platform-tree-webjar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tree</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <packaging>webjar</packaging>
   <artifactId>xwiki-platform-tree-webjar</artifactId>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/pom.xml
index 598c2e58f3bd..4bebcffe78c3 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension</artifactId>
   <name>XWiki Platform - UI Extension - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml
index 0153fdbc4791..4c9b9169686e 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-uiextension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension-api</artifactId>
   <name>XWiki Platform - UI Extension Extension - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml
index d244ce2ffd4e..7a2d8ebc2e37 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-uiextension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension-test</artifactId>
   <name>XWiki Platform - UI Extension Extension - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml
index 6ab07078f6ad..71bb335e787b 100644
--- a/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-uiextension/xwiki-platform-uiextension-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-uiextension</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-uiextension-ui</artifactId>
   <name>XWiki Platform - UI Extension - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/pom.xml b/xwiki-platform-core/xwiki-platform-url/pom.xml
index ba86aa9af6bb..2019e7caa203 100644
--- a/xwiki-platform-core/xwiki-platform-url/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url</artifactId>
   <name>XWiki Platform - URL - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
index 72a34767f652..ac85642e70bb 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-api</artifactId>
   <name>XWiki Platform - URL - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml
index 48d66c349fe2..790c7cea7162 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-container/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-container</artifactId>
   <name>XWiki Platform - URL - Container</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml
index 769fd7a08af3..e165ad0d9b09 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-default</artifactId>
   <name>XWiki Platform - URL - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml
index 096828f75d6b..b86acc2c0e72 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-schemes</artifactId>
   <name>XWiki Platform - URL - Schemes - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml
index 4ff0bb02508e..ad2f5da04396 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-filesystem/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url-schemes</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-scheme-filesystem</artifactId>
   <name>XWiki Platform - URL - Scheme - Filesystem Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml
index 25749ccc29f3..9b508cc2afb6 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-reference/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url-schemes</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-scheme-reference</artifactId>
   <name>XWiki Platform - URL - Scheme - Reference Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml
index 4b449f2066db..360ae68c3dcc 100644
--- a/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-url/xwiki-platform-url-schemes/xwiki-platform-url-scheme-standard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-url-schemes</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-url-scheme-standard</artifactId>
   <name>XWiki Platform - URL - Scheme - Standard Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/pom.xml b/xwiki-platform-core/xwiki-platform-user/pom.xml
index ab7e516d9b88..c2be3f80a981 100644
--- a/xwiki-platform-core/xwiki-platform-user/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user</artifactId>
   <name>XWiki Platform - User - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml
index 3c69b5c5c400..e38e105b9380 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-api</artifactId>
   <name>XWiki Platform - User - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml
index 197bddcd7178..ba77579379c2 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-default</artifactId>
   <name>XWiki Platform - User - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml
index e83ce1863741..5274867d1d97 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory</artifactId>
   <name>XWiki Platform - User - Directory - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml
index fe65c73a9281..d8f80ec4bf27 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-test</artifactId>
   <name>XWiki Platform - User - Directory - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml
index 1afb42d2149f..2b24a642c314 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-test-docker</artifactId>
   <name>XWiki Platform - User - Directory - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml
index ced2c7256d13..1fd01c6c30aa 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-test/xwiki-platform-user-directory-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-test-pageobjects</artifactId>
   <name>XWiki Platform - User - Directory - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml
index 4cdf8712e4d3..4f30d6a41a19 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-directory/xwiki-platform-user-directory-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-directory</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-directory-ui</artifactId>
   <name>XWiki Platform - User - Directory - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml
index 4ae6804ada3d..f8cae6f7fc67 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile</artifactId>
   <name>XWiki Platform - User - Profile - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml
index f5430081b230..876138101012 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-test</artifactId>
   <name>XWiki Platform - User - Profile - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml
index ddb44a703edd..d48bc689b179 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-test-docker</artifactId>
   <name>XWiki Platform - User - Profile - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml
index f4c5f12f894b..8caa59e9fd9f 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-test/xwiki-platform-user-profile-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-test-pageobjects</artifactId>
   <name>XWiki Platform - User - Profile - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml
index 02a07382a5f0..ed74c3139fc6 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-profile</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-profile-ui</artifactId>
   <name>XWiki Platform - User - Profile - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml
index 244073cfe80c..c4d71d5567f3 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-resource/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-resource</artifactId>
   <name>XWiki Platform - User - Resource</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml
index 66ead3a2ff7d..29a0a88ba045 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-script</artifactId>
   <name>XWiki Platform - User - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml
index e2ec63b4d7ce..8de86df64ca7 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-test</artifactId>
   <name>XWiki Platform - User - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml
index 89fc222dd70d..ef333a7ba47b 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-test/xwiki-platform-user-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-user-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-user-test-docker</artifactId>
   <name>XWiki Platform - User - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-velocity/pom.xml b/xwiki-platform-core/xwiki-platform-velocity/pom.xml
index d0e216d40cd1..f0f0c9a1da7e 100644
--- a/xwiki-platform-core/xwiki-platform-velocity/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-velocity/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-velocity</artifactId>
   <name>XWiki Platform - Velocity - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml
index ca4d76552f9a..2ed9c0940e69 100644
--- a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-webapp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-velocity</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-velocity-webapp</artifactId>
   <name>XWiki Platform - Velocity - WebApp Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml
index 16905587ee99..f19d2b468167 100644
--- a/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-velocity/xwiki-platform-velocity-xwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-velocity</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-velocity-xwiki</artifactId>
   <name>XWiki Platform - Velocity - Platform Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/pom.xml
index 3311d2b19b67..028e9ca5cd31 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs</artifactId>
   <packaging>pom</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
index 68e30bef501d..34bd83ac7599 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-api</artifactId>
   <name>XWiki Platform - VFS - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml
index c76b64e801b8..893855464c42 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-test</artifactId>
   <name>XWiki Platform - VFS - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml
index 63a1d8c833c9..698b12250be8 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-test/xwiki-platform-vfs-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-test-docker</artifactId>
   <name>XWiki Platform - VFS - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml
index 0b32a59d3669..8e5f97541f3d 100644
--- a/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-vfs/xwiki-platform-vfs-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-vfs</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-vfs-ui</artifactId>
   <name>XWiki Platform - VFS - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-web/pom.xml b/xwiki-platform-core/xwiki-platform-web/pom.xml
index 6c51a9727fc1..a28736608a04 100644
--- a/xwiki-platform-core/xwiki-platform-web/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-web</artifactId>
   <name>XWiki Platform - Web - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
index ce7f42d2bf14..2299d0eea1c3 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-web</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-web-templates</artifactId>
   <name>XWiki Platform - Web - Templates</name>
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
index 85fbddea0317..20153fbc03e0 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-web</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-web-war</artifactId>
   <name>XWiki Platform - Web - WAR</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/pom.xml
index 6c0457ec0591..6399551a0f7e 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars</artifactId>
   <name>XWiki Platform - WebJars - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
index f269c8337a31..b3d855cd5278 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-webjars</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars-api</artifactId>
   <name>XWiki Platform - WebJars - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml
index d3e62819c720..cffd8e7e2785 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-webjars</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars-test</artifactId>
   <name>XWiki Platform - WebJars - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml
index 518fda1f3218..bae5757a4659 100644
--- a/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-webjars/xwiki-platform-webjars-test/xwiki-platform-webjars-test-tests/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-webjars-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-webjars-test-tests</artifactId>
   <name>XWiki Platform - WebJars - Tests - Functional Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-websocket/pom.xml b/xwiki-platform-core/xwiki-platform-websocket/pom.xml
index 7098656639bb..0a04dd1ae413 100644
--- a/xwiki-platform-core/xwiki-platform-websocket/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-websocket/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-websocket</artifactId>
   <name>XWiki Platform - WebSocket</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml
index 08867e7a36f4..063bb1cd5a09 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew</artifactId>
   <name>XWiki Platform - What's New - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
index 56a5091c05ce..800d67211673 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-api</artifactId>
   <name>XWiki Platform - What's New - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml
index 5b6e9a9c2e13..a68dce529f1d 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-test</artifactId>
   <name>XWiki Platform - What's New - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml
index 71e928be03c1..061019d7684c 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-test-docker</artifactId>
   <name>XWiki Platform - What's New - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml
index 3b85ff331329..648facf7c2c5 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-test/xwiki-platform-whatsnew-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-test-pageobjects</artifactId>
   <name>XWiki Platform - What's New - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml
index c9d263bfc383..abcea07f4a1b 100644
--- a/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-whatsnew/xwiki-platform-whatsnew-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-whatsnew</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-whatsnew-ui</artifactId>
   <name>XWiki Platform - What's New - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/pom.xml
index d7aba13bfdda..31751e15bdfd 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki</artifactId>
   <name>XWiki Platform - Wiki - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml
index 2e9fc6d2c3df..231fdc2b8581 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-api</artifactId>
   <name>XWiki Platform - Wiki - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml
index 581948099db5..7f71f0c351d6 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-creationjob/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-creationjob</artifactId>
   <name>XWiki Platform - Wiki - Creation Job</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml
index 22327ff623c8..99d489366992 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-default</artifactId>
   <name>XWiki Platform - Wiki - Default Implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml
index 5fdea1e8196d..0d25c0f74c45 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-rest</artifactId>
   <name>XWiki Platform - Wiki - REST - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
index be5bf546b154..20483c469d4e 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-rest-api</artifactId>
   <name>XWiki Platform - Wiki - REST - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml
index 4e2e36f98f3b..2e441c3ae175 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-rest/xwiki-platform-wiki-rest-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-rest</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-rest-default</artifactId>
   <name>XWiki Platform - Wiki - REST - Default implementation</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml
index d7053cacd458..2ac9af762181 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-script</artifactId>
   <name>XWiki Platform - Wiki - Script services</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml
index 10cd61123ba7..e46aa14852b2 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template</artifactId>
   <name>XWiki Platform - Wiki - Template - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml
index cdcc1a4c2615..8f0a3ea81e12 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-template</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template-api</artifactId>
   <name>XWiki Platform - Wiki - Template - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml
index 471ed3085380..3ec7ec7c7502 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-template</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template-default</artifactId>
   <name>XWiki Platform - Wiki - Template - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml
index d8ab10d934ae..c207978b8133 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-template/xwiki-platform-wiki-template-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-template</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-template-script</artifactId>
   <name>XWiki Platform - Wiki - Template - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml
index d86de342e9ac..5d32683da34b 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-test</artifactId>
   <name>XWiki Platform - Wiki - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml
index a7d1b52c66dc..e1cdc8aa9cae 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-test-docker</artifactId>
   <name>XWiki Platform - Wiki - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml
index 39c4ea799f80..92724bd48af2 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-test/xwiki-platform-wiki-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-test-pageobjects</artifactId>
   <name>XWiki Platform - Wiki - Tests - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml
index d883717aba8e..dc942945e764 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui</artifactId>
   <name>XWiki Platform - Wiki - UI - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml
index c926b347acc4..99d3c7455ecd 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-wiki-ui</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui-common</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml
index 5b0c9895c5bc..92edcafc8c66 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-mainwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-wiki-ui</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui-mainwiki</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml
index 7e4d583984c4..1a48b36f869a 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-ui/xwiki-platform-wiki-ui-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>xwiki-platform-wiki-ui</artifactId>
     <groupId>org.xwiki.platform</groupId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-ui-wiki</artifactId>
   <packaging>xar</packaging>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml
index c53779a0592d..4608f9c77790 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user</artifactId>
   <name>XWiki Platform - Wiki - User - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml
index c2e7eea5577d..d3d3d9d8b000 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user-api</artifactId>
   <name>XWiki Platform - Wiki - User - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml
index 58714e05c0e0..ebc954fccdfd 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-default/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user-default</artifactId>
   <name>XWiki Platform - Wiki - User - Default</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml
index 51e99eb16d7d..a6b0de149f20 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-user/xwiki-platform-wiki-user-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki-user</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-user-script</artifactId>
   <name>XWiki Platform - Wiki - User - Script</name>
diff --git a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml
index bbb937936a9b..df57f7542771 100644
--- a/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wiki/xwiki-platform-wiki-workspaces-migrator/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wiki</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wiki-workspaces-migrator</artifactId>
   <name>XWiki Platform - Wiki - Workspaces Migrator</name>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
index 77f15974d8e6..22b2b0497790 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wysiwyg</artifactId>
   <name>XWiki Platform - WYSIWYG Editor - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml
index dd1f5cd17f34..7a2db9b1c177 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wysiwyg</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wysiwyg-api</artifactId>
   <name>XWiki Platform - WYSIWYG Editor - API</name>
diff --git a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml
index 2c1fd1cf1416..a98d881dc6d6 100644
--- a/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-wysiwyg/xwiki-platform-wysiwyg-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-wysiwyg</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-wysiwyg-ui</artifactId>
   <name>XWiki Platform - WYSIWYG Editor - Wiki Pages</name>
diff --git a/xwiki-platform-core/xwiki-platform-xar/pom.xml b/xwiki-platform-core/xwiki-platform-xar/pom.xml
index b14fdb8f6d70..250b821778ac 100644
--- a/xwiki-platform-core/xwiki-platform-xar/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xar/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xar</artifactId>
   <name>XWiki Platform - XAR - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml
index 32529f92f982..181bceccc214 100644
--- a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-model/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xar</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xar-model</artifactId>
   <name>XWiki Platform - XAR - Model API</name>
diff --git a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml
index 36019ff2b76d..6b01dfd91cc6 100644
--- a/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xar/xwiki-platform-xar-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xar</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xar-script</artifactId>
   <name>XWiki Platform - XAR - Scripting API</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/pom.xml
index 71ab74e02e32..6c2aab63a87c 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass</artifactId>
   <name>XWiki Platform - XClass - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml
index e5c1c200f99c..fb3eb06406d8 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-test</artifactId>
   <name>XWiki Platform - XClass - Tests - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml
index f45704fcd9f0..9c2f5ee67d30 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-docker/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-test-docker</artifactId>
   <name>XWiki Platform - XClass - Tests - Functional Docker Tests</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml
index 218ba0b0e9c5..0cee8914ae5a 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-test/xwiki-platform-xclass-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-test-pageobjects</artifactId>
   <name>XWiki Platform - XClass - Page Objects</name>
diff --git a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml
index 3fc18676d108..8784535edffa 100644
--- a/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xclass/xwiki-platform-xclass-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xclass</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xclass-ui</artifactId>
   <name>XWiki Platform - XClass - UI</name>
diff --git a/xwiki-platform-core/xwiki-platform-xml/pom.xml b/xwiki-platform-core/xwiki-platform-xml/pom.xml
index aa26246d2161..ffb5cec90861 100644
--- a/xwiki-platform-core/xwiki-platform-xml/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xml</artifactId>
   <name>XWiki Platform - XML - Parent POM</name>
diff --git a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml
index 65861f5b8587..c1672d9d8a4c 100644
--- a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-script/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xml</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xml-script</artifactId>
   <name>XWiki Platform - XML - Script Service</name>
diff --git a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml
index 8915a45e42f2..5c83afd41a05 100644
--- a/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-xml/xwiki-platform-xml-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-xml</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-xml-security</artifactId>
   <name>XWiki Platform - XML - Script Security</name>
diff --git a/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml b/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml
index edea8d99e160..c8913fe414f6 100644
--- a/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml
+++ b/xwiki-platform-core/xwiki-platform-zipexplorer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-core</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-zipexplorer</artifactId>
   <name>XWiki Platform - ZIP Explorer</name>
diff --git a/xwiki-platform-distribution/pom.xml b/xwiki-platform-distribution/pom.xml
index 07b52a90e467..42c6d7b50641 100644
--- a/xwiki-platform-distribution/pom.xml
+++ b/xwiki-platform-distribution/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution</artifactId>
   <name>XWiki Platform - Distribution - Parent POM</name>
@@ -220,12 +220,12 @@
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-webjars-api</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
+        <version>16.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.xwiki.platform</groupId>
         <artifactId>xwiki-platform-rendering-macro-velocity</artifactId>
-        <version>16.1.0-SNAPSHOT</version>
+        <version>16.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
index 61f19e4ad1c4..ed0de79a4b44 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian</artifactId>
   <name>XWiki Platform - Distribution - Debian</name>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-distribution-resources</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
index 467a14da2b13..122cd6caae10 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-common</artifactId>
   <packaging>deb</packaging>
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-distribution-war</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>war</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml
index ef9a8788245a..92eb1fd9e265 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mariadb-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-mariadb-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - MariaDB - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml
index a71842f4dfe2..a1e4174ba20e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-mysql-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-mysql-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - MySQL - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml
index 85239125a0b4..0c005f2dedfb 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-pgsql-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-pgsql-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - Postgres SQL - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
index d0d10d688e69..891ff4127bab 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
   <name>XWiki Platform - Distribution - Debian - Solr</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
index 850dbd8150d7..835b60e95abb 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-all</artifactId>
   <packaging>deb</packaging>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
index f2e14d263c08..f192497a8e59 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-events/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-events</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
index 4c0bf62f00ac..ccd58b3a4717 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-extension_index/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-extension_index</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
index b56eb7cdaaa5..0fc116e8cf59 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-ratings/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-ratings</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core-minimal</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>zip</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
index c645bf360d12..4fa3b19f986c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-search/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-solr</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-solr-search</artifactId>
   <packaging>deb</packaging>
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-search-solr-server-core</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml
index 47f64676a292..03ee59f4de86 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml
index 33b4c97619cd..dfc40dfe40a0 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml
index 2d9075ffc166..c74e515fd6d4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mariadb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-mariadb</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - MariaDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml
index 02b124ee4255..21b9bdee270b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-mysql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-mysql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - MySQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml
index c21be70caf1e..a7ef8ba5cb85 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat8-pgsql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat8-pgsql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 8 - Postgres SQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml
index 17464163d9fc..db26536ce47f 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml
index e07816f3f04d..1335f022d69b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mariadb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-mariadb</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - MariaDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml
index 1f65a44cd54e..b31ac448466e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-mysql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-mysql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - MySQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml
index b3eed44a014f..45f8715a211f 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-tomcat/xwiki-platform-distribution-debian-tomcat9-pgsql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-tomcat</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-tomcat9-pgsql</artifactId>
   <name>XWiki Platform - Distribution - Debian - Tomcat 9 - Postgres SQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml
index cf5b6853d2be..b4bc97d143af 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
index 4e95efe27e33..36e5304a06fd 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-common</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - Common</name>
@@ -41,14 +41,14 @@
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-tool-rootwebapp</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>war</type>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.xwiki.platform</groupId>
       <artifactId>xwiki-platform-tool-jetty-resources</artifactId>
-      <version>16.1.0-SNAPSHOT</version>
+      <version>16.2.0-SNAPSHOT</version>
       <type>zip</type>
       <optional>true</optional>
     </dependency>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml
index f8fcd90fc4a6..23a96e16468d 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mariadb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-mariadb</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - MariaDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml
index 896b084f4806..f65b7edb97ea 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-mysql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-mysql</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - MySQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml
index 45af79b023ec..bd276ca1657c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-xjetty/xwiki-platform-distribution-debian-xjetty-pgsql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-debian-xjetty</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-debian-xjetty-pgsql</artifactId>
   <name>XWiki Platform - Distribution - Debian - XJetty - Postgres SQL</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml
index d3e576a6029d..35cf457bbd60 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor</artifactId>
   <name>XWiki Platform - Distribution - Flavor</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
index e7164d9653d0..f087c65bb5ff 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-common/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-common</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Common</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml
index dbc51651506e..460e23a13c9b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-data</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Data</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml
index a58030a83989..a6be147b678c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-data/xwiki-platform-distribution-flavor-data-hsqldb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-data</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-data-hsqldb</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Data - HSQLDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml
index e5d8273e4358..337726d29d45 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-jetty-hsqldb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-jetty-hsqldb</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Jetty HSQLDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml
index 19b58a7c1a29..58ad45f68cd1 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-mainwiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-mainwiki</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Main Wiki</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
index ff4b6bfe541b..15908218e482 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Parent POM</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml
index 3592223e6aa6..f96ca0893dde 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-escaping/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-escaping</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Escaping</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml
index 18e4094c41f5..758fc3d0fee4 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-misc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-misc</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Misc</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml
index b068bc0b0e45..8283a1f9d3e0 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-pageobjects/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-pageobjects</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Page Objects test framework</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml
index 2f1754a71be4..c5eb895f998c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-security</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Security</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml
index cd69c05a4237..51d8f8b1110b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-storage/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-storage</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Storage</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml
index b05ced666a96..b2e8df3a6fd9 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-ui</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - UI</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml
index 9f2812d5962b..08af16dfe3f1 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml
index 67c04427538c..c305fefc096c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1011/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1011</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml
index 407bed76d88e..25577726b239 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1110/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1110</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml
index 9be073988951..3fe49ec0079d 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1210/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1210</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml
index 3e5ff772d15a..b6d2a043fde5 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1310/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1310</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml
index 7b5cd1043b6c..4f2722582b0c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1410/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1410</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml
index 0e0ce762489c..6c9213bc8595 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-1510/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-1510</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml
index 1ffdfa4f7ac5..d5ed3d0c919c 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84-filestore/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-84-filestore</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version} - Filestore</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml
index 74d05754d1a0..1d0fc0ea5f88 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-84/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-84</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml
index 41a62675b8a7..9786238f783b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-upgrade/xwiki-platform-distribution-flavor-test-upgrade-911/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test-upgrade</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-upgrade-911</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Upgrade - From ${upgradetest.previousflavor.version}</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml
index b09475c7355e..b6150f3cf58b 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-test/xwiki-platform-distribution-flavor-test-webstandards/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor-test</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-test-webstandards</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Functional Tests - Web Standards</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml
index 4ed56d57e00c..b874abb76b5a 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-tour/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-tour</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Tour</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml
index 7c4b6efbee0e..f3e591a12f38 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-wiki/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-wiki</artifactId>
   <name>XWiki Platform - Distribution - Flavor - Wiki</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml
index 5874d8a0b094..03e5dc3a905e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-flavor/xwiki-platform-distribution-flavor-xip/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-flavor</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-flavor-xip</artifactId>
   <name>XWiki Platform - Distribution - Flavor - XIP</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml
index d8355ce63c39..92fc9e7f3c7e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-jetty-hsqldb/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-jetty-hsqldb</artifactId>
   <name>XWiki Platform - Distribution - Jetty HSQLDB</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml
index d1a71d14f75e..3c93e226fc01 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-resources</artifactId>
   <name>XWiki Platform - Distribution - XWiki Resources</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml
index 82918ac5b807..1eaf229f373e 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-ui/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-ui</artifactId>
   <name>XWiki Platform - Distribution - UI - Parent POM</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml
index 0e3bd8e181c0..b2058182e7b3 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-admin-user/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-ui</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-ui-admin-user</artifactId>
   <name>XWiki Platform - Distribution - UI - Admin User</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml
index 3d82cdb168ef..cb195526183a 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-ui/xwiki-platform-distribution-ui-base/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution-ui</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-ui-base</artifactId>
   <name>XWiki Platform - Distribution - UI - Flavor Base</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
index 7218d1425285..dab95c5752c0 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-war-dependencies</artifactId>
   <name>XWiki Platform - Distribution - War - Dependencies</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml
index 24f8efc97eaf..d070e3bd57b3 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-war-legacydependencies/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-war-legacydependencies</artifactId>
   <name>XWiki Platform - Distribution - War - Legacy Dependencies</name>
diff --git a/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml b/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml
index 77bd96f62662..72250c14b2df 100644
--- a/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml
+++ b/xwiki-platform-distribution/xwiki-platform-distribution-war/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-distribution</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-distribution-war</artifactId>
   <name>XWiki Platform - Distribution - War</name>
diff --git a/xwiki-platform-tools/pom.xml b/xwiki-platform-tools/pom.xml
index 04f089ac160d..e1e4f516eed7 100644
--- a/xwiki-platform-tools/pom.xml
+++ b/xwiki-platform-tools/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tools</artifactId>
   <name>XWiki Platform - Tools - Parent POM</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml
index 6414c412dbc1..f168fe481798 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-configuration-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-configuration-resources</artifactId>
   <name>XWiki Platform - Tools - XWiki Configuration Resources</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml
index 09cc0c78c473..8a3cc026bd72 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-jetty/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-jetty</artifactId>
   <name>XWiki Platform - Tools - Jetty - Parent POM</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml
index e2f720b73870..f34b60ab66c0 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-listener/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tool-jetty</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-jetty-listener</artifactId>
   <name>XWiki Platform - Tools - Jetty - Jetty Lifecycle Listener</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml
index ad723e60dec6..f24b9f1820ae 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-jetty/xwiki-platform-tool-jetty-resources/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tool-jetty</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-jetty-resources</artifactId>
   <name>XWiki Platform - Tools - Jetty - Jetty Configuration Resources</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml
index 8b0006352c78..b8d0f6770726 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-packager-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-packager-plugin</artifactId>
   <name>XWiki Platform - Tools - Packager</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml
index 7894fa09909a..460e267b6353 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-provision-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-provision-plugin</artifactId>
   <name>XWiki Platform - Tools - Provision</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml
index 9fd744963f61..418a30f933fa 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-rootwebapp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-rootwebapp</artifactId>
   <packaging>war</packaging>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml
index 5378d46b5c69..48014b35ac4b 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-standards-validator/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-standards-validator</artifactId>
   <name>XWiki Platform - Tools - Web Standards Validator</name>
diff --git a/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml b/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml
index 8f5c08235077..d52df68c2460 100644
--- a/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml
+++ b/xwiki-platform-tools/xwiki-platform-tool-xmldoc-update-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.xwiki.platform</groupId>
     <artifactId>xwiki-platform-tools</artifactId>
-    <version>16.1.0-SNAPSHOT</version>
+    <version>16.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>xwiki-platform-tool-xmldoc-update-plugin</artifactId>
   <name>XWiki Platform - Tools - XML Doc Update Plugin</name>