diff --git a/src/lib/profiles/data-management/Current/MessageDef.cpp b/src/lib/profiles/data-management/Current/MessageDef.cpp
index 7a94b4880b..aed3ea1958 100644
--- a/src/lib/profiles/data-management/Current/MessageDef.cpp
+++ b/src/lib/profiles/data-management/Current/MessageDef.cpp
@@ -1281,6 +1281,17 @@ DataElement::Parser::ParseData(nl::Weave::TLV::TLVReader & aReader, int aDepth)
         break;
     }
 
+    case nl::Weave::TLV::kTLVType_FloatingPointNumber:
+    {
+        double value_fp;
+
+        err = aReader.Get(value_fp);
+        SuccessOrExit(err);
+
+        PRETTY_PRINT_SAMELINE("%lf, ", value_fp);
+        break;
+    }
+
     case nl::Weave::TLV::kTLVType_Boolean:
     {
         bool value_b;
diff --git a/src/test-apps/MockSinkTraits.cpp b/src/test-apps/MockSinkTraits.cpp
index 5a93618b68..0fa4bc6128 100644
--- a/src/test-apps/MockSinkTraits.cpp
+++ b/src/test-apps/MockSinkTraits.cpp
@@ -737,7 +737,7 @@ TestATraitDataSink::SetLeafData(PropertyPathHandle aLeafHandle, TLVReader &aRead
             err = aReader.Get(tax);
             SuccessOrExit(err);
 
-            WeaveLogDetail(DataManagement, "<<  ta_x %d", tax);
+            WeaveLogDetail(DataManagement, "<<  ta_x %lf", tax);
             break;
 
         case TestATrait::kPropertyHandle_TaI_Value:
@@ -1012,7 +1012,7 @@ WEAVE_ERROR TestATraitDataSink::GetLeafData(PropertyPathHandle aLeafHandle, uint
             err = aWriter.Put(aTagToWrite, tax);
             SuccessOrExit(err);
 
-            WeaveLogDetail(DataManagement, ">>  ta_x %d", tax);
+            WeaveLogDetail(DataManagement, ">>  ta_x %lf", tax);
             break;
 
         case TestATrait::kPropertyHandle_TaI_Value:
@@ -2336,7 +2336,7 @@ TestATraitUpdatableDataSink::SetLeafData(PropertyPathHandle aLeafHandle, TLVRead
             err = aReader.Get(tax);
             SuccessOrExit(err);
 
-            WeaveLogDetail(DataManagement, "<<  ta_x %d", tax);
+            WeaveLogDetail(DataManagement, "<<  ta_x %lf", tax);
             break;
 
         case TestATrait::kPropertyHandle_TaI_Value:
@@ -2590,7 +2590,7 @@ WEAVE_ERROR TestATraitUpdatableDataSink::GetLeafData(PropertyPathHandle aLeafHan
             err = aWriter.Put(aTagToWrite, tax);
             SuccessOrExit(err);
 
-            WeaveLogDetail(DataManagement, ">>  ta_x %d", tax);
+            WeaveLogDetail(DataManagement, ">>  ta_x %lf", tax);
             break;
 
         case TestATrait::kPropertyHandle_TaI_Value:
diff --git a/src/test-apps/MockSinkTraits.h b/src/test-apps/MockSinkTraits.h
index 1b1d50675a..0373fd641e 100644
--- a/src/test-apps/MockSinkTraits.h
+++ b/src/test-apps/MockSinkTraits.h
@@ -157,7 +157,7 @@ class TestATraitUpdatableDataSink : public MockTraitUpdatableDataSink
     bool tav;
     char taw[20];
     // boxed float
-    int16_t tax;
+    double tax;
 
     bool nullified_path[Schema::Nest::Test::Trait::TestATrait::kPropertyHandle_TaJ_Value_SaB];
     uint32_t mTestCounter = 0;
@@ -320,7 +320,7 @@ class TestATraitDataSink : public MockTraitDataSink, public MockTraitDataSourceD
     bool tav;
     char taw[20];
     // boxed float
-    int16_t tax;
+    double tax;
 
     bool nullified_path[Schema::Nest::Test::Trait::TestATrait::kPropertyHandle_TaJ_Value_SaB];
 };
diff --git a/src/test-apps/MockSourceTraits.cpp b/src/test-apps/MockSourceTraits.cpp
index 9c88e3582c..01c2021283 100644
--- a/src/test-apps/MockSourceTraits.cpp
+++ b/src/test-apps/MockSourceTraits.cpp
@@ -384,7 +384,7 @@ TestATraitDataSource::TestATraitDataSource():
     tat = 1000;
     tau = -1000;
     tav = true;
-    tax = 800;
+    tax = 800.1;
 
     for (size_t i = 0; i < 4; i++) {
         tai_map[i] = 100 + i;
@@ -1061,7 +1061,7 @@ TestATraitDataSource::SetLeafData(PropertyPathHandle aLeafHandle, TLVReader &aRe
             err = aReader.Get(tax);
             SuccessOrExit(err);
 
-            WeaveLogDetail(DataManagement, "<<  ta_x %d", tax);
+            WeaveLogDetail(DataManagement, "<<  ta_x %lf", tax);
             break;
 
         case TestATrait::kPropertyHandle_TaI_Value:
@@ -1302,7 +1302,7 @@ WEAVE_ERROR TestATraitDataSource::GetLeafData(PropertyPathHandle aLeafHandle, ui
             err = aWriter.Put(aTagToWrite, tax);
             SuccessOrExit(err);
 
-            WeaveLogDetail(DataManagement, ">>  ta_x %d", tax);
+            WeaveLogDetail(DataManagement, ">>  ta_x %lf", tax);
             break;
 
         case TestATrait::kPropertyHandle_TaI_Value:
diff --git a/src/test-apps/MockSourceTraits.h b/src/test-apps/MockSourceTraits.h
index 9e802a19f7..e0b256fa0b 100644
--- a/src/test-apps/MockSourceTraits.h
+++ b/src/test-apps/MockSourceTraits.h
@@ -188,7 +188,7 @@ class TestATraitDataSource :
     bool tav;
     char *taw = "boxedstring";
     // boxed float
-    int16_t tax;
+    double tax;
 
     bool nullified_path[Schema::Nest::Test::Trait::TestATrait::kPropertyHandle_TaJ_Value_SaB];