diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch
index e2cbefb..61e139d 100644
--- a/SOURCES/openvswitch-2.15.0.patch
+++ b/SOURCES/openvswitch-2.15.0.patch
@@ -605,7 +605,7 @@ index a7982de381..39d9aa391e 100644
  ])
  AT_CLEANUP
 diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at
-index 2862a3c9b9..d5765a6632 100644
+index 2862a3c9b9..57cae383fe 100644
 --- a/tests/dpif-netdev.at
 +++ b/tests/dpif-netdev.at
 @@ -299,59 +299,61 @@ type=drop rate=1 burst_size=2
@@ -708,7 +708,16 @@ index 2862a3c9b9..d5765a6632 100644
  ])
  
  AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl
-@@ -589,3 +591,20 @@ arp,in_port=ANY,dl_vlan=11,dl_vlan_pcp=7,vlan_tci1=0x0000,dl_src=00:06:07:08:09:
+@@ -370,6 +372,8 @@ recirc_id(0),in_port(7),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), a
+ recirc_id(0),in_port(8),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:2
+ ])
+ 
++AT_CHECK([ovs-ofctl -O OpenFlow13 del-meters br0])
++
+ OVS_VSWITCHD_STOP
+ AT_CLEANUP
+ 
+@@ -589,3 +593,20 @@ arp,in_port=ANY,dl_vlan=11,dl_vlan_pcp=7,vlan_tci1=0x0000,dl_src=00:06:07:08:09:
  
  DPIF_NETDEV_FLOW_HW_OFFLOAD_OFFSETS_VID_ARP([dummy])
  DPIF_NETDEV_FLOW_HW_OFFLOAD_OFFSETS_VID_ARP([dummy-pmd])
@@ -937,6 +946,42 @@ index d71c34e691..4156da20ef 100644
      help)
          usage
          ;;
+diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
+index 3601890f40..62059e962f 100644
+--- a/utilities/ovs-ofctl.c
++++ b/utilities/ovs-ofctl.c
+@@ -4020,6 +4020,7 @@ ofctl_meter_mod__(const char *bridge, const char *str, int command)
+     enum ofputil_protocol usable_protocols;
+     enum ofp_version version;
+ 
++    memset(&mm, 0, sizeof mm);
+     if (str) {
+         char *error;
+         error = parse_ofp_meter_mod_str(&mm, str, command, &usable_protocols);
+@@ -4030,7 +4031,6 @@ ofctl_meter_mod__(const char *bridge, const char *str, int command)
+         usable_protocols = OFPUTIL_P_OF13_UP;
+         mm.command = command;
+         mm.meter.meter_id = OFPM13_ALL;
+-        mm.meter.bands = NULL;
+     }
+ 
+     protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols);
+@@ -4050,6 +4050,7 @@ ofctl_meter_request__(const char *bridge, const char *str,
+     enum ofputil_protocol protocol;
+     enum ofp_version version;
+ 
++    memset(&mm, 0, sizeof mm);
+     if (str) {
+         char *error;
+         error = parse_ofp_meter_mod_str(&mm, str, -1, &usable_protocols);
+@@ -4059,7 +4060,6 @@ ofctl_meter_request__(const char *bridge, const char *str,
+     } else {
+         usable_protocols = OFPUTIL_P_OF13_UP;
+         mm.meter.meter_id = OFPM13_ALL;
+-        mm.meter.bands = NULL;
+     }
+ 
+     protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols);
 diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
 index a2ad84edef..4597a215d9 100644
 --- a/vswitchd/vswitch.xml
diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec
index b78453f..513490c 100644
--- a/SPECS/openvswitch2.15.spec
+++ b/SPECS/openvswitch2.15.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.15.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -697,6 +697,10 @@ exit 0
 %endif
 
 %changelog
+* Wed Mar 31 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.15.0-7
+- Merging upstream branch-2.15
+  [cbb083630e893c069842cbad76381b677dd15298]
+
 * Wed Mar 31 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.15.0-6
 - Merging upstream branch-2.15
   [221cf613d702776d42a960a0ab99da970d50b555]