diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index decdf5c..6503ee7 100644
--- a/apps/bgprouter/pom.xml
+++ b/apps/bgprouter/pom.xml
@@ -24,7 +24,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>onos-app-bgprouter</artifactId>
 
     <packaging>bundle</packaging>
diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
index 8826535..6130a2e 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java
@@ -101,6 +101,7 @@
         icmpReplyIpv4.setChecksum((short) 0);
 
         ICMP icmpReply = new ICMP();
+        icmpReply.setPayload(((ICMP) icmpRequestIpv4.getPayload()).getPayload());
         icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY);
         icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY);
         icmpReply.setChecksum((short) 0);
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
index 0f8fa59..f65f03e 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
@@ -111,10 +111,10 @@
         icmpReplyIpv4.setChecksum((short) 0);
 
         ICMP icmpReply = new ICMP();
+        icmpReply.setPayload(((ICMP) icmpRequestIpv4.getPayload()).getPayload());
         icmpReply.setIcmpType(ICMP.TYPE_ECHO_REPLY);
         icmpReply.setIcmpCode(ICMP.SUBTYPE_ECHO_REPLY);
         icmpReply.setChecksum((short) 0);
-
         icmpReplyIpv4.setPayload(icmpReply);
 
         icmpReplyEth.setPayload(icmpReplyIpv4);
