diff --git a/fm-common/sources/fmSnmpConstants.h b/fm-common/sources/fmSnmpConstants.h
index 2b0ca83e..e140d0d3 100644
--- a/fm-common/sources/fmSnmpConstants.h
+++ b/fm-common/sources/fmSnmpConstants.h
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2017-2020 Wind River Systems, Inc.
+// Copyright (c) 2017-2022 Wind River Systems, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -25,6 +25,7 @@ const std::string ALARM_MSG = "wrsAlarmMessage";
 const std::string ALARM_CLEAR = "wrsAlarmClear";
 const std::string ALARM_HIERARCHICAL_CLEAR = "wrsAlarmHierarchicalClear";
 
+const std::string ALARM_UUID = "wrsAlarmActiveUuid";
 const std::string ALARM_ID = "wrsAlarmActiveAlarmId";
 const std::string ALARM_INSTANCE_ID = "wrsAlarmActiveEntityInstanceId";
 const std::string ALARM_DATE_TIME = "wrsAlarmActiveDateAndTime";
@@ -36,6 +37,7 @@ const std::string ALARM_REPAIR_ACTION = "wrsAlarmActiveProposedRepairAction";
 const std::string ALARM_SERVICE_AFFECTING = "wrsAlarmActiveServiceAffecting";
 const std::string ALARM_SUPPRESSION = "wrsAlarmActiveSuppressionAllowed";
 
+const std::string EVENT_UUID = "wrsEventUuid";
 const std::string EVENT_ID = "wrsEventEventId";
 const std::string EVENT_INSTANCE_ID = "wrsEventEntityInstanceId";
 const std::string EVENT_DATE_TIME = "wrsEventDateAndTime";
diff --git a/fm-common/sources/fmSnmpUtils.cpp b/fm-common/sources/fmSnmpUtils.cpp
index b74979b6..719eef46 100644
--- a/fm-common/sources/fmSnmpUtils.cpp
+++ b/fm-common/sources/fmSnmpUtils.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2014-2020 Wind River Systems, Inc.
+// Copyright (c) 2014-2022 Wind River Systems, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -204,6 +204,7 @@ static std::string format_trap_json(int type, SFmAlarmDataT &data){
     }
 
     if (operation_type == ALARM_CLEAR){
+        add_value_json_trap(result, ALARM_UUID, data.uuid);
         add_value_json_trap(result, ALARM_ID, data.alarm_id);
         add_value_json_trap(result, ALARM_INSTANCE_ID,
                 data.entity_instance_id);
@@ -211,12 +212,14 @@ static std::string format_trap_json(int type, SFmAlarmDataT &data){
         add_value_json_trap(result, ALARM_DATE_TIME, time_str);
         add_value_json_trap(result, ALARM_REASON_TEXT, data.reason_text);
     } else if (operation_type == ALARM_HIERARCHICAL_CLEAR){
+        add_value_json_trap(result, ALARM_UUID, data.uuid);
         add_value_json_trap(result, ALARM_INSTANCE_ID,
                 data.entity_instance_id);
         fm_db_util_make_timestamp_string(time_str, 0, true);
         add_value_json_trap(result, ALARM_DATE_TIME, time_str);
         add_value_json_trap(result, ALARM_REASON_TEXT, CLEAR_REASON_TEXT);
     } else if (operation_type == ALARM_MSG){
+        add_value_json_trap(result, EVENT_UUID, data.uuid);
         add_value_json_trap(result, EVENT_ID, data.alarm_id);
         add_value_json_trap(result, EVENT_INSTANCE_ID,
                 data.entity_instance_id);
@@ -234,6 +237,7 @@ static std::string format_trap_json(int type, SFmAlarmDataT &data){
     } else if (operation_type == WARM_START){
         // nothing to add to cmd
     } else {
+        add_value_json_trap(result, ALARM_UUID, data.uuid);
         add_value_json_trap(result, ALARM_ID, data.alarm_id);
         add_value_json_trap(result, ALARM_INSTANCE_ID,
                 data.entity_instance_id );