diff --git a/SAI b/SAI
index b2487f0ef..b908a5bf0 160000
--- a/SAI
+++ b/SAI
@@ -1 +1 @@
-Subproject commit b2487f0ef018435a036c0b6a8238e7ae737eb3a2
+Subproject commit b908a5bf073c6c48645b832c81c186a9bd9e7f15
diff --git a/lib/src/sai_redis_hash.cpp b/lib/src/sai_redis_hash.cpp
index c65581b8f..0dec9b313 100644
--- a/lib/src/sai_redis_hash.cpp
+++ b/lib/src/sai_redis_hash.cpp
@@ -1,8 +1,9 @@
 #include "sai_redis.h"
 
 REDIS_GENERIC_QUAD(HASH,hash);
+REDIS_GENERIC_QUAD(FINE_GRAINED_HASH_FIELD,fine_grained_hash_field);
 
 const sai_hash_api_t redis_hash_api = {
-
     REDIS_GENERIC_QUAD_API(hash)
+    REDIS_GENERIC_QUAD_API(fine_grained_hash_field)
 };
diff --git a/lib/src/sai_redis_hostintf.cpp b/lib/src/sai_redis_hostintf.cpp
index a8ac3ad73..fab7a9cfa 100644
--- a/lib/src/sai_redis_hostintf.cpp
+++ b/lib/src/sai_redis_hostintf.cpp
@@ -24,6 +24,27 @@ static sai_status_t redis_send_hostif_packet(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+static sai_status_t redis_allocate_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _In_ sai_size_t buffer_size,
+        _Out_ void **buffer,
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t redis_free_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _Inout_ void *buffer)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 REDIS_GENERIC_QUAD(HOSTIF,hostif);
 REDIS_GENERIC_QUAD(HOSTIF_TABLE_ENTRY,hostif_table_entry);
 REDIS_GENERIC_QUAD(HOSTIF_TRAP_GROUP,hostif_trap_group);
@@ -40,4 +61,6 @@ const sai_hostif_api_t redis_hostif_api = {
 
     redis_recv_hostif_packet,
     redis_send_hostif_packet,
+    redis_allocate_hostif_packet,
+    redis_free_hostif_packet,
 };
diff --git a/vslib/src/SwitchStateBaseMACsec.cpp b/vslib/src/SwitchStateBaseMACsec.cpp
index aacaa2280..578038ab5 100644
--- a/vslib/src/SwitchStateBaseMACsec.cpp
+++ b/vslib/src/SwitchStateBaseMACsec.cpp
@@ -541,15 +541,16 @@ sai_status_t SwitchStateBase::loadMACsecAttrFromMACsecSA(
 
     macsecAttr.m_an = attr->value.u8;
 
-    SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE, attrCount, attrList);
-
-    macsecAttr.m_encryptionEnable = attr->value.booldata;
+    //SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE, attrCount, attrList);
+    //macsecAttr.m_encryptionEnable = attr->value.booldata;
+    SWSS_LOG_THROW("SAI_MACSEC_SA_ATTR_ENCRYPTION_ENABLE is not available in SAI 1.7.1, please help fix this");
 
     SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK, attrCount, attrList);
 
     macsecAttr.m_sak = sai_serialize_hex_binary(attr->value.macsecsak);
 
-    SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK_256_BITS, attrCount, attrList);
+    //SAI_METADATA_GET_ATTR_BY_ID(attr, SAI_MACSEC_SA_ATTR_SAK_256_BITS, attrCount, attrList);
+    SWSS_LOG_THROW("SAI_MACSEC_SA_ATTR_256_BITS is not available in SAI 1.7.1, please help fix this");
 
     if (!attr->value.booldata)
     {
diff --git a/vslib/src/sai_vs_hash.cpp b/vslib/src/sai_vs_hash.cpp
index a1428a401..d7f6e1c89 100644
--- a/vslib/src/sai_vs_hash.cpp
+++ b/vslib/src/sai_vs_hash.cpp
@@ -1,8 +1,9 @@
 #include "sai_vs.h"
 
 VS_GENERIC_QUAD(HASH,hash);
+VS_GENERIC_QUAD(FINE_GRAINED_HASH_FIELD,fine_grained_hash_field);
 
 const sai_hash_api_t vs_hash_api = {
-
     VS_GENERIC_QUAD_API(hash)
+    VS_GENERIC_QUAD_API(fine_grained_hash_field)
 };
diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp
index 679162a00..2a35c2bef 100644
--- a/vslib/src/sai_vs_hostintf.cpp
+++ b/vslib/src/sai_vs_hostintf.cpp
@@ -24,6 +24,27 @@ static sai_status_t vs_send_hostif_packet(
     return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
+static sai_status_t vs_allocate_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _In_ sai_size_t buffer_size,
+        _Out_ void **buffer,
+        _In_ uint32_t attr_count,
+        _In_ const sai_attribute_t *attr_list)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
+static sai_status_t vs_free_hostif_packet(
+        _In_ sai_object_id_t hostif_id,
+        _Inout_ void *buffer)
+{
+    SWSS_LOG_ENTER();
+
+    return SAI_STATUS_NOT_IMPLEMENTED;
+}
+
 VS_GENERIC_QUAD(HOSTIF,hostif);
 VS_GENERIC_QUAD(HOSTIF_TABLE_ENTRY,hostif_table_entry);
 VS_GENERIC_QUAD(HOSTIF_TRAP_GROUP,hostif_trap_group);
@@ -40,4 +61,6 @@ const sai_hostif_api_t vs_hostif_api = {
 
     vs_recv_hostif_packet,
     vs_send_hostif_packet,
+    vs_allocate_hostif_packet,
+    vs_free_hostif_packet,
 };