Starting snapshot 1.8.4-SNAPSHOT
diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index 73e97c8..f5cc96a 100644
--- a/apps/acl/pom.xml
+++ b/apps/acl/pom.xml
@@ -26,11 +26,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-acl</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>ONOS ACL application</description>
diff --git a/apps/actn-mdsc/actn-mdscapp/pom.xml b/apps/actn-mdsc/actn-mdscapp/pom.xml
index 35e077b..9c4b4e2 100644
--- a/apps/actn-mdsc/actn-mdscapp/pom.xml
+++ b/apps/actn-mdsc/actn-mdscapp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-actn-mdscapp</artifactId>
diff --git a/apps/actn-mdsc/pom.xml b/apps/actn-mdsc/pom.xml
index 6bf5536..5f9c371 100644
--- a/apps/actn-mdsc/pom.xml
+++ b/apps/actn-mdsc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-actn-mdsc</artifactId>
diff --git a/apps/actn-mdsc/tetunnel-ctl/pom.xml b/apps/actn-mdsc/tetunnel-ctl/pom.xml
index 7bffed9..87d8454 100644
--- a/apps/actn-mdsc/tetunnel-ctl/pom.xml
+++ b/apps/actn-mdsc/tetunnel-ctl/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-actn-mdsc-tetunnel-ctl</artifactId>
diff --git a/apps/actn-mdsc/tetunnel-pce/pom.xml b/apps/actn-mdsc/tetunnel-pce/pom.xml
index c38760e..5ca15b2 100755
--- a/apps/actn-mdsc/tetunnel-pce/pom.xml
+++ b/apps/actn-mdsc/tetunnel-pce/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-actn-mdsc</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -33,12 +33,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index 048e23c..03684d1 100644
--- a/apps/bgprouter/pom.xml
+++ b/apps/bgprouter/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-bgprouter</artifactId>
diff --git a/apps/bmv2-demo/common/pom.xml b/apps/bmv2-demo/common/pom.xml
index 0a690fe..71013cf 100644
--- a/apps/bmv2-demo/common/pom.xml
+++ b/apps/bmv2-demo/common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-common</artifactId>
diff --git a/apps/bmv2-demo/ecmp/pom.xml b/apps/bmv2-demo/ecmp/pom.xml
index ba9c066..8a94fd6 100644
--- a/apps/bmv2-demo/ecmp/pom.xml
+++ b/apps/bmv2-demo/ecmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-ecmp</artifactId>
diff --git a/apps/bmv2-demo/pom.xml b/apps/bmv2-demo/pom.xml
index fc41d70..d739c57 100644
--- a/apps/bmv2-demo/pom.xml
+++ b/apps/bmv2-demo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo</artifactId>
diff --git a/apps/bmv2-demo/wcmp/pom.xml b/apps/bmv2-demo/wcmp/pom.xml
index 99b6c0a..7d3ef9e 100644
--- a/apps/bmv2-demo/wcmp/pom.xml
+++ b/apps/bmv2-demo/wcmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-bmv2-demo</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-bmv2-demo-wcmp</artifactId>
diff --git a/apps/cip/pom.xml b/apps/cip/pom.xml
index 81c4309..e1dcd0d 100644
--- a/apps/cip/pom.xml
+++ b/apps/cip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-cip</artifactId>
diff --git a/apps/cpman/api/pom.xml b/apps/cpman/api/pom.xml
index 8c6c916..0eb6fee 100644
--- a/apps/cpman/api/pom.xml
+++ b/apps/cpman/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-cpman</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-cpman-api</artifactId>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index 229f035..d5c578e 100644
--- a/apps/cpman/app/pom.xml
+++ b/apps/cpman/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-cpman</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-cpman</artifactId>
diff --git a/apps/cpman/pom.xml b/apps/cpman/pom.xml
index d586fa6..2bf1e66 100644
--- a/apps/cpman/pom.xml
+++ b/apps/cpman/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-cpman</artifactId>
diff --git a/apps/dhcp/api/pom.xml b/apps/dhcp/api/pom.xml
index 04c1ca0..54ada1f 100644
--- a/apps/dhcp/api/pom.xml
+++ b/apps/dhcp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-dhcp-api</artifactId>
diff --git a/apps/dhcp/app/pom.xml b/apps/dhcp/app/pom.xml
index 6ef938a..919d231 100644
--- a/apps/dhcp/app/pom.xml
+++ b/apps/dhcp/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-dhcp</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-dhcp</artifactId>
diff --git a/apps/dhcp/pom.xml b/apps/dhcp/pom.xml
index 7bfe3aa..bb1bee0 100644
--- a/apps/dhcp/pom.xml
+++ b/apps/dhcp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-dhcp</artifactId>
diff --git a/apps/dhcprelay/pom.xml b/apps/dhcprelay/pom.xml
index d8429da..8f390e2 100644
--- a/apps/dhcprelay/pom.xml
+++ b/apps/dhcprelay/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/drivermatrix/pom.xml b/apps/drivermatrix/pom.xml
index bda867c..4bb50e0 100644
--- a/apps/drivermatrix/pom.xml
+++ b/apps/drivermatrix/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-drivermatrix</artifactId>
diff --git a/apps/events/pom.xml b/apps/events/pom.xml
index 1c40697..5e83db1 100644
--- a/apps/events/pom.xml
+++ b/apps/events/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-events</artifactId>
diff --git a/apps/faultmanagement/app/pom.xml b/apps/faultmanagement/app/pom.xml
index d0f7833..8af5060 100644
--- a/apps/faultmanagement/app/pom.xml
+++ b/apps/faultmanagement/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-onosfw</artifactId>
diff --git a/apps/faultmanagement/fmcli/pom.xml b/apps/faultmanagement/fmcli/pom.xml
index 7a57f63..f3e5f38 100644
--- a/apps/faultmanagement/fmcli/pom.xml
+++ b/apps/faultmanagement/fmcli/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-cli</artifactId>
diff --git a/apps/faultmanagement/fmgui/pom.xml b/apps/faultmanagement/fmgui/pom.xml
index 8f747f3..fd325d9 100644
--- a/apps/faultmanagement/fmgui/pom.xml
+++ b/apps/faultmanagement/fmgui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-gui</artifactId>
diff --git a/apps/faultmanagement/fmmgr/pom.xml b/apps/faultmanagement/fmmgr/pom.xml
index c037bce..453adba 100644
--- a/apps/faultmanagement/fmmgr/pom.xml
+++ b/apps/faultmanagement/fmmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm-mgr</artifactId>
diff --git a/apps/faultmanagement/fmweb/pom.xml b/apps/faultmanagement/fmweb/pom.xml
index 6db836f..b9fdffd 100644
--- a/apps/faultmanagement/fmweb/pom.xml
+++ b/apps/faultmanagement/fmweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-fm</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
 
