diff --git a/src/STEPCAFControl/STEPCAFControl_Reader.cxx b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
index b5f30d9c52..ab04efc4db 100644
--- a/src/STEPCAFControl/STEPCAFControl_Reader.cxx
+++ b/src/STEPCAFControl/STEPCAFControl_Reader.cxx
@@ -2604,6 +2604,10 @@ static void collectShapeAspect(const Handle(StepRepr_ShapeAspect)& theSA,
     if (!aSADR.IsNull())
       collectShapeAspect(aSADR->RelatedShapeAspect(), theWS, theSAs);
   }
+  else if (theSA->IsKind(STANDARD_TYPE(StepDimTol_DatumFeature))) {
+    theSAs.Append(theSA);
+    return;
+  }
   else {
     // Find all children Shape_Aspect
     Standard_Boolean isSimple = Standard_True;
@@ -2950,7 +2954,8 @@ static TDF_Label createGDTObjectInXCAF(const Handle(Standard_Transient)& theEnt,
       }
     }
   }
-  if(aSeqRI1.IsEmpty()) return aGDTL;
+  if(aSeqRI1.IsEmpty()) 
+    return aGDTL;
 
   TDF_LabelSequence aShLS1, aShLS2;
 
diff --git a/tests/gdt/export/A6 b/tests/gdt/export/A6
index 33d7a0034a..b10be35292 100644
--- a/tests/gdt/export/A6
+++ b/tests/gdt/export/A6
@@ -2,14 +2,15 @@
 set filename bug27645_nist_ftc_06_asme1_cr3000_rd.prt.stp
 puts "TODO CR26859 ALL:Error : 3 differences with reference data found :"
 puts "TODO CR26859 ALL:Error on writing file"
