From 037acde1bf3276b435529d0dbd8c360f564e00c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Thu, 30 May 2024 18:37:31 +0200
Subject: [PATCH 01/20] Added manipulation
 CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentification.

---
 src/t2iapi/context/context_requests.proto | 12 ++++++++++++
 src/t2iapi/context/service.proto          | 13 +++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index b03e3fa..40510ee 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -64,6 +64,18 @@ message CreateContextStateWithAssocAndSpecificValidatorRequest {
     ValidatorType validator_type = 3;  // type of pm:Validator
 }
 
+/*
+Request to create or adapt a context state with a given association, a list of specific validators
+  and a specific Identification.
+ */
+message CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentificationRequest {
+    string descriptor_handle = 1;
+    ContextAssociation context_association = 2;  // the initial association of the context state
+    repeated ValidatorType validator_type = 3;  // type of pm:Validator
+    string identification_root = 4; // pm:Identification/@Root
+    string identification_extension = 5; // pm:Identification/@Extension
+}
+
 /*
 Request to associate a specific patient type.
  */
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 48e9a2c..858cc6b 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -105,6 +105,19 @@ service ContextService {
   t2iapi.context.CreateContextStateWithAssocAndSpecificValidatorRequest)
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
+  /*
+  Create a ContextState instance for the given descriptor handle, that
+  - has the given @contextAssociation value,
+  - has exactly the pm:Validators listed in the request, (in particular: no pm:Validators when
+    the list is empty), and
+  - has exactly one pm:Identification with the given @Root and @Extension and no other children.
+  The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
+  the static state, it shall return RESULT_NOT_SUPPORTED.
+   */
+  rpc CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentification(
+  t2iapi.context.CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentificationRequest)
+      returns (t2iapi.context.CreateContextStateWithAssociationResponse);
+
   /*
   Create or adapt neonatal patient with a given type of association and
   including the mothers identification.

From e99bc576fdf4194652cb13cac8c9e97853ce2cc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Thu, 30 May 2024 18:43:37 +0200
Subject: [PATCH 02/20] updated Changelog.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 282eebb..1c6d688 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- manipulation CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentification for contexts
 - manipulation SetComponentActivationAndSetOperatingMode for components and operations
 - manipulation SetAlertActivationAndSetOperatingMode for alerts and operations
 - manipulation TransitionFromCreateStateWithIdentificationToRemoveIdentification for contexts

From 8fddb9d3d7c6cce5243511edb048c85480d407ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Fri, 7 Jun 2024 12:55:57 +0200
Subject: [PATCH 03/20] Updated manipulation.

---
 src/t2iapi/context/context_requests.proto |  2 +-
 src/t2iapi/context/service.proto          | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index 40510ee..84e74d4 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -71,7 +71,7 @@ Request to create or adapt a context state with a given association, a list of s
 message CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentificationRequest {
     string descriptor_handle = 1;
     ContextAssociation context_association = 2;  // the initial association of the context state
-    repeated ValidatorType validator_type = 3;  // type of pm:Validator
+    string num_validators = 3;  // number of pm:Validator elements
     string identification_root = 4; // pm:Identification/@Root
     string identification_extension = 5; // pm:Identification/@Extension
 }
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 858cc6b..9738fc0 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -106,11 +106,17 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-  Create a ContextState instance for the given descriptor handle, that
-  - has the given @contextAssociation value,
-  - has exactly the pm:Validators listed in the request, (in particular: no pm:Validators when
-    the list is empty), and
-  - has exactly one pm:Identification with the given @Root and @Extension and no other children.
+  Create or adapt a ContextState instance for the given descriptor handle, that
+  - is related to the given descriptor_handle and of appropriate class for a state of this descriptor,
+  - has the given context_association value,
+  - has the given number of pm:Validators (num_validators)
+  - has exactly one pm:Identification with the given identification_root
+    and identification_extension and no other children.
+  Shall return the handle of the context state. This context state shall either be
+  newly created or it shall be adapted from a previously existing context state of the same descriptor, by
+  - disassociating it (in case it was associated)
+  - changing its Validators and Identifications
+  - setting its @contextAssociation to the given value.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */

From 87c763b54653a2bf4d65e80cd856fb76eb21d6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Mon, 10 Jun 2024 18:09:30 +0200
Subject: [PATCH 04/20] Updated manipulation.