diff --git a/apps/faultmanagement/pom.xml b/apps/faultmanagement/pom.xml
index da06922..a3db347 100644
--- a/apps/faultmanagement/pom.xml
+++ b/apps/faultmanagement/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fm</artifactId>
diff --git a/apps/flowanalyzer/pom.xml b/apps/flowanalyzer/pom.xml
index ede8ae6..c6ab494 100644
--- a/apps/flowanalyzer/pom.xml
+++ b/apps/flowanalyzer/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-flowanalyzer</artifactId>
diff --git a/apps/fwd/pom.xml b/apps/fwd/pom.xml
index f6efd40..bc507a5 100644
--- a/apps/fwd/pom.xml
+++ b/apps/fwd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-fwd</artifactId>
diff --git a/apps/gangliametrics/pom.xml b/apps/gangliametrics/pom.xml
index 72c2aa8..a4f6a76 100644
--- a/apps/gangliametrics/pom.xml
+++ b/apps/gangliametrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-ganglia</artifactId>
diff --git a/apps/graphitemetrics/pom.xml b/apps/graphitemetrics/pom.xml
index e4628b7..3fc08af 100644
--- a/apps/graphitemetrics/pom.xml
+++ b/apps/graphitemetrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-graphite</artifactId>
diff --git a/apps/influxdbmetrics/pom.xml b/apps/influxdbmetrics/pom.xml
index efaa2f1..a4f833d 100644
--- a/apps/influxdbmetrics/pom.xml
+++ b/apps/influxdbmetrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-influxdb</artifactId>
diff --git a/apps/iptopology-api/pom.xml b/apps/iptopology-api/pom.xml
index 65a1034..ae694c4 100644
--- a/apps/iptopology-api/pom.xml
+++ b/apps/iptopology-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-iptopology-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/kafka-integration/api/pom.xml b/apps/kafka-integration/api/pom.xml
index 23d0cf0..685841f 100644
--- a/apps/kafka-integration/api/pom.xml
+++ b/apps/kafka-integration/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-kafka</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-kafka-api</artifactId>
diff --git a/apps/kafka-integration/app/pom.xml b/apps/kafka-integration/app/pom.xml
index 1d4d294..5b3b02f 100644
--- a/apps/kafka-integration/app/pom.xml
+++ b/apps/kafka-integration/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/core/pom.xml b/apps/kafka-integration/core/pom.xml
index 925b699..231b839 100644
--- a/apps/kafka-integration/core/pom.xml
+++ b/apps/kafka-integration/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/pom.xml b/apps/kafka-integration/pom.xml
index 9fa1a7b..c62f922 100644
--- a/apps/kafka-integration/pom.xml
+++ b/apps/kafka-integration/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/kafka-integration/web/pom.xml b/apps/kafka-integration/web/pom.xml
index 0b4206e..88d2f16 100644
--- a/apps/kafka-integration/web/pom.xml
+++ b/apps/kafka-integration/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-kafka</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/learning-switch/pom.xml b/apps/learning-switch/pom.xml
index 58c116c..53d3cdb 100644
--- a/apps/learning-switch/pom.xml
+++ b/apps/learning-switch/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/metrics/pom.xml b/apps/metrics/pom.xml
index 20892b7..8283b57 100644
--- a/apps/metrics/pom.xml
+++ b/apps/metrics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-metrics</artifactId>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index dbae7ac..abcbac3 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-mfwd</artifactId>
diff --git a/apps/mlb/pom.xml b/apps/mlb/pom.xml
index 089642f..00223e7 100644
--- a/apps/mlb/pom.xml
+++ b/apps/mlb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-mlb</artifactId>
diff --git a/apps/mobility/pom.xml b/apps/mobility/pom.xml
index dc6bc3d..4c11428 100644
--- a/apps/mobility/pom.xml
+++ b/apps/mobility/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-mobility</artifactId>
diff --git a/apps/newoptical/pom.xml b/apps/newoptical/pom.xml
index 95cb817..80818ce 100644
--- a/apps/newoptical/pom.xml
+++ b/apps/newoptical/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-newoptical</artifactId>
diff --git a/apps/openstackinterface/api/pom.xml b/apps/openstackinterface/api/pom.xml
index 91d233b..58e15b1 100644
--- a/apps/openstackinterface/api/pom.xml
+++ b/apps/openstackinterface/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-api</artifactId>
diff --git a/apps/openstackinterface/app/pom.xml b/apps/openstackinterface/app/pom.xml
index 192696c..09d9497 100644
--- a/apps/openstackinterface/app/pom.xml
+++ b/apps/openstackinterface/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstackinterface</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface-app</artifactId>
diff --git a/apps/openstackinterface/pom.xml b/apps/openstackinterface/pom.xml
index fc04cb6..99c7b45 100644
--- a/apps/openstackinterface/pom.xml
+++ b/apps/openstackinterface/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackinterface</artifactId>
diff --git a/apps/openstacknetworking/api/pom.xml b/apps/openstacknetworking/api/pom.xml
index defa4e8..a2fb74c 100644
--- a/apps/openstacknetworking/api/pom.xml
+++ b/apps/openstacknetworking/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-api</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-openstackinterface-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/openstacknetworking/cli/pom.xml b/apps/openstacknetworking/cli/pom.xml
index 04f37e5..15c27bd 100644
--- a/apps/openstacknetworking/cli/pom.xml
+++ b/apps/openstacknetworking/cli/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-cli</artifactId>
diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml
index bc58bbc..8d5e4c9 100644
--- a/apps/openstacknetworking/pom.xml
+++ b/apps/openstacknetworking/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking</artifactId>
diff --git a/apps/openstacknetworking/routing/pom.xml b/apps/openstacknetworking/routing/pom.xml
index 5e0c433..c1335ae 100644
--- a/apps/openstacknetworking/routing/pom.xml
+++ b/apps/openstacknetworking/routing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackrouting</artifactId>
diff --git a/apps/openstacknetworking/switching/pom.xml b/apps/openstacknetworking/switching/pom.xml
index a7d993b..de4568d 100644
--- a/apps/openstacknetworking/switching/pom.xml
+++ b/apps/openstacknetworking/switching/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstackswitching</artifactId>
diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml
index 554bdf2..475e14d 100644
--- a/apps/openstacknetworking/web/pom.xml
+++ b/apps/openstacknetworking/web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-openstacknetworking</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknetworking-web</artifactId>
diff --git a/apps/openstacknode/pom.xml b/apps/openstacknode/pom.xml
index 9c07beb..3324055 100644
--- a/apps/openstacknode/pom.xml
+++ b/apps/openstacknode/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-openstacknode</artifactId>
diff --git a/apps/optical-model/pom.xml b/apps/optical-model/pom.xml
index f631859..956d4c8 100644
--- a/apps/optical-model/pom.xml
+++ b/apps/optical-model/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/optical/pom.xml b/apps/optical/pom.xml
index 302f0eb..fe92cd9 100644
--- a/apps/optical/pom.xml
+++ b/apps/optical/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-optical</artifactId>
diff --git a/apps/patchpanel/pom.xml b/apps/patchpanel/pom.xml
index cfd0735..92ef651 100644
--- a/apps/patchpanel/pom.xml
+++ b/apps/patchpanel/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pathpainter/pom.xml b/apps/pathpainter/pom.xml
index b56d590..ac6f483 100644
--- a/apps/pathpainter/pom.xml
+++ b/apps/pathpainter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-pp</artifactId>
diff --git a/apps/pce/app/pom.xml b/apps/pce/app/pom.xml
index 9b304ef..b0e5bc5 100644
--- a/apps/pce/app/pom.xml
+++ b/apps/pce/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-pce</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pce/pcerest/pom.xml b/apps/pce/pcerest/pom.xml
index 66ba828..21c5cb4 100644
--- a/apps/pce/pcerest/pom.xml
+++ b/apps/pce/pcerest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/pce/pceweb/pom.xml b/apps/pce/pceweb/pom.xml
index 8150ff4..1352f51 100644
--- a/apps/pce/pceweb/pom.xml
+++ b/apps/pce/pceweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pce</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-pceweb</artifactId>
diff --git a/apps/pce/pom.xml b/apps/pce/pom.xml
index 26dfbfd..4890683 100644
--- a/apps/pce/pom.xml
+++ b/apps/pce/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/pcep-api/pom.xml b/apps/pcep-api/pom.xml
index 3854b7f..da7f8f3 100644
--- a/apps/pcep-api/pom.xml
+++ b/apps/pcep-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-app-pcep-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/apps/pim/pom.xml b/apps/pim/pom.xml
index 504bbfb..dfe481f 100644
--- a/apps/pim/pom.xml
+++ b/apps/pim/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-pim</artifactId>
diff --git a/apps/pom.xml b/apps/pom.xml
index de7af3b..30ef073 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-apps</artifactId>
diff --git a/apps/proxyarp/pom.xml b/apps/proxyarp/pom.xml
index 74fabaa..86d43bf 100644
--- a/apps/proxyarp/pom.xml
+++ b/apps/proxyarp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-proxyarp</artifactId>
diff --git a/apps/rabbitmq/pom.xml b/apps/rabbitmq/pom.xml
index a6498f1..1dca536 100644
--- a/apps/rabbitmq/pom.xml
+++ b/apps/rabbitmq/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-app-rabbitmq</artifactId>
diff --git a/apps/reactive-routing/pom.xml b/apps/reactive-routing/pom.xml
index b32016b..55cf42b 100644
--- a/apps/reactive-routing/pom.xml
+++ b/apps/reactive-routing/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-reactive-routing</artifactId>
diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index bc3dc57..9805d9f 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index d5ba29f..4f104b5 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/scalablegateway/pom.xml b/apps/scalablegateway/pom.xml
index 47cbf52..a44d0b89f 100644
--- a/apps/scalablegateway/pom.xml
+++ b/apps/scalablegateway/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-scalablegateway</artifactId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index b4a3da6..350b880 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-sdnip</artifactId>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index 86f2c79..383ad37 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-segmentrouting</artifactId>
diff --git a/apps/tenbi/pom.xml b/apps/tenbi/pom.xml
index 1f4c646..8ad59d9 100644
--- a/apps/tenbi/pom.xml
+++ b/apps/tenbi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/topology/pom.xml b/apps/tenbi/topology/pom.xml
index 80de5c6..328e83e 100644
--- a/apps/tenbi/topology/pom.xml
+++ b/apps/tenbi/topology/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/tunnel/pom.xml b/apps/tenbi/tunnel/pom.xml
index c820a30..4173441 100755
--- a/apps/tenbi/tunnel/pom.xml
+++ b/apps/tenbi/tunnel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>onos-app-tenbi</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/apps/tenbi/utils/pom.xml b/apps/tenbi/utils/pom.xml
index 6a1cc3b..e43f6bd 100644
--- a/apps/tenbi/utils/pom.xml
+++ b/apps/tenbi/utils/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/tenbi/yangmodel/pom.xml b/apps/tenbi/yangmodel/pom.xml
index fd9284f..949c9e6 100644
--- a/apps/tenbi/yangmodel/pom.xml
+++ b/apps/tenbi/yangmodel/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-tenbi</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index f4d3b8e..a257b50 100644
--- a/apps/test/demo/pom.xml
+++ b/apps/test/demo/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-demo</artifactId>
diff --git a/apps/test/distributed-primitives/pom.xml b/apps/test/distributed-primitives/pom.xml
index ec9236b..586438c 100644
--- a/apps/test/distributed-primitives/pom.xml
+++ b/apps/test/distributed-primitives/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-distributed-primitives</artifactId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-dist</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/apps/test/election/pom.xml b/apps/test/election/pom.xml
index a20acfa..ac00faf 100644
--- a/apps/test/election/pom.xml
+++ b/apps/test/election/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-election</artifactId>
diff --git a/apps/test/flow-perf/pom.xml b/apps/test/flow-perf/pom.xml
index aff4c72..9dc7b1f 100644
--- a/apps/test/flow-perf/pom.xml
+++ b/apps/test/flow-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-flow-perf</artifactId>
diff --git a/apps/test/intent-perf/pom.xml b/apps/test/intent-perf/pom.xml
index d161b03..611f8af 100644
--- a/apps/test/intent-perf/pom.xml
+++ b/apps/test/intent-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-intent-perf</artifactId>
diff --git a/apps/test/loadtest/pom.xml b/apps/test/loadtest/pom.xml
index 2b09fa3..ae41b8a 100644
--- a/apps/test/loadtest/pom.xml
+++ b/apps/test/loadtest/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-loadtest</artifactId>
diff --git a/apps/test/messaging-perf/pom.xml b/apps/test/messaging-perf/pom.xml
index 5a7de9c..46e49e6 100644
--- a/apps/test/messaging-perf/pom.xml
+++ b/apps/test/messaging-perf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-messaging-perf</artifactId>
diff --git a/apps/test/netcfg-monitor/pom.xml b/apps/test/netcfg-monitor/pom.xml
index 84dfc43..2a885ed 100644
--- a/apps/test/netcfg-monitor/pom.xml
+++ b/apps/test/netcfg-monitor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps-test</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-netcfg-monitor</artifactId>
diff --git a/apps/test/pom.xml b/apps/test/pom.xml
index c976634..7287948 100644
--- a/apps/test/pom.xml
+++ b/apps/test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-apps-test</artifactId>
diff --git a/apps/tetopology/api/pom.xml b/apps/tetopology/api/pom.xml
index 5c9c26b..a14b5b0 100644
--- a/apps/tetopology/api/pom.xml
+++ b/apps/tetopology/api/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <artifactId>onos-tetopology</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetopology-api</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
     
     <description>IETF TE topology management API</description>
