diff --git a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java
index 6ec881c69149bef5e4584c43277cdbfac646e908..576926488f807b60383470761c089e4eaf25eb32 100644
--- a/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java
+++ b/server-application-server/source/java/ch/ethz/sis/openbis/generic/server/xls/export/helper/XLSSampleTypeExportHelper.java
@@ -19,6 +19,8 @@ import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.AUTO_GENER
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.CODE;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.DESCRIPTION;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.GENERATED_CODE_PREFIX;
+import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.MODIFICATION_DATE;
+import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.UNIQUE_SUBCODES;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VALIDATION_SCRIPT;
 import static ch.ethz.sis.openbis.generic.server.xls.export.Attribute.VERSION;
 
@@ -72,7 +74,7 @@ public class XLSSampleTypeExportHelper extends AbstractXLSEntityTypeExportHelper
     protected Attribute[] getAttributes(final SampleType sampleType)
     {
         return new Attribute[] { VERSION, CODE, DESCRIPTION, AUTO_GENERATE_CODES, VALIDATION_SCRIPT,
-                GENERATED_CODE_PREFIX };
+                GENERATED_CODE_PREFIX, UNIQUE_SUBCODES, MODIFICATION_DATE };
     }
 
     @Override
@@ -107,6 +109,14 @@ public class XLSSampleTypeExportHelper extends AbstractXLSEntityTypeExportHelper
             {
                 return sampleType.isAutoGeneratedCode().toString().toUpperCase();
             }
