diff --git a/inc/saiport.h b/inc/saiport.h
index 6d45ab797f..3d4944668e 100644
--- a/inc/saiport.h
+++ b/inc/saiport.h
@@ -1105,15 +1105,6 @@ typedef enum _sai_port_attr_t
      */
     SAI_PORT_ATTR_MACSEC_PORT_LIST,
 
-    /**
-     * @brief Associated IPsec port
-     *
-     * @type sai_object_id_t
-     * @flags READ_ONLY
-     * @objects SAI_OBJECT_TYPE_IPSEC_PORT
-     */
-    SAI_PORT_ATTR_IPSEC_PORT,
-
     /**
      * @brief Enable/Disable Mirror session
      *
@@ -1974,6 +1965,15 @@ typedef enum _sai_port_attr_t
      */
     SAI_PORT_ATTR_AUTO_NEG_FEC_MODE_EXTENDED,
 
+    /**
+     * @brief Associated IPsec port
+     *
+     * @type sai_object_id_t
+     * @flags READ_ONLY
+     * @objects SAI_OBJECT_TYPE_IPSEC_PORT
+     */
+    SAI_PORT_ATTR_IPSEC_PORT,
+
     /**
      * @brief End of attributes
      */
diff --git a/meta/saiserialize.c b/meta/saiserialize.c
index 75ef7bc500..22ab479e28 100644
--- a/meta/saiserialize.c
+++ b/meta/saiserialize.c
@@ -584,28 +584,28 @@ int sai_serialize_macsec_sak(
         _Out_ char *buffer,
         _In_ const sai_macsec_sak_t sak)
 {
-   return sai_serialize_encrypt_key( buffer, sak );
+   return sai_serialize_encrypt_key(buffer, sak);
 }
 
 int sai_deserialize_macsec_sak(
         _In_ const char *buffer,
         _Out_ sai_macsec_sak_t sak)
 {
-   return sai_deserialize_encrypt_key( buffer, sak );
+   return sai_deserialize_encrypt_key(buffer, sak);
 }
 
 int sai_serialize_macsec_auth_key(
         _Out_ char *buffer,
         _In_ const sai_macsec_auth_key_t auth)
 {
-   return sai_serialize_auth_key( buffer, auth );
+   return sai_serialize_auth_key(buffer, auth);
 }
 
 int sai_deserialize_macsec_auth_key(
         _In_ const char *buffer,
         _Out_ sai_macsec_auth_key_t auth)
 {
-   return sai_deserialize_auth_key( buffer, auth );
+   return sai_deserialize_auth_key(buffer, auth);
 }
 
 int sai_serialize_macsec_salt(