diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl
index 34a00e4c35e4..9255c339868e 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields-date.xsl
@@ -79,6 +79,7 @@
   <xsl:template mode="mode-iso19139"
                 priority="2000"
                 match="gmd:CI_Date/gmd:date">
+
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
     <xsl:param name="listOfValues" select="$iso19139codelists" required="no"/>
@@ -175,6 +176,8 @@
   <xsl:template mode="mode-iso19139"
                 priority="2000"
                 match="*[(gco:Date|gco:DateTime) and not(../gmd:dateType)]">
+
+
     <xsl:param name="schema" select="$schema" required="no"/>
     <xsl:param name="labels" select="$labels" required="no"/>
     <xsl:param name="overrideLabel" select="''" required="no"/>
diff --git a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
index bcd1f66e0914..f4a8cdb236a5 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/layout/layout-custom-fields.xsl
@@ -151,6 +151,259 @@
 
 -->
 
+  <xsl:template mode="mode-iso19139"
+                match="gml320:TimeInstant[gml320:timePosition]|gml:TimeInstant[gml:timePosition]"
+                priority="50000">
+
+    <xsl:variable name="configName" select="concat(local-name(..),'Position')"/>
+        <!-- 'temporalRangeSection' this is the name of the section (defined elsewhere)
+             and uses to find the translated tag for the section in the UI -->
+        <xsl:variable name="translation"
+                      select="$strings/*[name() = $configName]"/>
+        <xsl:variable name="name"
+                      select="if ($translation != '')
+                                    then $translation
+                                    else $configName"/>
+
+        <xsl:variable name="id" select="concat('_X', gn:element/@ref, '_replace')"/>
+
+    <xsl:variable name="isFirst" select="position() = 1"/>
+    <xsl:variable name="originalNode"
+                  select="gn-fn-metadata:getOriginalNode($metadata, .)"/>
+    <xsl:variable name="del" select="./@del"/>
+
+    <xsl:variable name="refToDelete">
+      <xsl:call-template name="get-ref-element-to-delete">
+        <xsl:with-param name="node" select="$originalNode"/>
+        <xsl:with-param name="delXpath" select="$del"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:variable name="parent_parent" select="."/>
+
+    <!-- look at the actual XML's gml namespace URI
+         if its GML 32, then that matches most of the implicit
+         assumptions inside GN.  Especially the JS, which assumes that
+         an element with a "gml:" prefix is GML 3.2.
+         However, this is a really bad assumption - all the iso19139 sample data
+         has "gml:" as the old (NOT GML 3.2).
+         Also, in this XSLT;
+         "gml:" - version 3.2
+         "gml320:" - OLD VERSION (!!!!!!!!)
+     -->
+    <xsl:variable name="element_ns_uri" select="namespace-uri()"/>
+    <xsl:variable name="element_ns_prefix" select="prefix-from-QName(node-name(.))"/>
+    <xsl:variable name="gml_is_32" select="$element_ns_uri = 'http://www.opengis.net/gml/3.2'"/>
+    <xsl:variable name="timeinstance_id" select="@*[local-name() = 'id']"/>
+
+    <xsl:variable name="prefix_to_use">gml</xsl:variable>
+
+    <xsl:variable name="prefix_to_use_select">
+      <xsl:choose>
+        <xsl:when test="$gml_is_32">gml</xsl:when>
+        <xsl:otherwise>gml320</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+
+    <xsl:variable name="label_node" select="local-name(..)"/>
+
+
+    <xsl:variable name="template">
+          <template  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gn="http://www.fao.org/geonetwork" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx" xmlns:srv="http://www.isotc211.org/2005/srv"  xmlns:xlink="http://www.w3.org/1999/xlink">
+            <values>
+              <key
+                   xpath="."
+                   use="gn-date-picker"
+                   tooltip="gmd:extent|gmd:EX_TemporalExtent">
+                <xsl:attribute name="label" select="$label_node"/>
+
+                <directiveAttributes
+                        data-assume-gml-ns="true"
+                >
+                  <xsl:attribute name="data-indeterminate-position" select="concat('eval#',$prefix_to_use_select,':timePosition/@indeterminatePosition')"/>
+                  <xsl:attribute name="data-tag-name" select="concat($prefix_to_use,':timePosition')"/>
+
+                </directiveAttributes>
+              </key>
+            </values>
+            <snippet>
+              <!-- this is more explicitly done, below -->
+              <gml:TimeInstant>
+              {{<xsl:copy-of select="local-name(..)"/>}}
+              </gml:TimeInstant>
+            </snippet>
+          </template>
+        </xsl:variable>
+
+    <xsl:variable name="keyValues">
+          <xsl:call-template name="build-key-value-configuration">
+            <xsl:with-param name="template" select="$template/template"/>
+            <xsl:with-param name="currentNode" select="$parent_parent"/>
+            <xsl:with-param name="readonly" select="'false'"/>
+          </xsl:call-template>
+        </xsl:variable>
+
+    <xsl:variable name="templateCombinedWithNode" as="node()">
+      <template>
+        <xsl:copy-of select="$template/template/values"/>
+
+        <xsl:element name="snippet" inherit-namespaces="no">
+          <xsl:attribute name="data-remove-gn-ns-def">true</xsl:attribute>
+
+            <xsl:element name="gml:TimeInstant"  namespace="{$element_ns_uri}" inherit-namespaces="no">
+                <xsl:attribute  namespace="{$element_ns_uri}" name="gml:id"><xsl:value-of select="$timeinstance_id"/></xsl:attribute>
+              {{<xsl:copy-of select="local-name(..)"/>}}
+            </xsl:element>
+
+
+        </xsl:element>
+      </template>
+    </xsl:variable>
+
+
+    <xsl:call-template name="render-element-template-field">
+      <xsl:with-param name="name" select="$name"/>
+      <xsl:with-param name="id" select="$id"/>
+      <xsl:with-param name="isExisting" select="true()"/>
+      <xsl:with-param name="template" select="$templateCombinedWithNode"/>
+      <xsl:with-param name="keyValues" select="$keyValues"/>
+      <xsl:with-param name="refToDelete" select="$refToDelete/gn:element"/>
+      <xsl:with-param name="isFirst" select="$isFirst"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <!---
+    For temporal extent, we want a more complicated control.
+    This will allow the <beginPosition   indeterminatePosition="now"></beginPosition>
+    It also sets up the DatePicker so it has the indeterminatePosition drop-down, plus
+    a calendar date selector, a time selector, a timezone selector, and "mode" selector (i.e. only year, year + month, date & time).
+
+    This is basically a replacement for https://github.com/geonetwork/core-geonetwork/blob/5f6571e72e2bd39237394caf1f076a6cc0dc8758/schemas/iso19139/src/main/plugin/iso19139/layout/config-editor.xml#L1471-L1513
+    See the "template" variable, below.
+
+    This is basically a stand-in for the  <field name="temporalRangeSection"> and uses the same template to do the controls.
+
+    NOTE: we are using [//local-name()='XYZ'] for the `gml:` namespace to make it work with both original gml and gml 3.2.
+  -->
+
+  <xsl:template mode="mode-iso19139"
+                match="gml:TimePeriod[.//gml:beginPosition]|gml320:TimePeriod[.//gml320:beginPosition]"
+                priority="30000">
+
+    <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
+    <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
+
+
+    <xsl:variable name="configName" select="'temporalRangeSection'"/>
+    <!-- 'temporalRangeSection' this is the name of the section (defined elsewhere)
+         and uses to find the translated tag for the section in the UI -->
+    <xsl:variable name="translation"
+                  select="$strings/*[name() = $configName]"/>
+    <xsl:variable name="name"
+                  select="if ($translation != '')
+                                then $translation
+                                else $configName"/>
+
+    <xsl:variable name="id" select="concat('_X', gn:element/@ref, '_replace')"/>
+
+    <xsl:variable name="element_ns_uri" select="namespace-uri()"/>
+    <xsl:variable name="gml_is_32" select="$element_ns_uri = 'http://www.opengis.net/gml/3.2'"/>
+    <xsl:variable name="timeperiod_id" select="@*[local-name() = 'id']"/>
+
+    <xsl:variable name="prefix_to_use">gml</xsl:variable>
+
+    <xsl:variable name="prefix_to_use_select">
+      <xsl:choose>
+        <xsl:when test="$gml_is_32">gml</xsl:when>
+        <xsl:otherwise>gml320</xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <xsl:variable name="template">
+      <template  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gn="http://www.fao.org/geonetwork" xmlns:gco="http://www.isotc211.org/2005/gco" xmlns:gmd="http://www.isotc211.org/2005/gmd" xmlns:gmx="http://www.isotc211.org/2005/gmx" xmlns:srv="http://www.isotc211.org/2005/srv" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xlink="http://www.w3.org/1999/xlink">
+      <values>
+        <!-- -Need a * for gml:TimePeriodTypeCHOICE_ELEMENT2 added by editor enumerated tree
+              but this will make the XSLT formatter fails. Using // to access the element in both case. -->
+        <key label="beginPosition"
+             xpath=".//*[local-name()='beginPosition']"
+             use="gn-date-picker"
+             tooltip="gmd:extent|gmd:EX_TemporalExtent">
+          <directiveAttributes
+            data-assume-gml-ns="true"
+          >
+            <xsl:attribute name="data-indeterminate-position" select="concat('eval#.//',$prefix_to_use_select,':beginPosition/@indeterminatePosition')"/>
+            <xsl:attribute name="data-tag-name" select="concat($prefix_to_use,':beginPosition')"/>
+          </directiveAttributes>
+        </key>
+        <key label="endPosition"
+             xpath=".//*[local-name()='endPosition']"
+             use="gn-date-picker"
+             tooltip="gmd:extent|gmd:EX_TemporalExtent">
+          <directiveAttributes
+            data-assume-gml-ns="true"
+          >
+            <xsl:attribute name="data-indeterminate-position" select="concat('eval#.//',$prefix_to_use_select,':endPosition/@indeterminatePosition')"/>
+            <xsl:attribute name="data-tag-name" select="concat($prefix_to_use,':endPosition')"/>
+          </directiveAttributes>
+        </key>
+      </values>
+      <snippet>
+        <!-- Bind the wrapper to the record's actual gml namespace (old GML or GML 3.2)
+             rather than hardcoding GML 3.2, so editing begin/end position does not
+             silently change the namespace of an existing element. -->
+        <xsl:element name="gml:TimePeriod" namespace="{$element_ns_uri}" inherit-namespaces="no">
+          <xsl:attribute namespace="{$element_ns_uri}" name="gml:id"><xsl:value-of select="$timeperiod_id"/></xsl:attribute>
+          {{beginPosition}}
+          {{endPosition}}
+        </xsl:element>
+      </snippet>
+    </template>
+    </xsl:variable>
+    <xsl:variable name="isFirst" select="position() = 1"/>
+    <xsl:variable name="originalNode"
+                  select="gn-fn-metadata:getOriginalNode($metadata, .)"/>
+    <xsl:variable name="del" select="./@del"/>
+
+    <xsl:variable name="refToDelete">
+      <xsl:call-template name="get-ref-element-to-delete">
+        <xsl:with-param name="node" select="$originalNode"/>
+        <xsl:with-param name="delXpath" select="$del"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+    <xsl:variable name="parent_parent" select="."/>
+
+    <xsl:variable name="keyValues">
+      <xsl:call-template name="build-key-value-configuration">
+        <xsl:with-param name="template" select="$template/template"/>
+        <xsl:with-param name="currentNode" select="$parent_parent"/>
+        <xsl:with-param name="readonly" select="'false'"/>
+      </xsl:call-template>
+    </xsl:variable>
+
+
+    <xsl:variable name="templateCombinedWithNode" as="node()">
+      <template>
+        <xsl:copy-of select="$template/template/values"/>
+        <snippet>
+          <xsl:apply-templates mode="gn-merge" select="$template/template/snippet/*|$editorConfig/editor/snippets/list[@name = $template/template/snippets/@name]/snippet/*">
+            <xsl:with-param name="node-to-merge" select="$parent_parent"/>
+          </xsl:apply-templates>
+        </snippet>
+      </template>
+    </xsl:variable>
+
+    <xsl:call-template name="render-element-template-field">
+      <xsl:with-param name="id" select="$id"/>
+      <xsl:with-param name="isExisting" select="true()"/>
+      <xsl:with-param name="template" select="$templateCombinedWithNode"/>
+      <xsl:with-param name="keyValues" select="$keyValues"/>
+      <xsl:with-param name="refToDelete" select="$refToDelete/gn:element"/>
+      <xsl:with-param name="isFirst" select="$isFirst"/>
+    </xsl:call-template>
+
+  </xsl:template>
 
 
   <!-- ===================================================================== -->
@@ -158,11 +411,10 @@
   <!-- ===================================================================== -->
 
   <xsl:template mode="mode-iso19139"
-                match="gml:beginPosition|gml:endPosition|gml:timePosition|
-                       gml320:beginPosition|gml320:endPosition|gml320:timePosition"
+                match="gml:beginPosition|gml:endPosition|
+                       gml320:beginPosition|gml320:endPosition"
                 priority="200">
 
-
     <xsl:variable name="xpath" select="gn-fn-metadata:getXPath(.)"/>
     <xsl:variable name="value" select="normalize-space(text())"/>
     <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
@@ -181,7 +433,6 @@
       </xsl:if>
     </xsl:variable>
 
-
     <xsl:call-template name="render-element">
       <xsl:with-param name="label"
                       select="$labelConfig"/>
@@ -189,6 +440,7 @@
       <xsl:with-param name="value" select="text()"/>
       <xsl:with-param name="cls" select="local-name()"/>
       <xsl:with-param name="xpath" select="$xpath"/>
+
       <!--
           Default field type is Date.
 
diff --git a/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl b/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl
index 82d2dbf11cb7..781437b917c7 100644
--- a/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl
+++ b/schemas/iso19139/src/main/plugin/iso19139/update-fixed-info.xsl
@@ -756,6 +756,9 @@
   <xsl:template match="gmd:dataQualityInfo[count(*) = 0]"/>
   <xsl:template match="gmd:transferOptions[gmd:MD_DigitalTransferOptions/count(*) = 0]"/>
 
+  <!-- Delete empty temporal elements -->
+  <xsl:template match="gmd:temporalElement[count(*) = 0]"/>
+
   <!-- ================================================================= -->
   <!-- copy everything else as is -->
 
diff --git a/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js b/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js
index c9c7e7ac2d37..dba4c400cefb 100644
--- a/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js
+++ b/web-ui/src/main/resources/catalog/components/edit/datepicker/DatePickerDirective.js
@@ -159,6 +159,7 @@
           elementRef: "@",
           id: "@",
           tagName: "@",
+          assumeGmlNs: "@",
           indeterminatePosition: "@",
           required: "@",
           hideTime: "@",
@@ -358,14 +359,26 @@
                 scope.dateTime = "";
               }
 