+            case UNIQUE_SUBCODES:
+            {
+                return sampleType.isSubcodeUnique().toString().toUpperCase();
+            }
+            case MODIFICATION_DATE:
+            {
+                return DATE_FORMAT.format(sampleType.getModificationDate());
+            }
             default:
             {
                 return null;
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
index 1c2b5e6c552f9a4ece2d0d00527a01e7919b7380..8fb3e83d7af6e8c6e5e61e9199eeb7a5129c8de1 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeExpectations.java
@@ -18,7 +18,9 @@ package ch.ethz.sis.openbis.generic.server.xls.export;
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportData.TEST_SCRIPT_CONTENT;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -57,6 +59,11 @@ class SampleTypeExpectations extends Expectations
                 final SampleTypeFetchOptions fetchOptions = (SampleTypeFetchOptions) invocation.getParameter(2);
                 final PluginFetchOptions pluginFetchOptions = fetchOptions.withValidationPlugin();
 
+                final Calendar calendar = Calendar.getInstance();
+
+                calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+                final Date modificationDate = calendar.getTime();
+
                 final SampleType sampleType = new SampleType();
                 sampleType.setFetchOptions(fetchOptions);
                 sampleType.setPermId(new EntityTypePermId("ENTRY", EntityKind.SAMPLE));
@@ -65,6 +72,8 @@ class SampleTypeExpectations extends Expectations
                 sampleType.setAutoGeneratedCode(true);
                 sampleType.setGeneratedCodePrefix("ENTRY");
                 sampleType.setPropertyAssignments(getPropertyAssignments(fetchOptions));
+                sampleType.setSubcodeUnique(true);
+                sampleType.setModificationDate(modificationDate);
 
                 final Plugin validationPlugin = new Plugin();
                 validationPlugin.setName("test");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
index eb471f509fbec2b9450f3335c90b8d5a073bfeaa..820d75963cd32ef2ee7aad6222a2729e1628c5bf 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithBareSamplePropertyExpectations.java
@@ -18,7 +18,9 @@ package ch.ethz.sis.openbis.generic.server.xls.export;
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportData.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.jmock.Expectations;
@@ -59,6 +61,11 @@ class SampleTypeWithBareSamplePropertyExpectations extends Expectations
             @Override
             public Object invoke(final Invocation invocation) throws Throwable
             {
+                final Calendar calendar = Calendar.getInstance();
+
+                calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+                final Date modificationDate = calendar.getTime();
+
                 final SampleTypeFetchOptions fetchOptions = (SampleTypeFetchOptions) invocation.getParameter(2);
                 final SampleType sampleType = new SampleType();
                 sampleType.setFetchOptions(fetchOptions);
@@ -67,6 +74,9 @@ class SampleTypeWithBareSamplePropertyExpectations extends Expectations
                 sampleType.setDescription("Course");
                 sampleType.setAutoGeneratedCode(false);
                 sampleType.setPropertyAssignments(getCoursePropertyAssignments(fetchOptions));
+                sampleType.setSubcodeUnique(true);
+                sampleType.setModificationDate(modificationDate);
+
                 final Plugin validationPlugin = new Plugin();
                 validationPlugin.setFetchOptions(fetchOptions.withValidationPlugin());
                 validationPlugin.setName("date_range_validation");
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
index 0fef0651224365956e07c936cdc35c1846cd734d..32789bee5aa3eb6726ddeb798daaa47dbc65bd5b 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithChainedSamplePropertiesExpectations.java
@@ -18,7 +18,9 @@ package ch.ethz.sis.openbis.generic.server.xls.export;
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportData.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.jmock.Expectations;
@@ -42,6 +44,11 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
     public SampleTypeWithChainedSamplePropertiesExpectations(final IApplicationServerApi api,
             final boolean exportReferred)
     {
+        final Calendar calendar = Calendar.getInstance();
+
+        calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+        final Date modificationDate = calendar.getTime();
+
         if (exportReferred)
         {
             allowing(api).getSampleTypes(with(XLSExportTest.SESSION_TOKEN), with(new CollectionMatcher<>(
@@ -61,7 +68,10 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
                     sampleType.setCode("DEPARTMENT");
                     sampleType.setDescription("Department");
                     sampleType.setAutoGeneratedCode(false);
+                    sampleType.setSubcodeUnique(true);
+                    sampleType.setModificationDate(modificationDate);
                     sampleType.setPropertyAssignments(getDepartmentPropertyAssignments(fetchOptions));
+
                     return Collections.singletonMap(sampleType.getPermId(), sampleType);
                 }
 
@@ -84,6 +94,8 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
                     sampleType.setCode("PERSON");
                     sampleType.setDescription("Person");
                     sampleType.setAutoGeneratedCode(false);
+                    sampleType.setSubcodeUnique(true);
+                    sampleType.setModificationDate(modificationDate);
                     sampleType.setPropertyAssignments(getPersonPropertyAssignments(fetchOptions));
                     return Collections.singletonMap(sampleType.getPermId(), sampleType);
                 }
@@ -108,6 +120,8 @@ class SampleTypeWithChainedSamplePropertiesExpectations extends Expectations
                 sampleType.setCode("COURSE");
                 sampleType.setDescription("Course");
                 sampleType.setAutoGeneratedCode(false);
+                sampleType.setSubcodeUnique(true);
+                sampleType.setModificationDate(modificationDate);
                 sampleType.setPropertyAssignments(getCoursePropertyAssignments(fetchOptions));
                 final Plugin validationPlugin = new Plugin();
                 validationPlugin.setFetchOptions(fetchOptions.withValidationPlugin());
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
index 0bc58d72a20994397bfe8d7b1abf3f9eac9deed0..2133fd350ff0e13f2fd775fa7ae39327dbc0c403 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithCyclicSamplePropertiesExpectations.java
@@ -18,7 +18,9 @@ package ch.ethz.sis.openbis.generic.server.xls.export;
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportData.DATE_RANGE_VALIDATION_SCRIPT_CONTENT;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.jmock.Expectations;
@@ -42,6 +44,11 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
     public SampleTypeWithCyclicSamplePropertiesExpectations(final IApplicationServerApi api,
             final boolean exportReferred)
     {
+        final Calendar calendar = Calendar.getInstance();
+
+        calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+        final Date modificationDate = calendar.getTime();
+
         if (exportReferred)
         {
             allowing(api).getSampleTypes(with(XLSExportTest.SESSION_TOKEN), with(new CollectionMatcher<>(
@@ -61,6 +68,8 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
                     sampleType.setCode("DEPARTMENT");
                     sampleType.setDescription("Department");
                     sampleType.setAutoGeneratedCode(false);
+                    sampleType.setSubcodeUnique(true);
+                    sampleType.setModificationDate(modificationDate);
                     sampleType.setPropertyAssignments(getDepartmentPropertyAssignments(fetchOptions));
                     return Collections.singletonMap(sampleType.getPermId(), sampleType);
                 }
@@ -84,6 +93,8 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
                     sampleType.setCode("PERSON");
                     sampleType.setDescription("Person");
                     sampleType.setAutoGeneratedCode(false);
+                    sampleType.setSubcodeUnique(true);
+                    sampleType.setModificationDate(modificationDate);
                     sampleType.setPropertyAssignments(getPersonPropertyAssignments(fetchOptions));
                     return Collections.singletonMap(sampleType.getPermId(), sampleType);
                 }
@@ -108,6 +119,8 @@ class SampleTypeWithCyclicSamplePropertiesExpectations extends Expectations
                 sampleType.setCode("COURSE");
                 sampleType.setDescription("Course");
                 sampleType.setAutoGeneratedCode(false);
+                sampleType.setSubcodeUnique(true);
+                sampleType.setModificationDate(modificationDate);
                 sampleType.setPropertyAssignments(getCoursePropertyAssignments(fetchOptions));
                 final Plugin validationPlugin = new Plugin();
                 validationPlugin.setFetchOptions(fetchOptions.withValidationPlugin());
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
index da9c0b2bbeee10a0fb65134555da1a520445e3d3..f04bb060cb19ac4fdb353d021f6aa0ad3ec859b2 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithSamplePropertyExpectations.java
@@ -19,7 +19,9 @@ import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportData.DATE_R
 import static ch.ethz.sis.openbis.generic.server.xls.export.XLSExportData.TEST_SCRIPT_CONTENT;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.jmock.Expectations;
@@ -56,6 +58,11 @@ class SampleTypeWithSamplePropertyExpectations extends Expectations
                 @Override
                 public Object invoke(final Invocation invocation) throws Throwable
                 {
+                    final Calendar calendar = Calendar.getInstance();
+
+                    calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+                    final Date modificationDate = calendar.getTime();
+
                     final SampleTypeFetchOptions fetchOptions = (SampleTypeFetchOptions) invocation.getParameter(2);
                     final SampleType sampleType = new SampleType();
                     sampleType.setFetchOptions(fetchOptions);
@@ -63,6 +70,8 @@ class SampleTypeWithSamplePropertyExpectations extends Expectations
                     sampleType.setCode("PERSON");
                     sampleType.setDescription("Person");
                     sampleType.setAutoGeneratedCode(false);
+                    sampleType.setSubcodeUnique(true);
+                    sampleType.setModificationDate(modificationDate);
                     sampleType.setPropertyAssignments(getPersonPropertyAssignments(fetchOptions));
                     return Collections.singletonMap(sampleType.getPermId(), sampleType);
                 }
@@ -80,6 +89,11 @@ class SampleTypeWithSamplePropertyExpectations extends Expectations
             @Override
             public Object invoke(final Invocation invocation) throws Throwable
             {
+                final Calendar calendar = Calendar.getInstance();
+
+                calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+                final Date modificationDate = calendar.getTime();
+
                 final SampleTypeFetchOptions fetchOptions = (SampleTypeFetchOptions) invocation.getParameter(2);
                 final SampleType sampleType = new SampleType();
                 sampleType.setFetchOptions(fetchOptions);
@@ -87,6 +101,8 @@ class SampleTypeWithSamplePropertyExpectations extends Expectations
                 sampleType.setCode("COURSE");
                 sampleType.setDescription("Course");
                 sampleType.setAutoGeneratedCode(false);
+                sampleType.setSubcodeUnique(true);
+                sampleType.setModificationDate(modificationDate);
                 sampleType.setPropertyAssignments(getCoursePropertyAssignments(fetchOptions));
                 final Plugin validationPlugin = new Plugin();
                 validationPlugin.setFetchOptions(fetchOptions.withValidationPlugin());
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
index 96bb36962ef37773564e0e1336b3ee0d24dfab02..f9114f9ef6b5c0cf98a594c8722b84ec28f5acb9 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/SampleTypeWithVocabularyPropertyExpectations.java
@@ -16,7 +16,9 @@
 package ch.ethz.sis.openbis.generic.server.xls.export;
 
 import java.util.Arrays;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import org.jmock.Expectations;
@@ -55,6 +57,11 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
             @Override
             public Object invoke(final Invocation invocation) throws Throwable
             {
+                final Calendar calendar = Calendar.getInstance();
+
+                calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+                final Date modificationDate = calendar.getTime();
+
                 final SampleTypeFetchOptions fetchOptions = (SampleTypeFetchOptions) invocation.getParameter(2);
                 final SampleType sampleType = new SampleType();
                 sampleType.setFetchOptions(fetchOptions);
@@ -63,6 +70,8 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
                 sampleType.setDescription("Antibody");
                 sampleType.setAutoGeneratedCode(true);
                 sampleType.setGeneratedCodePrefix("ANT");
+                sampleType.setSubcodeUnique(false);
+                sampleType.setModificationDate(modificationDate);
                 sampleType.setPropertyAssignments(getPropertyAssignments(fetchOptions));
                 return Collections.singletonMap(sampleType.getPermId(), sampleType);
             }
@@ -79,6 +88,11 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
             @Override
             public Object invoke(final Invocation invocation) throws Throwable
             {
+                final Calendar calendar = Calendar.getInstance();
+
+                calendar.set(2023, Calendar.MARCH, 11, 17, 23, 44);
+                final Date modificationDate = calendar.getTime();
+
                 final SampleTypeFetchOptions fetchOptions = (SampleTypeFetchOptions) invocation.getParameter(2);
                 final SampleType sampleType = new SampleType();
                 sampleType.setFetchOptions(fetchOptions);
@@ -87,6 +101,8 @@ class SampleTypeWithVocabularyPropertyExpectations extends Expectations
                 sampleType.setDescription("Virus");
                 sampleType.setAutoGeneratedCode(true);
                 sampleType.setGeneratedCodePrefix("VIR");
+                sampleType.setSubcodeUnique(false);
+                sampleType.setModificationDate(modificationDate);
                 sampleType.setPropertyAssignments(getPropertyAssignments(fetchOptions));
                 return Collections.singletonMap(sampleType.getPermId(), sampleType);
             }
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx
index 5c924dccb8cf87766e80f5a45d8b5fe36fa7d82e..196100d372c72de0cb03170905c97004cf46805e 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-bare-sample-property.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx
index 6c0a638f6da5f62db2c02a35a0d8cc84c6a2225f..755c51dc26e8712e6945501a60fdaa3966cffd97 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-chained-sample-properties.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx
index 8d6680972fb9c796ef64155433fcd983fabaed63..6d49c3efd75c1628a586ca8b5df2ac3ef96fa92f 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-cyclic-sample-properties.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx
index 935808e76602a389a23d90b4951b5f0cbcc7b27d..ad06fbca77c7983d92652dfd4ac9da75d49d1d20 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-sample-property.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx
index da51a09b25c69fbaa2a1ea640834f0fe13655352..a9c031224f7a22dff8d56c4745e1d38b76016d76 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-omitted-vocabulary-property.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx
index 6cf88400847695b7d0a0c7566eb1539361e2eb81..5d2e04d7bff2e0651ecdc251703c44c524a4070c 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type-with-sample-property.xlsx differ
diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx
index 7f19164501d9f4b9bb1ab2ce5989a4a6658d1de4..2c1e3e5719ea2f1b90a1ebbb4d049c426894f4cf 100644
Binary files a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx and b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/generic/server/xls/export/resources/export-sample-type.xlsx differ