diff --git a/.gitreview b/.gitreview
index 981cc4c..0f8a1de 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=olt.git
 defaultremote=origin
+defaultbranch=olt-5.1
diff --git a/app/pom.xml b/app/pom.xml
index 049a9f4..c7ca977 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -20,13 +20,13 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.1.0</version>
+        <version>5.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opencord</groupId>
     <artifactId>olt-app</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>OLT application for CORD</description>
     <properties>
diff --git a/impl/pom.xml b/impl/pom.xml
index 180276d..7c258ea 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -20,12 +20,12 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.1.0</version>
+        <version>5.1.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>olt-impl</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <dependencies>
         <dependency>
diff --git a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
index 080aa34..9112f23 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -369,11 +369,16 @@
         String tpId = get(properties, DEFAULT_TP_ID);
         defaultTechProfileId = isNullOrEmpty(tpId) ? DEFAULT_TP_ID_DEFAULT : Integer.parseInt(tpId.trim());
 
+        Boolean removeOnDisable = Tools.isPropertyEnabled(properties, REMOVE_FLOWS_ON_DISABLE);
+        if (removeOnDisable != null) {
+            removeFlowsOnDisable = removeOnDisable;
+        }
+
         log.info("Modified. Values = enableDhcpOnNni: {}, enableDhcpV4: {}, " + "enableDhcpV6:{}, " +
-                        "enableIgmpOnNni:{}, " + "enableEapol:{}, enablePppoeOnNni: {}, enablePppoe:{}, " +
-                        "defaultTechProfileId:{}," + "waitForRemoval:{}",
+                        "enableIgmpOnNni:{}, enableEapol:{}, enablePppoeOnNni: {}, enablePppoe:{}, " +
+                        "defaultTechProfileId:{}, waitForRemoval:{}, removeFlowsOnDisable:{}",
                 enableDhcpOnNni, enableDhcpV4, enableDhcpV6, enableIgmpOnNni, enableEapol,
-                enablePppoeOnNni, enablePppoe, defaultTechProfileId, waitForRemoval);
+                enablePppoeOnNni, enablePppoe, defaultTechProfileId, waitForRemoval, removeOnDisable);
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 0e53e5a..8756abe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
     </parent>
     <groupId>org.opencord</groupId>
     <artifactId>olt</artifactId>
-    <version>5.1.0</version>
+    <version>5.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>OLT Application</description>
     <url>http://onosproject.org</url>
diff --git a/web/pom.xml b/web/pom.xml
index b7c9e0b..7179e99 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>olt</artifactId>
         <groupId>org.opencord</groupId>
-        <version>5.1.0</version>
+        <version>5.1.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>olt-web</artifactId>