diff --git a/SOL005/NFVICapacityInformation-API/ApiVersion.robot b/SOL005/NFVICapacityInformation-API/ApiVersion.robot
index 7565b18839f951bdc624e10082f1cdd91a3115db..f6c9b672672067ff8de429c5d46d5e951e3cb862 100644
--- a/SOL005/NFVICapacityInformation-API/ApiVersion.robot
+++ b/SOL005/NFVICapacityInformation-API/ApiVersion.robot
@@ -7,7 +7,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -19,7 +19,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -44,7 +44,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -56,7 +56,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -68,7 +68,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -80,7 +80,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -93,7 +93,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -105,7 +105,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -117,7 +117,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.3.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 [5] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot b/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
index c0575ad034a5c80f1109d3f49db25270b733bf22..9584b54d384f8689bc98645b7bd1e43174d0eb5c 100644
--- a/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
+++ b/SOL005/NFVICapacityInformation-API/CapacityThresholds.robot
@@ -7,7 +7,7 @@ POST Create Capacity Threshold
     ...    Test title: POST Create Capacity Threshold
     ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -16,12 +16,12 @@ POST Create Capacity Threshold
     Check HTTP Response Body Json Schema Is    CapacityThreshold
     Check HTTP Response Contains Resource URI
 
-POST Create Capacity Threshold - Unprocessible Entity
+POST Create Capacity Threshold - Unprocessible Content
     [Documentation]    Test ID: 5.3.6.5.2
-    ...    Test title: POST Create Capacity Threshold - Unprocessible Entity
+    ...    Test title: POST Create Capacity Threshold - Unprocessible Content
     ...    Test objective: The objective is to test that POST method creates a Capacity  Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -34,7 +34,7 @@ GET Capacity Thresholds
     ...    Test title: GET Capacity Thresholds
     ...    Test objective: The objective is to GET Capacity Thresholds objects
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -47,7 +47,7 @@ GET Capacity Thresholds - Filter
     ...    Test title: GET Capacity Thresholds - Filter
     ...    Test objective: The objective is to GET Capacity Thresholds objects using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
     ...    Test title: GET Capacity Thresholds Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about Capacity Thresholds with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -73,7 +73,7 @@ GET Capacity Thresholds - Bad Request Response too Big
     ...    Test title: GET Capacity Thresholds - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing Capacity Thresholds list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -86,7 +86,7 @@ GET Capacity Thresholds as Paged Response
     ...    Test title: GET Capacity Thresholds as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing Capacity Thresholds as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -99,7 +99,7 @@ PUT Capacity Thresholds - Method not implemented
     ...    Test title: PUT Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -111,7 +111,7 @@ PATCH Capacity Thresholds - Method not implemented
     ...    Test title: PATCH Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ DELETE Capacity Thresholds - Method not implemented
     ...    Test title: DELETE Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.4.3.5 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot b/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
index e70d34dfce03dd7b18235b2218ace22c61da3e20..3c6051eaf124aae1d306a4c83c6b9e987281478d 100644
--- a/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
+++ b/SOL005/NFVICapacityInformation-API/IndividualCapacityThreshold.robot
@@ -7,7 +7,7 @@ POST Individual Capacity Threshold
     ...    Test title: POST Individual Capacity Threshold
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Individual Capacity Thresholds
     ...    Test title: GET Capacity Thresholds
     ...    Test objective: The objective is to test that GET method reads information about Individual Capacity Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Individual Capacity Thresholds - NOT FOUND
     ...    Test title: GET Capacity Thresholds - NOT FOUND
     ...    Test objective: The objective is to test that GET method returns an error when using and invalid URI
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ PUT Individual Capacity Threshold - Method not implemented
     ...    Test title: PUT Capacity Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -57,7 +57,7 @@ PATCH Individual Capacity Threshold - Success
     ...    Test title: PATCH Individual Capacity Threshold - Success
     ...    Test objective: The objective is to test that PATCH method successfully modifies an individual Capacity Threshold resource
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Capacity Threshold modified
@@ -70,20 +70,33 @@ PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because precondition given in an HTTP request header is not fulfilled due to an ETag mismatch.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
     PATCH Individual Capacity Threshold - ETag Mismatch
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
+
+PATCH Individual Capacity Threshold - Precondition Failed HTTP Conditional Request Not Supported
+    [Documentation]    Test ID: 5.3.6.4.6b
+    ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed HTTP Conditional Request Not Supported
+    ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because the API Producer does not support "Last-Modified" and "ETag" HTTP Headers
+    ...    Pre-conditions: none
+    ...    Reference: Clause 10.4.5.3.4, 4.5 - ETSI GS NFV-SOL 005 [3] v4.4.1
+    ...    Config ID: Config_prod_NFVO
+    ...    Applicability: API Producer does not support "Last-Modified" and "ETag" HTTP Headers
+    ...    Post-Conditions: none
+    PATCH Individual Capacity Threshold - HTTP Conditional Request not supported
+    Check HTTP Response Status Code Is    412
+    Check HTTP Response Body Json Schema Is   ProblemDetails
     
