diff --git a/CHANGELOG.md b/CHANGELOG.md
index f87df775d..90d39ee14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ All notable changes to the ZSS package will be documented in this file.
 
 - Breaking change: Cookie name now has a suffix which includes the port or if in an HA instance, the HA ID.
 - Enhancement: New configuration option that allows to run 64-bit ZSS
-
+- Bugfix: Do not use "tee" when log destination is /dev/null
 
 ## `1.27.0`
 
diff --git a/bin/zssServer.sh b/bin/zssServer.sh
index 241ccf93a..6364cd0df 100755
--- a/bin/zssServer.sh
+++ b/bin/zssServer.sh
@@ -162,11 +162,18 @@ else
   ZSS_SERVER="${ZSS_SERVER_31}"
 fi
 
-if [ -f "$CONFIG_FILE" ]
-then
-  _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
+if [ -f "$CONFIG_FILE" ]; then
+  if [ "$ZWES_LOG_FILE" = "/dev/null" ]; then
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1
+  else
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} "${CONFIG_FILE}" 2>&1 | tee $ZWES_LOG_FILE
+  fi
 else
-  _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} 2>&1 | tee $ZWES_LOG_FILE
+  if [ "$ZWES_LOG_FILE" = "/dev/null" ]; then
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} 2>&1
+  else
+    _BPX_SHAREAS=NO _BPX_JOBNAME=${ZOWE_PREFIX}SZ1 ${ZSS_SERVER} 2>&1 | tee $ZWES_LOG_FILE
+  fi
 fi
 # This program and the accompanying materials are
 # made available under the terms of the Eclipse Public License v2.0 which accompanies
diff --git a/deps/zowe-common-c b/deps/zowe-common-c
index b1a475810..6858714a3 160000
--- a/deps/zowe-common-c
+++ b/deps/zowe-common-c
@@ -1 +1 @@
-Subproject commit b1a4758109337fcb52d677998e0248594937f58c
+Subproject commit 6858714a312dd0d1401561a9dd235c8f18fab85c
diff --git a/h/zis/server.h b/h/zis/server.h
index d84ab26fa..095ace799 100644
--- a/h/zis/server.h
+++ b/h/zis/server.h
@@ -53,7 +53,7 @@ typedef struct ZISServerAnchor_tag {
 
 } ZISServerAnchor;
 
-typedef __packed struct ZISServiceRouterData_tag {
+typedef _Packed struct ZISServiceRouterData_tag {
   char eyecatcher[8];
 #define ZIS_SERVICE_ROUTER_EYECATCHER "ZISSREYE"
   unsigned int version;