+
 set ref_data {
 
- NbOfDimensions          : 20
-  NbOfDimensionalSize    : 18
+ NbOfDimensions          : 21
+  NbOfDimensionalSize    : 19
   NbOfDimensionalLocation: 2
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 22
+ NbOfTolerances          : 27
   NbOfGTWithModifiers    : 4
   NbOfGTWithMaxTolerance : 0
   NbOfGTWithDatums       : 3
diff --git a/tests/gdt/export/A7 b/tests/gdt/export/A7
index 51a3580eae..348ed7a4d9 100644
--- a/tests/gdt/export/A7
+++ b/tests/gdt/export/A7
@@ -1,19 +1,20 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug27645_nist_ftc_06_asme1_ct5240_rd.stp
+set filename bug27808_nist_ftc_06_asme1_ct5240_rd.stp
 puts "TODO CR26859 ALL:Error : 3 differences with reference data found :"
 puts "TODO CR26859 ALL:Error on writing file"
+
 set ref_data {
 
  NbOfDimensions          : 22
-  NbOfDimensionalSize    : 14
-  NbOfDimensionalLocation: 8
+  NbOfDimensionalSize    : 12
+  NbOfDimensionalLocation: 10
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 21
+ NbOfTolerances          : 27
   NbOfGTWithModifiers    : 4
   NbOfGTWithMaxTolerance : 0
-  NbOfGTWithDatums       : 20
+  NbOfGTWithDatums       : 23
  NbOfDatumFeature        : 6
- NbOfAttachedDatum       : 46
+ NbOfAttachedDatum       : 54
  NbOfDatumTarget         : 0
 }
diff --git a/tests/gdt/export/A8 b/tests/gdt/export/A8
index 4e9be97b0e..2c216cb72b 100644
--- a/tests/gdt/export/A8
+++ b/tests/gdt/export/A8
@@ -2,6 +2,7 @@
 set filename bug27645_nist_ftc_06_asme1_ct5240_rd-1.stp
 puts "TODO CR26859 ALL:Error : 3 differences with reference data found :"
 puts "TODO CR26859 ALL:Error on writing file"
+
 set ref_data {
 
  NbOfDimensions          : 22
@@ -9,11 +10,11 @@ set ref_data {
   NbOfDimensionalLocation: 8
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 21
+ NbOfTolerances          : 27
   NbOfGTWithModifiers    : 4
   NbOfGTWithMaxTolerance : 0
-  NbOfGTWithDatums       : 20
+  NbOfGTWithDatums       : 23
  NbOfDatumFeature        : 6
- NbOfAttachedDatum       : 46
+ NbOfAttachedDatum       : 54
  NbOfDatumTarget         : 0
 }
diff --git a/tests/gdt/export/B1 b/tests/gdt/export/B1
index 4b92217185..1b05cc435f 100644
--- a/tests/gdt/export/B1
+++ b/tests/gdt/export/B1
@@ -1,5 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug27645_nist_ftc_08_asme1_ct5240_rc.stp
+set filename bug27808_nist_ftc_08_asme1_ct5240_rc.stp
 
 set ref_data {
 
@@ -8,11 +8,11 @@ set ref_data {
   NbOfDimensionalLocation: 1
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 29
-  NbOfGTWithModifiers    : 22
+ NbOfTolerances          : 33
+  NbOfGTWithModifiers    : 23
   NbOfGTWithMaxTolerance : 0
-  NbOfGTWithDatums       : 28
+  NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 10
- NbOfAttachedDatum       : 71
+ NbOfAttachedDatum       : 75
  NbOfDatumTarget         : 0
 }
diff --git a/tests/gdt/export/B2 b/tests/gdt/export/B2
index 85c54f0a84..98bc13db37 100644
--- a/tests/gdt/export/B2
+++ b/tests/gdt/export/B2
@@ -8,11 +8,11 @@ set ref_data {
   NbOfDimensionalLocation: 1
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 29
-  NbOfGTWithModifiers    : 22
+ NbOfTolerances          : 33
+  NbOfGTWithModifiers    : 23
   NbOfGTWithMaxTolerance : 0
-  NbOfGTWithDatums       : 28
+  NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 10
- NbOfAttachedDatum       : 71
+ NbOfAttachedDatum       : 75
  NbOfDatumTarget         : 0
 }
diff --git a/tests/gdt/export/B4 b/tests/gdt/export/B4
index 65994b3ebd..4c12b905df 100644
--- a/tests/gdt/export/B4
+++ b/tests/gdt/export/B4
@@ -1,18 +1,20 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug27645_nist_ftc_09_asme1_ct5240_rd.stp
+set filename bug27808_nist_ftc_09_asme1_ct5240_rd.stp
+puts "TODO CR26859 ALL:Error : 2 differences with reference data found :"
+puts "TODO CR26859 ALL:Error on writing file"
 
 set ref_data {
 
- NbOfDimensions          : 22
-  NbOfDimensionalSize    : 15
+ NbOfDimensions          : 23
+  NbOfDimensionalSize    : 16
   NbOfDimensionalLocation: 7
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 28
+ NbOfTolerances          : 31
   NbOfGTWithModifiers    : 8
   NbOfGTWithMaxTolerance : 0
-  NbOfGTWithDatums       : 28
+  NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 6
- NbOfAttachedDatum       : 69
+ NbOfAttachedDatum       : 73
  NbOfDatumTarget         : 0
 }
diff --git a/tests/gdt/export/B5 b/tests/gdt/export/B5
index 0dd94c987a..7150ee9bdb 100644
--- a/tests/gdt/export/B5
+++ b/tests/gdt/export/B5
@@ -3,16 +3,16 @@ set filename bug27645_nist_ftc_09_asme1_ct5240_rd-1.stp
 
 set ref_data {
 
- NbOfDimensions          : 22
-  NbOfDimensionalSize    : 15
+ NbOfDimensions          : 23
+  NbOfDimensionalSize    : 16
   NbOfDimensionalLocation: 7
   NbOfAngular            : 0
   NbOfWithPath           : 0
- NbOfTolerances          : 28
+ NbOfTolerances          : 31
   NbOfGTWithModifiers    : 8
   NbOfGTWithMaxTolerance : 0
-  NbOfGTWithDatums       : 28
+  NbOfGTWithDatums       : 30
  NbOfDatumFeature        : 6
- NbOfAttachedDatum       : 69
+ NbOfAttachedDatum       : 73
  NbOfDatumTarget         : 0
 }
diff --git a/tests/gdt/presentation/A5 b/tests/gdt/presentation/A5
index 8665be418d..6d9fb01d07 100644
--- a/tests/gdt/presentation/A5
+++ b/tests/gdt/presentation/A5
@@ -4,7 +4,7 @@ puts "TODO CR27235 ALL:Error : 4 differences with reference data found :"
 puts "TODO CR27235 ALL:Error on writing file"
 
 set ref_data {
-Centre of mass: 571.08730967855467 2205.0751810551806 -1537.7275040606771
-Mass: 535373.51735687314
+Centre of mass: 362.61474383020976 2196.4222207238172 -2017.5878044804083
+Mass: 639159.86516525224
 
 }
diff --git a/tests/gdt/presentation/A6 b/tests/gdt/presentation/A6
index 7b96aaa1c2..3bc1bb30e7 100644
--- a/tests/gdt/presentation/A6
+++ b/tests/gdt/presentation/A6
@@ -1,10 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug27645_nist_ftc_06_asme1_ct5240_rd.stp
+set filename bug27808_nist_ftc_06_asme1_ct5240_rd.stp
 puts "TODO CR27235 ALL:Error : 4 differences with reference data found :"
 puts "TODO CR27235 ALL:Error on writing file"
 
 set ref_data {
-Centre of mass: 1.2441670631221204 66.716892937106863 -65.116654400171385
-Mass: 21888.331129713944
+Centre of mass: 4.9764239505863603 64.18438466729144 -67.058903377273126
+Mass: 24387.315415267363
 
 }
diff --git a/tests/gdt/presentation/A7 b/tests/gdt/presentation/A7
index cc25eb338c..71823c7aa2 100644
--- a/tests/gdt/presentation/A7
+++ b/tests/gdt/presentation/A7
@@ -4,7 +4,7 @@ puts "TODO CR27235 ALL:Error : 4 differences with reference data found :"
 puts "TODO CR27235 ALL:Error on writing file"
 
 set ref_data {
-Centre of mass: 31.601843403303537 1694.6090806025425 -1653.9630217643687
-Mass: 555963.61069472972
+Centre of mass: 126.40116834489778 1630.2833705491985 -1703.2961457827012
+Mass: 619437.81154779939
 
 }
diff --git a/tests/gdt/presentation/A9 b/tests/gdt/presentation/A9
index 91b1a96a29..85142b58e3 100644
--- a/tests/gdt/presentation/A9
+++ b/tests/gdt/presentation/A9
@@ -1,8 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug27645_nist_ftc_08_asme1_ct5240_rc.stp
+set filename bug27808_nist_ftc_08_asme1_ct5240_rc.stp
 
 set ref_data {
-Centre of mass: 45.768141003733746 46.547197794287811 34.003050733925484
-Mass: 21424.556049917097
+Centre of mass: 44.537314289484314 44.054934745863214 33.295311157211145
+Mass: 22754.349304272349
 
 }
diff --git a/tests/gdt/presentation/B1 b/tests/gdt/presentation/B1
index 124e7966a7..365af2e841 100644
--- a/tests/gdt/presentation/B1
+++ b/tests/gdt/presentation/B1
@@ -2,7 +2,7 @@
 set filename bug27645_nist_ftc_08_asme1_ct5240_rc-1.stp
 
 set ref_data {
-Centre of mass: 1162.5107814948756 1182.2988239749477 863.67748864175542
-Mass: 544183.72366787971
+Centre of mass: 1131.248437223685 1118.9954844429806 845.70091310388898
+Mass: 577960.40529879264
 
 }
diff --git a/tests/gdt/presentation/B3 b/tests/gdt/presentation/B3
index 9c8a7a45ef..2ecabeebca 100644
--- a/tests/gdt/presentation/B3
+++ b/tests/gdt/presentation/B3
@@ -1,8 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-set filename bug27645_nist_ftc_09_asme1_ct5240_rd.stp
+set filename bug27808_nist_ftc_09_asme1_ct5240_rd.stp
+puts "TODO CR27235 ALL:Error : 4 differences with reference data found :"
+puts "TODO CR27235 ALL:Error on writing file"
 
 set ref_data {
-Centre of mass: -21.689685614183912 7.533923731961659 -1.9615575977866939
-Mass: 22433.616210032662
+Centre of mass: -20.281360550123736 7.5575111121398644 -1.4132597243023584
+Mass: 23871.875331976771
 
 }
diff --git a/tests/gdt/presentation/B4 b/tests/gdt/presentation/B4
index eaca02f090..04d68b7b1f 100644
--- a/tests/gdt/presentation/B4
+++ b/tests/gdt/presentation/B4
@@ -2,7 +2,7 @@
 set filename bug27645_nist_ftc_09_asme1_ct5240_rd-1.stp
 
 set ref_data {
-Centre of mass: -550.91801460026238 191.36166279182876 -49.823562983782956
-Mass: 569813.85173483356
+Centre of mass: -515.14631491538069 191.96077215596614 -35.896739001613369
+Mass: 606345.50780760846
 
 }