+              //if we don't know what this namespace is (findNamespaceUri returns undefined),
+              //then we don't add it!
+              var elementNSDef = "";
+              var namespaceURI = gnSchemaManagerService.findNamespaceUri(
+                namespace,
+                gnCurrentEdit.schema
+              );
+              if (namespaceURI !== undefined) {
+                elementNSDef = " xmlns:" + namespace + '="' + namespaceURI + '"';
+              }
+
+              //if data-assume-gml-ns is set, then don't put in the NS declaration
+              if (scope.assumeGmlNs === "true" && namespace === "gml") {
+                elementNSDef = "";
+              }
+
               scope.xmlSnippet =
                 "<" +
                 tag +
-                " xmlns:" +
-                namespace +
-                '="' +
-                gnSchemaManagerService.findNamespaceUri(namespace, gnCurrentEdit.schema) +
-                '"' +
+                elementNSDef +
                 attribute +
                 ">" +
                 scope.dateTime +
diff --git a/web-ui/src/main/resources/catalog/components/edit/datepicker/partials/datepicker.html b/web-ui/src/main/resources/catalog/components/edit/datepicker/partials/datepicker.html
index 40c63dd69112..0108b63dc694 100644
--- a/web-ui/src/main/resources/catalog/components/edit/datepicker/partials/datepicker.html
+++ b/web-ui/src/main/resources/catalog/components/edit/datepicker/partials/datepicker.html
@@ -37,24 +37,30 @@
         class="form-control"
         data-ng-model="year"
         data-ng-show="mode === DATE_MODE.YEAR"
