diff --git a/files/build_templates/eventd.service.j2 b/files/build_templates/eventd.service.j2
index 1aaedefd1227..0ad7f52ee83d 100644
--- a/files/build_templates/eventd.service.j2
+++ b/files/build_templates/eventd.service.j2
@@ -14,4 +14,4 @@ ExecStop=/usr/bin/{{docker_container_name}}.sh stop
 RestartSec=30
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sonic.target
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index ecc13b26f70c..7e8d47cd635c 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit ecc13b26f70c22812eda4c03ddcc063ed800d8b7
+Subproject commit 7e8d47cd635c4da3533d4dd3aee64f485fe91e62
diff --git a/src/wpasupplicant/sonic-wpa-supplicant b/src/wpasupplicant/sonic-wpa-supplicant
index 24f505148191..88d1eaea944c 160000
--- a/src/wpasupplicant/sonic-wpa-supplicant
+++ b/src/wpasupplicant/sonic-wpa-supplicant
@@ -1 +1 @@
-Subproject commit 24f5051481910677b9e5937c01b8b941185086d3
+Subproject commit 88d1eaea944c5ea90d9d7796dc10abc80823ed93