diff --git a/CODEOWNERS b/CODEOWNERS
index 66160abe2f34..490d4c00fcd5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -166,6 +166,7 @@ Kconfig*                                  @tejlmand
 /subsys/zigbee/                           @tomchy @sebastiandraus
 /tests/bluetooth/tester/                  @carlescufi @trond-snekvik
 /tests/drivers/flash_nop_device/          @de-nordic
+/tests/drivers/clock_control/clock_control_mpsl/ @ryanjh
 /tests/lib/edge_impulse/                  @pdunaj @MarekPieta
 /tests/lib/hw_unique_key*/                @oyvindronningstad @Vge0rge
 /tests/lib/modem_jwt/                     @SeppoTakalo
diff --git a/applications/asset_tracker/src/motion/motion.c b/applications/asset_tracker/src/motion/motion.c
index bc6860a49fb4..15ea44633886 100644
--- a/applications/asset_tracker/src/motion/motion.c
+++ b/applications/asset_tracker/src/motion/motion.c
@@ -96,7 +96,7 @@ static int get_orientation(motion_orientation_state_t *orientation,
 
 /**@brief Callback for sensor trigger events */
 static void sensor_trigger_handler(const struct device *dev,
-			struct sensor_trigger *trigger)
+				   const struct sensor_trigger *trigger)
 {
 	ARG_UNUSED(dev);
 	ARG_UNUSED(trigger);
diff --git a/applications/asset_tracker/src/ui/buzzer.c b/applications/asset_tracker/src/ui/buzzer.c
index 1fd96777cc17..f90369e95816 100644
--- a/applications/asset_tracker/src/ui/buzzer.c
+++ b/applications/asset_tracker/src/ui/buzzer.c
@@ -63,7 +63,7 @@ static void buzzer_disable(void)
 	pwm_out(0, 0);
 
 #ifdef CONFIG_PM_DEVICE
-	int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPEND);
+	int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPENDED);
 	if (err) {
 		LOG_ERR("PWM disable failed");
 	}
diff --git a/applications/asset_tracker/src/ui/led_pwm.c b/applications/asset_tracker/src/ui/led_pwm.c
index 057e706595db..a9ba684445a3 100644
--- a/applications/asset_tracker/src/ui/led_pwm.c
+++ b/applications/asset_tracker/src/ui/led_pwm.c
@@ -200,7 +200,7 @@ void ui_leds_stop(void)
 {
 	k_work_cancel_delayable_sync(&leds.work, &leds.work_sync);
 #ifdef CONFIG_PM_DEVICE
-	int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_SUSPEND);
+	int err = pm_device_state_set(leds.pwm_dev, PM_DEVICE_STATE_SUSPENDED);
 	if (err) {
 		LOG_ERR("PWM disable failed");
 	}
diff --git a/applications/asset_tracker/src/ui/nmos.c b/applications/asset_tracker/src/ui/nmos.c
index 5ecc607fc767..2dcd116d7110 100644
--- a/applications/asset_tracker/src/ui/nmos.c
+++ b/applications/asset_tracker/src/ui/nmos.c
@@ -89,7 +89,7 @@ static void nmos_pwm_disable(uint32_t nmos_idx)
 		return;
 	}
 
-	int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPEND);
+	int err = pm_device_state_set(pwm_dev, PM_DEVICE_STATE_SUSPENDED);
 	if (err) {
 		LOG_WRN("PWM disable failed");
 	}