---
 src/t2iapi/context/context_requests.proto | 10 +++++-----
 src/t2iapi/context/service.proto          |  8 ++++----
 src/t2iapi/context/types.proto            |  5 +++++
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index 84e74d4..d9dafe8 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -68,12 +68,12 @@ message CreateContextStateWithAssocAndSpecificValidatorRequest {
 Request to create or adapt a context state with a given association, a list of specific validators
   and a specific Identification.
  */
-message CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentificationRequest {
+message CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentificationRequest {
     string descriptor_handle = 1;
-    ContextAssociation context_association = 2;  // the initial association of the context state
-    string num_validators = 3;  // number of pm:Validator elements
-    string identification_root = 4; // pm:Identification/@Root
-    string identification_extension = 5; // pm:Identification/@Extension
+    ContextAssociation context_association = 2;            // the initial association of the context state
+    string num_validators = 3;                             // number of pm:Validator elements
+    repeated Identification identification_exclusions = 4; // list of pm:Identifications that the context state
+                                                           //   should NOT have
 }
 
 /*
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 9738fc0..13bff6e 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -110,8 +110,8 @@ service ContextService {
   - is related to the given descriptor_handle and of appropriate class for a state of this descriptor,
   - has the given context_association value,
   - has the given number of pm:Validators (num_validators)
-  - has exactly one pm:Identification with the given identification_root
-    and identification_extension and no other children.
+  - has exactly one pm:Identification, that does not match any of the pm:Identification elements given
+    in identification_exclusions.
   Shall return the handle of the context state. This context state shall either be
   newly created or it shall be adapted from a previously existing context state of the same descriptor, by
   - disassociating it (in case it was associated)
@@ -120,8 +120,8 @@ service ContextService {
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */
-  rpc CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentification(
-  t2iapi.context.CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentificationRequest)
+  rpc CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentification(
+  t2iapi.context.CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentificationRequest)
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
diff --git a/src/t2iapi/context/types.proto b/src/t2iapi/context/types.proto
index 638dcff..8183a9e 100644
--- a/src/t2iapi/context/types.proto
+++ b/src/t2iapi/context/types.proto
@@ -78,4 +78,9 @@ enum ContextType {
     CONTEXT_TYPE_OPERATOR = 3;
     CONTEXT_TYPE_MEANS = 4;
     CONTEXT_TYPE_ENSEMBLE = 5;
+}
+
+message Identification {
+    google.protobuf.StringValue root = 1;       // @Root of pm:Identification
+    google.protobuf.StringValue extension = 2;  // @Extension of pm:Identification
 }
\ No newline at end of file

From 2458ad6ff55b49ee9459954691f75c63a8bbab5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Mon, 10 Jun 2024 18:16:50 +0200
Subject: [PATCH 05/20] Updated CHANGELOG.md and fixed linter issues.

---
 CHANGELOG.md                   | 2 +-
 src/t2iapi/context/types.proto | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 961f50b..a20eef2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
-- manipulation CreateContextStateWithAssocAndSpecificValidatorAndSpecificIdentification for contexts
+- manipulation CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentification for contexts
 
 ## [4.1.0] - 2024-02-22
 
diff --git a/src/t2iapi/context/types.proto b/src/t2iapi/context/types.proto
index 8183a9e..9c0ed49 100644
--- a/src/t2iapi/context/types.proto
+++ b/src/t2iapi/context/types.proto
@@ -80,6 +80,9 @@ enum ContextType {
     CONTEXT_TYPE_ENSEMBLE = 5;
 }
 
+/*
+Represents elements of type pm:Identification from IEEE Std 11073-10207-2017.
+*/
 message Identification {
     google.protobuf.StringValue root = 1;       // @Root of pm:Identification
     google.protobuf.StringValue extension = 2;  // @Extension of pm:Identification

From 179319bb25bb2e9aec23ee6cb003b9b1d6ddced4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Tue, 11 Jun 2024 17:36:38 +0200
Subject: [PATCH 06/20] Updated manipulation.

---
 src/t2iapi/context/context_requests.proto | 13 +++++++------
 src/t2iapi/context/types.proto            | 19 +++++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index d9dafe8..58d8bce 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -65,17 +65,18 @@ message CreateContextStateWithAssocAndSpecificValidatorRequest {
 }
 
 /*
-Request to create or adapt a context state with a given association, a list of specific validators
-  and a specific Identification.
+Request to create or adapt a context state with a given association, a number of validators
+  and a list of excluded Identifications.
  */
 message CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentificationRequest {
     string descriptor_handle = 1;
-    ContextAssociation context_association = 2;            // the initial association of the context state
-    string num_validators = 3;                             // number of pm:Validator elements
-    repeated Identification identification_exclusions = 4; // list of pm:Identifications that the context state
-                                                           //   should NOT have
+    ContextAssociation context_association = 2;                  // the initial association of the context state
+    string num_validators = 3;                                   // number of pm:Validator elements
+    repeated SimpleIdentification identification_exclusions = 4; // list of pm:Identifications
+                                                                    // that the context state should NOT have
 }
 
+
 /*
 Request to associate a specific patient type.
  */
diff --git a/src/t2iapi/context/types.proto b/src/t2iapi/context/types.proto
index 9c0ed49..e974956 100644
--- a/src/t2iapi/context/types.proto
+++ b/src/t2iapi/context/types.proto
@@ -69,7 +69,7 @@ enum ValidatorType {
 }
 
 /*
-Represents types of contexts available in IEEE Std 11073-10207-2017.
+ Represents types of contexts available in IEEE Std 11073-10207-2017.
  */
 enum ContextType {
     CONTEXT_TYPE_PATIENT = 0;
@@ -81,9 +81,16 @@ enum ContextType {
 }
 
 /*
-Represents elements of type pm:Identification from IEEE Std 11073-10207-2017.
+Simplified Representation of pm:Identification from IEEE Std 11073-10207-2017.
 */
-message Identification {
-    google.protobuf.StringValue root = 1;       // @Root of pm:Identification
-    google.protobuf.StringValue extension = 2;  // @Extension of pm:Identification
-}
\ No newline at end of file
+message SimpleIdentification {
+    repeated SimpleInstanceIdentifier identifications = 1;
+}
+
+/*
+ Simplified representation of pm:InstanceIdentifier from IEEE Std 11073-10207-2017.
+ */
+message SimpleInstanceIdentifier {
+    google.protobuf.StringValue root = 1;
+    google.protobuf.StringValue extension = 2;
+}

From f3c1d551229c30e72dc7632affa2a73ce44f9046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Wed, 12 Jun 2024 15:02:19 +0200
Subject: [PATCH 07/20] simplified manipulation.

---
 src/t2iapi/context/context_requests.proto | 17 +++++++++--------
 src/t2iapi/context/service.proto          | 15 ++++++++-------
 src/t2iapi/context/types.proto            | 15 ---------------
 3 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index 58d8bce..ca01d36 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -65,15 +65,16 @@ message CreateContextStateWithAssocAndSpecificValidatorRequest {
 }
 
 /*
-Request to create or adapt a context state with a given association, a number of validators
-  and a list of excluded Identifications.
+ Request to manipulate the context state with @handle = #state_handle# so that
+ - it has @contextAssociation = #context_association#
+ - it has #num_validators# pm:Validator elements
+ - its pm:Identification changes (after the manipulation it should at least
+   differ from the last 2 pm:Identifications of the manipulated context state)
  */
-message CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentificationRequest {
-    string descriptor_handle = 1;
-    ContextAssociation context_association = 2;                  // the initial association of the context state
-    string num_validators = 3;                                   // number of pm:Validator elements
-    repeated SimpleIdentification identification_exclusions = 4; // list of pm:Identifications
-                                                                    // that the context state should NOT have
+message AssociateValidateAndChangeIdentificationOfContextStateRequest {
+    string state_handle = 1;
+    ContextAssociation context_association = 2;
+    string num_validators = 3;
 }
 
 
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 13bff6e..ef4a0d7 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -106,23 +106,24 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-  Create or adapt a ContextState instance for the given descriptor handle, that
-  - is related to the given descriptor_handle and of appropriate class for a state of this descriptor,
+  Manipulate a given context state (specified by state_handle), such that
   - has the given context_association value,
   - has the given number of pm:Validators (num_validators)
-  - has exactly one pm:Identification, that does not match any of the pm:Identification elements given
-    in identification_exclusions.
+  - its pm:Identification changes so that it differs from the last 2 pm:Identifications
+    of this particular context state.
   Shall return the handle of the context state. This context state shall either be
   newly created or it shall be adapted from a previously existing context state of the same descriptor, by
   - disassociating it (in case it was associated)
   - changing its Validators and Identifications
   - setting its @contextAssociation to the given value.
+  Note that changing the pm:Validator or pm:Identification elements of a context state might
+  require disassociating it, changing them and re-associating it again.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */
-  rpc CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentification(
-  t2iapi.context.CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentificationRequest)
-      returns (t2iapi.context.CreateContextStateWithAssociationResponse);
+  rpc AssociateValidateAndChangeIdentificationOfContextState(
+  t2iapi.context.AssociateValidateAndChangeIdentificationOfContextStateRequest)
+      returns (t2iapi.context.BasicResponse);
 
   /*
   Create or adapt neonatal patient with a given type of association and
diff --git a/src/t2iapi/context/types.proto b/src/t2iapi/context/types.proto
index e974956..3cf86da 100644
--- a/src/t2iapi/context/types.proto
+++ b/src/t2iapi/context/types.proto
@@ -79,18 +79,3 @@ enum ContextType {
     CONTEXT_TYPE_MEANS = 4;
     CONTEXT_TYPE_ENSEMBLE = 5;
 }
-
-/*
-Simplified Representation of pm:Identification from IEEE Std 11073-10207-2017.
-*/
-message SimpleIdentification {
-    repeated SimpleInstanceIdentifier identifications = 1;
-}
-
-/*
- Simplified representation of pm:InstanceIdentifier from IEEE Std 11073-10207-2017.
- */
-message SimpleInstanceIdentifier {
-    google.protobuf.StringValue root = 1;
-    google.protobuf.StringValue extension = 2;
-}

From aa3c04c45b53d83ffca9a7f9557f5410c0828ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Wed, 12 Jun 2024 15:14:15 +0200
Subject: [PATCH 08/20] Fixed linter warning.

---
 src/t2iapi/context/service.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index ef4a0d7..27cc6a1 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -123,7 +123,7 @@ service ContextService {
    */
   rpc AssociateValidateAndChangeIdentificationOfContextState(
   t2iapi.context.AssociateValidateAndChangeIdentificationOfContextStateRequest)
-      returns (t2iapi.context.BasicResponse);
+      returns (BasicResponse);
 
   /*
   Create or adapt neonatal patient with a given type of association and

From 2239065c9d6c5b91d05aac8cf1c4f1409b404de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Thu, 13 Jun 2024 11:02:47 +0200
Subject: [PATCH 09/20] WIP.

---
 CHANGELOG.md                              |  2 +-
 src/t2iapi/context/context_requests.proto | 14 --------------
 src/t2iapi/context/service.proto          | 22 ++++++++++------------
 src/t2iapi/context/types.proto            |  4 ++--
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a20eef2..df1f8eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
-- manipulation CreateContextStateWithAssocAndSpecificValidatorAndExcludedIdentification for contexts
+- manipulation AssociateValidateAndChangeIdentificationOfContextState for contexts
 
 ## [4.1.0] - 2024-02-22
 
diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index ca01d36..b03e3fa 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -64,20 +64,6 @@ message CreateContextStateWithAssocAndSpecificValidatorRequest {
     ValidatorType validator_type = 3;  // type of pm:Validator
 }
 
-/*
- Request to manipulate the context state with @handle = #state_handle# so that
- - it has @contextAssociation = #context_association#
- - it has #num_validators# pm:Validator elements
- - its pm:Identification changes (after the manipulation it should at least
-   differ from the last 2 pm:Identifications of the manipulated context state)
- */
-message AssociateValidateAndChangeIdentificationOfContextStateRequest {
-    string state_handle = 1;
-    ContextAssociation context_association = 2;
-    string num_validators = 3;
-}
-
-
 /*
 Request to associate a specific patient type.
  */
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 27cc6a1..ec3a7db 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -106,23 +106,21 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-  Manipulate a given context state (specified by state_handle), such that
-  - has the given context_association value,
-  - has the given number of pm:Validators (num_validators)
-  - its pm:Identification changes so that it differs from the last 2 pm:Identifications
-    of this particular context state.
-  Shall return the handle of the context state. This context state shall either be
-  newly created or it shall be adapted from a previously existing context state of the same descriptor, by
-  - disassociating it (in case it was associated)
-  - changing its Validators and Identifications
-  - setting its @contextAssociation to the given value.
+  Create or adapt a context state, such that
+  - it belongs to the given descriptor_handle,
+  - it has the given context_association value,
+  - it has the given number of pm:Validators (num_validators)
+  - its pm:Identification changes (in case the context state is newly created, it
+    must differ from the pm:Identification of the previously associated context state
+    of the same descriptor_handle and in case it is adapted, it must differs from the
+    previous pm:Identification of this particular context state)
   Note that changing the pm:Validator or pm:Identification elements of a context state might
-  require disassociating it, changing them and re-associating it again.
+  require disassociating it, changing them and then re-associating it again.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */
   rpc AssociateValidateAndChangeIdentificationOfContextState(
-  t2iapi.context.AssociateValidateAndChangeIdentificationOfContextStateRequest)
+  t2iapi.context.CreateContextStateWithAssociationAndValidatorsRequest)
       returns (BasicResponse);
 
   /*
diff --git a/src/t2iapi/context/types.proto b/src/t2iapi/context/types.proto
index 3cf86da..638dcff 100644
--- a/src/t2iapi/context/types.proto
+++ b/src/t2iapi/context/types.proto
@@ -69,7 +69,7 @@ enum ValidatorType {
 }
 
 /*
- Represents types of contexts available in IEEE Std 11073-10207-2017.
+Represents types of contexts available in IEEE Std 11073-10207-2017.
  */
 enum ContextType {
     CONTEXT_TYPE_PATIENT = 0;
@@ -78,4 +78,4 @@ enum ContextType {
     CONTEXT_TYPE_OPERATOR = 3;
     CONTEXT_TYPE_MEANS = 4;
     CONTEXT_TYPE_ENSEMBLE = 5;
-}
+}
\ No newline at end of file

From b5a241233603d08f6bf1710585d4152be065289f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Thu, 13 Jun 2024 16:45:58 +0200
Subject: [PATCH 10/20] updated return value of manipulation.

---
 src/t2iapi/context/service.proto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index ec3a7db..a0d1133 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -116,12 +116,13 @@ service ContextService {
     previous pm:Identification of this particular context state)
   Note that changing the pm:Validator or pm:Identification elements of a context state might
   require disassociating it, changing them and then re-associating it again.
+  Returns the handle of the created or adapted context state.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */
   rpc AssociateValidateAndChangeIdentificationOfContextState(
   t2iapi.context.CreateContextStateWithAssociationAndValidatorsRequest)
-      returns (BasicResponse);
+      returns (CreateContextStateWithAssociationResponse);
 
   /*
   Create or adapt neonatal patient with a given type of association and

From bdad961c5bf8d4586452e36e21cdb2143cb9fc8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Thu, 20 Jun 2024 11:09:40 +0200
Subject: [PATCH 11/20] changes proposed by reviewers.

---
 src/t2iapi/context/service.proto | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index a0d1133..d8e0e8c 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -108,14 +108,12 @@ service ContextService {
   /*
   Create or adapt a context state, such that
   - it belongs to the given descriptor_handle,
-  - it has the given context_association value,
-  - it has the given number of pm:Validators (num_validators)
-  - its pm:Identification changes (in case the context state is newly created, it
-    must differ from the pm:Identification of the previously associated context state
-    of the same descriptor_handle and in case it is adapted, it must differs from the
-    previous pm:Identification of this particular context state)
-  Note that changing the pm:Validator or pm:Identification elements of a context state might
-  require disassociating it, changing them and then re-associating it again.
+  - it has the given @ContextAssociation value,
+  - it has the given number of pm:Validators
+  - its pm:Identification changes. In case the context state is newly created, it
+    must differ from the pm:Identifications of all previously associated context states
+    of the same @DescriptorHandle and in case it is adapted, it must differ from the
+    previous pm:Identification of this particular context state.
   Returns the handle of the created or adapted context state.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.

From 065fd9f2c0ec2684719b5cccac8db26c7b704913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Fri, 21 Jun 2024 08:56:23 +0200
Subject: [PATCH 12/20] Reordered entries in changelog.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54b7643..de6d398 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,9 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- manipulation AssociateValidateAndChangeIdentificationOfContextState for contexts
 - manipulation ProvideInformationAboutNextCalibration for devices
 - manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
-- manipulation AssociateValidateAndChangeIdentificationOfContextState for contexts
 
 ## [4.1.0] - 2024-02-22
 

From 247b83763e2b0cc56b320364cda454d7e7a535b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Fri, 21 Jun 2024 12:21:36 +0200
Subject: [PATCH 13/20] improved documentation of manipulation.

---
 src/t2iapi/context/service.proto | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index d8e0e8c..1578d66 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -110,10 +110,12 @@ service ContextService {
   - it belongs to the given descriptor_handle,
   - it has the given @ContextAssociation value,
   - it has the given number of pm:Validators
-  - its pm:Identification changes. In case the context state is newly created, it
-    must differ from the pm:Identifications of all previously associated context states
-    of the same @DescriptorHandle and in case it is adapted, it must differ from the
-    previous pm:Identification of this particular context state.
+  - its pm:Identification changes. In case the context state is newly created,
+    its pm:Identification must differ from the pm:Identifications of all
+    context states of the same @DescriptorHandle that were associated
+    previously and in case it is adapted, its pm:Identification must differ
+    from its previous pm:Identification. In this context previous
+    means directly prior to the manipulation call.
   Returns the handle of the created or adapted context state.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.

From 46e0ef7b4c6123c76b130a3bf2ae659a01a8d63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Fri, 21 Jun 2024 15:17:34 +0200
Subject: [PATCH 14/20] the manipulation - is now restricted to Patient- or
 LocationContextStates - is now restricted to @ContextAssociation=Assoc -
 returns the mdibVersion directly prior to the changes.

---
 src/t2iapi/context/context_requests.proto  | 10 ++++++++++
 src/t2iapi/context/context_responses.proto | 10 ++++++++++
 src/t2iapi/context/service.proto           | 20 +++++++++++---------
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index b03e3fa..8adff47 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -55,6 +55,16 @@ message CreateContextStateWithAssociationAndValidatorsRequest {
     string num_validators = 3;  // number of pm:Validator elements
 }
 
+/*
+Request to create or adapt a pm:PatientContextState or pm:LocationContextState instance for the given
+  @DescriptorHandle and with a given number
+  of pm:Validator elements.
+ */
+message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateRequest {
+    string descriptor_handle = 1;
+    string num_validators = 2;  // number of pm:Validator elements
+}
+
 /*
 Request to create or adapt a context state with a given association and specific validator.
  */
diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto
index a394b58..7b68691 100644
--- a/src/t2iapi/context/context_responses.proto
+++ b/src/t2iapi/context/context_responses.proto
@@ -24,6 +24,16 @@ message CreateContextStateWithAssociationResponse {
     string context_state_handle = 2;  // handle of the context state, that was created or adapted
 }
 
+/*
+Response containing the handle of the newly created or adapted context state as well as the mdibVersion
+directly prior to the change.
+ */
+message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateResponse {
+    BasicResponse status = 1;
+    string context_state_handle = 2;  // handle of the context state, that was created or adapted
+    string prior_mdib_version = 3;
+}
+
 /*
 Response which contains all context types supported by the DUT.
  */
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 1578d66..9f761cb 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -106,23 +106,25 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-  Create or adapt a context state, such that
-  - it belongs to the given descriptor_handle,
-  - it has the given @ContextAssociation value,
+  Create or adapt a patient- or location context state, such that
+  - it belongs to the given @DescriptorHandle,
+  - it has @ContextAssociation = Assoc,
   - it has the given number of pm:Validators
   - its pm:Identification changes. In case the context state is newly created,
-    its pm:Identification must differ from the pm:Identifications of all
+    its pm:Identification must differ structurally from the pm:Identifications of all
     context states of the same @DescriptorHandle that were associated
     previously and in case it is adapted, its pm:Identification must differ
-    from its previous pm:Identification. In this context previous
+    structurally from its previous pm:Identification. In this context previous
     means directly prior to the manipulation call.
-  Returns the handle of the created or adapted context state.
+  Returns the handle of the created or adapted context state and the mdib version
+  directly prior to the changes (the one that the changed pm:Identification must
+  structurally differ from).
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */
-  rpc AssociateValidateAndChangeIdentificationOfContextState(
-  t2iapi.context.CreateContextStateWithAssociationAndValidatorsRequest)
-      returns (CreateContextStateWithAssociationResponse);
+  rpc AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState(
+  t2iapi.context.AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateRequest)
+      returns (AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateResponse);
 
   /*
   Create or adapt neonatal patient with a given type of association and

From 0e00dd46c55e4ffc84e39125735f326af360c93f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Fri, 21 Jun 2024 17:59:22 +0200
Subject: [PATCH 15/20] changes requested by reviewers. Also: changed the
 response type of CreateContextStateWithAssocIdentificationAndValidator
 manipulation so it can return the context state handle.

---
 src/t2iapi/context/context_requests.proto  |  6 ++--
 src/t2iapi/context/context_responses.proto | 10 +++---
 src/t2iapi/context/service.proto           | 38 ++++++++++------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index 8adff47..388f2df 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -56,9 +56,9 @@ message CreateContextStateWithAssociationAndValidatorsRequest {
 }
 
 /*
-Request to create or adapt a pm:PatientContextState or pm:LocationContextState instance for the given
-  @DescriptorHandle and with a given number
-  of pm:Validator elements.
+ * Request to create or adapt a pm:PatientContextState or pm:LocationContextState instance with
+ * @ContextAssociation = Assoc for the given @DescriptorHandle, with a given number
+ * of pm:Validator elements and a changed pm:Identification.
  */
 message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateRequest {
     string descriptor_handle = 1;
diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto
index 7b68691..6e3fb0c 100644
--- a/src/t2iapi/context/context_responses.proto
+++ b/src/t2iapi/context/context_responses.proto
@@ -17,7 +17,7 @@ option java_package = "com.draeger.medical.t2iapi.context";
 option java_outer_classname = "ContextResponses";
 
 /*
-Response containing the handle of the newly created or adapted context state.
+ * Response containing the handle of the newly created or adapted context state.
  */
 message CreateContextStateWithAssociationResponse {
     BasicResponse status = 1;
@@ -25,13 +25,15 @@ message CreateContextStateWithAssociationResponse {
 }
 
 /*
-Response containing the handle of the newly created or adapted context state as well as the mdibVersion
-directly prior to the change.
+ * Response containing the context state handle and the prior mdib version.
+ * @see: AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState()
  */
 message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateResponse {
     BasicResponse status = 1;
     string context_state_handle = 2;  // handle of the context state, that was created or adapted
-    string prior_mdib_version = 3;
+    string prior_mdib_version = 3;    // mdib version before the change - contains the previously associated
+                                      //   context state whose pm:Identification the changed
+                                      //   pm:Identification must structurally differ from.
 }
 
 /*
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 9f761cb..a8c974e 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -68,14 +68,15 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-  Create or adapt a ContextState instance with the given ContextAssociation value for the given descriptor handle
-  and provide at least one Identification and Validator for this ContextState.
-  The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
-  the static state, it shall return RESULT_NOT_SUPPORTED.
+   * Create or adapt a ContextState instance with the given ContextAssociation value for the given descriptor handle
+   * and provide at least one Identification and Validator for this ContextState.
+   * The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
+   * the static state, it shall return RESULT_NOT_SUPPORTED.
+   * Returns the handle of the created or adapted context state.
    */
   rpc CreateContextStateWithAssocIdentificationAndValidator(
   t2iapi.context.CreateContextStateWithAssociationRequest)
-      returns (BasicResponse);
+      returns (CreateContextStateWithAssociationResponse);
 
   /*
   For the Context with the provided descriptor handle perform the following transition:
@@ -106,21 +107,18 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-  Create or adapt a patient- or location context state, such that
-  - it belongs to the given @DescriptorHandle,
-  - it has @ContextAssociation = Assoc,
-  - it has the given number of pm:Validators
-  - its pm:Identification changes. In case the context state is newly created,
-    its pm:Identification must differ structurally from the pm:Identifications of all
-    context states of the same @DescriptorHandle that were associated
-    previously and in case it is adapted, its pm:Identification must differ
-    structurally from its previous pm:Identification. In this context previous
-    means directly prior to the manipulation call.
-  Returns the handle of the created or adapted context state and the mdib version
-  directly prior to the changes (the one that the changed pm:Identification must
-  structurally differ from).
-  The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
-  the static state, it shall return RESULT_NOT_SUPPORTED.
+   * Create or adapt a patient- or location context state, such that
+   * - it belongs to the given @DescriptorHandle,
+   * - it has @ContextAssociation = Assoc,
+   * - it has the given number of pm:Validators, and
+   * - the pm:Identification of the created resp. adapted context state differs structurally from
+   *   the pm:Identification of the previously associated context state of the same @DescriptorHandle.
+   *   In this context previous means directly prior to the manipulation call.
+   * Returns the handle of the created or adapted context state and the mdib version
+   * that contains the previously associated context state whose pm:Identification
+   * the changed pm:Identification must structurally differ from.
+   * The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
+   * the static state, it shall return RESULT_NOT_SUPPORTED.
    */
   rpc AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState(
   t2iapi.context.AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateRequest)

From 45a54662c823e785d1b7b9cd56be2636a6065e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Mon, 24 Jun 2024 14:17:51 +0200
Subject: [PATCH 16/20] changes proposed by Reviewers.

---
 src/t2iapi/context/service.proto | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index a8c974e..ef9d376 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -68,15 +68,14 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-   * Create or adapt a ContextState instance with the given ContextAssociation value for the given descriptor handle
-   * and provide at least one Identification and Validator for this ContextState.
-   * The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
-   * the static state, it shall return RESULT_NOT_SUPPORTED.
-   * Returns the handle of the created or adapted context state.
+  Create or adapt a ContextState instance with the given ContextAssociation value for the given descriptor handle
+  and provide at least one Identification and Validator for this ContextState.
+  The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
+  the static state, it shall return RESULT_NOT_SUPPORTED.
    */
   rpc CreateContextStateWithAssocIdentificationAndValidator(
   t2iapi.context.CreateContextStateWithAssociationRequest)
-      returns (CreateContextStateWithAssociationResponse);
+      returns (BasicResponse);
 
   /*
   For the Context with the provided descriptor handle perform the following transition:
@@ -107,18 +106,19 @@ service ContextService {
       returns (t2iapi.context.CreateContextStateWithAssociationResponse);
 
   /*
-   * Create or adapt a patient- or location context state, such that
-   * - it belongs to the given @DescriptorHandle,
-   * - it has @ContextAssociation = Assoc,
-   * - it has the given number of pm:Validators, and
-   * - the pm:Identification of the created resp. adapted context state differs structurally from
-   *   the pm:Identification of the previously associated context state of the same @DescriptorHandle.
-   *   In this context previous means directly prior to the manipulation call.
-   * Returns the handle of the created or adapted context state and the mdib version
-   * that contains the previously associated context state whose pm:Identification
-   * the changed pm:Identification must structurally differ from.
-   * The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
-   * the static state, it shall return RESULT_NOT_SUPPORTED.
+  Create or adapt a patient- or location context state, such that
+  - it belongs to the given @DescriptorHandle,
+  - it has @ContextAssociation = Assoc,
+  - it has the given number of pm:Validators, and
+  - its pm:Identification changes.
+  The pm:Identification of the created resp. adapted context state must differ structurally from
+  the pm:Identification of the previously associated context state of the same @DescriptorHandle.
+  In this context previous means directly prior to the manipulation call.
+  Returns the handle of the created or adapted context state and the mdib version
+  that contains the previously associated context state whose pm:Identification
+  the changed pm:Identification must structurally differ from.
+  The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
+  the static state, it shall return RESULT_NOT_SUPPORTED.
    */
   rpc AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState(
   t2iapi.context.AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateRequest)

From a51f8414d21ffa40f624d9d537b7b4305793fd68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Mon, 24 Jun 2024 14:21:36 +0200
Subject: [PATCH 17/20] changes proposed by Reviewers.

---
 src/t2iapi/context/context_responses.proto | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto
index 6e3fb0c..6aba73a 100644
--- a/src/t2iapi/context/context_responses.proto
+++ b/src/t2iapi/context/context_responses.proto
@@ -17,7 +17,7 @@ option java_package = "com.draeger.medical.t2iapi.context";
 option java_outer_classname = "ContextResponses";
 
 /*
- * Response containing the handle of the newly created or adapted context state.
+Response containing the handle of the newly created or adapted context state.
  */
 message CreateContextStateWithAssociationResponse {
     BasicResponse status = 1;
@@ -25,8 +25,8 @@ message CreateContextStateWithAssociationResponse {
 }
 
 /*
- * Response containing the context state handle and the prior mdib version.
- * @see: AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState()
+Response containing the context state handle and the prior mdib version.
+@see: AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState()
  */
 message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateResponse {
     BasicResponse status = 1;

From 55c4777ef507724d3b519a27946d47ca4fd24d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Mon, 24 Jun 2024 16:19:33 +0200
Subject: [PATCH 18/20] changes proposed by Reviewers.

---
 src/t2iapi/context/context_requests.proto  | 6 +++---
 src/t2iapi/context/context_responses.proto | 3 +--
 src/t2iapi/context/service.proto           | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/t2iapi/context/context_requests.proto b/src/t2iapi/context/context_requests.proto
index 388f2df..e5f1ced 100644
--- a/src/t2iapi/context/context_requests.proto
+++ b/src/t2iapi/context/context_requests.proto
@@ -56,9 +56,9 @@ message CreateContextStateWithAssociationAndValidatorsRequest {
 }
 
 /*
- * Request to create or adapt a pm:PatientContextState or pm:LocationContextState instance with
- * @ContextAssociation = Assoc for the given @DescriptorHandle, with a given number
- * of pm:Validator elements and a changed pm:Identification.
+Request to create or adapt a pm:PatientContextState or pm:LocationContextState instance with
+@ContextAssociation = Assoc for the given @DescriptorHandle, with a given number
+of pm:Validator elements and a changed pm:Identification.
  */
 message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateRequest {
     string descriptor_handle = 1;
diff --git a/src/t2iapi/context/context_responses.proto b/src/t2iapi/context/context_responses.proto
index 6aba73a..4f7c649 100644
--- a/src/t2iapi/context/context_responses.proto
+++ b/src/t2iapi/context/context_responses.proto
@@ -26,12 +26,11 @@ message CreateContextStateWithAssociationResponse {
 
 /*
 Response containing the context state handle and the prior mdib version.
-@see: AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState()
  */
 message AssociateValidateAndChangeIdentificationOfPatientOrLocationContextStateResponse {
     BasicResponse status = 1;
     string context_state_handle = 2;  // handle of the context state, that was created or adapted
-    string prior_mdib_version = 3;    // mdib version before the change - contains the previously associated
+    uint64 prior_mdib_version = 3;    // mdib version before the change - contains the previously associated
                                       //   context state whose pm:Identification the changed
                                       //   pm:Identification must structurally differ from.
 }
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index ef9d376..0ce735b 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -113,10 +113,11 @@ service ContextService {
   - its pm:Identification changes.
   The pm:Identification of the created resp. adapted context state must differ structurally from
   the pm:Identification of the previously associated context state of the same @DescriptorHandle.
-  In this context previous means directly prior to the manipulation call.
   Returns the handle of the created or adapted context state and the mdib version
-  that contains the previously associated context state whose pm:Identification
+  that contains the version of the previously associated context state whose pm:Identification
   the changed pm:Identification must structurally differ from.
+  The mdib version must be the one that represents the mdib of the device before the changes of the
+  manipulation are applied to the mdib.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.
    */

From 8467d22e09382462192d345d5db88f27c0dba3b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Fri, 28 Jun 2024 15:51:58 +0200
Subject: [PATCH 19/20] changes discussed in meeting on 2024.06.28

---
 CHANGELOG.md                     | 2 +-
 src/t2iapi/context/service.proto | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 837be63..30ecfd7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- manipulation AssociateValidateAndChangeIdentificationOfContextState for contexts
+- manipulation AssociateValidateAndChangeIdentificationOfPatientOrLocationContextState for contexts
 - manipulation ProvideInformationAboutLastCalibration for devices
 - manipulation ProvideInformationAboutNextCalibration for devices
 - manipulation SetSystemContextActivationStateAndContextAssociation for combined settings
diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 0ce735b..0130be9 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -113,10 +113,10 @@ service ContextService {
   - its pm:Identification changes.
   The pm:Identification of the created resp. adapted context state must differ structurally from
   the pm:Identification of the previously associated context state of the same @DescriptorHandle.
-  Returns the handle of the created or adapted context state and the mdib version
+  Returns the handle of the created or adapted context state and a mdib version
   that contains the version of the previously associated context state whose pm:Identification
   the changed pm:Identification must structurally differ from.
-  The mdib version must be the one that represents the mdib of the device before the changes of the
+  The mdib version must represent the mdib of the device before the changes of the
   manipulation are applied to the mdib.
   The manipulated state shall be persistent until a next manipulation call. If the device is not able to maintain
   the static state, it shall return RESULT_NOT_SUPPORTED.

From 4ee70b203ceebbb18a3368a130fdbcb46412ae96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Engelmann?=
 <bjoern.engelmann.contractor@draeger.com>
Date: Mon, 1 Jul 2024 08:44:24 +0200
Subject: [PATCH 20/20] corrected a spelling error.

---
 src/t2iapi/context/service.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/t2iapi/context/service.proto b/src/t2iapi/context/service.proto
index 0130be9..82cdff1 100644
--- a/src/t2iapi/context/service.proto
+++ b/src/t2iapi/context/service.proto
@@ -113,7 +113,7 @@ service ContextService {
   - its pm:Identification changes.
   The pm:Identification of the created resp. adapted context state must differ structurally from
   the pm:Identification of the previously associated context state of the same @DescriptorHandle.
-  Returns the handle of the created or adapted context state and a mdib version
+  Returns the handle of the created or adapted context state and an mdib version
   that contains the version of the previously associated context state whose pm:Identification
   the changed pm:Identification must structurally differ from.
   The mdib version must represent the mdib of the device before the changes of the