diff --git a/installation/settings.gradle b/installation/settings.gradle
index 50c7d614b24c5ecf1e16be23114aa0bb44214dd6..12be7850681587b97ba9f8c03725af0ea2db159a 100644
--- a/installation/settings.gradle
+++ b/installation/settings.gradle
@@ -1,4 +1,4 @@
 includeFlat 'commonbase', 'common', 
     'openbis_api', 'openbis-common', 'authentication', 'dbmigration', 'openbis', 
     'datastore_server', 'screening', 'rtd_yeastx', 'deep_sequencing_unit', 'plasmid',
-    'openbis_standard_technologies', 'big_data_link_server', 'openbis_ng_ui'
+    'openbis_standard_technologies', 'big_data_link_server', 'openbis_ng_ui', 'microservice_server_template'
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 2d3ba264f36b909d24e91cb4f7fff4eec6313081..8d002ba6df1e41fa0e2614ba6a76913b67a603af 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -1100,7 +1100,7 @@ var FormUtil = new function() {
             $component.css("font-family", "Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace");
         }
 
-		if (propertyType.mandatory) {
+		if (propertyType && propertyType.mandatory) {
 			$component.attr('required', '');
 		}
 
diff --git a/openbis_standard_technologies/settings.gradle b/openbis_standard_technologies/settings.gradle
index 550d8a405555407efb4df309efa4f703cf331a5b..9fd3b7e8b5f85dcb197bbe1d42fd2835dffdb449 100644
--- a/openbis_standard_technologies/settings.gradle
+++ b/openbis_standard_technologies/settings.gradle
@@ -1,3 +1,3 @@
 includeFlat 'commonbase', 'common', 'openbis_api', 'openbis-common', 'authentication', 'dbmigration', 'openbis', 
     'datastore_server', 'screening', 'rtd_yeastx', 'deep_sequencing_unit', 'plasmid', 'big_data_link_server',
-    'openbis_ng_ui'
+    'openbis_ng_ui', 'microservice_server_template'
diff --git a/rtd_cina/settings.gradle b/rtd_cina/settings.gradle
index 251ea7819844d063703a7d7c535735cabc2a8793..733f3175645e7d0db57c08df98e8609ccc1b0c59 100644
--- a/rtd_cina/settings.gradle
+++ b/rtd_cina/settings.gradle
@@ -1,3 +1,3 @@
 includeFlat 'commonbase', 'common', 'openbis_api', 'openbis-common', 'authentication', 'dbmigration', 'openbis', 
     'datastore_server', 'screening', 'rtd_yeastx', 'deep_sequencing_unit', 'plasmid', 'openbis_standard_technologies', 
-    'big_data_link_server', 'openbis_ng_ui'
+    'big_data_link_server', 'openbis_ng_ui', 'microservice_server_template'