+        data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
       />
       <input
         type="month"
         class="form-control"
         data-ng-model="month"
         data-ng-show="mode === DATE_MODE.MONTH"
+        data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
       />
       <input
         type="date"
         class="form-control"
         data-ng-model="date"
         data-ng-show="mode === DATE_MODE.DATE || mode === DATE_MODE.DATETIME"
+        data-ng-class="hideTime == 'true' ? 'gn-notime' : ''"
+        data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
+        style="width: 100%"
       />
       <!-- Time input -->
       <input
         type="time"
-        class="form-control"
+        class="form-control gn-time"
         data-ng-model="time"
+        data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
         data-ng-show="mode === DATE_MODE.DATETIME && !hideTime"
       />
       <!-- Timezone selector (only if time is to be displayed) -->
@@ -63,6 +69,7 @@
         data-ng-model="timezoneObj"
         data-ng-show="mode === DATE_MODE.DATETIME && !hideTime"
         data-ng-options="t as (t.name + ' ' + t.offset) for t in timezoneNames"
+        data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
       ></select>
 
       <!-- Date mode selector -->
@@ -71,6 +78,7 @@
           type="button"
           class="btn btn-default dropdown-toggle"
           data-toggle="dropdown"
+          data-ng-disabled="withIndeterminatePosition && (indeterminatePosition === 'now' || indeterminatePosition === 'unknown')"
         >
           <i class="fa fa-cog"></i>&nbsp;<span class="caret"></span>
         </button>