diff --git a/apps/tetopology/app/pom.xml b/apps/tetopology/app/pom.xml
index 45e04a0..bacaf4f 100644
--- a/apps/tetopology/app/pom.xml
+++ b/apps/tetopology/app/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-tetopology</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetopology</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>IETF TE topology application</description>
diff --git a/apps/tetopology/pom.xml b/apps/tetopology/pom.xml
index e51cfaf..5df8e83 100644
--- a/apps/tetopology/pom.xml
+++ b/apps/tetopology/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-tetopology</artifactId>
diff --git a/apps/tetunnel/api/pom.xml b/apps/tetunnel/api/pom.xml
index 6ea707d..6eb358b 100755
--- a/apps/tetunnel/api/pom.xml
+++ b/apps/tetunnel/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetunnel-api</artifactId>
diff --git a/apps/tetunnel/app/pom.xml b/apps/tetunnel/app/pom.xml
index bc5cd0f..ed5ff17 100644
--- a/apps/tetunnel/app/pom.xml
+++ b/apps/tetunnel/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-tetunnel</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-tetunnel</artifactId>
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-tetunnel-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-core-serializers</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/apps/tetunnel/pom.xml b/apps/tetunnel/pom.xml
index 2772962..904ec88 100644
--- a/apps/tetunnel/pom.xml
+++ b/apps/tetunnel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-tetunnel</artifactId>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index f6756e4..fb450a0 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-virtualbng</artifactId>
diff --git a/apps/vpls/pom.xml b/apps/vpls/pom.xml
index 71ed2d4..03af0ed 100644
--- a/apps/vpls/pom.xml
+++ b/apps/vpls/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vpls</artifactId>
diff --git a/apps/vrouter/pom.xml b/apps/vrouter/pom.xml
index 8d8c5be..bf149fc 100644
--- a/apps/vrouter/pom.xml
+++ b/apps/vrouter/pom.xml
@@ -21,12 +21,12 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-app-vrouter</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>Virtual router (vRouter) application</description>
diff --git a/apps/vtn/app/pom.xml b/apps/vtn/app/pom.xml
index 61e7394..ac03125 100644
--- a/apps/vtn/app/pom.xml
+++ b/apps/vtn/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vtn-onosfw</artifactId>
diff --git a/apps/vtn/pom.xml b/apps/vtn/pom.xml
index 26a1d96..2f1c729 100644
--- a/apps/vtn/pom.xml
+++ b/apps/vtn/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vtn</artifactId>
diff --git a/apps/vtn/sfcmgr/pom.xml b/apps/vtn/sfcmgr/pom.xml
index 1279c2d..6b40d97 100644
--- a/apps/vtn/sfcmgr/pom.xml
+++ b/apps/vtn/sfcmgr/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>org.onosproject</groupId>
 		<artifactId>onos-app-vtn</artifactId>
-		<version>1.8.3</version>
+		<version>1.8.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>onos-app-sfc-mgr</artifactId>
diff --git a/apps/vtn/sfcweb/pom.xml b/apps/vtn/sfcweb/pom.xml
index 99af0ff..2bfc150 100755
--- a/apps/vtn/sfcweb/pom.xml
+++ b/apps/vtn/sfcweb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-sfc-web</artifactId>
diff --git a/apps/vtn/vtnmgr/pom.xml b/apps/vtn/vtnmgr/pom.xml
index 183748b..e2bd850 100644
--- a/apps/vtn/vtnmgr/pom.xml
+++ b/apps/vtn/vtnmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-vtn-mgr</artifactId>
diff --git a/apps/vtn/vtnrsc/pom.xml b/apps/vtn/vtnrsc/pom.xml
index e2598a0..67e7fdf 100644
--- a/apps/vtn/vtnrsc/pom.xml
+++ b/apps/vtn/vtnrsc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
 
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index e18e551..7abfaff 100644
--- a/apps/vtn/vtnweb/pom.xml
+++ b/apps/vtn/vtnweb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-app-vtn</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
 
diff --git a/apps/xosclient/pom.xml b/apps/xosclient/pom.xml
index fd5bb63..3b33505 100644
--- a/apps/xosclient/pom.xml
+++ b/apps/xosclient/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-apps</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-xos-client</artifactId>
diff --git a/apps/yms/api/pom.xml b/apps/yms/api/pom.xml
index e5eb6d2..e953d94 100644
--- a/apps/yms/api/pom.xml
+++ b/apps/yms/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-yms-api</artifactId>
diff --git a/apps/yms/app/pom.xml b/apps/yms/app/pom.xml
index 6f543cb..a6b61ff 100644
--- a/apps/yms/app/pom.xml
+++ b/apps/yms/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-yms</artifactId>
diff --git a/apps/yms/pom.xml b/apps/yms/pom.xml
index 8a24cda..f8266c6 100644
--- a/apps/yms/pom.xml
+++ b/apps/yms/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-apps</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-yms</artifactId>
diff --git a/apps/yms/ut/pom.xml b/apps/yms/ut/pom.xml
index 16ff501..c30f599 100644
--- a/apps/yms/ut/pom.xml
+++ b/apps/yms/ut/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-yms</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-app-yms-ut</artifactId>
diff --git a/cli/pom.xml b/cli/pom.xml
index fa47f68..374564e 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-cli</artifactId>
diff --git a/core/api/pom.xml b/core/api/pom.xml
index fedae19..2abb2e5 100644
--- a/core/api/pom.xml
+++ b/core/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-api</artifactId>
diff --git a/core/common/pom.xml b/core/common/pom.xml
index d9b5006..ee62659 100644
--- a/core/common/pom.xml
+++ b/core/common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-common</artifactId>
diff --git a/core/net/pom.xml b/core/net/pom.xml
index eac3788..a405b33 100644
--- a/core/net/pom.xml
+++ b/core/net/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-net</artifactId>
diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index b389a82..d2e018a 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -64,7 +64,7 @@
     private final Logger log = LoggerFactory.getLogger(getClass());
 
     private static final File VERSION_FILE = new File("../VERSION");
