diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 5857d278d89e70999b091343b218ff330fe021cc..ffd3b27dccc7070d3cd7f3106a1e2cc248a37eba 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -5788,14 +5788,15 @@ module OneM2M_PermutationFunctions {
 		    			
 					}//end f_CSE_DMR_UPD_011
     				
-					function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive) runs on AeSimu system CseSystem {
+					function f_CSE_DMR_UPD_014(ResourceType p_resourceType, template RequestPrimitive p_createRequestPrimitive, template RequestPrimitive p_updateRequestPrimitive, in boolean p_acpsRequired := false) runs on AeSimu system CseSystem {
 	
 						// Local variables
 						var MsgIn v_response;
 						var RequestPrimitive v_request;
-						var integer v_aeIndex := -1;
 						var integer v_resourceIndex := -1;
 						var integer v_ae2Index := -1;
+						var integer v_acp1Index := -1;
+						var integer v_acp2Index := -1;
 							   
 						// Test control
 	
@@ -5805,11 +5806,20 @@ module OneM2M_PermutationFunctions {
 						// Test adapter configuration
 	
 						// Preamble
-						v_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
+						vc_aeIndex := f_cse_preamble_registerAe();//c_CRUDNDi);
 		
 						f_cse_preamble_subscriptionVerification(v_ae2Index, p_createRequestPrimitive, p_resourceType);
 		
-						v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, v_aeIndex); 				
+						if (p_acpsRequired) {
+							v_acp1Index := f_cse_createResource(int1, m_createAcp("MyAcp1"), vc_aeIndex); 				
+							v_acp2Index := f_cse_createResource(int1, m_createAcp("MyAcp2"), vc_aeIndex); 				
+						
+							p_createRequestPrimitive := f_setAcpId(p_createRequestPrimitive,{f_getResourceId(vc_resourcesList[v_acp1Index].resource)});
+							p_updateRequestPrimitive := f_setAcpId(p_updateRequestPrimitive,{f_getResourceId(vc_resourcesList[v_acp2Index].resource)});
+						
+						}
+						
+						v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive, vc_aeIndex); 				
 						
 						// Test Body
 						v_request := f_getUpdateRequestPrimitive(p_resourceType, v_resourceIndex, p_updateRequestPrimitive);
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 6e0779db8dae56c25b449b3b960a7c9a57af79dc..7b0544db6a784e82dcdf426217793b022c2c9ae6 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -6575,7 +6575,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.container.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
-						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest));//Container
+						v_ae1.start(f_CSE_DMR_UPD_014(int3, v_createRequest, v_updateRequest, true));//Container
 						v_ae1.done;
 						
 						 
@@ -6719,7 +6719,7 @@ module OneM2M_Testcases_CSE_Release_1 {
 						v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
 						v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
 
-						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest));//Subscription
+						v_ae1.start(f_CSE_DMR_UPD_014(int23, v_createRequest, v_updateRequest, true));//Subscription
 						v_ae1.done;