diff --git a/web-ui/src/main/resources/catalog/style/gn_editor.less b/web-ui/src/main/resources/catalog/style/gn_editor.less
index 491be62f6e2e..cf1c8ce01d73 100644
--- a/web-ui/src/main/resources/catalog/style/gn_editor.less
+++ b/web-ui/src/main/resources/catalog/style/gn_editor.less
@@ -314,6 +314,7 @@ form.gn-editor {
       }
     }
     &.gn-time-with-ind-position {
+      display: flex;
       > select.gn-indeterminate-position {
         width: 20%;
       }
diff --git a/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less b/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less
index f36b116924f7..c447ff372b2c 100644
--- a/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less
+++ b/web-ui/src/main/resources/catalog/views/default/less/gn_editor_default.less
@@ -2,6 +2,25 @@
 @import "../../../style/gn_editor.less";
 @import "gn_view.less";
 
+//ensure gn-beginPosition has the label displayed
+.gn-beginPosition {
+  label {
+    display: block !important;
+    visibility: visible !important;
+  }
+  .row {
+    display: flex;
+  }
+
+  .gn-control {
+    margin-top: auto;
+  }
+
+  .gn-indeterminate-position {
+    min-width: 90px;
+  }
+}
+
 .gn-results-editor {
   .gn-status {
     font-weight: 500;
diff --git a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
index ddd6ec44d114..bc1bd7870d64 100644
--- a/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
+++ b/web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
@@ -106,6 +106,7 @@
 
     <xsl:param name="isReadOnly" required="no" as="xs:boolean" select="false()"/>
 
+
     <xsl:variable name="isMultilingual" select="count($value/values) > 0"/>
 
     <xsl:variable name="isoType" select="if (../@gco:isoType) then ../@gco:isoType else ''"/>
@@ -370,6 +371,7 @@
         <xsl:with-param name="name" select="name()"/>
       </xsl:call-template>
     </xsl:if>
+
   </xsl:template>
 
 
@@ -505,14 +507,6 @@
 
     <xsl:variable name="tagId" select="generate-id()"/>
 
-    <!-- <xsl:message>!render-element-template-field <xsl:copy-of select="$keyValues"/>
-        <xsl:value-of select="$name"/>/tpl:
-        <xsl:copy-of select="$template"/>/
-        <xsl:value-of select="$id"/>/
-        <xsl:value-of select="$isExisting"/>/
-        <xsl:value-of select="$id"/>
-      </xsl:message>-->
-
     <xsl:variable name="firstFieldKey"
                   select="$template/values/key[position() = 1]/@label"/>
 
@@ -866,6 +860,7 @@
         </div>
       </xsl:if>
     </div>
+
   </xsl:template>
 
   <xsl:template name="build-snippet" as="xs:string?">