-    private static Version version = Version.version("1.8.3");
+    private static Version version = Version.version("1.8.4-SNAPSHOT");
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected ApplicationIdStore applicationIdStore;
diff --git a/core/pom.xml b/core/pom.xml
index 9ed6974..1fc561b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core</artifactId>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 165d995..97a19e6 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-core</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-security</artifactId>
diff --git a/core/store/dist/pom.xml b/core/store/dist/pom.xml
index 676817a..a6dd97d 100644
--- a/core/store/dist/pom.xml
+++ b/core/store/dist/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-dist</artifactId>
diff --git a/core/store/persistence/pom.xml b/core/store/persistence/pom.xml
index de969cb..fe666f2 100644
--- a/core/store/persistence/pom.xml
+++ b/core/store/persistence/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-persistence</artifactId>
diff --git a/core/store/pom.xml b/core/store/pom.xml
index c20f9ef..11ecab6 100644
--- a/core/store/pom.xml
+++ b/core/store/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-store</artifactId>
diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index 0baac5d..6f73109 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-primitives</artifactId>
diff --git a/core/store/serializers/pom.xml b/core/store/serializers/pom.xml
index 1870211..2757301 100644
--- a/core/store/serializers/pom.xml
+++ b/core/store/serializers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-core-store</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-core-serializers</artifactId>
diff --git a/docs/external.xml b/docs/external.xml
index dec6eb4..540df46 100644
--- a/docs/external.xml
+++ b/docs/external.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -53,7 +53,7 @@
                     </sourceFileExcludes>
                     <excludePackageNames>@external-excludes</excludePackageNames>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.8.3)</doctitle>
+                    <doctitle>ONOS Java API (1.8.4-SNAPSHOT)</doctitle>
                     <groups>
                         <group>
                             <title>Network Model &amp; Services</title>
diff --git a/docs/internal.xml b/docs/internal.xml
index a37326f..e436fc2 100644
--- a/docs/internal.xml
+++ b/docs/internal.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -49,7 +49,7 @@
                 <configuration>
                     <show>package</show>
                     <docfilessubdirs>true</docfilessubdirs>
