diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/152-tr069-connectionrequest.t b/.gitlab/tests/cram/generic/acceleration-plan-components/152-tr069-connectionrequest.t
new file mode 100644
index 0000000000..4d9353ded5
--- /dev/null
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/152-tr069-connectionrequest.t
@@ -0,0 +1,114 @@
+Define R() for access to DUT
+
+  $ R() { ${CRAM_REMOTE_COMMAND:-} "$@"; }
+
+Define G() hop via DUT -> GW
+
+  $ G() {  ssh -y root@192.168.1.1 "$@"; }
+
+Skip the test because it uses a reboot command and requires long delays in some of the steps:
+
+  $ exit 80
+
+AllowReservedAddr on Gataway:
+
+  $ G 'ba-cli "Device.UPnP.X_PRPLWARE-COM_IGDConfig.AllowReservedAddr=1" | sed -e "/^> /d"' 2>/dev/null
+  Device.UPnP.X_PRPLWARE-COM_IGDConfig.
+  Device.UPnP.X_PRPLWARE-COM_IGDConfig.AllowReservedAddr=1
+  
+Switch to IPv4 mode
+
+  $ R 'ba-cli "ManagementServer.URL=\"http://192.168.77.161:50555/\""' >/dev/null 2>&1
+
+Restart tr069-connectionrequest 
+
+  $ R 'service tr069-connectionrequest stop' 2>/dev/null
+  $ sleep 5
+  $ R 'service tr069-connectionrequest start' 2>/dev/null
+  $ sleep 30
+
+Check that tr069-connectionrequest is enabled and running by default:
+
+  $ R 'ps ax | grep -q [t]r069-connectionrequest && echo OK || echo FAIL'
+  OK
+
+Check that port mapping is enabled on the GW:
+  $ CONNREQ_PORT=$(R 'ba-cli "ManagementServer.ConnRequest._get()"' 2>/dev/null | sed -n 's/.*ConnRequestPort = \([0-9]\+\),/\1/p')
+  $ G "ba-cli 'Device.NAT.PortMapping.[InternalClient==\"$TARGET_LAN_IP\" && InternalPort==$CONNREQ_PORT].Status?'"  2>/dev/null | grep -F Enable >/dev/null && echo OK || echo FAIL
+  OK
+
+Check that ConnectionRequestURL was set correctly:
+
+  $ ORIG_WAN_IP=$(G 'ba-cli -l "Device.IP.Interface.wan.IPv4Address.1.IPAddress?"')
+  $ R 'ba-cli "ManagementServer.ConnectionRequestURL?" | sed -e "/^> /d" | grep -F "http://$ORIG_WAN_IP" >/dev/null && echo OK || echo FAIL' 
+  OK
+
+Wait at least 300 seconds to check PortMapping keepalive:
+
+  $ sleep 300
+
+Check that port mapping still on the GW after 300 sec.:
+
+  $ CONNREQ_PORT=$(R 'ba-cli "ManagementServer.ConnRequest._get()"' 2>/dev/null | sed -n 's/.*ConnRequestPort = \([0-9]\+\),/\1/p')
+  $ G "ba-cli 'Device.NAT.PortMapping.[InternalClient==\"$TARGET_LAN_IP\" && InternalPort==$CONNREQ_PORT].Status?'"  2>/dev/null | grep -F Enable >/dev/null && echo OK || echo FAIL
+  OK
+
+Check that ConnectionRequestURL still correctly after 300 sec:
+
+  $ ORIG_WAN_IP=$(G 'ba-cli -l "Device.IP.Interface.wan.IPv4Address.1.IPAddress?"')
+  $ R 'ba-cli "ManagementServer.ConnectionRequestURL?" | sed -e "/^> /d" | grep -F "http://$ORIG_WAN_IP" >/dev/null && echo OK || echo FAIL' 
+  OK
+
+Check that service subscribed to IGD changes:
+
+  $ NEW_WAN_IP=91.90.40.100
+  $ G ba-cli "'IP.Interface.wan.IPv4Address.1._set\(parameters=\{IPAddress=\"$NEW_WAN_IP\"\}\)'" >/dev/null 2>&1
+  $ sleep 3
+
+Check that ConnectionRequestURL contain new WAN IP:
+
+  $ R 'ba-cli "ManagementServer.ConnectionRequestURL?" | sed -e "/^> /d" | grep -F "http://$NEW_WAN_IP" >/dev/null && echo OK || echo FAIL' 
+  OK
+
+Return original WAN IP back:
+
+  $ G ba-cli "'IP.Interface.wan.IPv4Address.1._set\(parameters=\{IPAddress=\"$ORIG_WAN_IP\"\}\)'" >/dev/null 2>&1
+
+Check GW device has rebooted
+
+  $ G 'reboot' 2>/dev/null
+  $ sleep 120
+
+Check that port mapping is enabled on the GW after GW reboot:
+
+  $ CONNREQ_PORT=$(R 'ba-cli "ManagementServer.ConnRequest._get()"' 2>/dev/null | sed -n 's/.*ConnRequestPort = \([0-9]\+\),/\1/p')
+  $ G "ba-cli 'Device.NAT.PortMapping.[InternalClient==\"$TARGET_LAN_IP\" && InternalPort==$CONNREQ_PORT].Status?'"  2>/dev/null | grep -F Enable >/dev/null && echo OK || echo FAIL
+  OK
+
+Check that ConnectionRequestURL was set correctly after GW reboot:
+
+  $ ORIG_WAN_IP=$(G 'ba-cli -l "Device.IP.Interface.wan.IPv4Address.1.IPAddress?"')
+  $ R 'ba-cli "ManagementServer.ConnectionRequestURL?" | sed -e "/^> /d" | grep -F "http://$ORIG_WAN_IP" >/dev/null && echo OK || echo FAIL' 
+  OK
+
+Check when IGD service on GW has stopped:
+
+  $ G 'service tr181-upnp stop' 2>/dev/null
+  $ sleep 10
+
+Check that ConnectionRequestURL is FAIL after stop tr181-upnp:
+
+  $ ORIG_WAN_IP=$(G 'ba-cli -l "Device.IP.Interface.wan.IPv4Address.1.IPAddress?"')
+  $ R 'ba-cli "ManagementServer.ConnectionRequestURL?" | sed -e "/^> /d" | grep -F "http://$ORIG_WAN_IP" >/dev/null && echo OK || echo FAIL' 
+  FAIL
+
+Check when IGD service on GW has started:
+
+  $ G 'service tr181-upnp start' 2>/dev/null
+  $ sleep 10
+
+Check that ConnectionRequestURL is OK after start tr181-upnp:
+
+  $ ORIG_WAN_IP=$(G 'ba-cli -l "Device.IP.Interface.wan.IPv4Address.1.IPAddress?"')
+  $ R 'ba-cli "ManagementServer.ConnectionRequestURL?" | sed -e "/^> /d" | grep -F "http://$ORIG_WAN_IP" >/dev/null && echo OK || echo FAIL' 
+  OK
diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
index b99db71f1f..72e0d40532 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
@@ -523,7 +523,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_libudev-zero=y
   CONFIG_PACKAGE_libugwhelper=y
   CONFIG_PACKAGE_libunbound-prpl=y
