diff --git a/dockers/docker-lldp-sv2/lldpmgrd b/dockers/docker-lldp-sv2/lldpmgrd
index 65f624dfd1dc..c572967d3e48 100755
--- a/dockers/docker-lldp-sv2/lldpmgrd
+++ b/dockers/docker-lldp-sv2/lldpmgrd
@@ -126,7 +126,7 @@ class LldpManager(object):
         TABLE_SEPARATOR = "|"
 
         # Retrieve all entires for this port from the Port table
-        port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME, TABLE_SEPARATOR)
+        port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME)
         (status, fvp) = port_table.get(port_name)
         if status:
             # Convert list of tuples to a dictionary
@@ -144,7 +144,7 @@ class LldpManager(object):
         lldpcli_cmd = "lldpcli configure ports {0} lldp portidsubtype local {1}".format(port_name, port_alias)
 
         # Retrieve all entires for this port from the Device Neighbor table
-        device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME, TABLE_SEPARATOR)
+        device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME)
         (status, fvp) = device_neighbor_table.get(port_name)
         if status:
             # Convert list of tuples to a dictionary
@@ -216,7 +216,7 @@ class LldpManager(object):
 
         # Listen indefinitely for changes to the PORT table in the State DB
         while True:
-            (state, c, fd) = sel.select(SELECT_TIMEOUT_MS)
+            (state, c) = sel.select(SELECT_TIMEOUT_MS)
 
             if state == swsscommon.Select.OBJECT:
                 (key, op, fvp) = sst.pop()
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index c860472a3d8c..a314ac45a189 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit c860472a3d8c16cad8a44fd7f76e848c39651f2e
+Subproject commit a314ac45a1899fafc913fbf6f1df83cbf5d7d069
diff --git a/src/sonic-swss b/src/sonic-swss
index a1b6fa323c69..7331f922de7a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit a1b6fa323c693fe3e21cc0aebf2e29fce18aa5b3
+Subproject commit 7331f922de7af71b0f40d8b2bdd2e1d30fcba6b0
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 14ca39fa0670..b4367a440fb7 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 14ca39fa0670b0e9b34d0ab63b12348bcba652ac
+Subproject commit b4367a440fb7b188c60774808195164438061bba