-                    <doctitle>ONOS Java API (1.8.3)</doctitle>
+                    <doctitle>ONOS Java API (1.8.4-SNAPSHOT)</doctitle>
                     <excludePackageNames>@internal-excludes</excludePackageNames>
                     <sourceFileExcludes>
                         <sourceFileExclude>**/generated-sources/**</sourceFileExclude>
diff --git a/drivers/arista/pom.xml b/drivers/arista/pom.xml
index b91dfa9..c426a7f 100755
--- a/drivers/arista/pom.xml
+++ b/drivers/arista/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index 2ba8610..52e998b 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/bti/pom.xml b/drivers/bti/pom.xml
index 7ecd143..a10a83e 100644
--- a/drivers/bti/pom.xml
+++ b/drivers/bti/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/ciena/pom.xml b/drivers/ciena/pom.xml
index e713ac2..42f92c2 100644
--- a/drivers/ciena/pom.xml
+++ b/drivers/ciena/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/cisco/pom.xml b/drivers/cisco/pom.xml
index 9969272..923bd47 100644
--- a/drivers/cisco/pom.xml
+++ b/drivers/cisco/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/corsa/pom.xml b/drivers/corsa/pom.xml
index 6078483..6b01f1f 100644
--- a/drivers/corsa/pom.xml
+++ b/drivers/corsa/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/default/pom.xml b/drivers/default/pom.xml
index ebd846f..9924c68 100644
--- a/drivers/default/pom.xml
+++ b/drivers/default/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/fujitsu/pom.xml b/drivers/fujitsu/pom.xml
index 1a36cdc..0a71029 100644
--- a/drivers/fujitsu/pom.xml
+++ b/drivers/fujitsu/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/juniper/pom.xml b/drivers/juniper/pom.xml
index 7c6de97..4f8a535 100644
--- a/drivers/juniper/pom.xml
+++ b/drivers/juniper/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/lumentum/pom.xml b/drivers/lumentum/pom.xml
index 43eaa44..d0a2110 100644
--- a/drivers/lumentum/pom.xml
+++ b/drivers/lumentum/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/netconf/pom.xml b/drivers/netconf/pom.xml
index 16e2bbd..76e4cb1 100644
--- a/drivers/netconf/pom.xml
+++ b/drivers/netconf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/optical/pom.xml b/drivers/optical/pom.xml
index c4668cb..e04a341 100644
--- a/drivers/optical/pom.xml
+++ b/drivers/optical/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/ovsdb/pom.xml b/drivers/ovsdb/pom.xml
index 97ea85b..5598f59 100644
--- a/drivers/ovsdb/pom.xml
+++ b/drivers/ovsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/drivers/pom.xml b/drivers/pom.xml
index 28c8e42..f002dec 100644
--- a/drivers/pom.xml
+++ b/drivers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-drivers-general</artifactId>
diff --git a/drivers/utilities/pom.xml b/drivers/utilities/pom.xml
index 6bc6098..bfa97b5 100644
--- a/drivers/utilities/pom.xml
+++ b/drivers/utilities/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-drivers-general</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/features/pom.xml b/features/pom.xml
index 078a975..aaebac0 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-features</artifactId>
diff --git a/incubator/api/pom.xml b/incubator/api/pom.xml
index 5f59f3b..d661187 100644
--- a/incubator/api/pom.xml
+++ b/incubator/api/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-api</artifactId>
diff --git a/incubator/core/pom.xml b/incubator/core/pom.xml
index a262b5d..2fa097a 100644
--- a/incubator/core/pom.xml
+++ b/incubator/core/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-core</artifactId>
diff --git a/incubator/grpc/pom.xml b/incubator/grpc/pom.xml
index 2909401..d51bca1 100644
--- a/incubator/grpc/pom.xml
+++ b/incubator/grpc/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/net/pom.xml b/incubator/net/pom.xml
index c51201c..e72b464 100644
--- a/incubator/net/pom.xml
+++ b/incubator/net/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-net</artifactId>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 700cc14..c291d70 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator</artifactId>
diff --git a/incubator/protobuf-nb/pom.xml b/incubator/protobuf-nb/pom.xml
index 4bc5f98..372ec1d 100644
--- a/incubator/protobuf-nb/pom.xml
+++ b/incubator/protobuf-nb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/protobuf/pom.xml b/incubator/protobuf/pom.xml
index d693848..62be7ad 100644
--- a/incubator/protobuf/pom.xml
+++ b/incubator/protobuf/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-protobuf</artifactId>
diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index 3416583..cc8ad91 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-rpc-grpc</artifactId>
diff --git a/incubator/rpc-nb/pom.xml b/incubator/rpc-nb/pom.xml
index 3ab942f..51daa1a 100644
--- a/incubator/rpc-nb/pom.xml
+++ b/incubator/rpc-nb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/incubator/rpc/pom.xml b/incubator/rpc/pom.xml
index 03beb8c..3705172 100644
--- a/incubator/rpc/pom.xml
+++ b/incubator/rpc/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>onos-incubator</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-rpc</artifactId>
diff --git a/incubator/store/pom.xml b/incubator/store/pom.xml
index da19fc4..743c0c3 100644
--- a/incubator/store/pom.xml
+++ b/incubator/store/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-incubator</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-incubator-store</artifactId>
diff --git a/lib/pom.xml b/lib/pom.xml
index 7c21413..ff75b4c 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -33,7 +33,7 @@
     <groupId>org.onosproject</groupId>
     <artifactId>onos-dependencies</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System shared dependencies</description>
diff --git a/onos.defs b/onos.defs
index 0c8ba4d..c4cfec7 100644
--- a/onos.defs
+++ b/onos.defs
@@ -1,6 +1,6 @@
 ONOS_ORIGIN = 'ON.Lab'
 ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.8.3'
+ONOS_VERSION = '1.8.4-SNAPSHOT'
 DEFAULT_APP_CATEGORY = 'Utility'
 ONOS_ARTIFACT_BASE = 'onos-'
 APP_PREFIX = ONOS_GROUP_ID + '.'
diff --git a/pom.xml b/pom.xml
index 4e58e33..c30524a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,14 +26,14 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-dependencies</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>lib/pom.xml</relativePath>
     </parent>
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos</artifactId>
     <packaging>pom</packaging>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
 
     <name>${project.artifactId}</name>
     <description>Open Network Operating System root project</description>
diff --git a/protocols/bgp/api/pom.xml b/protocols/bgp/api/pom.xml
index 48c3c83..a959fac 100755
--- a/protocols/bgp/api/pom.xml
+++ b/protocols/bgp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgp-api</artifactId>
diff --git a/protocols/bgp/bgpio/pom.xml b/protocols/bgp/bgpio/pom.xml
index 03f83dc..cd30599e 100755
--- a/protocols/bgp/bgpio/pom.xml
+++ b/protocols/bgp/bgpio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgpio</artifactId>
diff --git a/protocols/bgp/ctl/pom.xml b/protocols/bgp/ctl/pom.xml
index 34188fa..d887efc 100644
--- a/protocols/bgp/ctl/pom.xml
+++ b/protocols/bgp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgp-ctl</artifactId>
diff --git a/protocols/bgp/pom.xml b/protocols/bgp/pom.xml
index d584bfe..08191ac 100755
--- a/protocols/bgp/pom.xml
+++ b/protocols/bgp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgp</artifactId>
diff --git a/protocols/bmv2/api/pom.xml b/protocols/bmv2/api/pom.xml
index c70566a..827140c 100644
--- a/protocols/bmv2/api/pom.xml
+++ b/protocols/bmv2/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/ctl/pom.xml b/protocols/bmv2/ctl/pom.xml
index b8c27e7..b218f11 100644
--- a/protocols/bmv2/ctl/pom.xml
+++ b/protocols/bmv2/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/pom.xml b/protocols/bmv2/pom.xml
index 8b8501c..e900d8b 100644
--- a/protocols/bmv2/pom.xml
+++ b/protocols/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/bmv2/thrift-api/pom.xml b/protocols/bmv2/thrift-api/pom.xml
index b38932a..f3d434b 100644
--- a/protocols/bmv2/thrift-api/pom.xml
+++ b/protocols/bmv2/thrift-api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/protocols/isis/api/pom.xml b/protocols/isis/api/pom.xml
index 079e76e..f616fbb 100644
--- a/protocols/isis/api/pom.xml
+++ b/protocols/isis/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-api</artifactId>
diff --git a/protocols/isis/ctl/pom.xml b/protocols/isis/ctl/pom.xml
index 29d6cd4..e366f62 100644
--- a/protocols/isis/ctl/pom.xml
+++ b/protocols/isis/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-ctl</artifactId>
diff --git a/protocols/isis/isisio/pom.xml b/protocols/isis/isisio/pom.xml
index 6df58df..5d29fbb 100644
--- a/protocols/isis/isisio/pom.xml
+++ b/protocols/isis/isisio/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-isisio</artifactId>
diff --git a/protocols/isis/pom.xml b/protocols/isis/pom.xml
index 2731e6e..83c1955 100644
--- a/protocols/isis/pom.xml
+++ b/protocols/isis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis</artifactId>
diff --git a/protocols/lisp/api/pom.xml b/protocols/lisp/api/pom.xml
index af1740e..0c40f31 100644
--- a/protocols/lisp/api/pom.xml
+++ b/protocols/lisp/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp-api</artifactId>
diff --git a/protocols/lisp/ctl/pom.xml b/protocols/lisp/ctl/pom.xml
index 75c9c71..241c40e 100644
--- a/protocols/lisp/ctl/pom.xml
+++ b/protocols/lisp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp-ctl</artifactId>
diff --git a/protocols/lisp/msg/pom.xml b/protocols/lisp/msg/pom.xml
index 2293c35..d21bc2c 100644
--- a/protocols/lisp/msg/pom.xml
+++ b/protocols/lisp/msg/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp-msg</artifactId>
diff --git a/protocols/lisp/pom.xml b/protocols/lisp/pom.xml
index 79b9d5c..fdcb1fc 100644
--- a/protocols/lisp/pom.xml
+++ b/protocols/lisp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp</artifactId>
diff --git a/protocols/netconf/api/pom.xml b/protocols/netconf/api/pom.xml
index bac4526..f7ef71c 100644
--- a/protocols/netconf/api/pom.xml
+++ b/protocols/netconf/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-netconf-api</artifactId>
diff --git a/protocols/netconf/ctl/pom.xml b/protocols/netconf/ctl/pom.xml
index 73eda62..81a6a9a 100644
--- a/protocols/netconf/ctl/pom.xml
+++ b/protocols/netconf/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-netconf-ctl</artifactId>
diff --git a/protocols/netconf/pom.xml b/protocols/netconf/pom.xml
index 8e82356..9e6448e 100644
--- a/protocols/netconf/pom.xml
+++ b/protocols/netconf/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-netconf</artifactId>
diff --git a/protocols/openflow/api/pom.xml b/protocols/openflow/api/pom.xml
index ff0a4a1..6d3388e 100644
--- a/protocols/openflow/api/pom.xml
+++ b/protocols/openflow/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-api</artifactId>
diff --git a/protocols/openflow/ctl/pom.xml b/protocols/openflow/ctl/pom.xml
index 2c3a2d9..3880cd9 100644
--- a/protocols/openflow/ctl/pom.xml
+++ b/protocols/openflow/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-ctl</artifactId>
diff --git a/protocols/openflow/pom.xml b/protocols/openflow/pom.xml
index 9fafd7e..0557e4e 100644
--- a/protocols/openflow/pom.xml
+++ b/protocols/openflow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of</artifactId>
diff --git a/protocols/ospf/api/pom.xml b/protocols/ospf/api/pom.xml
index 3dff9e7..cca5410 100755
--- a/protocols/ospf/api/pom.xml
+++ b/protocols/ospf/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ospf-api</artifactId>
diff --git a/protocols/ospf/ctl/pom.xml b/protocols/ospf/ctl/pom.xml
index e1880fa..6561987 100755
--- a/protocols/ospf/ctl/pom.xml
+++ b/protocols/ospf/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ospf-ctl</artifactId>
diff --git a/protocols/ospf/pom.xml b/protocols/ospf/pom.xml
index 1471b93..a601f4a 100755
--- a/protocols/ospf/pom.xml
+++ b/protocols/ospf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ospf</artifactId>
diff --git a/protocols/ospf/protocol/pom.xml b/protocols/ospf/protocol/pom.xml
index 6d69869..4c04713 100644
--- a/protocols/ospf/protocol/pom.xml
+++ b/protocols/ospf/protocol/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ospf-protocol</artifactId>
diff --git a/protocols/ovsdb/api/pom.xml b/protocols/ovsdb/api/pom.xml
index 1119f03..e320ac9 100644
--- a/protocols/ovsdb/api/pom.xml
+++ b/protocols/ovsdb/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-ovsdb-api</artifactId>
     <packaging>bundle</packaging>
diff --git a/protocols/ovsdb/ctl/pom.xml b/protocols/ovsdb/ctl/pom.xml
index d1933d3..0fbb30e 100644
--- a/protocols/ovsdb/ctl/pom.xml
+++ b/protocols/ovsdb/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb-ctl</artifactId>
diff --git a/protocols/ovsdb/pom.xml b/protocols/ovsdb/pom.xml
index e54c01a..04b48a3 100644
--- a/protocols/ovsdb/pom.xml
+++ b/protocols/ovsdb/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb</artifactId>
diff --git a/protocols/ovsdb/rfc/pom.xml b/protocols/ovsdb/rfc/pom.xml
index 5f10a53..ecade6c 100644
--- a/protocols/ovsdb/rfc/pom.xml
+++ b/protocols/ovsdb/rfc/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-ovsdb-rfc</artifactId>
     <packaging>bundle</packaging>
diff --git a/protocols/pcep/api/pom.xml b/protocols/pcep/api/pom.xml
index 278df0e..5df1446 100644
--- a/protocols/pcep/api/pom.xml
+++ b/protocols/pcep/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-pcep-controller-api</artifactId>
diff --git a/protocols/pcep/ctl/pom.xml b/protocols/pcep/ctl/pom.xml
index 5da5c26..955f290 100644
--- a/protocols/pcep/ctl/pom.xml
+++ b/protocols/pcep/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-pcep-controller-impl</artifactId>
diff --git a/protocols/pcep/pcepio/pom.xml b/protocols/pcep/pcepio/pom.xml
index a23cf10..e161b7f 100755
--- a/protocols/pcep/pcepio/pom.xml
+++ b/protocols/pcep/pcepio/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-controller</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-pcepio</artifactId>
diff --git a/protocols/pcep/pom.xml b/protocols/pcep/pom.xml
index 9324081..8b42658 100755
--- a/protocols/pcep/pom.xml
+++ b/protocols/pcep/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-protocols</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-pcep-controller</artifactId>
diff --git a/protocols/pom.xml b/protocols/pom.xml
index a7dd267..34388ab 100644
--- a/protocols/pom.xml
+++ b/protocols/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-protocols</artifactId>
diff --git a/protocols/rest/api/pom.xml b/protocols/rest/api/pom.xml
index 56691ee..fe4ceaa 100644
--- a/protocols/rest/api/pom.xml
+++ b/protocols/rest/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-restsb-api</artifactId>
diff --git a/protocols/rest/ctl/pom.xml b/protocols/rest/ctl/pom.xml
index c3697bf..c3c2cc3 100644
--- a/protocols/rest/ctl/pom.xml
+++ b/protocols/rest/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/rest/pom.xml b/protocols/rest/pom.xml
index c26afad..4b34d67 100644
--- a/protocols/rest/pom.xml
+++ b/protocols/rest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/restconf/client/api/pom.xml b/protocols/restconf/client/api/pom.xml
index 34e634c..5753b3a 100644
--- a/protocols/restconf/client/api/pom.xml
+++ b/protocols/restconf/client/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf-client</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client-api</artifactId>
diff --git a/protocols/restconf/client/ctl/pom.xml b/protocols/restconf/client/ctl/pom.xml
index 2c3f843..6410f3b 100644
--- a/protocols/restconf/client/ctl/pom.xml
+++ b/protocols/restconf/client/ctl/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf-client</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client-ctl</artifactId>
diff --git a/protocols/restconf/client/pom.xml b/protocols/restconf/client/pom.xml
index 93cda46..3aadf2f 100644
--- a/protocols/restconf/client/pom.xml
+++ b/protocols/restconf/client/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-restconf</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>onos-restconf-client</artifactId>
diff --git a/protocols/restconf/pom.xml b/protocols/restconf/pom.xml
index 51632d6..2f2909e 100644
--- a/protocols/restconf/pom.xml
+++ b/protocols/restconf/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-protocols</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-restconf</artifactId>
diff --git a/protocols/restconf/server/api/pom.xml b/protocols/restconf/server/api/pom.xml
index 2951ff0..ffa187b 100644
--- a/protocols/restconf/server/api/pom.xml
+++ b/protocols/restconf/server/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/app/pom.xml b/protocols/restconf/server/app/pom.xml
index 1fee54b..eae0c9e 100644
--- a/protocols/restconf/server/app/pom.xml
+++ b/protocols/restconf/server/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/pom.xml b/protocols/restconf/server/pom.xml
index 0b954c1..8660fa2 100644
--- a/protocols/restconf/server/pom.xml
+++ b/protocols/restconf/server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/restconfmgr/pom.xml b/protocols/restconf/server/restconfmgr/pom.xml
index 64c27aa..404a129 100644
--- a/protocols/restconf/server/restconfmgr/pom.xml
+++ b/protocols/restconf/server/restconfmgr/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/rpp/pom.xml b/protocols/restconf/server/rpp/pom.xml
index a66a3a0..68c6a78 100644
--- a/protocols/restconf/server/rpp/pom.xml
+++ b/protocols/restconf/server/rpp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restconf-server</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/protocols/restconf/server/utils/pom.xml b/protocols/restconf/server/utils/pom.xml
index 373b26e..838780c 100644
--- a/protocols/restconf/server/utils/pom.xml
+++ b/protocols/restconf/server/utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-restconf-server</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/snmp/api/pom.xml b/protocols/snmp/api/pom.xml
index 1292f6a..464d6ce 100644
--- a/protocols/snmp/api/pom.xml
+++ b/protocols/snmp/api/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/protocols/snmp/ctl/pom.xml b/protocols/snmp/ctl/pom.xml
index 2dd870c..881135c 100644
--- a/protocols/snmp/ctl/pom.xml
+++ b/protocols/snmp/ctl/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-snmp-protocol</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/protocols/snmp/pom.xml b/protocols/snmp/pom.xml
index 6f97146..1ebf7f1 100644
--- a/protocols/snmp/pom.xml
+++ b/protocols/snmp/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-protocols</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bgp/app/pom.xml b/providers/bgp/app/pom.xml
index 138289a..13d4248 100755
--- a/providers/bgp/app/pom.xml
+++ b/providers/bgp/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgp-app</artifactId>
diff --git a/providers/bgp/cfg/pom.xml b/providers/bgp/cfg/pom.xml
index 14916ee..9a7da6f 100755
--- a/providers/bgp/cfg/pom.xml
+++ b/providers/bgp/cfg/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgp-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-bgp-provider-cfg</artifactId>
     <packaging>bundle</packaging>
diff --git a/providers/bgp/pom.xml b/providers/bgp/pom.xml
index 93e8f2d..01cc7e3 100644
--- a/providers/bgp/pom.xml
+++ b/providers/bgp/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <artifactId>onos-bgp-providers</artifactId>
   <packaging>pom</packaging>
diff --git a/providers/bgp/topology/pom.xml b/providers/bgp/topology/pom.xml
index cc2c877..18b5d79 100755
--- a/providers/bgp/topology/pom.xml
+++ b/providers/bgp/topology/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-bgp-providers</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <artifactId>onos-bgp-provider-topology</artifactId>
   <packaging>bundle</packaging>
diff --git a/providers/bgpcep/app/pom.xml b/providers/bgpcep/app/pom.xml
index 982c6a4..19323db 100644
--- a/providers/bgpcep/app/pom.xml
+++ b/providers/bgpcep/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgpcep-app</artifactId>
diff --git a/providers/bgpcep/flow/pom.xml b/providers/bgpcep/flow/pom.xml
index 45c7e90..b363827 100644
--- a/providers/bgpcep/flow/pom.xml
+++ b/providers/bgpcep/flow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-bgpcep-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-bgpcep-provider-flow</artifactId>
diff --git a/providers/bgpcep/pom.xml b/providers/bgpcep/pom.xml
index a579c91..2b37cdc 100644
--- a/providers/bgpcep/pom.xml
+++ b/providers/bgpcep/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-bgpcep-providers</artifactId>
diff --git a/providers/bmv2/app/pom.xml b/providers/bmv2/app/pom.xml
index 753673a..03f99eb 100644
--- a/providers/bmv2/app/pom.xml
+++ b/providers/bmv2/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/bmv2/device/pom.xml b/providers/bmv2/device/pom.xml
index de611a3..1c83a0f 100644
--- a/providers/bmv2/device/pom.xml
+++ b/providers/bmv2/device/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bmv2/packet/pom.xml b/providers/bmv2/packet/pom.xml
index 992db36..22198d6 100644
--- a/providers/bmv2/packet/pom.xml
+++ b/providers/bmv2/packet/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-bmv2-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/bmv2/pom.xml b/providers/bmv2/pom.xml
index a60852e..c7cdb84 100644
--- a/providers/bmv2/pom.xml
+++ b/providers/bmv2/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/host/pom.xml b/providers/host/pom.xml
index b4be94f..6ec378f 100644
--- a/providers/host/pom.xml
+++ b/providers/host/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-host-provider</artifactId>
diff --git a/providers/ietfte/app/pom.xml b/providers/ietfte/app/pom.xml
index d94dd73..9d81da0 100644
--- a/providers/ietfte/app/pom.xml
+++ b/providers/ietfte/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/ietfte/pom.xml b/providers/ietfte/pom.xml
index 4b6e8e4..87d7963 100644
--- a/providers/ietfte/pom.xml
+++ b/providers/ietfte/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -50,12 +50,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-yms-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-restconf-server-utils</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/providers/ietfte/topology/pom.xml b/providers/ietfte/topology/pom.xml
index e31cd61..ba29fa4 100644
--- a/providers/ietfte/topology/pom.xml
+++ b/providers/ietfte/topology/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/providers/ietfte/tunnel/pom.xml b/providers/ietfte/tunnel/pom.xml
index 5fb7c2c..87b8e2e 100755
--- a/providers/ietfte/tunnel/pom.xml
+++ b/providers/ietfte/tunnel/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>
diff --git a/providers/ietfte/utils/pom.xml b/providers/ietfte/utils/pom.xml
index ce9031a..1642559 100755
--- a/providers/ietfte/utils/pom.xml
+++ b/providers/ietfte/utils/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>onos-ietfte-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>onos-ietfte-provider-utils</artifactId>
diff --git a/providers/isis/app/pom.xml b/providers/isis/app/pom.xml
index d072bcd..a85d752 100644
--- a/providers/isis/app/pom.xml
+++ b/providers/isis/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-app</artifactId>
diff --git a/providers/isis/cfg/pom.xml b/providers/isis/cfg/pom.xml
index 6ba4d09..9c4c662 100644
--- a/providers/isis/cfg/pom.xml
+++ b/providers/isis/cfg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-provider-cfg</artifactId>
diff --git a/providers/isis/cli/pom.xml b/providers/isis/cli/pom.xml
index e1b1085..7cd1e7b 100644
--- a/providers/isis/cli/pom.xml
+++ b/providers/isis/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-provider-cli</artifactId>
diff --git a/providers/isis/pom.xml b/providers/isis/pom.xml
index 5d31d55..e84c628 100644
--- a/providers/isis/pom.xml
+++ b/providers/isis/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-providers</artifactId>
diff --git a/providers/isis/topology/pom.xml b/providers/isis/topology/pom.xml
index ce7d15f..9710bb5 100644
--- a/providers/isis/topology/pom.xml
+++ b/providers/isis/topology/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-isis-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-isis-provider-topology</artifactId>
diff --git a/providers/link/pom.xml b/providers/link/pom.xml
index ac8efaf..271bc82 100644
--- a/providers/link/pom.xml
+++ b/providers/link/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
 
diff --git a/providers/lisp/app/pom.xml b/providers/lisp/app/pom.xml
index af4e56e..594ac98 100644
--- a/providers/lisp/app/pom.xml
+++ b/providers/lisp/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp-app</artifactId>
diff --git a/providers/lisp/device/pom.xml b/providers/lisp/device/pom.xml
index b899360..63fe7c3 100644
--- a/providers/lisp/device/pom.xml
+++ b/providers/lisp/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-lisp-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp-provider-device</artifactId>
diff --git a/providers/lisp/pom.xml b/providers/lisp/pom.xml
index 9ea0af0..df5c7b3 100644
--- a/providers/lisp/pom.xml
+++ b/providers/lisp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lisp-providers</artifactId>
diff --git a/providers/lldp/pom.xml b/providers/lldp/pom.xml
index 36214ed..71d00ca 100644
--- a/providers/lldp/pom.xml
+++ b/providers/lldp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-lldp-provider</artifactId>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/providers/lldpcommon/pom.xml b/providers/lldpcommon/pom.xml
index 0e729d7..abf8947 100644
--- a/providers/lldpcommon/pom.xml
+++ b/providers/lldpcommon/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
 
diff --git a/providers/netcfghost/pom.xml b/providers/netcfghost/pom.xml
index 07c5706..5d42b95 100644
--- a/providers/netcfghost/pom.xml
+++ b/providers/netcfghost/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/netcfglinks/pom.xml b/providers/netcfglinks/pom.xml
index 6a89b7b..6b6fa32 100644
--- a/providers/netcfglinks/pom.xml
+++ b/providers/netcfglinks/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-lldp-provider-common</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
 
         <dependency>
diff --git a/providers/netconf/alarm/pom.xml b/providers/netconf/alarm/pom.xml
index f48773f..967edd4 100644
--- a/providers/netconf/alarm/pom.xml
+++ b/providers/netconf/alarm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onos-netconf-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/netconf/app/pom.xml b/providers/netconf/app/pom.xml
index 71afd9c..f05181c 100644
--- a/providers/netconf/app/pom.xml
+++ b/providers/netconf/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-netconf-app</artifactId>
diff --git a/providers/netconf/device/pom.xml b/providers/netconf/device/pom.xml
index 4a01b10..0a76d1c 100644
--- a/providers/netconf/device/pom.xml
+++ b/providers/netconf/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-netconf-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-netconf-provider-device</artifactId>
diff --git a/providers/netconf/pom.xml b/providers/netconf/pom.xml
index 95bdaf2..d193815 100644
--- a/providers/netconf/pom.xml
+++ b/providers/netconf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-netconf-providers</artifactId>
diff --git a/providers/null/pom.xml b/providers/null/pom.xml
index c970e99..927862e 100644
--- a/providers/null/pom.xml
+++ b/providers/null/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-null-provider</artifactId>
diff --git a/providers/openflow/app/pom.xml b/providers/openflow/app/pom.xml
index 078da1e..bc93d2f 100644
--- a/providers/openflow/app/pom.xml
+++ b/providers/openflow/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-openflow</artifactId>
diff --git a/providers/openflow/base/pom.xml b/providers/openflow/base/pom.xml
index 306dfad..bfa3542 100644
--- a/providers/openflow/base/pom.xml
+++ b/providers/openflow/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-openflow-base</artifactId>
diff --git a/providers/openflow/device/pom.xml b/providers/openflow/device/pom.xml
index 5339614..3e00ad8 100644
--- a/providers/openflow/device/pom.xml
+++ b/providers/openflow/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-provider-device</artifactId>
diff --git a/providers/openflow/flow/pom.xml b/providers/openflow/flow/pom.xml
index b7be41d..d3757dd 100644
--- a/providers/openflow/flow/pom.xml
+++ b/providers/openflow/flow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-provider-flow</artifactId>
diff --git a/providers/openflow/group/pom.xml b/providers/openflow/group/pom.xml
index 89ba2f3..75e5d7d 100644
--- a/providers/openflow/group/pom.xml
+++ b/providers/openflow/group/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-provider-group</artifactId>
diff --git a/providers/openflow/message/pom.xml b/providers/openflow/message/pom.xml
index ed75fa5..6a0180d 100644
--- a/providers/openflow/message/pom.xml
+++ b/providers/openflow/message/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-provider-message</artifactId>
diff --git a/providers/openflow/meter/pom.xml b/providers/openflow/meter/pom.xml
index e794c76..af68ab0 100644
--- a/providers/openflow/meter/pom.xml
+++ b/providers/openflow/meter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-provider-meter</artifactId>
diff --git a/providers/openflow/packet/pom.xml b/providers/openflow/packet/pom.xml
index 4f9c9be..bf95b68 100644
--- a/providers/openflow/packet/pom.xml
+++ b/providers/openflow/packet/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-of-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-provider-packet</artifactId>
diff --git a/providers/openflow/pom.xml b/providers/openflow/pom.xml
index 47d27de..b306780 100644
--- a/providers/openflow/pom.xml
+++ b/providers/openflow/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-of-providers</artifactId>
diff --git a/providers/ospf/app/pom.xml b/providers/ospf/app/pom.xml
index 3e255c2..cc95bd5 100644
--- a/providers/ospf/app/pom.xml
+++ b/providers/ospf/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/cfg/pom.xml b/providers/ospf/cfg/pom.xml
index 4863cfa..4e8143b 100644
--- a/providers/ospf/cfg/pom.xml
+++ b/providers/ospf/cfg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/cli/pom.xml b/providers/ospf/cli/pom.xml
index 6e193cd..cbc8a89 100644
--- a/providers/ospf/cli/pom.xml
+++ b/providers/ospf/cli/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/pom.xml b/providers/ospf/pom.xml
index 2466b83..a212ed3 100644
--- a/providers/ospf/pom.xml
+++ b/providers/ospf/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ospf/topology/pom.xml b/providers/ospf/topology/pom.xml
index 23f27dd..74a2ffb 100644
--- a/providers/ospf/topology/pom.xml
+++ b/providers/ospf/topology/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ospf-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/providers/ovsdb/app/pom.xml b/providers/ovsdb/app/pom.xml
index 7305bce..10284c5 100644
--- a/providers/ovsdb/app/pom.xml
+++ b/providers/ovsdb/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdatabase</artifactId>
diff --git a/providers/ovsdb/base/pom.xml b/providers/ovsdb/base/pom.xml
index edb1bf0..6e2a8bb 100644
--- a/providers/ovsdb/base/pom.xml
+++ b/providers/ovsdb/base/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb-base</artifactId>
diff --git a/providers/ovsdb/device/pom.xml b/providers/ovsdb/device/pom.xml
index 9eeef39..cbc7f72 100644
--- a/providers/ovsdb/device/pom.xml
+++ b/providers/ovsdb/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-device</artifactId>
diff --git a/providers/ovsdb/host/pom.xml b/providers/ovsdb/host/pom.xml
index 337f9aa..35feba1 100644
--- a/providers/ovsdb/host/pom.xml
+++ b/providers/ovsdb/host/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-host</artifactId>
diff --git a/providers/ovsdb/pom.xml b/providers/ovsdb/pom.xml
index 848b4d1..8d73f19 100644
--- a/providers/ovsdb/pom.xml
+++ b/providers/ovsdb/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb-providers</artifactId>
diff --git a/providers/ovsdb/tunnel/pom.xml b/providers/ovsdb/tunnel/pom.xml
index 50171c4..6d73f8c 100644
--- a/providers/ovsdb/tunnel/pom.xml
+++ b/providers/ovsdb/tunnel/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-ovsdb-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-ovsdb-provider-tunnel</artifactId>
diff --git a/providers/pcep/app/pom.xml b/providers/pcep/app/pom.xml
index ea49b9a..cd7627f 100644
--- a/providers/pcep/app/pom.xml
+++ b/providers/pcep/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-pcep</artifactId>
diff --git a/providers/pcep/pom.xml b/providers/pcep/pom.xml
index a62f458..8b3bdaf 100644
--- a/providers/pcep/pom.xml
+++ b/providers/pcep/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-providers</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <artifactId>onos-pcep-providers</artifactId>
   <packaging>pom</packaging>
diff --git a/providers/pcep/topology/pom.xml b/providers/pcep/topology/pom.xml
index 2e2ed8e..e13b0de 100644
--- a/providers/pcep/topology/pom.xml
+++ b/providers/pcep/topology/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-pcep-providers</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
   <artifactId>onos-pcep-provider-topology</artifactId>
   <packaging>bundle</packaging>
diff --git a/providers/pcep/tunnel/pom.xml b/providers/pcep/tunnel/pom.xml
index 62e89c1..cce5598 100644
--- a/providers/pcep/tunnel/pom.xml
+++ b/providers/pcep/tunnel/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-pcep-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <artifactId>onos-pcep-provider-tunnel</artifactId>
     <packaging>bundle</packaging>
diff --git a/providers/pom.xml b/providers/pom.xml
index 374c871..16aeee4 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-providers</artifactId>
diff --git a/providers/rest/app/pom.xml b/providers/rest/app/pom.xml
index f8506d3..9fa6154 100644
--- a/providers/rest/app/pom.xml
+++ b/providers/rest/app/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-restsb-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/rest/device/pom.xml b/providers/rest/device/pom.xml
index c1322cf..e7da423 100644
--- a/providers/rest/device/pom.xml
+++ b/providers/rest/device/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-restsb-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/rest/pom.xml b/providers/rest/pom.xml
index aad8fd0..c9a582d 100644
--- a/providers/rest/pom.xml
+++ b/providers/rest/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>onos-providers</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/providers/snmp/app/pom.xml b/providers/snmp/app/pom.xml
index 5ba2acd..80173d6 100644
--- a/providers/snmp/app/pom.xml
+++ b/providers/snmp/app/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-snmp-app</artifactId>
diff --git a/providers/snmp/device/pom.xml b/providers/snmp/device/pom.xml
index 50435a7..df3e55d 100644
--- a/providers/snmp/device/pom.xml
+++ b/providers/snmp/device/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-snmp-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-snmp-provider-device</artifactId>
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-api</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-snmp-ctl</artifactId>
-            <version>1.8.3</version>
+            <version>1.8.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
diff --git a/providers/snmp/pom.xml b/providers/snmp/pom.xml
index 124a931..6dc63cd 100644
--- a/providers/snmp/pom.xml
+++ b/providers/snmp/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-providers</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-snmp-providers</artifactId>
diff --git a/tools/build/envDefaults b/tools/build/envDefaults
index f474b09..7472c6d 100644
--- a/tools/build/envDefaults
+++ b/tools/build/envDefaults
@@ -18,8 +18,8 @@
 export BUILD_NUMBER=${BUILD_NUMBER:-$(id -un)}
 
 # ONOS Version and onos.tar.gz staging environment
-export ONOS_POM_VERSION="1.8.3"
-export ONOS_VERSION=${ONOS_VERSION:-1.8.3.$BUILD_NUMBER}
+export ONOS_POM_VERSION="1.8.4-SNAPSHOT"
+export ONOS_VERSION=${ONOS_VERSION:-1.8.4.$BUILD_NUMBER}
 
 # ONOS production bits (onos.tar.gz, onos.zip, onos.deb, onos.rpm) staging environment
 export ONOS_BITS=onos-${ONOS_VERSION%~*}
diff --git a/tools/build/onos-prepare-sonar b/tools/build/onos-prepare-sonar
index a7f4140..20b782e 100755
--- a/tools/build/onos-prepare-sonar
+++ b/tools/build/onos-prepare-sonar
@@ -12,7 +12,7 @@
 from subprocess import call, check_call, check_output
 
 # FIXME pull the version from the Buck version file
-ONOS_VERSION='1.8.3'
+ONOS_VERSION='1.8.4-SNAPSHOT'
 
 # SonarQube property file name and template
 FILE_NAME = 'sonar-project.properties'
diff --git a/tools/package/archetypes/api/pom.xml b/tools/package/archetypes/api/pom.xml
index 76433d8..af9be59 100644
--- a/tools/package/archetypes/api/pom.xml
+++ b/tools/package/archetypes/api/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-api-archetype</artifactId>
diff --git a/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
index e7bbc85..9c80120 100644
--- a/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/api/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
     </properties>
 
     <dependencies>
diff --git a/tools/package/archetypes/bundle/pom.xml b/tools/package/archetypes/bundle/pom.xml
index 2c77c51..449c0f1 100644
--- a/tools/package/archetypes/bundle/pom.xml
+++ b/tools/package/archetypes/bundle/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-bundle-archetype</artifactId>
diff --git a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
index 998b99d..12953c7 100644
--- a/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/bundle/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/cli/pom.xml b/tools/package/archetypes/cli/pom.xml
index e5a0af7..9c59b2a 100644
--- a/tools/package/archetypes/cli/pom.xml
+++ b/tools/package/archetypes/cli/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-cli-archetype</artifactId>
diff --git a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
index 672ffca..f87bebb 100644
--- a/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/cli/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
     </properties>
 
     <dependencies>
diff --git a/tools/package/archetypes/pom.xml b/tools/package/archetypes/pom.xml
index ce72231..5dbb165 100644
--- a/tools/package/archetypes/pom.xml
+++ b/tools/package/archetypes/pom.xml
@@ -28,7 +28,7 @@
 
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>ONOS archetypes project</description>
diff --git a/tools/package/archetypes/rest/pom.xml b/tools/package/archetypes/rest/pom.xml
index 06704de..16c3df7 100644
--- a/tools/package/archetypes/rest/pom.xml
+++ b/tools/package/archetypes/rest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-rest-archetype</artifactId>
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index 190964b..4962b48 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
 
         <web.context>/onos/${artifactId}</web.context>
         <api.version>1.0.0</api.version>
diff --git a/tools/package/archetypes/ui/pom.xml b/tools/package/archetypes/ui/pom.xml
index aacec38..ddace9d 100644
--- a/tools/package/archetypes/ui/pom.xml
+++ b/tools/package/archetypes/ui/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-ui-archetype</artifactId>
diff --git a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
index 6d7f869..7161637 100644
--- a/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/ui/src/main/resources/archetype-resources/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitab/pom.xml b/tools/package/archetypes/uitab/pom.xml
index 6a6a6f1..f7c772f 100644
--- a/tools/package/archetypes/uitab/pom.xml
+++ b/tools/package/archetypes/uitab/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-uitab-archetype</artifactId>
diff --git a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
index f8f3a35..6baab8e 100644
--- a/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitab/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/archetypes/uitopo/pom.xml b/tools/package/archetypes/uitopo/pom.xml
index eb80422..e37bc1b 100644
--- a/tools/package/archetypes/uitopo/pom.xml
+++ b/tools/package/archetypes/uitopo/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.onosproject</groupId>
     <artifactId>onos-archetypes</artifactId>
-    <version>1.8.3</version>
+    <version>1.8.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>onos-uitopo-archetype</artifactId>
diff --git a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
index 4e5d49e..00611fe 100644
--- a/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/uitopo/src/main/resources/archetype-resources/pom.xml
@@ -33,7 +33,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <onos.version>1.8.3</onos.version>
+        <onos.version>1.8.4-SNAPSHOT</onos.version>
         <!-- Uncomment to generate ONOS app from this module.
         <onos.app.name>org.foo.app</onos.app.name>
         <onos.app.title>Foo App</onos.app.title>
diff --git a/tools/package/branding/pom.xml b/tools/package/branding/pom.xml
index 48048ec..86c6294 100644
--- a/tools/package/branding/pom.xml
+++ b/tools/package/branding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 
diff --git a/tools/test/bin/onos-archetypes-test b/tools/test/bin/onos-archetypes-test
index fd91aa8..ada9eb2 100755
--- a/tools/test/bin/onos-archetypes-test
+++ b/tools/test/bin/onos-archetypes-test
@@ -19,7 +19,7 @@
 set -e
 
 export AROOT=${ONOS_STAGE_ROOT:-/tmp}/foo
-export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.3"
+export ARCHETYPE_OPTS="-DarchetypeGroupId=org.onosproject -DarchetypeVersion=1.8.4-SNAPSHOT"
 
 mkdir -p $AROOT
 for an in api bundle cli rest ui uitab uitopo; do
diff --git a/utils/junit/pom.xml b/utils/junit/pom.xml
index 696c557..0d522ff 100644
--- a/utils/junit/pom.xml
+++ b/utils/junit/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onlab-junit</artifactId>
diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index 0298426..7227ff9 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onlab-misc</artifactId>
diff --git a/utils/osgi/pom.xml b/utils/osgi/pom.xml
index ed5b495..b21e04d 100644
--- a/utils/osgi/pom.xml
+++ b/utils/osgi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onlab-osgi</artifactId>
diff --git a/utils/osgiwrap/pom.xml b/utils/osgiwrap/pom.xml
index 145e067..1076d57 100644
--- a/utils/osgiwrap/pom.xml
+++ b/utils/osgiwrap/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>onlab-utils</artifactId>
         <groupId>org.onosproject</groupId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/pom.xml b/utils/pom.xml
index 1c56d28..964d8af 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onlab-utils</artifactId>
diff --git a/utils/rest/pom.xml b/utils/rest/pom.xml
index 0a9001a..aa88590 100644
--- a/utils/rest/pom.xml
+++ b/utils/rest/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-utils</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onlab-rest</artifactId>
diff --git a/web/api/pom.xml b/web/api/pom.xml
index 6c9897e..3953185 100644
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-web</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-rest</artifactId>
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index 86bb6ad..74dbe73 100644
--- a/web/gui/pom.xml
+++ b/web/gui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos-web</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-gui</artifactId>
diff --git a/web/pom.xml b/web/pom.xml
index b76e93d..cbf2cb5 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onosproject</groupId>
         <artifactId>onos</artifactId>
-        <version>1.8.3</version>
+        <version>1.8.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>onos-web</artifactId>