-  CONFIG_PACKAGE_libupnp=y
+  CONFIG_PACKAGE_libupnp-prpl=y
   CONFIG_PACKAGE_liburcu=y
   CONFIG_PACKAGE_libusb-1.0=y
   CONFIG_PACKAGE_libusp=y
@@ -865,7 +865,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_SSH_SERVER=y
   CONFIG_SAH_AMX_SSH_SERVER_ORDER=25
   CONFIG_SAH_AMX_TR069_MANAGER=y
-  CONFIG_SAH_AMX_TR069_MANAGER_ORDER=98
+  CONFIG_SAH_AMX_TR069_MANAGER_ORDER=97
   CONFIG_SAH_AMX_TR069_MANAGER_USE_GSDM=y
   CONFIG_SAH_AMX_TR181_BRIDGING=y
   CONFIG_SAH_AMX_TR181_BRIDGING_MSTPD=y
diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
index f988224172..35cc02f52f 100644
--- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t
+++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
@@ -324,7 +324,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_PACKAGE_libtr69-engine=y
   CONFIG_PACKAGE_libudev-zero=y
   CONFIG_PACKAGE_libunbound-prpl=y
-  CONFIG_PACKAGE_libupnp=y
+  CONFIG_PACKAGE_libupnp-prpl=y
   CONFIG_PACKAGE_liburcu=y
   CONFIG_PACKAGE_libusb-1.0=y
   CONFIG_PACKAGE_libusp=y
@@ -627,7 +627,7 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_SSH_SERVER=y
   CONFIG_SAH_AMX_SSH_SERVER_ORDER=25
   CONFIG_SAH_AMX_TR069_MANAGER=y
-  CONFIG_SAH_AMX_TR069_MANAGER_ORDER=98
+  CONFIG_SAH_AMX_TR069_MANAGER_ORDER=97
   CONFIG_SAH_AMX_TR069_MANAGER_USE_GSDM=y
   CONFIG_SAH_AMX_TR181_BRIDGING=y
   CONFIG_SAH_AMX_TR181_BRIDGING_MSTPD=y