diff --git a/files/build_templates/enable_counters.service b/files/build_templates/enable_counters.service
index 98db4da3d2a3..f19249369f87 100644
--- a/files/build_templates/enable_counters.service
+++ b/files/build_templates/enable_counters.service
@@ -3,5 +3,5 @@ Description=Enable SONiC counters
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/counterpoll queue enable
+ExecStart=/bin/bash -c '/usr/bin/counterpoll queue enable ; /usr/bin/counterpoll port enable ; /usr/bin/pfcwd counter_poll enable'
 RemainAfterExit=yes
diff --git a/src/sonic-swss b/src/sonic-swss
index 98ad0bd500fc..72a7f3a5cb99 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit 98ad0bd500fc23fb61197e0ff8390d332216c9e8
+Subproject commit 72a7f3a5cb99cec297c7eb0e9e3b2b583eccf8bd
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 5baa30528bd7..27ae65122582 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 5baa30528bd73ffc364de03c9098263d42a2d320
+Subproject commit 27ae651225820e3eb4f08ed4cd80f93bbb5fe9bf