diff --git a/dockers/docker-platform-monitor/Dockerfile.j2 b/dockers/docker-platform-monitor/Dockerfile.j2
index 9a3deebef34a..c2e142727b80 100755
--- a/dockers/docker-platform-monitor/Dockerfile.j2
+++ b/dockers/docker-platform-monitor/Dockerfile.j2
@@ -56,5 +56,6 @@ RUN apt-get purge -y           \
 
 COPY ["docker_init.sh", "lm-sensors.sh", "/usr/bin/"]
 COPY ["docker-pmon.supervisord.conf.j2", "start.sh.j2", "/usr/share/sonic/templates/"]
+COPY ["ssd_tools/*", "/usr/bin/"]
 
 ENTRYPOINT ["/usr/bin/docker_init.sh"]
diff --git a/dockers/docker-platform-monitor/base_image_files/sensors b/dockers/docker-platform-monitor/base_image_files/cmd_wrapper
similarity index 69%
rename from dockers/docker-platform-monitor/base_image_files/sensors
rename to dockers/docker-platform-monitor/base_image_files/cmd_wrapper
index 23a12034f071..74e5dd7ab9cb 100755
--- a/dockers/docker-platform-monitor/base_image_files/sensors
+++ b/dockers/docker-platform-monitor/base_image_files/cmd_wrapper
@@ -7,4 +7,4 @@ if [ -t 1 ] ; then
     DOCKER_EXEC_FLAGS+="t"
 fi
 
-docker exec -$DOCKER_EXEC_FLAGS pmon sensors "$@"
+docker exec -$DOCKER_EXEC_FLAGS pmon $(basename $0) "$@"
diff --git a/dockers/docker-platform-monitor/base_image_files/smartctl b/dockers/docker-platform-monitor/base_image_files/smartctl
deleted file mode 100755
index 2bbc5f7a6d74..000000000000
--- a/dockers/docker-platform-monitor/base_image_files/smartctl
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_EXEC_FLAGS="i"
-
-# Determine whether stdout is on a terminal
-if [ -t 1 ] ; then
-    DOCKER_EXEC_FLAGS+="t"
-fi
-
-docker exec -$DOCKER_EXEC_FLAGS pmon smartctl "$@"
diff --git a/dockers/docker-platform-monitor/ssd_tools/SmartCmd b/dockers/docker-platform-monitor/ssd_tools/SmartCmd
new file mode 100755
index 000000000000..dae647e4697e
Binary files /dev/null and b/dockers/docker-platform-monitor/ssd_tools/SmartCmd differ
diff --git a/dockers/docker-platform-monitor/ssd_tools/iSmart b/dockers/docker-platform-monitor/ssd_tools/iSmart
new file mode 100755
index 000000000000..c6bba0046024
Binary files /dev/null and b/dockers/docker-platform-monitor/ssd_tools/iSmart differ
diff --git a/rules/docker-platform-monitor.mk b/rules/docker-platform-monitor.mk
index 617cf39e8b87..5eb26fec2f82 100644
--- a/rules/docker-platform-monitor.mk
+++ b/rules/docker-platform-monitor.mk
@@ -40,5 +40,7 @@ $(DOCKER_PLATFORM_MONITOR)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista:/usr/lib/python2.7/dist-packages/arista:ro
 $(DOCKER_PLATFORM_MONITOR)_aboot_RUN_OPT += -v /usr/lib/python2.7/dist-packages/arista/utils/sonic_platform:/usr/lib/python2.7/dist-packages/sonic_platform:ro
 
-$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += sensors:/usr/bin/sensors
-$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += smartctl:/usr/sbin/smartctl
+$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/bin/sensors
+$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/smartctl
+$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/iSmart
+$(DOCKER_PLATFORM_MONITOR)_BASE_IMAGE_FILES += cmd_wrapper:/usr/sbin/SmartCmd
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 33b037d38f1c..cc2dac5963a1 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 33b037d38f1c96264729b966e777efed143ed01d
+Subproject commit cc2dac5963a14d04dd15735de35df9b30cff1e41