-PATCH Individual Capacity Threshold - Unprocessible Entity
+PATCH Individual Capacity Threshold - Unprocessable Content
     [Documentation]    Test ID: 5.3.6.4.7
-    ...    Test title: PATCH Individual Capacity Threshold - Precondition Failed
+    ...    Test title: PATCH Individual Capacity Threshold - Unprocessable Content
     ...    Test objective: The objective is to that the modification of individual Capacity Threshold fails because callbackUri provided in the request body is unreachable.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -96,10 +109,10 @@ DELETE Individual Capacity Threshold
     ...    Test title: DELETE Individual Capacity Threshold
     ...    Test objective: The objective is to delete an Individual Capacity Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.5.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: Capacity threshold is deleted
     DELETE Individual Capacity Threshold
     Check HTTP Response Status Code Is    204
-    Check Postcondition resource is deleted
\ No newline at end of file
+    Check Postcondition resource is deleted
diff --git a/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
index bcacd63c06ae87b5a1f1b77b09cefb52a6a2cb48..68e2fdf49445fe31dad0d6f8ba6d4cb41c123980 100644
--- a/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
+++ b/SOL005/NFVICapacityInformation-API/IndividualVIMsNFVICapacityInformation.robot
@@ -7,7 +7,7 @@ POST Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test title: POST Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET Information about an Individual VIMs NFVI Capacity Information
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET Information about an Individual VIMs NFVI Capacity Information using filter
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information using filter query parameter
     ...    Test objective: The objective is to retrieve information about Individual VIMs NFVI Capacity Information using filter query parameter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET Information about an Individual VIMs NFVI Capacity Information - NOT FOUND
     ...    Test title: GET Information about an Individual VIMs NFVI Capacity Information - NOT FOUND
     ...    Test objective: The objective is to test that the retrieval of Individual VIMs NFVI Capacity Information fails when using an invalid resource identifier.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFV-MANO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ PUT Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test title: PUT Individual VIMs NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package not modified
@@ -70,7 +70,7 @@ PATCH Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test title: PATCH Individual VIMs NFVI Capacity Information
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package modified
@@ -82,7 +82,7 @@ DELETE Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test title: DELETE Individual VIMs NFVI Capacity Information - Method Not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.3.3.5 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: VNF Snapshot Package deleted
diff --git a/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot b/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
index 18da26d8e21470ee6cceb677dd74f59e1c513b38..649dea4b748b72da6693c2a9d6ef27ce31a0ab3e 100644
--- a/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
+++ b/SOL005/NFVICapacityInformation-API/NFVICapacityInformation.robot
@@ -7,7 +7,7 @@ POST NFVI Capacity Information - Method not implemented
     ...    Test title: POST NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -19,7 +19,7 @@ GET NFVI Capacity Information
     ...    Test title: GET NFVI Capacity Information
     ...    Test objective: The objective is to GET NFVI Capacity Information objects
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -32,7 +32,7 @@ GET NFVI Capacity Information - Filter
     ...    Test title: GET NFVI Capacity Information - Filter
     ...    Test objective: The objective is to GET NFVI Capacity Information objects using filter
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -45,7 +45,7 @@ GET NFVI Capacity Information Bad Request Invalid attribute-based filtering para
     ...    Test title: GET NFVI Capacity Information Bad Request Invalid attribute-based filtering parameters
     ...    Test objective: The objective is to get information about NFVI Capacity Information with Invalid attribute-based filtering parameters
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -58,7 +58,7 @@ GET NFVI Capacity Information Bad Request Invalid attribute selector
     ...    Test title: GET NFVI Capacity Information Bad Request Invalid attribute selector
     ...    Test objective: The objective is to get information about NFVI Capacity Information with Invalid attribute selector
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -71,7 +71,7 @@ GET NFVI Capacity Information with "all_fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "all_fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "all_fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -84,7 +84,7 @@ GET NFVI Capacity Information with "exclude_default" attribute selector
     ...    Test title: GET NFVI Capacity Information with "exclude_default" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_default" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -97,7 +97,7 @@ GET NFVI Capacity Information with "fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -110,7 +110,7 @@ GET NFVI Capacity Information with "exclude_default" and "fields" attribute sele
     ...    Test title: GET NFVI Capacity Information with "exclude_default" and "fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_default" and "fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -123,7 +123,7 @@ GET NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Test title: GET NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Test objective: The objective is to query NFVI Capacity Information with "exclude_fields" attribute selector
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -136,7 +136,7 @@ GET NFVI Capacity Information - Bad Request Response too Big
     ...    Test title: GET NFVI Capacity Information - Bad Request Response too Big
     ...    Test objective: The objective is test that the retrieval of existing NFVI Capacity Information list fails because response is too big, and perform the JSON schema validation of the failed operation HTTP response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO does not support paged response.
     ...    Post-Conditions: none 
