diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4e3df33f5089456fc4d64b9dcd03d40ab38864c..123aa439d130c609788b4bf7cb1bac087abecb2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,47 @@
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
 stages:
   - check
+  - build
 
 process_asn:
-  image: "mcanterb/asn1test:latest"
+  image: "forge.etsi.org:5050/li/schemas-definitions/asn1test:latest"
   stage: check
   interruptible: true
   script:
     - python3 testing/asn_process.py
 
 process_xsd:
-  image: "mcanterb/xsdtest:latest"
+  image: "forge.etsi.org:5050/li/schemas-definitions/xsdtest:latest"
   stage: check
   interruptible: true
   script:
     - python3 testing/xsd_process.py
 
+generate_artefacts:
+  image: "forge.etsi.org:5050/li/trial/changemarks"
+  stage: build
+  interruptible: true
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  script:
+    - echo $CI_PROJECT_ID
+    - echo $CI_PROJECT_NAME
+    - echo $CI_PROJECT_PATH
+    - echo $CI_PIPELINE_SOURCE
+    - echo $CI_OPEN_MERGE_REQUESTS
+    - echo $CI_MERGE_REQUEST_IID
+    - echo $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+    - echo $ARTEFACT_NAME
+    - forgelib-changedocs -v https://$CI_SERVER_HOST $CI_PROJECT_ID $CI_PROJECT_PATH $CI_MERGE_REQUEST_IID
+  artifacts:
+    untracked: true
+    paths:
+      - "*.docx"
+    name: $CI_MERGE_REQUEST_TITLE
+    expire_in: 30 days
diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
index d5711021a34fd13dc744ab71d790c72a08c58c59..317069050aa632135c556cb1b111c6eb1cf78099 100644
--- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
+++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml
@@ -377,6 +377,10 @@
 				<Value>IsLocal</Value>
 				<Meaning>Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed.</Meaning>
 			</DictionaryEntry>
+			<DictionaryEntry>
+				<Value>IsLocationOnly</Value>
+				<Meaning>Indicates that the current Task shall intercept and report location only and not service-specific events.</Meaning>
+			</DictionaryEntry>
 		</DictionaryEntries>
 	</Dictionary>
     <Dictionary>   											<!--LDTaskStatus: see Clause 8.3.3 Table 8.16 -->
diff --git a/103120/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd
index 4459cf959f5840a0db2c206b1f5543975458bdee..c1479b75f5092cdd7f8fdba17b24d530941cbbcd 100644
--- a/103120/schema/ts_103120_Task.xsd
+++ b/103120/schema/ts_103120_Task.xsd
@@ -78,6 +78,7 @@
 			<xs:element name="HandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>
 			<xs:element name="DeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>
 			<xs:element name="NationalDeliveryParameters" type="NationalDeliveryParameters" minOccurs="0"/>
+			<xs:element name="LocationOnly" type="xs:boolean" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="DeliveryAddress">