diff --git a/tools/package/config/samples/network-cfg.json b/tools/package/config/samples/network-cfg.json
new file mode 100644
index 0000000..b3705d6
--- /dev/null
+++ b/tools/package/config/samples/network-cfg.json
@@ -0,0 +1,42 @@
+{
+    "ports" : {
+	"of:0000000000000002/1" : {
+	    "interfaces" : [
+		{
+		    "ips" : [ "192.168.10.101/24" ],
+		    "mac" : "08:9e:01:82:38:68",
+		    "vlan" : "100"
+		}
+	    ]
+	},
+	"of:0000000000000002/20" : {
+	    "interfaces" : [
+		{
+		    "ips" : [ "192.168.20.101/24" ],
+		    "mac" : "08:9e:01:82:38:68",
+		    "vlan" : "200"
+		}
+	    ]
+	}
+    },
+    "apps" : {
+	"org.onosproject.router" : {
+	    "bgp" : {
+		"bgpSpeakers" : [
+		    {
+			"connectPoint" : "of:00000000000000aa/10",
+			"peers" : [
+			    "192.168.10.1"
+			]
+		    },
+		    {
+			"connectPoint" : "of:00000000000000aa/20",
+			"peers" : [
+			    "192.168.20.1"
+			]
+		    }
+		]
+	    }
+	}
+    }
+}
diff --git a/tools/package/config/samples/segmentrouting.conf b/tools/package/config/samples/segmentrouting.conf
index 8df6c3d..fca41e0 100644
--- a/tools/package/config/samples/segmentrouting.conf
+++ b/tools/package/config/samples/segmentrouting.conf
@@ -1,78 +1,95 @@
 {
-  "comment": " Multilayer topology description and configuration",
+  "comment": "Configuration for a 4X4 leaf-spine fabric",
   "restrictSwitches": true,
   "restrictLinks": true,
 
   "switchConfig":
              [
-               { "nodeDpid" : "of:0000000000000001", "name": "Dallas-R1", "type": "Router_SR", "allowed": true,
+               { "nodeDpid" : "of:0000000000000001", "name": "Leaf-R1", "type": "Router_SR", "allowed": true,
                  "latitude": 80.80, "longitude": 90.10,
-                 "params": { "routerIp": "192.168.0.1/32",
-                             "routerMac": "00:00:01:01:01:80",
+                 "params": { "routerIp": "10.0.1.254/32",
+                             "routerMac": "00:00:00:00:01:80",
                              "nodeSid": 101,
                              "isEdgeRouter" : true,
-                             "adjacencySids": [
-                                               { "ports": [ 4, 5 ], "adjSid": 10234 },
-                                               { "ports": [ 6, 7 ], "adjSid": 29019 }
-                                               ],
                              "subnets": [
-                                         { "portNo": 1, "subnetIp": "10.0.1.128/24" }
+                                         { "portNo": 1, "subnetIp": "10.0.1.254/24" }
                                          ]
                              }
                  },
 
-               { "nodeDpid": "of:0000000000000002", "name": "Dallas-R2", "type": "Router_SR", "allowed": true,
+               { "nodeDpid": "of:0000000000000002", "name": "Leaf-R2", "type": "Router_SR", "allowed": true,
                  "latitude": 80.80, "longitude": 90.10,
-                 "params": { "routerIp": "192.168.0.2/32",
-                             "routerMac": "00:00:02:02:02:80",
+                 "params": { "routerIp": "10.0.2.254/32",
+                             "routerMac": "00:00:00:00:02:80",
                              "nodeSid": 102,
-                             "isEdgeRouter" : false,
-                             "adjacencySids": [
-                                               { "ports": [ 1, 2 ], "adjSid": 12453 },
-                                               { "ports": [ 2, 3 ], "adjSid": 23333 },
-                                               { "ports": [ 3, 1 ], "adjSid": 22233 }
-                                               ]
+                             "isEdgeRouter" : true,
+                             "subnets": [
+                                         { "portNo": 1, "subnetIp": "10.0.2.254/24" }
+                                         ]
                              }
+
                  },
 
-               { "nodeDpid": "of:0000000000000003", "name": "Dallas-R3", "type": "Router_SR", "allowed": true,
+               { "nodeDpid": "of:0000000000000003", "name": "Leaf-R3", "type": "Router_SR", "allowed": true,
                  "latitude": 80.80, "longitude": 90.10,
-                 "params": { "routerIp": "192.168.0.3/32",
-                             "routerMac": "00:00:03:03:03:80",
+                 "params": { "routerIp": "10.0.3.101/32",
+                             "routerMac": "00:00:00:00:03:80",
                              "nodeSid": 103,
-                             "isEdgeRouter" : false
+                             "isEdgeRouter" : true,
+                             "subnets": [
+                                         { "portNo": 1, "subnetIp": "10.0.3.254/24" }
+                                         ]
                              }
-                 },
 
-		{ "nodeDpid": "of:0000000000000004", "name": "Dallas-R4", "type": "Router_SR", "allowed": true,
+               },
+
+               { "nodeDpid": "of:0000000000000004", "name": "Leaf-R4", "type": "Router_SR", "allowed": true,
                  "latitude": 80.80, "longitude": 90.10,
-                 "params": { "routerIp": "192.168.0.4/32",
-                             "routerMac": "00:00:04:04:04:80",
+                 "params": { "routerIp": "10.0.4.101/32",
+                             "routerMac": "00:00:00:00:04:80",
                              "nodeSid": 104,
-                             "isEdgeRouter" : false
+                             "isEdgeRouter" : true,
+                             "subnets": [
+                                         { "portNo": 1, "subnetIp": "10.0.4.254/24" }
+                                         ]
                              }
-                 },
 
-		{ "nodeDpid": "of:0000000000000005", "name": "Dallas-R5", "type": "Router_SR", "allowed": true,
+               },
+
+		{ "nodeDpid": "of:0000000000000191", "name": "Spine-R1", "type": "Router_SR", "allowed": true,
                  "latitude": 80.80, "longitude": 90.10,
-                 "params": { "routerIp": "192.168.0.5/32",
-                             "routerMac": "00:00:05:05:05:80",
+                 "params": { "routerIp": "192.168.0.11/32",
+                             "routerMac": "00:00:01:00:11:80",
                              "nodeSid": 105,
                              "isEdgeRouter" : false
                              }
                  },
 
-		{ "nodeDpid": "of:0000000000000006", "name": "Dallas-R6", "type": "Router_SR", "allowed": true,
+        { "nodeDpid": "of:0000000000000192", "name": "Spine-R2", "type": "Router_SR", "allowed": true,
                  "latitude": 80.80, "longitude": 90.10,
-                 "params": { "routerIp": "192.168.0.6/32",
-                             "routerMac": "00:00:07:07:07:80",
+                 "params": { "routerIp": "192.168.0.22/32",
+                             "routerMac": "00:00:01:00:22:80",
                              "nodeSid": 106,
-                             "isEdgeRouter" : true,
-                             "subnets": [
-                                         { "portNo": 1, "subnetIp": "7.7.7.128/24" }
-                                         ]
+                             "isEdgeRouter" : false
                              }
-                 }
+                 },
 
+        { "nodeDpid": "of:0000000000000193", "name": "Spine-R3", "type": "Router_SR", "allowed": true,
+                 "latitude": 80.80, "longitude": 90.10,
+                 "params": { "routerIp": "192.168.0.33/32",
+                             "routerMac": "00:00:01:00:33:80",
+                             "nodeSid": 107,
+                             "isEdgeRouter" : false
+                             }
+                 },
+
+		{ "nodeDpid": "of:0000000000000194", "name": "Spine-R4", "type": "Router_SR", "allowed": true,
+                 "latitude": 80.80, "longitude": 90.10,
+                 "params": { "routerIp": "192.168.0.44/32",
+                             "routerMac": "00:00:01:00:44:80",
+                             "nodeSid": 108,
+                             "isEdgeRouter" : false
+			   }
+                 }
                ]
 }