diff --git a/app/prj.conf b/app/prj.conf
index 915c185b..ef47bd64 100644
--- a/app/prj.conf
+++ b/app/prj.conf
@@ -233,6 +233,7 @@ CONFIG_TASK_WDT_MIN_TIMEOUT=10000
 # Device power management
 CONFIG_PM_DEVICE=y
 CONFIG_PM_DEVICE_SHELL=y
+CONFIG_PM_DEVICE_RUNTIME=n
 
 # nRF Cloud Provisioning
 CONFIG_MODEM_ATTEST_TOKEN=y
diff --git a/app/src/modules/power/Kconfig.power b/app/src/modules/power/Kconfig.power
index 30c9fbf3..5761362d 100644
--- a/app/src/modules/power/Kconfig.power
+++ b/app/src/modules/power/Kconfig.power
@@ -21,6 +21,7 @@ config APP_POWER_SHELL
 
 config APP_POWER_DISABLE_UART_ON_VBUS_REMOVED
 	bool "Disable UART when VBUS is removed"
+	default y
 	help
 	  Disable UART when VBUS is removed to save power.
 	  The UART is re-enabled when VBUS is connected again.
diff --git a/tests/module/cloud/CMakeLists.txt b/tests/module/cloud/CMakeLists.txt
index bd0372b7..9b716190 100644
--- a/tests/module/cloud/CMakeLists.txt
+++ b/tests/module/cloud/CMakeLists.txt
@@ -31,6 +31,7 @@ zephyr_include_directories(../../../app/src/modules/environmental)
 zephyr_include_directories(../../../app/src/modules/location)
 zephyr_include_directories(../../../app/src/modules/storage)
 zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/include)
+zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/common/include)
 zephyr_include_directories(${NRF_DIR}/include/net)
 zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/coap/include)
 zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
diff --git a/tests/module/fota/CMakeLists.txt b/tests/module/fota/CMakeLists.txt
index 3a18d75d..969b6372 100644
--- a/tests/module/fota/CMakeLists.txt
+++ b/tests/module/fota/CMakeLists.txt
@@ -27,6 +27,8 @@ zephyr_include_directories(${ZEPHYR_BASE}/subsys/testsuite/include)
 
 zephyr_include_directories(${NRF_DIR}/include/net)
 zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/include)
+zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/common/include)
+zephyr_include_directories(${NRF_DIR}/subsys/net/lib/nrf_cloud/mqtt/include)
 zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
 zephyr_include_directories(${NRF_DIR}/../modules/lib/cjson)
 
diff --git a/west.yml b/west.yml
index ded7136c..6de50020 100644
--- a/west.yml
+++ b/west.yml
@@ -14,5 +14,5 @@ manifest:
     - name: nrf
       remote: ncs
       repo-path: sdk-nrf
-      revision: 810b478aacde5d612130c32c9f0be52ca49aee2a
+      revision: fd20d7a44cf2361183b6b2dbdb79b5aff82fbd03
       import: true