diff --git a/Tools/kconfig/merge_config.py b/Tools/kconfig/merge_config.py
index 2c2d0688d6..eedae3cb6e 100755
--- a/Tools/kconfig/merge_config.py
+++ b/Tools/kconfig/merge_config.py
@@ -115,10 +115,11 @@ def main(kconfig_file, config1, config2):
             sym_name = match.group(1)
             kconf.syms[sym_name].unset_value()
 
-            for default, cond in kconf.syms[sym_name].orig_defaults:
-                if(cond.str_value == 'y'):
-                    # Default is y, our diff is unset thus we've set it to no
-                    kconf.syms[sym_name].set_value(0)
+            if kconf.syms[sym_name].type is BOOL:
+                for default, cond in kconf.syms[sym_name].orig_defaults:
+                    if(cond.str_value == 'y'):
+                        # Default is y, our diff is unset thus we've set it to no
+                        kconf.syms[sym_name].set_value(0)
 
     f.close()
 
diff --git a/boards/ark/can-rtk-gps/debug.px4board b/boards/ark/can-rtk-gps/debug.px4board
index 9f93d6cba4..dee7679749 100644
--- a/boards/ark/can-rtk-gps/debug.px4board
+++ b/boards/ark/can-rtk-gps/debug.px4board
@@ -1,6 +1,5 @@
 CONFIG_BOARD_CONSTRAINED_FLASH=n
 CONFIG_BOARD_NO_HELP=n
-CONFIG_BOARD_CONSTRAINED_MEMORY=y
-CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_REBOOT=y
+CONFIG_SYSTEMCMDS_TOP=y
 CONFIG_SYSTEMCMDS_UORB=y
diff --git a/boards/av/x-v1/default.px4board b/boards/av/x-v1/default.px4board
index 8a30c536a4..2b46215968 100644
--- a/boards/av/x-v1/default.px4board
+++ b/boards/av/x-v1/default.px4board
@@ -44,8 +44,8 @@ CONFIG_MODULES_EKF2=y
 CONFIG_MODULES_ESC_BATTERY=y
 CONFIG_MODULES_EVENTS=y
 CONFIG_MODULES_FLIGHT_MODE_MANAGER=y
-CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y
 CONFIG_MODULES_FW_ATT_CONTROL=y
+CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y
 CONFIG_MODULES_FW_POS_CONTROL_L1=y
 CONFIG_MODULES_GYRO_CALIBRATION=y
 CONFIG_MODULES_GYRO_FFT=y
diff --git a/boards/omnibus/f4sd/default.px4board b/boards/omnibus/f4sd/default.px4board
index d7af7e4db9..38e1d573a8 100644
--- a/boards/omnibus/f4sd/default.px4board
+++ b/boards/omnibus/f4sd/default.px4board
@@ -2,8 +2,8 @@ CONFIG_BOARD_TOOLCHAIN="arm-none-eabi"
 CONFIG_BOARD_ARCHITECTURE="cortex-m4"
 CONFIG_BOARD_CONSTRAINED_FLASH=y
 CONFIG_BOARD_CONSTRAINED_MEMORY=y
-CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1"
 CONFIG_BOARD_SERIAL_URT6="/dev/ttyS2"
+CONFIG_BOARD_SERIAL_TEL2="/dev/ttyS1"
 CONFIG_DRIVERS_ADC_BOARD_ADC=y
 CONFIG_DRIVERS_BAROMETER_BMP280=y
 CONFIG_DRIVERS_DSHOT=y
diff --git a/boards/px4/fmu-v2/fixedwing.px4board b/boards/px4/fmu-v2/fixedwing.px4board
index 8a4f571743..01dfb4f527 100644
--- a/boards/px4/fmu-v2/fixedwing.px4board
+++ b/boards/px4/fmu-v2/fixedwing.px4board
@@ -5,9 +5,11 @@ CONFIG_MODULES_MC_HOVER_THRUST_ESTIMATOR=n
 CONFIG_MODULES_MC_POS_CONTROL=n
 CONFIG_MODULES_MC_RATE_CONTROL=n
 CONFIG_SYSTEMCMDS_BL_UPDATE=n
-CONFIG_COMMON_DIFFERENTIAL_PRESSURE=y
 CONFIG_DRIVERS_CAMERA_CAPTURE=y
 CONFIG_DRIVERS_CAMERA_TRIGGER=y
+CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_ETS=y
+CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_MS5525=y
+CONFIG_DRIVERS_DIFFERENTIAL_PRESSURE_SDP3X=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LL40LS=y
 CONFIG_MODULES_CAMERA_FEEDBACK=y
diff --git a/boards/px4/fmu-v4pro/test.px4board b/boards/px4/fmu-v4pro/test.px4board
index d629724bf9..27cedc328f 100644
--- a/boards/px4/fmu-v4pro/test.px4board
+++ b/boards/px4/fmu-v4pro/test.px4board
@@ -1,14 +1,11 @@
+CONFIG_DRIVERS_ADC_ADS1115=n
+CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=n
+CONFIG_DRIVERS_IRLOCK=n
+CONFIG_DRIVERS_PCA9685=n
+CONFIG_DRIVERS_PCA9685_PWM_OUT=n
+CONFIG_DRIVERS_RPM=n
 CONFIG_MODULES_ATTITUDE_ESTIMATOR_Q=n
 CONFIG_MODULES_LOCAL_POSITION_ESTIMATOR=n
 CONFIG_BOARD_TESTING=y
-CONFIG_DRIVERS_ADC_ADS1115=n
 CONFIG_DRIVERS_TEST_PPM=y
-CONFIG_DRIVERS_PCA9685=n
-CONFIG_DRIVERS_PCA9685_PWM_OUT=n
 CONFIG_SYSTEMCMDS_MICROBENCH=y
-CONFIG_DRIVERS_RPM=n
-CONFIG_DRIVERS_PCA9685=n
-CONFIG_DRIVERS_PCA9685_PWM_OUT=n
-CONFIG_DRIVERS_IRLOCK=n
-CONFIG_DRIVERS_ADC_ADS1115=n
-CONFIG_DRIVERS_IMU_ANALOG_DEVICES_ADIS16448=n
diff --git a/boards/px4/fmu-v5/default.px4board b/boards/px4/fmu-v5/default.px4board
index 35249f488c..d876f4cb89 100644
--- a/boards/px4/fmu-v5/default.px4board
+++ b/boards/px4/fmu-v5/default.px4board
@@ -54,8 +54,8 @@ CONFIG_MODULES_EKF2=y
 CONFIG_MODULES_ESC_BATTERY=y
 CONFIG_MODULES_EVENTS=y
 CONFIG_MODULES_FLIGHT_MODE_MANAGER=y
-CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y
 CONFIG_MODULES_FW_ATT_CONTROL=y
+CONFIG_MODULES_FW_AUTOTUNE_ATTITUDE_CONTROL=y
 CONFIG_MODULES_FW_POS_CONTROL_L1=y
 CONFIG_MODULES_GYRO_CALIBRATION=y
 CONFIG_MODULES_GYRO_FFT=y
diff --git a/boards/px4/fmu-v5/uavcanv0periph.px4board b/boards/px4/fmu-v5/uavcanv0periph.px4board
index 61dd253a97..e030d7d9b5 100644
--- a/boards/px4/fmu-v5/uavcanv0periph.px4board
+++ b/boards/px4/fmu-v5/uavcanv0periph.px4board
@@ -6,7 +6,6 @@ CONFIG_DRIVERS_IMU_INVENSENSE_ICM20948=n
 CONFIG_DRIVERS_IRLOCK=n
 CONFIG_DRIVERS_OSD=n
 CONFIG_DRIVERS_PCA9685_PWM_OUT=n
-CONFIG_DRIVERS_PCA9685=y
 CONFIG_DRIVERS_PWM_INPUT=n
 CONFIG_DRIVERS_ROBOCLAW=n
 CONFIG_DRIVERS_RPM=n
diff --git a/boards/px4/sitl/test.px4board b/boards/px4/sitl/test.px4board
index d142ee4906..fcaf472f79 100644
--- a/boards/px4/sitl/test.px4board
+++ b/boards/px4/sitl/test.px4board
@@ -1,3 +1,2 @@
 CONFIG_BOARD_NOLOCKSTEP=y
 CONFIG_DRIVERS_DISTANCE_SENSOR_LIGHTWARE_LASER_SERIAL=y
-CONFIG_MODULES_CONTROL_ALLOCATOR=y