@@ -149,7 +149,7 @@ GET NFVI Capacity Information as Paged Response
     ...    Test title: GET NFVI Capacity Information as Paged Response
     ...    Test objective: The objective is to test that GET method retrieves the list of existing NFVI Capacity Information as paged response.
     ...    Pre-conditions: none
-    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: NFVO supports paged response.
     ...    Post-Conditions: none    
@@ -162,7 +162,7 @@ PUT NFVI Capacity Information - Method not implemented
     ...    Test title: PUT NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions:  none
-    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -174,7 +174,7 @@ PATCH NFVI Capacity Information - Method not implemented
     ...    Test title: PATCH NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -186,7 +186,7 @@ DELETE NFVI Capacity Information - Method not implemented
     ...    Test title: DELETE NFVI Capacity Information - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none 
-    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.2.3.5 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_NFVO
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot b/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot
index d4ce40ea15adfc90e0a0747fab991e7fb287748d..c7c754f37708a2eab2d2651998ee77acf47c0dcc 100644
--- a/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot
+++ b/SOL005/NFVICapacityInformation-API/NFVICapacityInformationKeywords.robot
@@ -418,6 +418,18 @@ PATCH Individual Capacity Threshold - ETag mismatch
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse} 
 
+PATCH Individual Capacity Threshold - HTTP Conditional Request not supported
+    Pass Execution If    ${PRODUCER_SUPPORT_COND_REQ} == 1    NVFO allows conditional requests, skipping test
+    log    Trying to perform a PATCH to modify individual VNF snapshot
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template} =    Get File    jsons/CapacityThresholdModificationRequest.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}
+    Patch    ${apiRoot}/${apiName}/${apiMajorVersion}/capacity_thresholds/${capacityThreshold}    ${body} 		
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
 PATCH Individual Capacity Threshold - Unreachable CallbackURI
     log    Trying to perform a PATCH to modify individual VNF snapshot
     Set Headers  {"Accept":"${ACCEPT_JSON}"}  
diff --git a/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot b/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
index d6361043b28b371e6ec39269f5fb06531903e184..7afef2e5276645be51e4cd39b54a1516163e62cc 100644
--- a/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
+++ b/SOL005/NFVICapacityInformation-API/NotificationEndpoint.robot
@@ -8,7 +8,7 @@ Capacity Shortage Notification
     ...    Test title: Capacity Shortage Notification
     ...    Test objective: The objective is to test that Capacity Shortage Notification is delivered with success to the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.6.3.1 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -20,7 +20,7 @@ Test the Notification Endpoint - Successful
     ...    Test title: Test the Notification Endpoint - Successful
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -32,7 +32,7 @@ Test the Notification Endpoint - UNREACHABLE
     ...    Test title: Test the Notification Endpoint - UNREACHABLE
     ...    Test objective: The objective is to test the Notification Endpoint provided by the notification consumer.
     ...    Pre-conditions: The consumer has already created an Individual Capacity Threshold resource
-    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.6.3.2 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: The notification endpoint is unreachable by the API producer.
     ...    Post-Conditions: none 
@@ -45,7 +45,7 @@ PUT Notification endpoint - Method Not Implemented
     ...    Test title: PUT Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PUT method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.6.3.3 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -57,7 +57,7 @@ PATCH Notification endpoint - Method Not Implemented
     ...    Test title: PATCH Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the PATCH method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.6.3.4 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -69,7 +69,7 @@ DELETE Notification endpoint - Method Not Implemented
     ...    Test title: DELETE Notification endpoint - Method Not Implemented
     ...    Test objective: The objective is to test the DELETE method for Notification Endpoint provided by the consumer is not implemented.
     ...    Pre-conditions: A notification endpoint is provided by the API consumer upon subscription.
-    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v4.3.1
+    ...    Reference: Clause 10.4.6.3.5 - ETSI GS NFV-SOL 005 [3] v4.4.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL005/NFVICapacityInformation-API/environment/variables.txt b/SOL005/NFVICapacityInformation-API/environment/variables.txt
index d5ee2bb0c86df5df96262559ea20fd6efb3a75a4..20c6351696d8304b27257a1a5af65174636651d0 100644
--- a/SOL005/NFVICapacityInformation-API/environment/variables.txt
+++ b/SOL005/NFVICapacityInformation-API/environment/variables.txt
@@ -36,4 +36,6 @@ ${callbackResp}    localhost
 ${vimId}
 ${invalidVimId}
 ${capacityThreshold}
-${invalid_capacityThreshold}
\ No newline at end of file
+${invalid_capacityThreshold}
+
+${PRODUCER_SUPPORT_COND_REQ}    1