diff --git a/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c b/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c
index 18923b78d6c4..9700d5bbcdee 100644
--- a/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c
+++ b/applications/asset_tracker_v2/src/ext_sensors/ext_sensors.c
@@ -56,7 +56,7 @@ static ext_sensor_handler_t evt_handler;
 static bool initial_trigger;
 
 static void accelerometer_trigger_handler(const struct device *dev,
-					  struct sensor_trigger *trig)
+					  const struct sensor_trigger *trig)
 {
 	int err = 0;
 	struct sensor_value data[ACCELEROMETER_CHANNELS];
diff --git a/applications/asset_tracker_v2/tests/debug_module/CMakeLists.txt b/applications/asset_tracker_v2/tests/debug_module/CMakeLists.txt
index 7d507c57df2c..15a5a9365281 100644
--- a/applications/asset_tracker_v2/tests/debug_module/CMakeLists.txt
+++ b/applications/asset_tracker_v2/tests/debug_module/CMakeLists.txt
@@ -26,7 +26,6 @@ cmock_handle(${MEMFAULT_SDK_DIR}/ports/include/memfault/ports/watchdog.h memfaul
 
 # Create mock for nRF SDK
 cmock_handle(${NRF_SDK_DIR}/include/event_manager.h)
-cmock_handle(${ZEPHYR_BASE}/include/sys/reboot.h)
 
 # Create mock for Asset Tracker v2 application source files
 cmock_handle(${ASSET_TRACKER_V2_DIR}/src/modules/modules_common.h)
diff --git a/applications/asset_tracker_v2/tests/debug_module/boards/native_posix.conf b/applications/asset_tracker_v2/tests/debug_module/boards/native_posix.conf
new file mode 100644
index 000000000000..bb53bcf285cf
--- /dev/null
+++ b/applications/asset_tracker_v2/tests/debug_module/boards/native_posix.conf
@@ -0,0 +1,3 @@
+# The following option is required to silence the linker warning about orphan
+# sections. The event manager header files uses orphan sections.
+CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/applications/asset_tracker_v2/tests/debug_module/prj.conf b/applications/asset_tracker_v2/tests/debug_module/prj.conf
index 4bb7ba365f26..a5789c90fdd9 100644
--- a/applications/asset_tracker_v2/tests/debug_module/prj.conf
+++ b/applications/asset_tracker_v2/tests/debug_module/prj.conf
@@ -9,3 +9,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=1024
 
 # Make CONFIG_EVENT_MANAGER_MAX_EVENT_CNT defined
 CONFIG_EVENT_MANAGER=y
+
+# Event manager requires sys_reboot()
+CONFIG_REBOOT=y
diff --git a/applications/asset_tracker_v2/tests/gps_module/CMakeLists.txt b/applications/asset_tracker_v2/tests/gps_module/CMakeLists.txt
index 06fc5b5bb1fe..99e0987a22f0 100644
--- a/applications/asset_tracker_v2/tests/gps_module/CMakeLists.txt
+++ b/applications/asset_tracker_v2/tests/gps_module/CMakeLists.txt
@@ -18,7 +18,6 @@ cmock_handle(${ZEPHYR_BASE}/../nrf/include/event_manager.h )
 cmock_handle(${ZEPHYR_BASE}/../nrf/include/date_time.h )
 cmock_handle(${ZEPHYR_BASE}/../nrf/include/modem/at_cmd.h )
 cmock_handle(${ZEPHYR_BASE}/../nrfxlib/nrf_modem/include/nrf_modem_gnss.h )
-cmock_handle(${ZEPHYR_BASE}/include/sys/reboot.h sys)
 
 
 
diff --git a/applications/asset_tracker_v2/tests/gps_module/boards/native_posix.conf b/applications/asset_tracker_v2/tests/gps_module/boards/native_posix.conf
new file mode 100644
index 000000000000..bb53bcf285cf
--- /dev/null
+++ b/applications/asset_tracker_v2/tests/gps_module/boards/native_posix.conf
@@ -0,0 +1,3 @@
+# The following option is required to silence the linker warning about orphan
+# sections. The event manager header files uses orphan sections.
+CONFIG_LINKER_ORPHAN_SECTION_PLACE=y
diff --git a/applications/asset_tracker_v2/tests/gps_module/prj.conf b/applications/asset_tracker_v2/tests/gps_module/prj.conf
index 430801e8d61b..f886e95f8ac0 100644
--- a/applications/asset_tracker_v2/tests/gps_module/prj.conf
+++ b/applications/asset_tracker_v2/tests/gps_module/prj.conf
@@ -16,3 +16,6 @@ CONFIG_NRF_MODEM_LIB=n
 
 # Make CONFIG_EVENT_MANAGER_MAX_EVENT_CNT defined
 CONFIG_EVENT_MANAGER=y
+
+# Event manager requires sys_reboot()
+CONFIG_REBOOT=y
diff --git a/applications/connectivity_bridge/app.overlay b/applications/connectivity_bridge/app.overlay
new file mode 100644
index 000000000000..42449d53e6f4
--- /dev/null
+++ b/applications/connectivity_bridge/app.overlay
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+&zephyr_udc0 {
+	cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+
+	cdc_acm_uart1 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_1";
+	};
+};
diff --git a/applications/connectivity_bridge/prj.conf b/applications/connectivity_bridge/prj.conf
index 2f9dd40534de..397fa2fe9dbb 100644
--- a/applications/connectivity_bridge/prj.conf
+++ b/applications/connectivity_bridge/prj.conf
@@ -17,7 +17,6 @@ CONFIG_BRIDGE_MSC_ENABLE=y
 CONFIG_BRIDGE_BLE_ENABLE=y
 
  # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor"
 CONFIG_USB_DEVICE_PRODUCT="Thingy:91 UART"
@@ -26,7 +25,6 @@ CONFIG_USB_DEVICE_PID=0x9100
 CONFIG_USB_DEVICE_SN="THINGY91 12PLACEHLDRS" # This is overridden at runtime
 CONFIG_USB_COMPOSITE_DEVICE=y
 CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=2
 
 # Disk and file system
 CONFIG_DISK_ACCESS=y
@@ -89,7 +87,7 @@ CONFIG_BT_DEVICE_NAME_DYNAMIC=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=16
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_BONDABLE=n
 CONFIG_BT_LL_SOFTDEVICE=y
diff --git a/applications/connectivity_bridge/src/modules/Kconfig b/applications/connectivity_bridge/src/modules/Kconfig
index e5b2c76eefe9..721cdf527c6a 100644
--- a/applications/connectivity_bridge/src/modules/Kconfig
+++ b/applications/connectivity_bridge/src/modules/Kconfig
@@ -10,7 +10,7 @@ source "subsys/logging/Kconfig.template.log_config"
 
 config BRIDGE_CDC_ENABLE
 	bool "Enable USB CDC ACM"
-	depends on USB
+	depends on USB_DEVICE_STACK
 	select USB_CDC_ACM
 	help
 		This option enables USB CDC ACM
diff --git a/applications/connectivity_bridge/src/modules/uart_handler.c b/applications/connectivity_bridge/src/modules/uart_handler.c
index f3a60a85482f..57c1a304483d 100644
--- a/applications/connectivity_bridge/src/modules/uart_handler.c
+++ b/applications/connectivity_bridge/src/modules/uart_handler.c
@@ -246,7 +246,7 @@ static void set_uart_power_state(uint8_t dev_idx, bool active)
 	enum pm_device_state current_state;
 	enum pm_device_state target_state;
 
-	target_state = active ? PM_DEVICE_STATE_ACTIVE : PM_DEVICE_STATE_SUSPEND;
+	target_state = active ? PM_DEVICE_STATE_ACTIVE : PM_DEVICE_STATE_SUSPENDED;
 
 	err = pm_device_state_get(dev, &current_state);
 	if (err) {
diff --git a/applications/connectivity_bridge/src/modules/usb_cdc_handler.c b/applications/connectivity_bridge/src/modules/usb_cdc_handler.c
index e1b04ec9671d..fd7cf230be68 100644
--- a/applications/connectivity_bridge/src/modules/usb_cdc_handler.c
+++ b/applications/connectivity_bridge/src/modules/usb_cdc_handler.c
@@ -17,8 +17,8 @@
 #include <logging/log.h>
 LOG_MODULE_REGISTER(MODULE, CONFIG_BRIDGE_CDC_LOG_LEVEL);
 
-#define CDC_DEVICE_COUNT CONFIG_USB_CDC_ACM_DEVICE_COUNT
-#define CDC_DEVICE_NAME_TEMPLATE CONFIG_USB_CDC_ACM_DEVICE_NAME "_%d"
+#define CDC_DEVICE_COUNT 2
+#define CDC_DEVICE_NAME_TEMPLATE "CDC_ACM_%d"
 
 #define USB_CDC_DTR_POLL_MS 500
 #define USB_CDC_RX_BLOCK_SIZE CONFIG_BRIDGE_BUF_SIZE
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
index bde6814bfad8..9d1851ee2065 100644
--- a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
+++ b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
@@ -48,6 +48,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf
index 1e563851d096..7d6a029a8550 100644
--- a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf
+++ b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZDebugNUS.conf
@@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
@@ -114,7 +115,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
index 532e3ff1a5c5..c149c9bf62c0 100644
--- a/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
+++ b/applications/machine_learning/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
@@ -46,6 +46,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
diff --git a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf b/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
index 661e988618a1..c62baab1f691 100644
--- a/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
+++ b/applications/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
@@ -58,6 +58,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for simulated acceleration signal
 CONFIG_EDGE_IMPULSE=y
@@ -132,7 +133,7 @@ CONFIG_BT_BONDABLE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf b/applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf
index c47e6e790a21..da258e10ee99 100644
--- a/applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf
+++ b/applications/machine_learning/configuration/thingy52_nrf52832/app_ZDebug.conf
@@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -111,7 +112,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf b/applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf
index 5bb4c00d7d69..f2f4259d79e9 100644
--- a/applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf
+++ b/applications/machine_learning/configuration/thingy52_nrf52832/app_ZRelease.conf
@@ -50,6 +50,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -109,7 +110,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf
index 1cd95b52b820..95cc9f2745a7 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebug.conf
@@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -126,7 +127,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
@@ -154,7 +155,6 @@ CONFIG_LOG_STRDUP_MAX_STRING=64
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -165,7 +165,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
 # Use CDC_ACM_0 for UART console
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 ################################################################################
 # Bootloader Configuration
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf
index 7207b9315825..098e44522c0a 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZDebugRTT.conf
@@ -59,6 +59,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -132,7 +133,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf
index 35163b07b9ce..394d21aaa4ed 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/app_ZRelease.conf
@@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -125,7 +126,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/dts.overlay b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/dts.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/dts.overlay
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp/dts.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf
index 1cd95b52b820..95cc9f2745a7 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebug.conf
@@ -57,6 +57,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -126,7 +127,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
@@ -154,7 +155,6 @@ CONFIG_LOG_STRDUP_MAX_STRING=64
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -165,7 +165,6 @@ CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
 # Use CDC_ACM_0 for UART console
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 ################################################################################
 # Bootloader Configuration
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf
index 7207b9315825..098e44522c0a 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZDebugRTT.conf
@@ -59,6 +59,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -132,7 +133,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf
index 35163b07b9ce..394d21aaa4ed 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/app_ZRelease.conf
@@ -52,6 +52,7 @@ CONFIG_CPLUSPLUS=y
 CONFIG_LIB_CPLUSPLUS=y
 CONFIG_STD_CPP11=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Use the NCS machine learning model for acceleration readouts coming from HW accelerometer
 CONFIG_EDGE_IMPULSE=y
@@ -125,7 +126,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 CONFIG_BT_GAP_AUTO_UPDATE_CONN_PARAMS=y
 
diff --git a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/dts.overlay b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/dts.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/dts.overlay
+++ b/applications/machine_learning/configuration/thingy53_nrf5340_cpuapp_ns/dts.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/applications/machine_learning/src/modules/Kconfig.usb_state b/applications/machine_learning/src/modules/Kconfig.usb_state
index 24894501f56e..1443d9ff376d 100644
--- a/applications/machine_learning/src/modules/Kconfig.usb_state
+++ b/applications/machine_learning/src/modules/Kconfig.usb_state
@@ -6,7 +6,7 @@
 
 menuconfig ML_APP_USB_STATE
 	bool "USB module"
-	depends on USB
+	depends on USB_DEVICE_STACK
 	depends on CAF_POWER_MANAGER
 	select CAF_FORCE_POWER_DOWN_EVENTS
 	help
diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/dts.overlay b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/dts.overlay
new file mode 100644
index 000000000000..1db446422bbb
--- /dev/null
+++ b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/dts.overlay
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+		zephyr,shell-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf
index f0489e87fa29..a1615235eeb4 100644
--- a/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf
+++ b/applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_ZDebug.conf
@@ -109,7 +109,6 @@ CONFIG_SHELL=y
 CONFIG_SHELL_LOG_BACKEND=n
 
 # Enable USB CDC ACM
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -118,10 +117,7 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y
 CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 CONFIG_UART_LINE_CTRL=y
-CONFIG_UART_SHELL_ON_DEV_NAME="CDC_ACM_0"
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
 
 # Configure Thingy:53 sensors
diff --git a/applications/matter_weather_station/src/main.cpp b/applications/matter_weather_station/src/main.cpp
index c303369b9052..6bff4782ce9f 100644
--- a/applications/matter_weather_station/src/main.cpp
+++ b/applications/matter_weather_station/src/main.cpp
@@ -8,7 +8,7 @@
 
 #include <logging/log.h>
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 #include <usb/usb_device.h>
 #endif
 
@@ -25,7 +25,7 @@ int main()
 	int ret = 0;
 	CHIP_ERROR err = CHIP_NO_ERROR;
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 	err = chip::System::MapErrorZephyr(usb_enable(NULL));
 	if (err != CHIP_NO_ERROR) {
 		goto exit;
diff --git a/applications/matter_weather_station/thingy53_nrf5340_cpuapp.overlay b/applications/matter_weather_station/thingy53_nrf5340_cpuapp.overlay
index e99da5c3fa93..98c28e74a289 100644
--- a/applications/matter_weather_station/thingy53_nrf5340_cpuapp.overlay
+++ b/applications/matter_weather_station/thingy53_nrf5340_cpuapp.overlay
@@ -60,6 +60,18 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+		zephyr,shell-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
 
 &i2c1 {
diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZDebug.conf
index babe799e0412..6666ae2538cd 100644
--- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZDebug.conf
@@ -132,7 +132,7 @@ CONFIG_BT_CTLR=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=n
 CONFIG_BT_CTLR_TX_PWR_0=y
 CONFIG_BT_CONN_TX_MAX=4
-CONFIG_BT_CTLR_WL_SIZE=1
+CONFIG_BT_CTLR_FAL_SIZE=1
 CONFIG_BT_CTLR_RL_SIZE=2
 
 CONFIG_BT_DATA_LEN_UPDATE=n
@@ -141,12 +141,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZRelease.conf
index 520f54e19b23..9da071136412 100644
--- a/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app_ZRelease.conf
@@ -127,7 +127,7 @@ CONFIG_BT_CTLR=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=n
 CONFIG_BT_CTLR_TX_PWR_0=y
 CONFIG_BT_CONN_TX_MAX=4
-CONFIG_BT_CTLR_WL_SIZE=1
+CONFIG_BT_CTLR_FAL_SIZE=1
 CONFIG_BT_CTLR_RL_SIZE=2
 
 CONFIG_BT_DATA_LEN_UPDATE=n
@@ -136,12 +136,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZDebug.conf
index 46e3b2a9d841..901baf8d61b6 100644
--- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZDebug.conf
@@ -94,7 +94,6 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_NRFX_EVT_QUEUE_SIZE=16
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZRelease.conf
index fb9908448914..0df5aae39244 100644
--- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZRelease.conf
@@ -93,7 +93,6 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_NRFX_EVT_QUEUE_SIZE=30
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZReleaseMCUBoot.conf
index 749bc074de23..cc00a4ea6794 100644
--- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZReleaseMCUBoot.conf
+++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app_ZReleaseMCUBoot.conf
@@ -93,7 +93,6 @@ CONFIG_SPEED_OPTIMIZATIONS=y
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_NRFX_EVT_QUEUE_SIZE=30
 CONFIG_USB_DEVICE_STACK=y
diff --git a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/mcuboot_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/mcuboot_ZReleaseMCUBoot.conf
index 29fd01e5bddb..b42087839aba 100644
--- a/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/mcuboot_ZReleaseMCUBoot.conf
+++ b/applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/mcuboot_ZReleaseMCUBoot.conf
@@ -47,7 +47,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=17
 CONFIG_MULTITHREADING=y
 
 # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebug.conf
index adedacf9a192..72986bb881eb 100644
--- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebug.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebugWithShell.conf
index d1ec6b0f49f5..09e65153e4f7 100644
--- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebugWithShell.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZDebugWithShell.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZRelease.conf
index dfe15be01aaa..8a9f760d3336 100644
--- a/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dk_nrf52833/app_ZRelease.conf
@@ -99,7 +99,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebug.conf
index cf994450f50c..18fdf0eec880 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebug.conf
@@ -96,7 +96,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugMCUBoot.conf
index dc6eecd273a5..518f46fd5696 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugMCUBoot.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugMCUBoot.conf
@@ -97,7 +97,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugWithShell.conf
index 82a9eff595b2..cb3d656edcc3 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugWithShell.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZDebugWithShell.conf
@@ -97,7 +97,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZRelease.conf
index 8296d5bc856e..05c07d3aaa93 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZRelease.conf
@@ -95,7 +95,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZReleaseMCUBoot.conf
index c8c440255256..86effca1f02e 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZReleaseMCUBoot.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/app_ZReleaseMCUBoot.conf
@@ -95,7 +95,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZDebugMCUBoot.conf
index 8b3762daff5a..5fd6297aad9c 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZDebugMCUBoot.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZDebugMCUBoot.conf
@@ -47,7 +47,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=10
 CONFIG_MULTITHREADING=y
 
 # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZReleaseMCUBoot.conf
index 1703f7997cbe..d272024dafbb 100644
--- a/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZReleaseMCUBoot.conf
+++ b/applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/mcuboot_ZReleaseMCUBoot.conf
@@ -47,7 +47,6 @@ CONFIG_BOOT_SERIAL_DETECT_PIN=10
 CONFIG_MULTITHREADING=y
 
 # USB
-CONFIG_USB=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader nRF52 Desktop"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
index 38ea7b28cf60..f087772bc365 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug.conf
@@ -103,7 +103,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -142,12 +141,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugB0.conf
index 93211c74a0be..4cd3b4b2cd29 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugB0.conf
@@ -104,7 +104,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -143,12 +142,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootQSPI.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootQSPI.conf
index 78d3e8c8be39..c7da22efa46d 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootQSPI.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootQSPI.conf
@@ -108,7 +108,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -147,12 +146,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootSMP.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootSMP.conf
index dc5f2eb4ebd8..1301a7065a14 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootSMP.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugMCUBootSMP.conf
@@ -111,7 +111,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -160,12 +159,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugWithShell.conf
index 3bc0d6ae422a..cfc60a7e433c 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugWithShell.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebugWithShell.conf
@@ -103,7 +103,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -142,12 +141,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_dongle.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_dongle.conf
index 089335ee9849..c8d9c58a68e5 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_dongle.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_dongle.conf
@@ -105,7 +105,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_keyboard.conf
index e9beffb79356..ac682fb9bc7e 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_keyboard.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZDebug_keyboard.conf
@@ -110,7 +110,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -149,12 +148,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=47
 CONFIG_BT_GATT_CHRC_POOL_SIZE=17
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
index 45e51dacb1e5..eba5ca72e593 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZRelease.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -137,12 +136,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZReleaseB0.conf
index 9c133c2d0805..3634c878d4fe 100644
--- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZReleaseB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_ZReleaseB0.conf
@@ -101,7 +101,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -138,12 +137,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug.conf
index 50fb6917bf49..4678b3f226f5 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug.conf
@@ -104,7 +104,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug3BLEconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug3BLEconn.conf
index 34ae04f93a81..bff203bc9ef7 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug3BLEconn.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug3BLEconn.conf
@@ -111,7 +111,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug4LLPMconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug4LLPMconn.conf
index 5d2d9861488b..5437ddcf4a04 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug4LLPMconn.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebug4LLPMconn.conf
@@ -111,7 +111,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugB0.conf
index 0565712ed5c6..76e8967e35aa 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugB0.conf
@@ -105,7 +105,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugWithShell.conf
index 776a3141afde..ab7109ef2616 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugWithShell.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZDebugWithShell.conf
@@ -104,7 +104,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease.conf
index e68a155b8ff1..d6d565bdc227 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease.conf
@@ -102,7 +102,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease4LLPMconn.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease4LLPMconn.conf
index 45875b9f6a97..2697df7b4176 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease4LLPMconn.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZRelease4LLPMconn.conf
@@ -109,7 +109,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZReleaseB0.conf
index cbcf5be6fabb..89464c91a8b6 100644
--- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZReleaseB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_ZReleaseB0.conf
@@ -103,7 +103,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebug.conf
index 7cc04875583e..87cf6e1ea239 100644
--- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebug.conf
@@ -152,7 +152,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -192,12 +191,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=8
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugB0.conf
index 1e1308ad5ca4..3a98b2ac415c 100644
--- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugB0.conf
@@ -153,7 +153,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -193,12 +192,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=8
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugMCUBootSMP.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugMCUBootSMP.conf
index a5839addbd9f..366c45af2b17 100644
--- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugMCUBootSMP.conf
+++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugMCUBootSMP.conf
@@ -161,7 +161,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -211,7 +210,7 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugWithShell.conf
index d2394a583700..7c63c7e91b9e 100644
--- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugWithShell.conf
+++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZDebugWithShell.conf
@@ -152,7 +152,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -192,12 +191,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=8
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZRelease.conf
index 07b2b79fbb53..e13283b7ccb7 100644
--- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZRelease.conf
@@ -147,7 +147,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -185,12 +184,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=8
diff --git a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZReleaseB0.conf
index 6620c356c3dc..c1d749e72aa6 100644
--- a/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZReleaseB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52840gmouse_nrf52840/app_ZReleaseB0.conf
@@ -148,7 +148,6 @@ CONFIG_SPI=y
 CONFIG_SPI_NRFX=y
 CONFIG_SPI_NRFX_RAM_BUFFER_SIZE=8
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
@@ -186,12 +185,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=8
diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZDebug.conf
index 9fa2f7ef0e84..4575a5162187 100644
--- a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZDebug.conf
@@ -131,7 +131,7 @@ CONFIG_BT_CTLR=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=n
 CONFIG_BT_CTLR_TX_PWR_0=y
 CONFIG_BT_CONN_TX_MAX=4
-CONFIG_BT_CTLR_WL_SIZE=1
+CONFIG_BT_CTLR_FAL_SIZE=1
 CONFIG_BT_CTLR_RL_SIZE=2
 
 CONFIG_BT_DATA_LEN_UPDATE=n
@@ -140,12 +140,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZRelease.conf
index e4809b72c290..8258e6a688f0 100644
--- a/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52dmouse_nrf52832/app_ZRelease.conf
@@ -126,7 +126,7 @@ CONFIG_BT_CTLR=y
 CONFIG_BT_CTLR_CONN_PARAM_REQ=n
 CONFIG_BT_CTLR_TX_PWR_0=y
 CONFIG_BT_CONN_TX_MAX=4
-CONFIG_BT_CTLR_WL_SIZE=1
+CONFIG_BT_CTLR_FAL_SIZE=1
 CONFIG_BT_CTLR_RL_SIZE=2
 
 CONFIG_BT_DATA_LEN_UPDATE=n
@@ -135,12 +135,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=27
 CONFIG_BT_GATT_CHRC_POOL_SIZE=7
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebug.conf
index 49000b19e327..3f78a7728ebe 100644
--- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebug.conf
@@ -148,12 +148,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=47
 CONFIG_BT_GATT_CHRC_POOL_SIZE=17
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugB0.conf
index b31d051ad939..2b7d41d4544a 100644
--- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugB0.conf
@@ -149,12 +149,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=47
 CONFIG_BT_GATT_CHRC_POOL_SIZE=17
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugWithShell.conf
index 01b54f0b2b19..047d827b77d6 100644
--- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugWithShell.conf
+++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZDebugWithShell.conf
@@ -148,12 +148,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=47
 CONFIG_BT_GATT_CHRC_POOL_SIZE=17
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZRelease.conf
index fcac52b5fd6d..69db25f51588 100644
--- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZRelease.conf
@@ -144,12 +144,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=47
 CONFIG_BT_GATT_CHRC_POOL_SIZE=17
diff --git a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZReleaseB0.conf
index 5ae22c07954d..e7b66d545efa 100644
--- a/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZReleaseB0.conf
+++ b/applications/nrf_desktop/configuration/nrf52kbd_nrf52832/app_ZReleaseB0.conf
@@ -145,12 +145,12 @@ CONFIG_BT_AUTO_PHY_UPDATE=n
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=99
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=99
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=400
 
 CONFIG_BT_CONN_PARAM_UPDATE_TIMEOUT=1000
 
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 
 CONFIG_BT_GATT_UUID16_POOL_SIZE=47
 CONFIG_BT_GATT_CHRC_POOL_SIZE=17
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
index 3036c8a90407..9653305c4f5b 100644
--- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
+++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebug.conf
@@ -100,7 +100,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebugB0.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebugB0.conf
index 9888c81de0a8..32b1843d1c1f 100644
--- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebugB0.conf
+++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZDebugB0.conf
@@ -101,7 +101,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZRelease.conf
index 01b2cdc2af1d..b9f84b06be5b 100644
--- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZRelease.conf
+++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZRelease.conf
@@ -98,7 +98,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZReleaseB0.conf b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZReleaseB0.conf
index 596481b18489..4d6588173d23 100644
--- a/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZReleaseB0.conf
+++ b/applications/nrf_desktop/configuration/nrf5340dk_nrf5340_cpuapp/app_ZReleaseB0.conf
@@ -99,7 +99,6 @@ CONFIG_PWM=y
 CONFIG_LED=y
 CONFIG_LED_PWM=y
 
-CONFIG_USB=y
 CONFIG_USB_NRFX=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
diff --git a/applications/nrf_desktop/doc/ble_adv.rst b/applications/nrf_desktop/doc/ble_adv.rst
index bbf46488f496..d00b23186166 100644
--- a/applications/nrf_desktop/doc/ble_adv.rst
+++ b/applications/nrf_desktop/doc/ble_adv.rst
@@ -31,7 +31,7 @@ Avoiding connection requests from unbonded centrals when bonded
 ===============================================================
 
 If the Bluetooth local identity currently in use already has a bond and the nRF Desktop device uses indirect advertising, the device will not set the General Discoverable flag.
-The nRF desktop devices also enable :kconfig:`CONFIG_BT_WHITELIST` to whitelist incoming scan response data requests and connection requests.
+The nRF Desktop devices also enable :kconfig:`CONFIG_BT_FILTER_ACCEPT_LIST` to mark incoming scan response data requests and connection requests as acceptable.
 This is done to prevent Bluetooth Centrals other than the bonded one from connecting with the device.
 The nRF Desktop dongle scans for peripheral devices using the Bluetooth device name, which is provided in the scan response data.
 
diff --git a/applications/nrf_desktop/doc/ble_latency.rst b/applications/nrf_desktop/doc/ble_latency.rst
index 28ac045bf12b..62bf25e46c63 100644
--- a/applications/nrf_desktop/doc/ble_latency.rst
+++ b/applications/nrf_desktop/doc/ble_latency.rst
@@ -52,7 +52,7 @@ The module listens for the following events related to data transfer initiated b
 * ``ble_smp_transfer_event`` - This event is received when the firmware update is received by :ref:`nrf_desktop_ble_smp`.
 
 When these events are received, the module sets the connection latency to low.
-When the :ref:`nrf_desktop_config_channel` is no longer in use and firmware update is not received by :ref:`nrf_desktop_ble_smp` (no mentioned events for ``LOW_LATENCY_CHECK_PERIOD_MS``), the module sets the connection latency to :kconfig:`CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY`  to reduce the power consumption.
+When the :ref:`nrf_desktop_config_channel` is no longer in use and firmware update is not received by :ref:`nrf_desktop_ble_smp` (no mentioned events for ``LOW_LATENCY_CHECK_PERIOD_MS``), the module sets the connection latency to :kconfig:`CONFIG_BT_PERIPHERAL_PREF_LATENCY`  to reduce the power consumption.
 
   .. note::
      If the option :kconfig:`CONFIG_DESKTOP_BLE_LOW_LATENCY_LOCK` is enabled, the LLPM connection latency is not increased unless the device is in the low power mode.
diff --git a/applications/nrf_desktop/doc/ble_qos.rst b/applications/nrf_desktop/doc/ble_qos.rst
index a79c978e3e0b..60c9a3bcd336 100644
--- a/applications/nrf_desktop/doc/ble_qos.rst
+++ b/applications/nrf_desktop/doc/ble_qos.rst
@@ -34,7 +34,7 @@ The option selects :kconfig:`CONFIG_BT_HCI_VS_EVT_USER`, because the module uses
 
 You can use the :kconfig:`CONFIG_DESKTOP_BLE_QOS_STATS_PRINTOUT_ENABLE` option to enable real-time QoS information printouts through a virtual COM port (serial port emulated over USB).
 This option also enables and configures the COM port (USB CDC ACM).
-For this reason, the :kconfig:`CONFIG_USB` must be enabled.
+For this reason, the :kconfig:`CONFIG_USB_DEVICE_STACK` must be enabled.
 
 The QoS module creates additional thread for processing the QoS algorithm.
 You can define the following options:
diff --git a/applications/nrf_desktop/src/hw_interface/motion_sensor.c b/applications/nrf_desktop/src/hw_interface/motion_sensor.c
index 7655228f85a9..e5cfaa3bc828 100644
--- a/applications/nrf_desktop/src/hw_interface/motion_sensor.c
+++ b/applications/nrf_desktop/src/hw_interface/motion_sensor.c
@@ -154,7 +154,7 @@ static int settings_set(const char *key, size_t len_rd,
 SETTINGS_STATIC_HANDLER_DEFINE(motion_sensor, MODULE_NAME, NULL, settings_set,
 			       NULL, NULL);
 
-static void data_ready_handler(const struct device *dev, struct sensor_trigger *trig);
+static void data_ready_handler(const struct device *dev, const struct sensor_trigger *trig);
 
 
 static int enable_trigger(void)
@@ -181,7 +181,7 @@ static int disable_trigger(void)
 	return err;
 }
 
-static void data_ready_handler(const struct device *dev, struct sensor_trigger *trig)
+static void data_ready_handler(const struct device *dev, const struct sensor_trigger *trig)
 {
 	k_spinlock_key_t key = k_spin_lock(&state.lock);
 
diff --git a/applications/nrf_desktop/src/hw_interface/wheel.c b/applications/nrf_desktop/src/hw_interface/wheel.c
index ce78b9cc4643..55a75972e436 100644
--- a/applications/nrf_desktop/src/hw_interface/wheel.c
+++ b/applications/nrf_desktop/src/hw_interface/wheel.c
@@ -56,7 +56,7 @@ static enum state state;
 static int enable_qdec(enum state next_state);
 
 
-static void data_ready_handler(const struct device *dev, struct sensor_trigger *trig)
+static void data_ready_handler(const struct device *dev, const struct sensor_trigger *trig)
 {
 	if (IS_ENABLED(CONFIG_ASSERT)) {
 		k_spinlock_key_t key = k_spin_lock(&lock);
@@ -199,7 +199,13 @@ static int enable_qdec(enum state next_state)
 {
 	__ASSERT_NO_MSG(next_state == STATE_ACTIVE);
 
-	int err = pm_device_state_set(qdec_dev, PM_DEVICE_STATE_ACTIVE);
+	int err = 0;
+
+	/* QDEC device driver starts in PM_DEVICE_STATE_ACTIVE state. */
+	if (state != STATE_DISABLED) {
+		err = pm_device_state_set(qdec_dev, PM_DEVICE_STATE_ACTIVE);
+	}
+
 	if (err) {
 		LOG_ERR("Cannot activate QDEC");
 		return err;
@@ -237,7 +243,7 @@ static int disable_qdec(enum state next_state)
 		return err;
 	}
 
-	err = pm_device_state_set(qdec_dev, PM_DEVICE_STATE_SUSPEND);
+	err = pm_device_state_set(qdec_dev, PM_DEVICE_STATE_SUSPENDED);
 	if (err) {
 		LOG_ERR("Cannot suspend QDEC");
 	} else {
diff --git a/applications/nrf_desktop/src/modules/Kconfig.ble b/applications/nrf_desktop/src/modules/Kconfig.ble
index b4472f5c1a4a..7bdb17fb929c 100644
--- a/applications/nrf_desktop/src/modules/Kconfig.ble
+++ b/applications/nrf_desktop/src/modules/Kconfig.ble
@@ -260,7 +260,7 @@ config DESKTOP_BLE_QOS_STACK_SIZE
 config DESKTOP_BLE_QOS_STATS_PRINTOUT_ENABLE
 	bool "Enable BLE QoS statistics printout"
 	depends on DESKTOP_BLE_QOS_ENABLE
-	depends on USB
+	depends on USB_DEVICE_STACK
 	select USB_COMPOSITE_DEVICE
 	select USB_CDC_ACM
 	select SERIAL
diff --git a/applications/nrf_desktop/src/modules/ble_conn_params.c b/applications/nrf_desktop/src/modules/ble_conn_params.c
index 97a74d557d4d..c122cf153d0f 100644
--- a/applications/nrf_desktop/src/modules/ble_conn_params.c
+++ b/applications/nrf_desktop/src/modules/ble_conn_params.c
@@ -150,7 +150,7 @@ static bool conn_params_update_required(struct connected_peer *peer)
 		return true;
 	}
 
-	__ASSERT_NO_MSG(info.role == BT_CONN_ROLE_MASTER);
+	__ASSERT_NO_MSG(info.role == BT_CONN_ROLE_CENTRAL);
 
 	if ((peer->llpm_support && (info.le.interval != CONN_INTERVAL_LLPM_REG)) ||
 	    (!peer->llpm_support && (info.le.interval != CONN_INTERVAL_BLE_REG)) ||
diff --git a/applications/nrf_desktop/src/modules/ble_latency.c b/applications/nrf_desktop/src/modules/ble_latency.c
index c7d5feeb3c49..a94e42dc2719 100644
--- a/applications/nrf_desktop/src/modules/ble_latency.c
+++ b/applications/nrf_desktop/src/modules/ble_latency.c
@@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_DESKTOP_BLE_LATENCY_LOG_LEVEL);
 #define SECURITY_FAIL_TIMEOUT_MS \
 	K_SECONDS(CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S)
 #define LOW_LATENCY_CHECK_PERIOD_MS	K_SECONDS(5)
-#define DEFAULT_LATENCY			CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY
+#define DEFAULT_LATENCY			CONFIG_BT_PERIPHERAL_PREF_LATENCY
 #define DEFAULT_TIMEOUT			CONFIG_BT_PERIPHERAL_PREF_TIMEOUT
 #define REG_CONN_INTERVAL_LLPM_MASK	0x0d00
 #define REG_CONN_INTERVAL_BLE_DEFAULT	0x0006
@@ -94,7 +94,7 @@ static void set_conn_latency(bool low_latency)
 		return;
 	}
 
-	__ASSERT_NO_MSG(info.role == BT_CONN_ROLE_SLAVE);
+	__ASSERT_NO_MSG(info.role == BT_CONN_ROLE_PERIPHERAL);
 	if ((low_latency && (info.le.latency == 0)) ||
 	    ((!low_latency) && (info.le.latency == DEFAULT_LATENCY))) {
 		LOG_INF("Latency is already updated");
diff --git a/applications/nrf_desktop/src/modules/usb_state.c b/applications/nrf_desktop/src/modules/usb_state.c
index 08bdb73c7a86..4a089c134d13 100644
--- a/applications/nrf_desktop/src/modules/usb_state.c
+++ b/applications/nrf_desktop/src/modules/usb_state.c
@@ -10,7 +10,7 @@
 #include <sys/util.h>
 
 #include <usb/usb_device.h>
-#include <usb/usb_common.h>
+#include <usb/usb_ch9.h>
 #include <usb/class/usb_hid.h>
 
 
diff --git a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.dts b/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.dts
index 9c35ed6efa0f..59ccc0fe0943 100644
--- a/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.dts
+++ b/boards/arm/nrf52820dongle_nrf52820/nrf52820dongle_nrf52820.dts
@@ -107,7 +107,7 @@
 	};
 };
 
-&usbd {
+zephyr_udc0: &usbd {
 	compatible = "nordic,nrf-usbd";
 	status = "okay";
 };
diff --git a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts b/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts
index c5910b7c9b00..1dc66cabda80 100644
--- a/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts
+++ b/boards/arm/nrf52833dongle_nrf52833/nrf52833dongle_nrf52833.dts
@@ -116,7 +116,7 @@
 	};
 };
 
-&usbd {
+zephyr_udc0: &usbd {
 	compatible = "nordic,nrf-usbd";
 	status = "okay";
 };
diff --git a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.dts b/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.dts
index 6557aac6506c..cb088c55ff5c 100644
--- a/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.dts
+++ b/boards/arm/nrf52840gmouse_nrf52840/nrf52840gmouse_nrf52840.dts
@@ -130,7 +130,7 @@
 	};
 };
 
-&usbd {
+zephyr_udc0: &usbd {
 	compatible = "nordic,nrf-usbd";
 	status = "okay";
 };
diff --git a/boards/arm/thingy91_nrf52840/thingy91_nrf52840.dts b/boards/arm/thingy91_nrf52840/thingy91_nrf52840.dts
index c69d3cb65fa3..7cf9a4a9ed14 100644
--- a/boards/arm/thingy91_nrf52840/thingy91_nrf52840.dts
+++ b/boards/arm/thingy91_nrf52840/thingy91_nrf52840.dts
@@ -54,7 +54,7 @@
 	cts-pin = <19>;
 };
 
-&usbd {
+zephyr_udc0: &usbd {
 	status = "okay";
 };
 
diff --git a/cmake/s1.cmake b/cmake/s1.cmake
index 108e0ad985b9..a4a4d5b9cdd3 100644
--- a/cmake/s1.cmake
+++ b/cmake/s1.cmake
@@ -80,6 +80,7 @@ if (CONFIG_BUILD_S1_VARIANT AND
     --output-source ${link_variant}dev_handles.c
     --kernel $<TARGET_FILE:${${link_variant}prebuilt}>
     --zephyr-base ${ZEPHYR_BASE}
+    --start-symbol "$<TARGET_PROPERTY:linker,devices_start_symbol>"
     DEPENDS $<TARGET_FILE:${${link_variant}prebuilt}>
     )
   list(APPEND ${link_variant}generated_kernel_files ${link_variant}dev_handles.c)
diff --git a/doc/nrf/libraries/bluetooth_services/rpc.rst b/doc/nrf/libraries/bluetooth_services/rpc.rst
index fdc16cd5402c..11c42f2c1de3 100644
--- a/doc/nrf/libraries/bluetooth_services/rpc.rst
+++ b/doc/nrf/libraries/bluetooth_services/rpc.rst
@@ -42,7 +42,7 @@ Set the following options in the same way for the :ref:`ble_rpc_host` and applic
 
    * :kconfig:`CONFIG_BT_CENTRAL`
    * :kconfig:`CONFIG_BT_PERIPHERAL`
-   * :kconfig:`CONFIG_BT_WHITELIST`
+   * :kconfig:`CONFIG_BT_FILTER_ACCEPT_LIST`
    * :kconfig:`CONFIG_BT_USER_PHY_UPDATE`
    * :kconfig:`CONFIG_BT_USER_DATA_LEN_UPDATE`
    * :kconfig:`CONFIG_BT_PRIVACY`
diff --git a/doc/nrf/libraries/caf/ble_adv.rst b/doc/nrf/libraries/caf/ble_adv.rst
index b3add384c761..35d13b9f05de 100644
--- a/doc/nrf/libraries/caf/ble_adv.rst
+++ b/doc/nrf/libraries/caf/ble_adv.rst
@@ -136,7 +136,7 @@ The module performs one of the following operations:
 Avoiding connection requests from unbonded centrals when bonded
 ===============================================================
 
-If :kconfig:`CONFIG_BT_WHITELIST` is enabled and Bluetooth local identity that is in use already has a bond, the device will whitelist incoming scan response data requests and connection requests.
+If :kconfig:`CONFIG_BT_FILTER_ACCEPT_LIST` is enabled and Bluetooth local identity that is in use already has a bond, the device will mark incoming scan response data requests and connection requests as acceptable.
 This is done to prevent Bluetooth Centrals other than the bonded one from connecting with the device.
 
 .. |ble_adv| replace:: Bluetooth® LE advertising module
diff --git a/doc/nrf/ug_thread_tools.rst b/doc/nrf/ug_thread_tools.rst
index afe53cf25a2b..672b9f69ff47 100644
--- a/doc/nrf/ug_thread_tools.rst
+++ b/doc/nrf/ug_thread_tools.rst
@@ -87,7 +87,7 @@ To program the nRF device with the RCP application, complete the following steps
 
          .. code-block:: console
 
-            west build -p always -b nrf52840dongle_nrf52840 nrf/samples/openthread/coprocessor/ -- -DOVERLAY_CONFIG="overlay-rcp.conf ../cli/overlay-thread_1_2.conf overlay-usb.conf"
+            west build -p always -b nrf52840dongle_nrf52840 nrf/samples/openthread/coprocessor/ -- -DOVERLAY_CONFIG="overlay-rcp.conf ../cli/overlay-thread_1_2.conf overlay-usb.conf" -DDTC_OVERLAY_FILE="usb.overlay"
 
       .. tab:: nRF52840 Development Kit (UART transport)
 
diff --git a/dts/bindings/vendor-prefixes.txt b/dts/bindings/vendor-prefixes.txt
new file mode 100644
index 000000000000..72f3a4fdc2d3
--- /dev/null
+++ b/dts/bindings/vendor-prefixes.txt
@@ -0,0 +1 @@
+pixart	PixArt Imaging Inc.
diff --git a/include/bluetooth/mesh/scene_srv.h b/include/bluetooth/mesh/scene_srv.h
index 4a00636bf32f..0960b903246c 100644
--- a/include/bluetooth/mesh/scene_srv.h
+++ b/include/bluetooth/mesh/scene_srv.h
@@ -34,7 +34,7 @@ extern "C" {
  *  @param[in] _name Name of the scene entry type
  */
 #define BT_MESH_SCENE_ENTRY_SIG(_name)                                         \
-	static const Z_STRUCT_SECTION_ITERABLE(                                \
+	static const STRUCT_SECTION_ITERABLE(                                \
 		bt_mesh_scene_entry, bt_mesh_scene_entry_sig_##_name)
 
 /** @def BT_MESH_SCENE_ENTRY_VND
@@ -44,7 +44,7 @@ extern "C" {
  *  @param[in] _name Name of the scene entry type
  */
 #define BT_MESH_SCENE_ENTRY_VND(_name)                                         \
-	static const Z_STRUCT_SECTION_ITERABLE(                                \
+	static const STRUCT_SECTION_ITERABLE(                                \
 		bt_mesh_scene_entry, bt_mesh_scene_entry_vnd_##_name)
 
 struct bt_mesh_scene_srv;
diff --git a/include/esb.h b/include/esb.h
index 565165e23442..3af917559ea2 100644
--- a/include/esb.h
+++ b/include/esb.h
@@ -54,8 +54,6 @@ extern "C" {
 		.retransmit_delay = 600,				       \
 		.retransmit_count = 3,					       \
 		.tx_mode = ESB_TXMODE_AUTO,				       \
-		.radio_irq_priority = 1,				       \
-		.event_irq_priority = 2,				       \
 		.payload_length = 32,					       \
 		.selective_auto_ack = false                                    \
 	}
@@ -75,8 +73,6 @@ extern "C" {
 		.retransmit_delay = 600,				       \
 		.retransmit_count = 3,					       \
 		.tx_mode = ESB_TXMODE_AUTO,				       \
-		.radio_irq_priority = 1,				       \
-		.event_irq_priority = 2,				       \
 		.payload_length = 32,					       \
 		.selective_auto_ack = false                                    \
 	}
@@ -238,9 +234,6 @@ struct esb_config {
 	/* Control settings */
 	enum esb_tx_mode tx_mode;	/**< Transmission mode. */
 
-	uint8_t radio_irq_priority;	/**< nRF radio interrupt priority. */
-	uint8_t event_irq_priority;	/**< ESB event interrupt priority. */
-
 	uint8_t payload_length; /**< Length of the payload (maximum length depends
 			       *  on the platforms that are used on each side).
 			       */
diff --git a/include/modem/at_monitor.h b/include/modem/at_monitor.h
index c2d2c932ea95..1bee1a97c765 100644
--- a/include/modem/at_monitor.h
+++ b/include/modem/at_monitor.h
@@ -69,7 +69,7 @@ void at_monitor_init(void);
  */
 #define AT_MONITOR(name, _filter, _handler, ...)                               \
 	static void _handler(const char *);                                    \
-	Z_STRUCT_SECTION_ITERABLE(at_monitor_entry, at_monitor_##name) = {     \
+	STRUCT_SECTION_ITERABLE(at_monitor_entry, at_monitor_##name) = {       \
 		.filter = _filter,                                             \
 		.handler = _handler,                                           \
 		COND_CODE_1(__VA_ARGS__, (.paused = __VA_ARGS__,), ())         \
diff --git a/include/nfc/tnep/tag.h b/include/nfc/tnep/tag.h
index d7df286b67bd..9b108b10fdd2 100644
--- a/include/nfc/tnep/tag.h
+++ b/include/nfc/tnep/tag.h
@@ -140,7 +140,7 @@ struct nfc_tnep_tag_service {
 		.error_detected = _error_cb,                            \
 	};                                                              \
 									\
-	const Z_STRUCT_SECTION_ITERABLE(nfc_tnep_tag_service, _name##_svc) = \
+	const STRUCT_SECTION_ITERABLE(nfc_tnep_tag_service, _name##_svc) = \
 		NFC_TNEP_TAG_SERVICE(_name)
 
 /**
diff --git a/lib/at_monitor/at_monitor.c b/lib/at_monitor/at_monitor.c
index e1611ac3b5ad..395fb42bc031 100644
--- a/lib/at_monitor/at_monitor.c
+++ b/lib/at_monitor/at_monitor.c
@@ -53,7 +53,7 @@ static void at_monitor_task(struct k_work *work)
 	while ((at_notif = k_fifo_get(&at_monitor_fifo, K_NO_WAIT))) {
 		/* Match notification with all monitors */
 		LOG_DBG("AT notif: %s", at_notif->data);
-		Z_STRUCT_SECTION_FOREACH(at_monitor_entry, e) {
+		STRUCT_SECTION_FOREACH(at_monitor_entry, e) {
 			if (!e->paused &&
 			   (e->filter == ANY || strstr(at_notif->data, e->filter))) {
 				LOG_DBG("Dispatching to %p", e->handler);
diff --git a/modules/mcuboot/CMakeLists.txt b/modules/mcuboot/CMakeLists.txt
index cfce5e6a8166..bfe9c8a46a1e 100644
--- a/modules/mcuboot/CMakeLists.txt
+++ b/modules/mcuboot/CMakeLists.txt
@@ -203,6 +203,16 @@ if(CONFIG_BOOTLOADER_MCUBOOT)
       )
   endif()
 
+  # For devices with USB then a USB CDC node in mcuboot is required.
+  # As USB CDC is generally needed for this mcuboot use-case it should be
+  # considered if this solution could be better generalized.
+  if (CONFIG_MCUBOOT_USB_SUPPORT)
+    add_overlay_dts(
+      mcuboot
+      ${ZEPHYR_NRF_MODULE_DIR}/modules/mcuboot/usb.overlay
+      )
+  endif()
+
   add_child_image(
     NAME mcuboot
     SOURCE_DIR ${ZEPHYR_MCUBOOT_MODULE_DIR}/boot/zephyr
diff --git a/modules/mcuboot/Kconfig b/modules/mcuboot/Kconfig
index b3707c04f3a1..484b27dd3e49 100644
--- a/modules/mcuboot/Kconfig
+++ b/modules/mcuboot/Kconfig
@@ -34,4 +34,8 @@ config DT_FLASH_WRITE_BLOCK_SIZE
 	int
 	default $(dt_node_int_prop_int,$(DT_CHOSEN_ZEPHYR_FLASH),write-block-size)
 
+config MCUBOOT_USB_SUPPORT
+	bool
+	default y if "$(dt_nodelabel_enabled,zephyr_udc0)"
+
 endmenu
diff --git a/modules/mcuboot/usb.overlay b/modules/mcuboot/usb.overlay
new file mode 100644
index 000000000000..a57a09277c37
--- /dev/null
+++ b/modules/mcuboot/usb.overlay
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/modules/trusted-firmware-m/Kconfig.mbedtls_minimal.defconfig b/modules/trusted-firmware-m/Kconfig.mbedtls_minimal.defconfig
index 490845e03b92..b56cdc10a0c3 100644
--- a/modules/trusted-firmware-m/Kconfig.mbedtls_minimal.defconfig
+++ b/modules/trusted-firmware-m/Kconfig.mbedtls_minimal.defconfig
@@ -21,7 +21,7 @@ config MBEDTLS_DHM_C
 config MBEDTLS_ECP_C
 	default n
 
-config MBEDTLS_HMAC_DRBG_C
+config MBEDTLS_CTR_DRBG_C
 	default n
 
 config MBEDTLS_CIPHER_MODE_CBC
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 61544a50f556..c9130394efba 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -24,6 +24,11 @@ if (CONFIG_SPM)
         spm
         ${NRF_DIR}/samples/spm/spm_ns_handler_from_spm_fault.conf
         )
+
+      add_overlay_dts(
+        mcuboot
+        ${NRF_DIR}/samples/spm/spm_uart.overlay
+      )
   endif()
 
   if (CONFIG_BOARD_ENABLE_CPUNET)
diff --git a/samples/bluetooth/alexa_gadget/prj.conf b/samples/bluetooth/alexa_gadget/prj.conf
index 8bc51cc92d15..d7cdfcd12517 100644
--- a/samples/bluetooth/alexa_gadget/prj.conf
+++ b/samples/bluetooth/alexa_gadget/prj.conf
@@ -39,7 +39,7 @@ CONFIG_BT_DEVICE_APPEARANCE=833
 CONFIG_BT_COMPANY_ID=0x0059
 CONFIG_BT_MAX_CONN=1
 CONFIG_BT_MAX_PAIRED=1
-CONFIG_BT_WHITELIST=y
+CONFIG_BT_FILTER_ACCEPT_LIST=y
 CONFIG_BT_SETTINGS=y
 CONFIG_BT_GATT_CLIENT=y
 # PHY update observed to have issue with Echo Input
diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf
index b7f47bd2532e..fa2b3a65777e 100644
--- a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf
+++ b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf
@@ -1,11 +1,9 @@
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="LLPM sample console"
 CONFIG_USB_UART_CONSOLE=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_UART_LINE_CTRL=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 # Since the default LOG_MODE_MINIMAL is synchronous, it will mess with the USB
 # driver/subsys. Use the deferred mode instead.
diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay
new file mode 100644
index 000000000000..a63a083aa45d
--- /dev/null
+++ b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/bluetooth/llpm/prj.conf b/samples/bluetooth/llpm/prj.conf
index 378e0f7f04ce..bcc2e74e3661 100644
--- a/samples/bluetooth/llpm/prj.conf
+++ b/samples/bluetooth/llpm/prj.conf
@@ -5,6 +5,7 @@
 #
 CONFIG_NCS_SAMPLES_DEFAULTS=y
 
+CONFIG_CONSOLE=y
 CONFIG_CONSOLE_SUBSYS=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_CONSOLE_GETCHAR=y
diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c
index b38d93d9e0df..91a04c720b1a 100644
--- a/samples/bluetooth/llpm/src/main.c
+++ b/samples/bluetooth/llpm/src/main.c
@@ -9,7 +9,7 @@
 #include <sys/printk.h>
 #include <zephyr/types.h>
 
-#if defined(CONFIG_USB)
+#if defined(CONFIG_USB_DEVICE_STACK)
 #include <usb/usb_device.h>
 #include <drivers/uart.h>
 #endif
@@ -188,14 +188,14 @@ static void connected(struct bt_conn *conn, uint8_t err)
 	}
 
 	/* make sure we're not scanning or advertising */
-	if (conn_info.role == BT_CONN_ROLE_MASTER) {
+	if (conn_info.role == BT_CONN_ROLE_CENTRAL) {
 		bt_scan_stop();
 	} else {
 		bt_le_adv_stop();
 	}
 
 	printk("Connected as %s\n",
-	       conn_info.role == BT_CONN_ROLE_MASTER ? "master" : "slave");
+	       conn_info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");
 	printk("Conn. interval is %u units (1.25 ms/unit)\n",
 	       conn_info.le.interval);
 
@@ -217,7 +217,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 		default_conn = NULL;
 	}
 
-	if (conn_info.role == BT_CONN_ROLE_MASTER) {
+	if (conn_info.role == BT_CONN_ROLE_CENTRAL) {
 		scan_start();
 	} else {
 		adv_start();
@@ -375,7 +375,7 @@ static void test_run(void)
 	test_ready = false;
 
 	/* Switch to LLPM short connection interval */
-	if (conn_info.role == BT_CONN_ROLE_MASTER) {
+	if (conn_info.role == BT_CONN_ROLE_CENTRAL) {
 		printk("Press any key to set LLPM short connection interval (1 ms)\n");
 		console_getchar();
 
@@ -420,9 +420,8 @@ void main(void)
 		.le_param_updated = le_param_updated,
 	};
 
-#if defined(CONFIG_USB)
-	const struct device *uart_dev = device_get_binding(
-			CONFIG_UART_CONSOLE_ON_DEV_NAME);
+#if defined(CONFIG_USB_DEVICE_STACK)
+	const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 	uint32_t dtr = 0;
 
 	if (usb_enable(NULL)) {
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf
index 0e80b51b9c86..7cbec0b94833 100644
--- a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.conf
@@ -28,7 +28,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -76,7 +76,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -90,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.overlay
+++ b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf
index 0e80b51b9c86..7cbec0b94833 100644
--- a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -28,7 +28,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -76,7 +76,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -90,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.overlay
+++ b/samples/bluetooth/mesh/light/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf
index 31f7417a681f..c0b2f94d64ff 100644
--- a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.conf
@@ -29,7 +29,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -77,7 +77,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -91,4 +90,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.overlay
+++ b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf
index 31f7417a681f..c0b2f94d64ff 100644
--- a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -29,7 +29,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -77,7 +77,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -91,4 +90,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.overlay
+++ b/samples/bluetooth/mesh/light_switch/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf
index 0e80b51b9c86..7cbec0b94833 100644
--- a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.conf
@@ -28,7 +28,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -76,7 +76,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -90,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.overlay
+++ b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf
index 0e80b51b9c86..7cbec0b94833 100644
--- a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -28,7 +28,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -76,7 +76,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Application"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -90,4 +89,3 @@ CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.overlay
index a2c997d5390d..541dbd6f7014 100644
--- a/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.overlay
+++ b/samples/bluetooth/peripheral_lbs/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,15 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
diff --git a/samples/bluetooth/peripheral_uart/README.rst b/samples/bluetooth/peripheral_uart/README.rst
index f4a95f57a13c..60e2a737261e 100644
--- a/samples/bluetooth/peripheral_uart/README.rst
+++ b/samples/bluetooth/peripheral_uart/README.rst
@@ -135,7 +135,7 @@ Activating sample extensions
 To activate the optional extensions supported by this sample, modify :makevar:`OVERLAY_CONFIG` in the following manner:
 
 * For the minimal build variant, set :file:`prj_minimal.conf`.
-* For the USB CDC ACM extension, set :file:`prj_cdc.conf`.
+* For the USB CDC ACM extension, set :file:`prj_cdc.conf`. Additionally, you need to set :makevar:`DTC_OVERLAY_FILE` to :file:`usb.overlay`.
 
 See :ref:`cmake_options` for instructions on how to add this option.
 For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf
index 10f0120be2b2..657bee2fe64a 100644
--- a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf
+++ b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.conf
@@ -28,7 +28,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -65,7 +65,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Nordic UART Service sample"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -75,9 +74,6 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y
 CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
-# Use CDC_ACM0 for logs, CDC_ACM1 has application-specific usage
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=2
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
 CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_LOG_PRINTK=y
@@ -85,7 +81,6 @@ CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
 CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=4000
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 CONFIG_BT_NUS_UART_ASYNC_ADAPTER=y
 CONFIG_BT_NUS_UART_DEV="CDC_ACM_1"
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.overlay b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.overlay
index a2c997d5390d..aa483bbc4618 100644
--- a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.overlay
+++ b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp.overlay
@@ -60,4 +60,20 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+
+	cdc_acm_uart1: cdc_acm_uart1 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_1";
+	};
 };
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf
index 10f0120be2b2..657bee2fe64a 100644
--- a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.conf
@@ -28,7 +28,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502
 # Use connection parameters that ensure quick data transfer
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=6
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6
-CONFIG_BT_PERIPHERAL_PREF_SLAVE_LATENCY=0
+CONFIG_BT_PERIPHERAL_PREF_LATENCY=0
 CONFIG_BT_PERIPHERAL_PREF_TIMEOUT=42
 
 # LEDs are not inverted on Thingy:53
@@ -65,7 +65,6 @@ CONFIG_FLASH_NOP_DEVICE=y
 ################################################################################
 # Enable USB CDC ACM
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Nordic UART Service sample"
 CONFIG_USB_DEVICE_VID=0x1915
@@ -75,9 +74,6 @@ CONFIG_USB_CDC_ACM=y
 CONFIG_USB_CDC_ACM_LOG_LEVEL_ERR=y
 CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y
 
-# Use CDC_ACM0 for logs, CDC_ACM1 has application-specific usage
-CONFIG_USB_CDC_ACM_DEVICE_COUNT=2
-CONFIG_USB_CDC_ACM_DEVICE_NAME="CDC_ACM"
 CONFIG_USB_UART_CONSOLE=y
 CONFIG_LOG_BACKEND_UART=y
 CONFIG_LOG_PRINTK=y
@@ -85,7 +81,6 @@ CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=1024
 CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=4000
 CONFIG_USE_SEGGER_RTT=n
 CONFIG_LOG_BACKEND_RTT=n
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
 
 CONFIG_BT_NUS_UART_ASYNC_ADAPTER=y
 CONFIG_BT_NUS_UART_DEV="CDC_ACM_1"
diff --git a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.overlay
index a2c997d5390d..aa483bbc4618 100644
--- a/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.overlay
+++ b/samples/bluetooth/peripheral_uart/boards/thingy53_nrf5340_cpuapp_ns.overlay
@@ -60,4 +60,20 @@
 			};
 		};
 	};
+
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+
+	cdc_acm_uart1: cdc_acm_uart1 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_1";
+	};
 };
diff --git a/samples/bluetooth/peripheral_uart/prj_cdc.conf b/samples/bluetooth/peripheral_uart/prj_cdc.conf
index d19f813604fe..bdd1d09a18bf 100644
--- a/samples/bluetooth/peripheral_uart/prj_cdc.conf
+++ b/samples/bluetooth/peripheral_uart/prj_cdc.conf
@@ -8,7 +8,6 @@
 CONFIG_UART_LINE_CTRL=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_BT_NUS_UART_ASYNC_ADAPTER=y
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_CDC_ACM=y
 CONFIG_BT_NUS_UART_DEV="CDC_ACM_0"
@@ -19,4 +18,3 @@ CONFIG_UART_NRFX=n
 
 # Redirect console to CDC
 CONFIG_USB_UART_CONSOLE=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="CDC_ACM_0"
diff --git a/samples/bluetooth/peripheral_uart/sample.yaml b/samples/bluetooth/peripheral_uart/sample.yaml
index 21540b738046..7b117f0c4def 100644
--- a/samples/bluetooth/peripheral_uart/sample.yaml
+++ b/samples/bluetooth/peripheral_uart/sample.yaml
@@ -28,9 +28,9 @@ tests:
     tags: bluetooth ci_build
   samples.bluetooth.peripheral_uart_cdc:
     extra_args: OVERLAY_CONFIG=prj_cdc.conf
+                DTC_OVERLAY_FILE="usb.overlay"
     build_only: true
     platform_allow: nrf52840dk_nrf52840 nrf52833dk_nrf52833
-      nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf52833dk_nrf52833
diff --git a/samples/bluetooth/peripheral_uart/src/main.c b/samples/bluetooth/peripheral_uart/src/main.c
index d6394ab52a94..2acac0051303 100644
--- a/samples/bluetooth/peripheral_uart/src/main.c
+++ b/samples/bluetooth/peripheral_uart/src/main.c
@@ -240,7 +240,7 @@ static int uart_init(void)
 		return -ENXIO;
 	}
 
-	if (IS_ENABLED(CONFIG_USB)) {
+	if (IS_ENABLED(CONFIG_USB_DEVICE_STACK)) {
 		err = usb_enable(NULL);
 		if (err) {
 			LOG_ERR("Failed to enable USB");
diff --git a/samples/bluetooth/peripheral_uart/usb.overlay b/samples/bluetooth/peripheral_uart/usb.overlay
new file mode 100644
index 000000000000..a63a083aa45d
--- /dev/null
+++ b/samples/bluetooth/peripheral_uart/usb.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,console = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/bluetooth/throughput/src/main.c b/samples/bluetooth/throughput/src/main.c
index a4c9e2a29ce6..92a1d1bee135 100644
--- a/samples/bluetooth/throughput/src/main.c
+++ b/samples/bluetooth/throughput/src/main.c
@@ -123,7 +123,7 @@ static void exchange_func(struct bt_conn *conn, uint8_t att_err,
 		return;
 	}
 
-	if (info.role == BT_CONN_ROLE_MASTER) {
+	if (info.role == BT_CONN_ROLE_CENTRAL) {
 		instruction_print();
 		test_ready = true;
 	}
@@ -200,10 +200,10 @@ static void connected(struct bt_conn *conn, uint8_t hci_err)
 	}
 
 	printk("Connected as %s\n",
-	       info.role == BT_CONN_ROLE_MASTER ? "master" : "slave");
+	       info.role == BT_CONN_ROLE_CENTRAL ? "central" : "peripheral");
 	printk("Conn. interval is %u units\n", info.le.interval);
 
-	if (info.role == BT_CONN_ROLE_MASTER) {
+	if (info.role == BT_CONN_ROLE_CENTRAL) {
 		err = bt_gatt_dm_start(default_conn,
 				       BT_UUID_THROUGHPUT,
 				       &discovery_cb,
@@ -296,7 +296,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 	}
 
 	/* Re-connect using same roles */
-	if (info.role == BT_CONN_ROLE_MASTER) {
+	if (info.role == BT_CONN_ROLE_CENTRAL) {
 		scan_start();
 	} else {
 		adv_start();
@@ -446,7 +446,7 @@ static int connection_configuration_set(const struct shell *shell,
 		return err;
 	}
 
-	if (info.role != BT_CONN_ROLE_MASTER) {
+	if (info.role != BT_CONN_ROLE_CENTRAL) {
 		shell_error(shell,
 		"'run' command shall be executed only on the master board");
 	}
diff --git a/samples/crypto/rsa/sample.yaml b/samples/crypto/rsa/sample.yaml
index af3744473c01..dd4e4f4ce87d 100644
--- a/samples/crypto/rsa/sample.yaml
+++ b/samples/crypto/rsa/sample.yaml
@@ -4,7 +4,6 @@ sample:
     name: RSA example
 tests:
     sample.rsa:
-        skip: true
         tags: introduction
         platform_allow: nrf5340dk_nrf5340_cpuapp_ns nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160_ns nrf9160dk_nrf9160 nrf52840dk_nrf52840
         harness: console
diff --git a/samples/edge_impulse/wrapper/prj.conf b/samples/edge_impulse/wrapper/prj.conf
index 9737d9cbc7f6..8a8f31cf86a2 100644
--- a/samples/edge_impulse/wrapper/prj.conf
+++ b/samples/edge_impulse/wrapper/prj.conf
@@ -16,6 +16,7 @@ CONFIG_LIB_CPLUSPLUS=y
 CONFIG_NEWLIB_LIBC=y
 CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
 CONFIG_FPU=y
+CONFIG_FP16=n
 
 # Enable Edge Impulse
 CONFIG_EDGE_IMPULSE=y
diff --git a/samples/keys/random_hw_unique_key/sample.yaml b/samples/keys/random_hw_unique_key/sample.yaml
index 0e4f3a84f321..a30420798f35 100644
--- a/samples/keys/random_hw_unique_key/sample.yaml
+++ b/samples/keys/random_hw_unique_key/sample.yaml
@@ -3,7 +3,7 @@ sample:
   name: Random HW Unique Key
 common:
     tags: hw_unique_key
-    platform_allow: nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 nrf52840dk_nrf52840
+    platform_allow: nrf5340dk_nrf5340_cpuapp nrf9160dk_nrf9160 nrf52840dk_nrf52840 nrf21540dk_nrf52840
     integration_platforms:
       - nrf5340dk_nrf5340_cpuapp
       - nrf9160dk_nrf9160
diff --git a/samples/nrf9160/lwm2m_client/README.rst b/samples/nrf9160/lwm2m_client/README.rst
index 684717b82bde..572dbfbc0b0c 100644
--- a/samples/nrf9160/lwm2m_client/README.rst
+++ b/samples/nrf9160/lwm2m_client/README.rst
@@ -108,11 +108,6 @@ The following LwM2M objects are implemented in this sample:
       - Yes
 
 
-.. note::
-
-   The level resource on the Buzzer object does not work properly.
-   This is due to an error in Zephyr’s float handling, which will be fixed soon.
-
 .. _dtls_support:
 
 DTLS Support
diff --git a/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c b/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c
index 0207f027fcf1..90df09ff31a4 100644
--- a/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c
+++ b/samples/nrf9160/lwm2m_client/src/ipso/ipso_colour_sensor.c
@@ -51,7 +51,7 @@ static struct lwm2m_engine_obj_field fields[] = {
 	OBJ_FIELD_DATA(APPLICATION_TYPE_RID, RW_OPT, STRING),
 #ifdef CONFIG_LWM2M_IPSO_APP_COLOUR_SENSOR_VERSION_1_1
 	OBJ_FIELD_DATA(TIMESTAMP_RID, R_OPT, TIME),
-	OBJ_FIELD_DATA(FRACTIONAL_TIMESTAMP_RID, R_OPT, FLOAT32),
+	OBJ_FIELD_DATA(FRACTIONAL_TIMESTAMP_RID, R_OPT, FLOAT),
 	OBJ_FIELD_DATA(MEASUREMENT_QUALITY_INDICATOR_RID, R_OPT, U8),
 	OBJ_FIELD_DATA(MEASUREMENT_QUALITY_LEVEL_RID, R_OPT, U8)
 #endif
diff --git a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c
index 0f803f4dafc5..99742b49b0cb 100644
--- a/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c
+++ b/samples/nrf9160/lwm2m_client/src/lwm2m/lwm2m_buzzer.c
@@ -62,7 +62,7 @@ static int buzzer_intensity_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t r
 int lwm2m_init_buzzer(void)
 {
 	int ret;
-	float64_value_t start_intensity = { .val1 = INTENSITY_START_VAL, .val2 = 0 };
+	float32_value_t start_intensity = { .val1 = INTENSITY_START_VAL, .val2 = 0 };
 
 	ret = ui_buzzer_init();
 	if (ret) {
@@ -86,7 +86,7 @@ int lwm2m_init_buzzer(void)
 						  buzzer_intensity_cb);
 	lwm2m_engine_set_res_data(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, APPLICATION_TYPE_RID),
 				  BUZZER_APP_TYPE, sizeof(BUZZER_APP_TYPE), LWM2M_RES_DATA_FLAG_RO);
-	lwm2m_engine_set_float64(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, LEVEL_RID), &start_intensity);
+	lwm2m_engine_set_float32(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, LEVEL_RID), &start_intensity);
 
 	if (IS_ENABLED(CONFIG_LWM2M_IPSO_APP_BUZZER_VERSION_1_1)) {
 		lwm2m_engine_set_res_data(LWM2M_PATH(IPSO_OBJECT_BUZZER_ID, 0, TIMESTAMP_RID),
diff --git a/samples/nrf9160/modem_shell/overlay-ppp.conf b/samples/nrf9160/modem_shell/overlay-ppp.conf
index fcaee93da6f9..23410442b130 100644
--- a/samples/nrf9160/modem_shell/overlay-ppp.conf
+++ b/samples/nrf9160/modem_shell/overlay-ppp.conf
@@ -18,9 +18,6 @@ CONFIG_MOSH_SMS=n
 CONFIG_SMS=n
 
 # UARTs are switched
-CONFIG_UART_SHELL_ON_DEV_NAME="UART_1"
-CONFIG_UART_CONSOLE_ON_DEV_NAME="UART_1"
-
 CONFIG_NET_PPP_UART_NAME="UART_0"
 
 # Enable net shell commands
@@ -48,6 +45,7 @@ CONFIG_NET_IP_ADDR_CHECK=n
 CONFIG_NET_DEFAULT_IF_PPP=y
 
 # UART PPP driver
+CONFIG_NET_DRIVERS=y
 CONFIG_NET_PPP=y
 #CONFIG_NET_PPP_RX_PRIORITY=15
 CONFIG_NET_PPP_DRV_NAME="ppp"
diff --git a/samples/nrf9160/modem_shell/boards/nrf9160dk_nrf9160_ns.overlay b/samples/nrf9160/modem_shell/ppp.overlay
similarity index 78%
rename from samples/nrf9160/modem_shell/boards/nrf9160dk_nrf9160_ns.overlay
rename to samples/nrf9160/modem_shell/ppp.overlay
index 2d20704cc1b0..adac11aebc61 100644
--- a/samples/nrf9160/modem_shell/boards/nrf9160dk_nrf9160_ns.overlay
+++ b/samples/nrf9160/modem_shell/ppp.overlay
@@ -10,3 +10,10 @@
 &uart1 {
 	status = "okay";
 };
+
+/ {
+	chosen {
+		zephyr,console = &uart1;
+		zephyr,shell-uart = &uart1;
+	};
+};
diff --git a/samples/nrf9160/modem_shell/sample.yaml b/samples/nrf9160/modem_shell/sample.yaml
index 215b1bfb1ad8..7a04db36a19f 100644
--- a/samples/nrf9160/modem_shell/sample.yaml
+++ b/samples/nrf9160/modem_shell/sample.yaml
@@ -7,3 +7,11 @@ tests:
     integration_platforms:
       - nrf9160dk_nrf9160_ns
     tags: ci_build
+  samples.nrf9160.modem_shell.ppp:
+    build_only: true
+    platform_allow: nrf9160dk_nrf9160_ns
+    integration_platforms:
+      - nrf9160dk_nrf9160_ns
+    extra_args: OVERLAY_CONFIG=overlay-ppp.conf
+                DTC_OVERLAY_FILE="ppp.overlay"
+    tags: ci_build
diff --git a/samples/openthread/cli/README.rst b/samples/openthread/cli/README.rst
index 174f1a8ee809..8ea4b1d9f553 100644
--- a/samples/openthread/cli/README.rst
+++ b/samples/openthread/cli/README.rst
@@ -120,7 +120,7 @@ To activate the optional extensions supported by this sample, modify :makevar:`O
 * For the experimental Thread 1.2 variant, set :file:`overlay-thread_1_2.conf`.
 * For the minimal single protocol variant, set :file:`overlay-minimal_singleprotocol.conf`.
 * For the minimal multiprotocol variant, set :file:`overlay-minimal_multiprotocol.conf`.
-* For USB transport support, set :file:`overlay-usb.conf`.
+* For USB transport support, set :file:`overlay-usb.conf`. Additionally, you need to set :makevar:`DTC_OVERLAY_FILE` to :file:`usb.overlay`.
 
 See :ref:`cmake_options` for instructions on how to add this option.
 For more information about using configuration overlay files, see :ref:`zephyr:important-build-vars` in the Zephyr documentation.
diff --git a/samples/openthread/cli/overlay-usb.conf b/samples/openthread/cli/overlay-usb.conf
index 45d7b7e94ed8..4bbe9ee3cece 100644
--- a/samples/openthread/cli/overlay-usb.conf
+++ b/samples/openthread/cli/overlay-usb.conf
@@ -7,9 +7,8 @@
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51
 
 CONFIG_UART_LINE_CTRL=y
-CONFIG_UART_SHELL_ON_DEV_NAME="CDC_ACM_0"
 
-CONFIG_USB=y
+CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Thread CLI"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/samples/openthread/cli/sample.yaml b/samples/openthread/cli/sample.yaml
index 0cde61c0f3ba..1ce3fd897c91 100644
--- a/samples/openthread/cli/sample.yaml
+++ b/samples/openthread/cli/sample.yaml
@@ -26,6 +26,7 @@ tests:
     platform_allow: nrf5340dk_nrf5340_cpuapp nrf5340dk_nrf5340_cpuapp_ns nrf52840dk_nrf52840 nrf52840dongle_nrf52840 nrf52833dk_nrf52833 nrf21540dk_nrf52840
     tags: ci_build
     extra_args: OVERLAY_CONFIG=overlay-usb.conf
+                DTC_OVERLAY_FILE="usb.overlay"
     integration_platforms:
       - nrf5340dk_nrf5340_cpuapp
       - nrf5340dk_nrf5340_cpuapp_ns
diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c
index fe13c7ccea05..9420aefeb264 100644
--- a/samples/openthread/cli/src/main.c
+++ b/samples/openthread/cli/src/main.c
@@ -41,7 +41,7 @@ void main(void)
 		return;
 	}
 
-	dev = device_get_binding(CONFIG_UART_SHELL_ON_DEV_NAME);
+	dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart));
 	if (dev == NULL) {
 		LOG_ERR("Failed to find specific UART device");
 		return;
diff --git a/samples/openthread/cli/usb.overlay b/samples/openthread/cli/usb.overlay
new file mode 100644
index 000000000000..50a819370eba
--- /dev/null
+++ b/samples/openthread/cli/usb.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,shell-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/openthread/coprocessor/README.rst b/samples/openthread/coprocessor/README.rst
index dc481ea792ce..c5f8483d19b2 100644
--- a/samples/openthread/coprocessor/README.rst
+++ b/samples/openthread/coprocessor/README.rst
@@ -126,7 +126,7 @@ The following configuration files are available:
 * :file:`overlay-minimal_rcp.conf` - Enables a minimal configuration that reduces the code size and RAM usage.
   This file enables the RCP architecture with basic functionality and optimizes stacks and buffer sizes.
   For more information, see :ref:`app_memory`.
-* :file:`overlay-usb.conf` - Enables emulating a serial port over USB for Spinel communication with the host.
+* :file:`overlay-usb.conf` - Enables emulating a serial port over USB for Spinel communication with the host. Additionally, you need to set :makevar:`DTC_OVERLAY_FILE` to :file:`usb.overlay`.
 
 Building and running
 ********************
diff --git a/samples/openthread/coprocessor/boards/nrf21540dk_nrf52840.overlay b/samples/openthread/coprocessor/boards/nrf21540dk_nrf52840.overlay
index 10ee03ec9254..6c6694cc2107 100644
--- a/samples/openthread/coprocessor/boards/nrf21540dk_nrf52840.overlay
+++ b/samples/openthread/coprocessor/boards/nrf21540dk_nrf52840.overlay
@@ -25,5 +25,6 @@
 	*/
 	chosen {
 		zephyr,entropy = &rng;
+		zephyr,ot-uart = &uart0;
 	};
 };
diff --git a/samples/openthread/coprocessor/boards/nrf52833dk_nrf52833.overlay b/samples/openthread/coprocessor/boards/nrf52833dk_nrf52833.overlay
index 9ec48e23d93c..fdabaaa53ba0 100644
--- a/samples/openthread/coprocessor/boards/nrf52833dk_nrf52833.overlay
+++ b/samples/openthread/coprocessor/boards/nrf52833dk_nrf52833.overlay
@@ -13,3 +13,9 @@
 	current-speed = <1000000>;
 	status = "okay";
 };
+
+/ {
+	chosen {
+		zephyr,ot-uart = &uart0;
+	};
+};
diff --git a/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.overlay b/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.overlay
index f198ffaf3fdf..c1ba031847fc 100644
--- a/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.overlay
+++ b/samples/openthread/coprocessor/boards/nrf52840dk_nrf52840.overlay
@@ -23,5 +23,6 @@
 	*/
 	chosen {
 		zephyr,entropy = &rng;
+		zephyr,ot-uart = &uart0;
 	};
 };
diff --git a/samples/openthread/coprocessor/overlay-usb.conf b/samples/openthread/coprocessor/overlay-usb.conf
index 28e27cbfb28b..fd61c214a00f 100644
--- a/samples/openthread/coprocessor/overlay-usb.conf
+++ b/samples/openthread/coprocessor/overlay-usb.conf
@@ -4,11 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# Use USB-CDC-ACM for Co-Processor
-CONFIG_OPENTHREAD_COPROCESSOR_SPINEL_ON_UART_ACM=y
-CONFIG_OPENTHREAD_COPROCESSOR_SPINEL_ON_UART_DEV_NAME="CDC_ACM_0"
-
-CONFIG_USB=y
+CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_CDC_ACM=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor"
diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml
index 8a8c2f3b886d..5293f690b632 100644
--- a/samples/openthread/coprocessor/sample.yaml
+++ b/samples/openthread/coprocessor/sample.yaml
@@ -24,7 +24,8 @@ tests:
     build_only: true
     platform_allow: nrf52840dk_nrf52840 nrf52840dongle_nrf52840 nrf52833dk_nrf52833 nrf21540dk_nrf52840
     tags: ci_build
-    extra_args: OVERLAY_CONFIG=overlay-usb.conf;
+    extra_args: OVERLAY_CONFIG=overlay-usb.conf
+                DTC_OVERLAY_FILE="usb.overlay"
     integration_platforms:
       - nrf52840dk_nrf52840
       - nrf52840dongle_nrf52840
diff --git a/samples/openthread/coprocessor/usb.overlay b/samples/openthread/coprocessor/usb.overlay
new file mode 100644
index 000000000000..923cc66cce1a
--- /dev/null
+++ b/samples/openthread/coprocessor/usb.overlay
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,ot-uart = &cdc_acm_uart0;
+	};
+};
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/peripheral/radio_test/src/radio_test.c b/samples/peripheral/radio_test/src/radio_test.c
index 54b87b1ebce2..459723ea9220 100644
--- a/samples/peripheral/radio_test/src/radio_test.c
+++ b/samples/peripheral/radio_test/src/radio_test.c
@@ -686,10 +686,10 @@ int radio_test_init(struct radio_test_config *config)
 #endif /* CONFIG_NRF21540_FEM */
 
 	timer_init(config);
-	IRQ_CONNECT(TIMER0_IRQn, NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY,
+	IRQ_CONNECT(TIMER0_IRQn, IRQ_PRIO_LOWEST,
 		nrfx_timer_0_irq_handler, NULL, 0);
 
-	irq_connect_dynamic(RADIO_IRQn, 7, radio_handler, config, 0);
+	irq_connect_dynamic(RADIO_IRQn, IRQ_PRIO_LOWEST, radio_handler, config, 0);
 	irq_enable(RADIO_IRQn);
 
 	return 0;
diff --git a/samples/sensor/bh1749/src/main.c b/samples/sensor/bh1749/src/main.c
index 34617cec11d9..7add95695628 100644
--- a/samples/sensor/bh1749/src/main.c
+++ b/samples/sensor/bh1749/src/main.c
@@ -18,7 +18,7 @@
 static K_SEM_DEFINE(sem, 0, 1);
 
 static void trigger_handler(const struct device *dev,
-			    struct sensor_trigger *trigger)
+			    const struct sensor_trigger *trigger)
 {
 	ARG_UNUSED(dev);
 	switch (trigger->type) {
diff --git a/samples/spm/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/spm/boards/nrf5340dk_nrf5340_cpuapp.overlay
deleted file mode 100644
index 95c1bef63cdc..000000000000
--- a/samples/spm/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */
-
-&uart0 {
-	status = "okay";
-
-	spm_uart: nrf-spm-uart {
-		compatible = "nordic,nrf-spm-uart";
-		status = "okay";
-		label = "SPM_UART";
-	};
-};
diff --git a/samples/spm/boards/thingy91_nrf9160.overlay b/samples/spm/boards/thingy91_nrf9160.overlay
deleted file mode 100644
index 95c1bef63cdc..000000000000
--- a/samples/spm/boards/thingy91_nrf9160.overlay
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */
-
-&uart0 {
-	status = "okay";
-
-	spm_uart: nrf-spm-uart {
-		compatible = "nordic,nrf-spm-uart";
-		status = "okay";
-		label = "SPM_UART";
-	};
-};
diff --git a/samples/spm/nrf9160dk_nrf9160.overlay b/samples/spm/nrf9160dk_nrf9160.overlay
index 848e1ac576f9..22e54441ed19 100644
--- a/samples/spm/nrf9160dk_nrf9160.overlay
+++ b/samples/spm/nrf9160dk_nrf9160.overlay
@@ -10,13 +10,3 @@
 &pwm3 {
 	status = "okay";
 };
-
-&uart0 {
-	status = "okay";
-
-	spm_uart: nrf-spm-uart {
-		compatible = "nordic,nrf-spm-uart";
-		status = "okay";
-		label = "SPM_UART";
-	};
-};
diff --git a/samples/spm/sample.yaml b/samples/spm/sample.yaml
index 6cfb436d37a6..fb8eb7fc49b0 100644
--- a/samples/spm/sample.yaml
+++ b/samples/spm/sample.yaml
@@ -16,6 +16,6 @@ tests:
       - nrf5340dk_nrf5340_cpuapp
       - nrf9160dk_nrf9160
     tags: ci_build
+    extra_args: DTC_OVERLAY_FILE="spm_uart.overlay"
     extra_configs:
       - CONFIG_SPM_SHARE_CONSOLE_UART=y
-      - CONFIG_UART_CONSOLE_ON_DEV_NAME="SPM_UART"
diff --git a/samples/spm/spm_ns_handler_from_spm_fault.conf b/samples/spm/spm_ns_handler_from_spm_fault.conf
index 446b89e5b632..be5eececcb12 100644
--- a/samples/spm/spm_ns_handler_from_spm_fault.conf
+++ b/samples/spm/spm_ns_handler_from_spm_fault.conf
@@ -10,7 +10,6 @@
 # When enabled, spm can print to UARTE0 even after switching to non-secure, e.g.
 # from secure fault handler.
 CONFIG_SPM_SHARE_CONSOLE_UART=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="SPM_UART"
 
 # When enabled, spm, in fault handler, will call non-secure fatal error handler.
 CONFIG_SPM_SERVICE_NS_HANDLER_FROM_SPM_FAULT=y
diff --git a/samples/spm/spm_uart.overlay b/samples/spm/spm_uart.overlay
new file mode 100644
index 000000000000..db79be63635d
--- /dev/null
+++ b/samples/spm/spm_uart.overlay
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */
+
+/ {
+	chosen {
+		zephyr,console = &spm_uart;
+	};
+};
+
+&uart0 {
+	status = "okay";
+
+	spm_uart: nrf-spm-uart {
+		compatible = "nordic,nrf-spm-uart";
+		status = "okay";
+		label = "SPM_UART";
+	};
+};
+
+/* This is a workaround for a problem that it's not possible to merge
+ * board-specific and DTC_OVERLAY_FILE defined overlays. Originally PWM was
+ * only enabled for nrf9160dk_nrf9160, but since enabling it only for that board
+ * would make spm_uart overlay selection problematic.
+ */
+&pwm1 {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "okay";
+};
+
+&pwm3 {
+	status = "okay";
+};
diff --git a/samples/zigbee/ncp/boards/nrf21540dk_nrf52840.overlay b/samples/zigbee/ncp/boards/nrf21540dk_nrf52840.overlay
index b69bb2af9e4a..b685c7c5927f 100644
--- a/samples/zigbee/ncp/boards/nrf21540dk_nrf52840.overlay
+++ b/samples/zigbee/ncp/boards/nrf21540dk_nrf52840.overlay
@@ -18,6 +18,13 @@
 	/delete-property/ cts-pin;
 };
 
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
+
 / {
 	chosen {
 		zephyr,entropy = &rng;
diff --git a/samples/zigbee/ncp/boards/nrf52833dk_nrf52833.overlay b/samples/zigbee/ncp/boards/nrf52833dk_nrf52833.overlay
index b69bb2af9e4a..b685c7c5927f 100644
--- a/samples/zigbee/ncp/boards/nrf52833dk_nrf52833.overlay
+++ b/samples/zigbee/ncp/boards/nrf52833dk_nrf52833.overlay
@@ -18,6 +18,13 @@
 	/delete-property/ cts-pin;
 };
 
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
+
 / {
 	chosen {
 		zephyr,entropy = &rng;
diff --git a/samples/zigbee/ncp/boards/nrf52840dk_nrf52840.overlay b/samples/zigbee/ncp/boards/nrf52840dk_nrf52840.overlay
index b69bb2af9e4a..307913d2c022 100644
--- a/samples/zigbee/ncp/boards/nrf52840dk_nrf52840.overlay
+++ b/samples/zigbee/ncp/boards/nrf52840dk_nrf52840.overlay
@@ -18,6 +18,14 @@
 	/delete-property/ cts-pin;
 };
 
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
+
+
 / {
 	chosen {
 		zephyr,entropy = &rng;
diff --git a/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.overlay b/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.overlay
index b5f36b93bf7e..8fcbe03cfb75 100644
--- a/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.overlay
+++ b/samples/zigbee/ncp/boards/nrf52840dongle_nrf52840.overlay
@@ -4,6 +4,13 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
+
 / {
 	chosen {
 		zephyr,entropy = &rng;
diff --git a/samples/zigbee/ncp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/zigbee/ncp/boards/nrf5340dk_nrf5340_cpuapp.overlay
index 5b2bed22f2a9..85e8443b4937 100644
--- a/samples/zigbee/ncp/boards/nrf5340dk_nrf5340_cpuapp.overlay
+++ b/samples/zigbee/ncp/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -18,3 +18,10 @@
 	/delete-property/ rts-pin;
 	/delete-property/ cts-pin;
 };
+
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
+};
diff --git a/samples/zigbee/ncp/prj_usb.conf b/samples/zigbee/ncp/prj_usb.conf
index c2071695580c..09e0c9f9ccce 100644
--- a/samples/zigbee/ncp/prj_usb.conf
+++ b/samples/zigbee/ncp/prj_usb.conf
@@ -23,7 +23,6 @@ CONFIG_ZBOSS_TRACE_LOGGER_DEVICE_NAME="UART_1"
 # CONFIG_USB_COMPOSITE_DEVICE=y
 ####
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zigbee NCP"
 CONFIG_USB_CDC_ACM=y
diff --git a/samples/zigbee/ncp/src/main.c b/samples/zigbee/ncp/src/main.c
index 92f4f99fb7f2..9eee87c3377f 100644
--- a/samples/zigbee/ncp/src/main.c
+++ b/samples/zigbee/ncp/src/main.c
@@ -177,7 +177,7 @@ int main(void)
 {
 	LOG_INF("Starting Zigbee Network Co-processor sample");
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 	/* Enable USB device. */
 	int ret = usb_enable(NULL);
 
@@ -217,7 +217,7 @@ int main(void)
 
 	/* Wait 1 sec for the host to do all settings */
 	k_sleep(K_SECONDS(1));
-#endif /* CONFIG_USB */
+#endif /* CONFIG_USB_DEVICE_STACK */
 
 	zb_osif_ncp_set_nvram_filter();
 
diff --git a/scripts/west_commands/ncs_commands.py b/scripts/west_commands/ncs_commands.py
index 5827e37424c9..e6d1e6e2e0b1 100644
--- a/scripts/west_commands/ncs_commands.py
+++ b/scripts/west_commands/ncs_commands.py
@@ -493,5 +493,5 @@ def _name_and_path(project):
      'modules/hal/telink',
      'modules/hal/ti',
      'modules/hal/xtensa',
-     'modules/lib/tensorflow',
+     'modules/lib/tflite-micro',
      ])
diff --git a/subsys/bluetooth/mesh/sensor_types.c b/subsys/bluetooth/mesh/sensor_types.c
index 3391826d4ee7..f0956e0f34ce 100644
--- a/subsys/bluetooth/mesh/sensor_types.c
+++ b/subsys/bluetooth/mesh/sensor_types.c
@@ -25,7 +25,7 @@
 	const struct bt_mesh_sensor_format bt_mesh_sensor_format_##_name
 
 #define SENSOR_TYPE(name)                                                      \
-	const Z_STRUCT_SECTION_ITERABLE(bt_mesh_sensor_type,                   \
+	const STRUCT_SECTION_ITERABLE(bt_mesh_sensor_type,                     \
 					bt_mesh_sensor_##name)
 
 #ifdef CONFIG_BT_MESH_SENSOR_LABELS
@@ -1204,7 +1204,7 @@ SENSOR_TYPE(rel_dev_runtime_in_a_generic_level_range) = {
 
 const struct bt_mesh_sensor_type *bt_mesh_sensor_type_get(uint16_t id)
 {
-	Z_STRUCT_SECTION_FOREACH(bt_mesh_sensor_type, type) {
+	STRUCT_SECTION_FOREACH(bt_mesh_sensor_type, type) {
 		if (type->id == id) {
 			return type;
 		}
diff --git a/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c b/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c
index a1672e2134cd..26a4e2abf160 100644
--- a/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c
+++ b/subsys/bluetooth/rpc/client/bt_rpc_conn_client.c
@@ -558,7 +558,7 @@ int bt_conn_le_create(const bt_addr_le_t *peer,
 	return result.result;
 }
 
-#if defined(CONFIG_BT_WHITELIST)
+#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
 int bt_conn_le_create_auto(const struct bt_conn_le_create_param *create_param,
 			   const struct bt_le_conn_param *conn_param)
 {
@@ -590,9 +590,9 @@ int bt_conn_create_auto_stop(void)
 
 	return result;
 }
-#endif /* defined(CONFIG_BT_WHITELIST) */
+#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
 
-#if !defined(CONFIG_BT_WHITELIST)
+#if !defined(CONFIG_BT_FILTER_ACCEPT_LIST)
 int bt_le_set_auto_conn(const bt_addr_le_t *addr,
 			const struct bt_le_conn_param *param)
 {
@@ -617,7 +617,7 @@ int bt_le_set_auto_conn(const bt_addr_le_t *addr,
 
 	return result;
 }
-#endif  /* !defined(CONFIG_BT_WHITELIST) */
+#endif  /* !defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
 #endif  /* defined(CONFIG_BT_CENTRAL) */
 
 #if defined(CONFIG_BT_SMP)
diff --git a/subsys/bluetooth/rpc/client/bt_rpc_gap_client.c b/subsys/bluetooth/rpc/client/bt_rpc_gap_client.c
index 673f5f384e85..e62a5dfce826 100644
--- a/subsys/bluetooth/rpc/client/bt_rpc_gap_client.c
+++ b/subsys/bluetooth/rpc/client/bt_rpc_gap_client.c
@@ -1671,8 +1671,8 @@ void bt_le_scan_cb_register(struct bt_le_scan_cb *cb)
 }
 #endif /* defined(CONFIG_BT_OBSERVER) */
 
-#if defined(CONFIG_BT_WHITELIST)
-int bt_le_whitelist_add(const bt_addr_le_t *addr)
+#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
+int bt_le_filter_accept_list_add(const bt_addr_le_t *addr)
 {
 	struct nrf_rpc_cbor_ctx ctx;
 	int result;
@@ -1691,7 +1691,7 @@ int bt_le_whitelist_add(const bt_addr_le_t *addr)
 }
 
 
-int bt_le_whitelist_rem(const bt_addr_le_t *addr)
+int bt_le_filter_accept_list_remove(const bt_addr_le_t *addr)
 {
 	struct nrf_rpc_cbor_ctx ctx;
 	int result;
@@ -1710,7 +1710,7 @@ int bt_le_whitelist_rem(const bt_addr_le_t *addr)
 }
 
 
-int bt_le_whitelist_clear(void)
+int bt_le_filter_accept_list_clear(void)
 {
 	struct nrf_rpc_cbor_ctx ctx;
 	int result;
@@ -1723,7 +1723,7 @@ int bt_le_whitelist_clear(void)
 
 	return result;
 }
-#endif /* defined(CONFIG_BT_WHITELIST) */
+#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
 
 int bt_le_set_chan_map(uint8_t chan_map[5])
 {
diff --git a/subsys/bluetooth/rpc/client/bt_rpc_gatt_svc_client.c b/subsys/bluetooth/rpc/client/bt_rpc_gatt_svc_client.c
index 31a02c686a10..e0ae9e55575d 100644
--- a/subsys/bluetooth/rpc/client/bt_rpc_gatt_svc_client.c
+++ b/subsys/bluetooth/rpc/client/bt_rpc_gatt_svc_client.c
@@ -568,7 +568,7 @@ int bt_rpc_gatt_init(void)
 {
 	int err;
 
-	Z_STRUCT_SECTION_FOREACH(bt_gatt_service_static, svc) {
+	STRUCT_SECTION_FOREACH(bt_gatt_service_static, svc) {
 		err = send_service((const struct bt_gatt_service *)svc);
 		if (err) {
 			LOG_ERR("Sending static service error: %d", err);
diff --git a/subsys/bluetooth/rpc/common/bt_rpc_common.c b/subsys/bluetooth/rpc/common/bt_rpc_common.c
index fa27aeda2584..338b0f30ee3d 100644
--- a/subsys/bluetooth/rpc/common/bt_rpc_common.c
+++ b/subsys/bluetooth/rpc/common/bt_rpc_common.c
@@ -198,7 +198,7 @@ static const CHECK_LIST_ENTRY_TYPE check_table[] = {
 		1,
 		CONFIG_BT_CENTRAL,
 		CONFIG_BT_PERIPHERAL,
-		CONFIG_BT_WHITELIST,
+		CONFIG_BT_FILTER_ACCEPT_LIST,
 		CONFIG_BT_USER_PHY_UPDATE,
 		CONFIG_BT_USER_DATA_LEN_UPDATE,
 		CONFIG_BT_PRIVACY,
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c b/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
index 4fce4c19788e..a5778d57c868 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_conn_host.c
@@ -557,7 +557,7 @@ static void bt_conn_le_create_rpc_handler(CborValue *value, void *handler_data)
 NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_conn_le_create, BT_CONN_LE_CREATE_RPC_CMD,
 			 bt_conn_le_create_rpc_handler, NULL);
 
-#if defined(CONFIG_BT_WHITELIST)
+#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
 static void bt_conn_le_create_auto_rpc_handler(CborValue *value, void *handler_data)
 {
 	struct bt_conn_le_create_param create_param;
@@ -596,9 +596,9 @@ static void bt_conn_create_auto_stop_rpc_handler(CborValue *value, void *handler
 
 NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_conn_create_auto_stop, BT_CONN_CREATE_AUTO_STOP_RPC_CMD,
 			 bt_conn_create_auto_stop_rpc_handler, NULL);
-#endif /* defined(CONFIG_BT_WHITELIST) */
+#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
 
-#if !defined(CONFIG_BT_WHITELIST)
+#if !defined(CONFIG_BT_FILTER_ACCEPT_LIST)
 static void bt_le_set_auto_conn_rpc_handler(CborValue *value, void *handler_data)
 {
 	bt_addr_le_t addr_data;
@@ -631,7 +631,7 @@ static void bt_le_set_auto_conn_rpc_handler(CborValue *value, void *handler_data
 
 NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_set_auto_conn, BT_LE_SET_AUTO_CONN_RPC_CMD,
 			 bt_le_set_auto_conn_rpc_handler, NULL);
-#endif  /* !defined(CONFIG_BT_WHITELIST) */
+#endif  /* !defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
 #endif  /* defined(CONFIG_BT_CENTRAL) */
 
 #if defined(CONFIG_BT_SMP)
diff --git a/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c b/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c
index 79bd105980f0..5cfbcdd5c110 100644
--- a/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c
+++ b/subsys/bluetooth/rpc/host/bt_rpc_gap_host.c
@@ -1115,8 +1115,8 @@ NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_scan_cb_register_on_remote,
 			 bt_le_scan_cb_register_on_remote_rpc_handler, NULL);
 #endif /* defined(CONFIG_BT_OBSERVER) */
 
-#if defined(CONFIG_BT_WHITELIST)
-static void bt_le_whitelist_add_rpc_handler(CborValue *value, void *handler_data)
+#if defined(CONFIG_BT_FILTER_ACCEPT_LIST)
+static void bt_le_filter_accept_list_add_rpc_handler(CborValue *value, void *handler_data)
 {
 	bt_addr_le_t addr_data;
 	const bt_addr_le_t *addr;
@@ -1128,7 +1128,7 @@ static void bt_le_whitelist_add_rpc_handler(CborValue *value, void *handler_data
 		goto decoding_error;
 	}
 
-	result = bt_le_whitelist_add(addr);
+	result = bt_le_filter_accept_list_add(addr);
 
 	ser_rsp_send_int(result);
 
@@ -1137,10 +1137,10 @@ static void bt_le_whitelist_add_rpc_handler(CborValue *value, void *handler_data
 	report_decoding_error(BT_LE_WHITELIST_ADD_RPC_CMD, handler_data);
 }
 
-NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_whitelist_add, BT_LE_WHITELIST_ADD_RPC_CMD,
-			 bt_le_whitelist_add_rpc_handler, NULL);
+NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_filter_accept_list_add, BT_LE_WHITELIST_ADD_RPC_CMD,
+			 bt_le_filter_accept_list_add_rpc_handler, NULL);
 
-static void bt_le_whitelist_rem_rpc_handler(CborValue *value, void *handler_data)
+static void bt_le_filter_accept_list_remove_rpc_handler(CborValue *value, void *handler_data)
 {
 	bt_addr_le_t addr_data;
 	const bt_addr_le_t *addr;
@@ -1152,7 +1152,7 @@ static void bt_le_whitelist_rem_rpc_handler(CborValue *value, void *handler_data
 		goto decoding_error;
 	}
 
-	result = bt_le_whitelist_rem(addr);
+	result = bt_le_filter_accept_list_remove(addr);
 
 	ser_rsp_send_int(result);
 
@@ -1161,23 +1161,23 @@ static void bt_le_whitelist_rem_rpc_handler(CborValue *value, void *handler_data
 	report_decoding_error(BT_LE_WHITELIST_REM_RPC_CMD, handler_data);
 }
 
-NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_whitelist_rem, BT_LE_WHITELIST_REM_RPC_CMD,
-			 bt_le_whitelist_rem_rpc_handler, NULL);
+NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_filter_accept_list_remove, BT_LE_WHITELIST_REM_RPC_CMD,
+			 bt_le_filter_accept_list_remove_rpc_handler, NULL);
 
-static void bt_le_whitelist_clear_rpc_handler(CborValue *value, void *handler_data)
+static void bt_le_filter_accept_list_clear_rpc_handler(CborValue *value, void *handler_data)
 {
 	int result;
 
 	nrf_rpc_cbor_decoding_done(value);
 
-	result = bt_le_whitelist_clear();
+	result = bt_le_filter_accept_list_clear();
 
 	ser_rsp_send_int(result);
 }
 
-NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_whitelist_clear, BT_LE_WHITELIST_CLEAR_RPC_CMD,
-			 bt_le_whitelist_clear_rpc_handler, NULL);
-#endif /* defined(CONFIG_BT_WHITELIST) */
+NRF_RPC_CBOR_CMD_DECODER(bt_rpc_grp, bt_le_filter_accept_list_clear, BT_LE_WHITELIST_CLEAR_RPC_CMD,
+			 bt_le_filter_accept_list_clear_rpc_handler, NULL);
+#endif /* defined(CONFIG_BT_FILTER_ACCEPT_LIST) */
 
 static void bt_le_set_chan_map_rpc_handler(CborValue *value, void *handler_data)
 {
diff --git a/subsys/caf/modules/ble_adv.c b/subsys/caf/modules/ble_adv.c
index 61f4c00c5674..6ce60e6f2d3b 100644
--- a/subsys/caf/modules/ble_adv.c
+++ b/subsys/caf/modules/ble_adv.c
@@ -206,8 +206,8 @@ static int ble_adv_start_undirected(const bt_addr_le_t *bond_addr,
 		adv_param.interval_max = BT_GAP_ADV_FAST_INT_MAX_2;
 	}
 
-	if (IS_ENABLED(CONFIG_BT_WHITELIST)) {
-		int err = bt_le_whitelist_clear();
+	if (IS_ENABLED(CONFIG_BT_FILTER_ACCEPT_LIST)) {
+		int err = bt_le_filter_accept_list_clear();
 
 		if (err) {
 			LOG_ERR("Cannot clear whitelist (err: %d)", err);
@@ -217,7 +217,7 @@ static int ble_adv_start_undirected(const bt_addr_le_t *bond_addr,
 		if (bt_addr_le_cmp(bond_addr, BT_ADDR_LE_ANY)) {
 			adv_param.options |= BT_LE_ADV_OPT_FILTER_SCAN_REQ;
 			adv_param.options |= BT_LE_ADV_OPT_FILTER_CONN;
-			err = bt_le_whitelist_add(bond_addr);
+			err = bt_le_filter_accept_list_add(bond_addr);
 		}
 
 		if (err) {
diff --git a/subsys/caf/modules/ble_state.c b/subsys/caf/modules/ble_state.c
index 170d8b668e87..35acea6e0a58 100644
--- a/subsys/caf/modules/ble_state.c
+++ b/subsys/caf/modules/ble_state.c
@@ -188,7 +188,7 @@ static void connected(struct bt_conn *conn, uint8_t error)
 	}
 
 	if (IS_ENABLED(CONFIG_BT_PERIPHERAL) &&
-	    (info.role == BT_CONN_ROLE_SLAVE)) {
+	    (info.role == BT_CONN_ROLE_PERIPHERAL)) {
 		struct bond_find_data bond_find_data = {
 			.peer_id = 0,
 			.peer_count = 0,
diff --git a/subsys/caf/modules/leds.c b/subsys/caf/modules/leds.c
index be1106ba1548..51f410e4b806 100644
--- a/subsys/caf/modules/leds.c
+++ b/subsys/caf/modules/leds.c
@@ -225,7 +225,7 @@ static void leds_stop(void)
 		/* Zephyr power management API is not implemented for GPIO LEDs.
 		 * LEDs are turned off by CAF LEDs module.
 		 */
-		int err = pm_device_state_set(leds[i].dev, PM_DEVICE_STATE_SUSPEND);
+		int err = pm_device_state_set(leds[i].dev, PM_DEVICE_STATE_SUSPENDED);
 
 		if (err) {
 			LOG_ERR("Failed to set LED driver into suspend state (err: %d)", err);
diff --git a/subsys/caf/modules/sensor_sampler.c b/subsys/caf/modules/sensor_sampler.c
index 2d59b3e5d7de..5f04b07d7afd 100644
--- a/subsys/caf/modules/sensor_sampler.c
+++ b/subsys/caf/modules/sensor_sampler.c
@@ -165,7 +165,7 @@ static bool can_sensor_sleep(const struct sensor_config *sc,
 	return false;
 }
 
-static void trigger_handler(const struct device *dev, struct sensor_trigger *trigger)
+static void trigger_handler(const struct device *dev, const struct sensor_trigger *trigger)
 {
 	sensor_trigger_set(dev, trigger, NULL);
 
diff --git a/subsys/esb/Kconfig b/subsys/esb/Kconfig
index 5f821be0e2a8..ff2954634c4b 100644
--- a/subsys/esb/Kconfig
+++ b/subsys/esb/Kconfig
@@ -43,6 +43,18 @@ config ESB_PIPE_COUNT
 	  accidental use of additional pipes, but it's not a problem leaving
 	  this at 8 even if fewer pipes are used.
 
+config ESB_RADIO_IRQ_PRIORITY
+	int "Radio interrupt priority"
+	range 0 5 if ZERO_LATENCY_IRQS
+	range 0 6
+	default 1
+
+config ESB_EVENT_IRQ_PRIORITY
+	int "Event interrupt priority"
+	range 0 5 if ZERO_LATENCY_IRQS
+	range 0 6
+	default 2
+
 menu "Hardware selection (alter with care)"
 
 choice ESB_SYS_TIMER
diff --git a/subsys/esb/esb.c b/subsys/esb/esb.c
index 470cfb4b1060..7221c4b5f4f8 100644
--- a/subsys/esb/esb.c
+++ b/subsys/esb/esb.c
@@ -1050,11 +1050,11 @@ int esb_init(const struct esb_config *config)
 	sys_timer_init();
 	ppi_init();
 
-	IRQ_DIRECT_CONNECT(RADIO_IRQn, config->radio_irq_priority,
+	IRQ_DIRECT_CONNECT(RADIO_IRQn, CONFIG_ESB_RADIO_IRQ_PRIORITY,
 			   RADIO_IRQHandler, 0);
-	IRQ_DIRECT_CONNECT(ESB_EVT_IRQ, config->event_irq_priority,
+	IRQ_DIRECT_CONNECT(ESB_EVT_IRQ, CONFIG_ESB_EVENT_IRQ_PRIORITY,
 			   ESB_EVT_IRQHandler, 0);
-	IRQ_DIRECT_CONNECT(ESB_SYS_TIMER_IRQn, config->event_irq_priority,
+	IRQ_DIRECT_CONNECT(ESB_SYS_TIMER_IRQn, CONFIG_ESB_EVENT_IRQ_PRIORITY,
 			   ESB_SYS_TIMER_IRQHandler, 0);
 
 	irq_enable(RADIO_IRQn);
diff --git a/subsys/fw_info/fw_info.c b/subsys/fw_info/fw_info.c
index 4995a4fd821f..bc1534a1fe34 100644
--- a/subsys/fw_info/fw_info.c
+++ b/subsys/fw_info/fw_info.c
@@ -15,7 +15,7 @@
 
 
 /* These symbols are defined in linker scripts. */
-extern const uint32_t _image_rom_start[];
+extern const uint32_t __rom_region_start[];
 extern const uint32_t _flash_used[];
 extern const struct fw_info _firmware_info_start[];
 extern const uint32_t _ext_apis_size[];
@@ -32,8 +32,8 @@ const struct fw_info m_firmware_info =
 	.total_size = (uint32_t)_fw_info_size,
 	.size = ((uint32_t)_flash_used),
 	.version = CONFIG_FW_INFO_FIRMWARE_VERSION,
-	.address = ((uint32_t)_image_rom_start),
-	.boot_address = (uint32_t)_image_rom_start,
+	.address = ((uint32_t)__rom_region_start),
+	.boot_address = (uint32_t)__rom_region_start,
 	.valid = CONFIG_FW_INFO_VALID_VAL,
 	.reserved = {0, 0, 0, 0},
 	.ext_api_num = (uint32_t)_ext_apis_size,
@@ -42,7 +42,7 @@ const struct fw_info m_firmware_info =
 
 
 Z_GENERIC_SECTION(.fw_info_images) __attribute__((used))
-const uint32_t self_image = ((uint32_t)&_image_rom_start - FW_INFO_VECTOR_OFFSET);
+const uint32_t self_image = ((uint32_t)&__rom_region_start - FW_INFO_VECTOR_OFFSET);
 
 #define NEXT_EXT_ABI(ext_api) ((const struct fw_info_ext_api *)\
 			(((const uint8_t *)(ext_api)) + (ext_api)->ext_api_len))
diff --git a/subsys/nfc/tnep/tag.c b/subsys/nfc/tnep/tag.c
index c9265093d87a..2badc07c8a5e 100644
--- a/subsys/nfc/tnep/tag.c
+++ b/subsys/nfc/tnep/tag.c
@@ -198,7 +198,7 @@ static int tnep_tx_initial_msg_set(void)
 		return tnep.initial_msg_encode(&NFC_NDEF_MSG(initial_msg));
 	}
 
-	Z_STRUCT_SECTION_FOREACH(nfc_tnep_tag_service, tnep_svc) {
+	STRUCT_SECTION_FOREACH(nfc_tnep_tag_service, tnep_svc) {
 		err = tnep_tx_msg_add_rec(&NFC_NDEF_MSG(initial_msg),
 					  tnep_svc->ndef_record);
 		if (err) {
@@ -226,7 +226,7 @@ static bool ndef_check_rec_type(const struct nfc_ndef_record_desc *record,
 
 static int tnep_svc_set_active(const uint8_t *uri_name, size_t uri_length)
 {
-	Z_STRUCT_SECTION_FOREACH(nfc_tnep_tag_service, tnep_svc) {
+	STRUCT_SECTION_FOREACH(nfc_tnep_tag_service, tnep_svc) {
 		if ((tnep_svc->parameters->uri_length == uri_length) &&
 		    !memcmp(uri_name,
 			    tnep_svc->parameters->uri, uri_length)) {
@@ -622,7 +622,7 @@ int nfc_tnep_initial_msg_encode(struct nfc_ndef_msg_desc *msg,
 		}
 	}
 
-	Z_STRUCT_SECTION_FOREACH(nfc_tnep_tag_service, tnep_svc) {
+	STRUCT_SECTION_FOREACH(nfc_tnep_tag_service, tnep_svc) {
 		err = tnep_tx_msg_add_rec(msg,
 					  tnep_svc->ndef_record);
 		if (err) {
diff --git a/subsys/spm/secure_services.ld b/subsys/spm/secure_services.ld
index 018167425fae..7ac99f3142d0 100644
--- a/subsys/spm/secure_services.ld
+++ b/subsys/spm/secure_services.ld
@@ -1,7 +1,7 @@
 #if USE_PARTITION_MANAGER
 	#include <pm_config.h>
 	#define NON_SECURE_APP_ADDRESS PM_APP_ADDRESS
-	ASSERT(((_image_rom_start + _flash_used - 1)
+	ASSERT(((__rom_region_start + _flash_used - 1)
 			/ CONFIG_NRF_SPU_FLASH_REGION_SIZE)
 		< (NON_SECURE_APP_ADDRESS / CONFIG_NRF_SPU_FLASH_REGION_SIZE),
 		"SPM and app are sharing an SPU region. \
diff --git a/subsys/spm/spm_uart.c b/subsys/spm/spm_uart.c
index 44158d2d645e..bbef5aeb18ef 100644
--- a/subsys/spm/spm_uart.c
+++ b/subsys/spm/spm_uart.c
@@ -65,7 +65,7 @@ static int spm_uart_init(const struct device *dev)
 	return 0;
 }
 
-DEVICE_DEFINE(spm_uart, DT_PROP(DT_NODELABEL(spm_uart), label), spm_uart_init,
-	      NULL, NULL, &spm_uart_config,
-	      PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
-	      &spm_uart_api);
+DEVICE_DT_DEFINE(DT_NODELABEL(spm_uart), spm_uart_init,
+		 NULL, NULL, &spm_uart_config,
+		 PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		 &spm_uart_api);
diff --git a/subsys/zigbee/Kconfig b/subsys/zigbee/Kconfig
index 0ee05bb538cf..b9d492b99c53 100644
--- a/subsys/zigbee/Kconfig
+++ b/subsys/zigbee/Kconfig
@@ -244,7 +244,6 @@ config ZBOSS_TRACE_UART_LOGGING
 
 config ZBOSS_TRACE_USB_CDC_LOGGING
 	bool "UART USB CDC (supported only for Zigbee NCP sample)"
-	select USB
 	select USB_DEVICE_STACK
 	select USB_CDC_ACM
 	select UART_LINE_CTRL
diff --git a/tests/drivers/clock_control/clock_control_mpsl/boards/nrf9160dk_nrf9160.overlay b/tests/drivers/clock_control/clock_control_mpsl/boards/nrf9160dk_nrf9160.overlay
new file mode 100644
index 000000000000..c870b02ea7e2
--- /dev/null
+++ b/tests/drivers/clock_control/clock_control_mpsl/boards/nrf9160dk_nrf9160.overlay
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+/ {
+	chosen {
+		zephyr,bt-uart=&uart1;
+	};
+};
diff --git a/tests/drivers/fprotect/negative/src/main.c b/tests/drivers/fprotect/negative/src/main.c
index 740b6ca1722d..28cbf7d363e0 100644
--- a/tests/drivers/fprotect/negative/src/main.c
+++ b/tests/drivers/fprotect/negative/src/main.c
@@ -26,11 +26,11 @@
 #endif
 
 #define TEST_FPROTECT_WRITE_ADDR ROUND_UP( \
-		(uint32_t)_image_rom_start + (uint32_t)_flash_used, \
+		(uint32_t)__rom_region_start + (uint32_t)_flash_used, \
 		CONFIG_FPROTECT_BLOCK_SIZE)
 
 #define TEST_FPROTECT_READ_ADDR \
-		(ROUND_UP((uint32_t)_image_rom_start + (uint32_t)_flash_used, \
+		(ROUND_UP((uint32_t)__rom_region_start + (uint32_t)_flash_used, \
 		CONFIG_FPROTECT_BLOCK_SIZE) \
 	+ CONFIG_FPROTECT_BLOCK_SIZE)
 
diff --git a/tests/modules/mcuboot/external_flash/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.conf b/tests/modules/mcuboot/external_flash/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
index 9965ab5ead64..0db6cbc947ee 100644
--- a/tests/modules/mcuboot/external_flash/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
+++ b/tests/modules/mcuboot/external_flash/child_image/mcuboot/boards/thingy53_nrf5340_cpuapp.conf
@@ -11,7 +11,7 @@ CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_1"
 CONFIG_BOOT_SERIAL_DETECT_PIN=13
 
 # USB
-CONFIG_USB=y
+CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA"
 CONFIG_USB_DEVICE_PRODUCT="Bootloader Thingy:53"
 CONFIG_USB_DEVICE_VID=0x1915
diff --git a/tests/subsys/event_manager/src/main.c b/tests/subsys/event_manager/src/main.c
index 024b0d1c911b..79ab3f45a6b2 100644
--- a/tests/subsys/event_manager/src/main.c
+++ b/tests/subsys/event_manager/src/main.c
@@ -59,16 +59,13 @@ static void test_subs_order(void)
 	test_start(TEST_SUBSCRIBER_ORDER);
 }
 
-static void test_oom_reset(void)
-{
-	test_start(TEST_OOM_RESET);
-}
-
 static void test_multicontext(void)
 {
 	test_start(TEST_MULTICONTEXT);
 }
 
+void test_oom_reset(void);
+
 void test_main(void)
 {
 	ztest_test_suite(event_manager_tests,
diff --git a/tests/subsys/event_manager/src/modules/test_oom.c b/tests/subsys/event_manager/src/modules/test_oom.c
index 7ec48d1a999e..22ed55c3b420 100644
--- a/tests/subsys/event_manager/src/modules/test_oom.c
+++ b/tests/subsys/event_manager/src/modules/test_oom.c
@@ -14,63 +14,39 @@
 #define TEST_EVENTS_CNT 150
 
 static struct data_event *event_tab[TEST_EVENTS_CNT];
-static bool oom_error;
 
 /* Custom reboot handler to check if sys_reboot is called when OOM. */
 void sys_reboot(int type)
 {
-	oom_error = true;
-}
-
-static bool event_handler(const struct event_header *eh)
-{
-	if (is_test_start_event(eh)) {
-		struct test_start_event *st = cast_test_start_event(eh);
-
-		switch (st->test_id) {
-		case TEST_OOM_RESET:
-		{
-			/* Sending large number of events to cause out of memory error. */
-			int i;
+	int i = 0;
 
-			for (i = 0; i < ARRAY_SIZE(event_tab); i++) {
-				event_tab[i] = new_data_event();
-				if (event_tab[i] == NULL) {
-					break;
-				}
-			}
+	/* Freeing memory to enable further testing. */
+	while (event_tab[i] != NULL) {
+		k_free(event_tab[i]);
+		i++;
+	}
 
-			zassert_true(i < ARRAY_SIZE(event_tab),
-				     "No OOM detected, increase TEST_EVENTS_CNT");
-			zassert_true(oom_error, "OOM error not detected");
+	ztest_test_pass();
 
-			/* Freeing memory to enable further testing. */
-			while (i >= 0) {
-				k_free(event_tab[i]);
-				i--;
-			}
+	while (true) {
+		;
+	}
+}
 
-			struct test_end_event *et = new_test_end_event();
+void test_oom_reset(void)
+{
+	/* Sending large number of events to cause out of memory error. */
+	int i;
 
-			zassert_not_null(et, "Failed to allocate event");
-			et->test_id = st->test_id;
-			EVENT_SUBMIT(et);
-			break;
-		}
-		default:
-			/* Ignore other test cases, check if proper test_id. */
-			zassert_true(st->test_id < TEST_CNT,
-				     "test_id out of range");
+	for (i = 0; i < ARRAY_SIZE(event_tab); i++) {
+		event_tab[i] = new_data_event();
+		if (event_tab[i] == NULL) {
 			break;
 		}
-
-		return false;
 	}
 
-	zassert_true(false, "Event unhandled");
-
-	return false;
+	/* This shall only be executed if OOM is not triggered. */
+	zassert_true(i < ARRAY_SIZE(event_tab),
+		     "No OOM detected, increase TEST_EVENTS_CNT");
+	zassert_unreachable("OOM error not detected");
 }
-
-EVENT_LISTENER(MODULE, event_handler);
-EVENT_SUBSCRIBE(MODULE, test_start_event);
diff --git a/tests/unity/example_test/src/foo/foo.h b/tests/unity/example_test/src/foo/foo.h
index f3e16c861ea9..812bf59f7de0 100644
--- a/tests/unity/example_test/src/foo/foo.h
+++ b/tests/unity/example_test/src/foo/foo.h
@@ -22,7 +22,7 @@ int foo_init(void *handle);
 static const char test_string[] = "test string";
 
 #define TEST_MACRO(xx) do { \
-	const Z_STRUCT_SECTION_ITERABLE(settings_handler_static, \
+	const STRUCT_SECTION_ITERABLE(settings_handler_static, \
 			name) \
 } while (0)
 
diff --git a/west.yml b/west.yml
index 1c6973a62edf..da306c4035d5 100644
--- a/west.yml
+++ b/west.yml
@@ -54,7 +54,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 15be5e615498377e9326cb2eb5819c7c62005299
+      revision: 379117545b61f57d9263fc3f0048929c779524df
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above
@@ -88,6 +88,7 @@ manifest:
           - net-tools
           - nrf_hw_models
           - open-amp
+          - openthread
           - segger
           - tinycbor
           - tinycrypt
@@ -98,16 +99,16 @@ manifest:
     # changes.
     - name: mcuboot
       repo-path: sdk-mcuboot
-      revision: 7606d9cad32c95a0d6fb7e872b070c71e85f931d
+      revision: 03421652deaf4a41814caaffd209a8c3c3e9e347
       path: bootloader/mcuboot
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: 4a060cdb789b8e8eec025f7164d77322ad0cc2a5
+      revision: dbcb163b7513fa7367f34d4ae1f170d103597063
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tfm
-      revision: d2e93153863e7add9fae3849faf7de430258c0de
+      revision: f9884923ea99cd96d47432b4fa04eb760cc2fa1a
     - name: tfm-mcuboot # This is used by the trusted-firmware-m module.
       repo-path: sdk-mcuboot
       path: modules/tee/tfm-mcuboot
@@ -133,10 +134,6 @@ manifest:
       repo-path: sdk-cjson
       path: modules/lib/cjson
       revision: c6af068b7f05207b28d68880740e4b9ec1e4b50a
-    - name: openthread
-      repo-path: sdk-openthread
-      path: modules/lib/openthread
-      revision: de387884c80094df8e310353c3a487c13c0c056b
     # Other third-party repositories.
     - name: cmock
       path: test/cmock
@@ -175,7 +172,7 @@ manifest:
       - find-my
     - name: memfault-firmware-sdk
       path: modules/lib/memfault-firmware-sdk
-      revision: 0.26.1
+      revision: 0.27.1
       remote: memfault
 
   # West-related configuration for the nrf repository.