diff --git a/SAI b/SAI
index a028b52231..ecced0cf01 160000
--- a/SAI
+++ b/SAI
@@ -1 +1 @@
-Subproject commit a028b522318ba553286cd5ae30a74371816c7a14
+Subproject commit ecced0cf01aa34b4cf7c136af5790bd9e30837e4
diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
index bbad23ba08..abeb9c6aea 100644
--- a/lib/inc/sai_redis.h
+++ b/lib/inc/sai_redis.h
@@ -49,6 +49,7 @@ PRIVATE extern const sai_scheduler_group_api_t  redis_scheduler_group_api;
 PRIVATE extern const sai_segmentroute_api_t     redis_segmentroute_api;
 PRIVATE extern const sai_stp_api_t              redis_stp_api;
 PRIVATE extern const sai_switch_api_t           redis_switch_api;
+PRIVATE extern const sai_system_port_api_t      redis_system_port_api;
 PRIVATE extern const sai_tam_api_t              redis_tam_api;
 PRIVATE extern const sai_tunnel_api_t           redis_tunnel_api;
 PRIVATE extern const sai_udf_api_t              redis_udf_api;
diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
index 5b9159bf3c..f6a002c13c 100644
--- a/lib/src/Makefile.am
+++ b/lib/src/Makefile.am
@@ -74,6 +74,7 @@ libsairedis_la_SOURCES = \
 						 sai_redis_segmentroute.cpp \
 						 sai_redis_stp.cpp \
 						 sai_redis_switch.cpp \
+						 sai_redis_system_port.cpp \
 						 sai_redis_tam.cpp \
 						 sai_redis_tunnel.cpp \
 						 sai_redis_udf.cpp \
diff --git a/lib/src/sai_redis_interfacequery.cpp b/lib/src/sai_redis_interfacequery.cpp
index 8492f10d65..1d8d9f4c2d 100644
--- a/lib/src/sai_redis_interfacequery.cpp
+++ b/lib/src/sai_redis_interfacequery.cpp
@@ -75,6 +75,7 @@ static sai_apis_t redis_apis = {
     API(counter),
     API(debug_counter),
     API(macsec),
+    API(system_port),
     API(bmtor),
 };
 
diff --git a/lib/src/sai_redis_system_port.cpp b/lib/src/sai_redis_system_port.cpp
new file mode 100644
index 0000000000..0514fd7231
--- /dev/null
+++ b/lib/src/sai_redis_system_port.cpp
@@ -0,0 +1,8 @@
+#include "sai_redis.h"
+
+REDIS_GENERIC_QUAD(SYSTEM_PORT,system_port);
+
+const sai_system_port_api_t redis_system_port_api = {
+
+    REDIS_GENERIC_QUAD_API(system_port)
+};
diff --git a/vslib/inc/sai_vs.h b/vslib/inc/sai_vs.h
index 6463553830..ce19aa6ac9 100644
--- a/vslib/inc/sai_vs.h
+++ b/vslib/inc/sai_vs.h
@@ -49,6 +49,7 @@ PRIVATE extern const sai_scheduler_group_api_t  vs_scheduler_group_api;
 PRIVATE extern const sai_segmentroute_api_t     vs_segmentroute_api;
 PRIVATE extern const sai_stp_api_t              vs_stp_api;
 PRIVATE extern const sai_switch_api_t           vs_switch_api;
+PRIVATE extern const sai_system_port_api_t      vs_system_port_api;
 PRIVATE extern const sai_tam_api_t              vs_tam_api;
 PRIVATE extern const sai_tunnel_api_t           vs_tunnel_api;
 PRIVATE extern const sai_udf_api_t              vs_udf_api;
diff --git a/vslib/src/Makefile.am b/vslib/src/Makefile.am
index ce2457db2c..b30ec668ab 100644
--- a/vslib/src/Makefile.am
+++ b/vslib/src/Makefile.am
@@ -88,6 +88,7 @@ libsaivs_la_SOURCES = \
 					  sai_vs_schedulergroup.cpp \
 					  sai_vs_segmentroute.cpp \
 					  sai_vs_stp.cpp \
+					  sai_vs_system_port.cpp \
 					  sai_vs_tam.cpp \
 					  sai_vs_tunnel.cpp \
 					  sai_vs_udf.cpp \
diff --git a/vslib/src/sai_vs_interfacequery.cpp b/vslib/src/sai_vs_interfacequery.cpp
index 2294041317..dddddcd8af 100644
--- a/vslib/src/sai_vs_interfacequery.cpp
+++ b/vslib/src/sai_vs_interfacequery.cpp
@@ -75,6 +75,7 @@ static sai_apis_t vs_apis = {
     API(counter),
     API(debug_counter),
     API(macsec),
+    API(system_port),
     API(bmtor),
 };
 
diff --git a/vslib/src/sai_vs_system_port.cpp b/vslib/src/sai_vs_system_port.cpp
new file mode 100644
index 0000000000..20b0243f4d
--- /dev/null
+++ b/vslib/src/sai_vs_system_port.cpp
@@ -0,0 +1,8 @@
+#include "sai_vs.h"
+
+VS_GENERIC_QUAD(SYSTEM_PORT,system_port);
+
+const sai_system_port_api_t vs_system_port_api = {
+
+    VS_GENERIC_QUAD_API(system_port)
+};