diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/4008_gz_advanced_plane b/ROMFS/px4fmu_common/init.d-posix/airframes/4008_gz_advanced_plane
new file mode 100644
index 0000000000..37a407383f
--- /dev/null
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/4008_gz_advanced_plane
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# @name Advanced Plane SITL
+#
+
+. ${R}etc/init.d/rc.fw_defaults
+
+PX4_SIMULATOR=${PX4_SIMULATOR:=gz}
+PX4_GZ_WORLD=${PX4_GZ_WORLD:=default}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=advanced_plane}
+
+param set-default SIM_GZ_EN 1
+
+param set-default SENS_EN_GPSSIM 1
+param set-default SENS_EN_MAGSIM 1
+param set-default SENS_EN_ARSPDSIM 1
+
+param set-default FW_LND_ANG 8
+param set-default NPFG_PERIOD 12
+
+param set-default FW_MAN_P_MAX 30
+param set-default FW_PR_P 0.9
+param set-default FW_PR_FF 0.5
+param set-default FW_PR_I 0.5
+
+param set-default FW_PSP_OFF 2
+param set-default FW_P_LIM_MAX 32
+param set-default FW_P_LIM_MIN -15
+
+param set-default FW_RR_FF 0.5
+param set-default FW_RR_P 0.3
+param set-default FW_RR_I 0.5
+
+param set-default FW_YR_FF 0.5
+param set-default FW_YR_P 0.6
+param set-default FW_YR_I 0.5
+
+param set-default FW_SPOILERS_LND 0.4
+
+param set-default FW_THR_MIN 0.05
+param set-default FW_THR_TRIM 0.25
+
+param set-default FW_T_CLMB_MAX 8
+param set-default FW_T_SINK_MAX 2.7
+param set-default FW_T_SINK_MIN 2.2
+
+param set-default FW_W_EN 1
+
+param set-default MIS_TAKEOFF_ALT 30
+
+param set-default NAV_ACC_RAD 15
+param set-default NAV_DLL_ACT 2
+
+param set-default RWTO_TKOFF 1
+
+param set-default CA_AIRFRAME 1
+
+param set-default CA_ROTOR_COUNT 1
+param set-default CA_ROTOR0_PX 0.3
+
+param set-default CA_SV_CS_COUNT 6
+param set-default CA_SV_CS0_TRQ_R -0.5
+param set-default CA_SV_CS0_TYPE 1
+param set-default CA_SV_CS1_TRQ_R 0.5
+param set-default CA_SV_CS1_TYPE 2
+param set-default CA_SV_CS2_TRQ_P 1.0
+param set-default CA_SV_CS2_TYPE 3
+param set-default CA_SV_CS3_TRQ_Y 1.0
+param set-default CA_SV_CS3_TYPE 4
+param set-default CA_SV_CS4_TYPE 9
+param set-default CA_SV_CS5_TYPE 10
+
+param set-default SIM_GZ_EC_FUNC1 101
+param set-default SIM_GZ_EC_MIN1 10
+param set-default SIM_GZ_EC_MAX1 1600
+
+param set-default SIM_GZ_SV_FUNC1 201
+param set-default SIM_GZ_SV_FUNC2 202
+param set-default SIM_GZ_SV_FUNC3 203
+param set-default SIM_GZ_SV_FUNC4 204
+param set-default SIM_GZ_SV_FUNC5 205
+param set-default SIM_GZ_SV_FUNC6 206
diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
index ded0ace48b..74925d102c 100644
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
@@ -79,6 +79,7 @@ px4_add_romfs_files(
4004_gz_standard_vtol
4005_gz_x500_vision
4006_gz_px4vision
+ 4008_gz_advanced_plane
6011_gazebo-classic_typhoon_h480
6011_gazebo-classic_typhoon_h480.post
diff --git a/Tools/simulation/gz/models/advanced_plane/model.config b/Tools/simulation/gz/models/advanced_plane/model.config
new file mode 100644
index 0000000000..92b629df7b
--- /dev/null
+++ b/Tools/simulation/gz/models/advanced_plane/model.config
@@ -0,0 +1,14 @@
+
+
+ Advanced Plane
+ 1.0
+ model.sdf
+
+
+ Karthik Srivatsan
+
+
+
+ This is a model of a standard plane, which uses the advanced liftdrag plugin.
+
+
diff --git a/Tools/simulation/gz/models/advanced_plane/model.sdf b/Tools/simulation/gz/models/advanced_plane/model.sdf
new file mode 100644
index 0000000000..4c7d77e784
--- /dev/null
+++ b/Tools/simulation/gz/models/advanced_plane/model.sdf
@@ -0,0 +1,578 @@
+
+
+
+ 0 0 0.246 0 0 0
+
+ 0 0 0 0 0 0
+
+ 0 0 0 0 0 0
+ 1
+
+ 0.197563
+ 0
+ 0
+ 0.1458929
+ 0
+ 0.1477
+
+
+
+ 0 0 -0.07 0 0 0
+
+
+ 0.47 0.47 0.11
+
+
+
+
+
+ 10
+ 0.01
+
+
+
+
+
+
+
+
+ 0.07 0 -0.08 0 0 0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/body.dae
+
+
+
+ .175 .175 .175 1.0
+ .175 .175 .175 1.0
+
+
+ 1
+
+ 0
+
+ 1
+ 250
+
+
+ 1
+ 50
+
+
+
+ 0
+ 0.01
+
+
+
+
+
+
+ 0.3 0 0.0 0 1.57 0
+
+ 0 0 0 0 0 0
+ 0.005
+
+ 9.75e-07
+ 0
+ 0
+ 0.000166704
+ 0
+ 0.000167604
+
+
+
+ 0.0 0 0.0 0 0 0
+
+
+ 0.005
+ 0.1
+
+
+
+
+
+
+
+
+
+
+
+
+ 0 0 -0.09 0 0 0
+
+
+ 1 1 1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/iris_prop_ccw.dae
+
+
+
+ .175 .175 .175 1.0
+ .175 .175 .175 1.0
+
+
+ 1
+
+ 0
+
+
+ rotor_puller
+ base_link
+
+ 1 0 0
+
+ -1e+16
+ 1e+16
+
+
+ 0
+ 0
+
+ 1
+
+
+
+
+
+ 0.00000001
+
+ 0.000001
+ 0.0
+ 0.000001
+ 0.0
+ 0.0
+ 0.000001
+
+ 0 0.3 0 0.00 0 0.0
+
+
+ 0.07 0.0 -0.08 0.00 0 0.0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/left_aileron.dae
+
+
+
+ 1 0 0 1.0
+ 1 0 0 1.0
+
+
+
+
+
+ 0.00000001
+
+ 0.000001
+ 0.0
+ 0.000001
+ 0.0
+ 0.0
+ 0.000001
+
+ 0 -0.3 0 0.00 0 0.0
+
+
+ 0.07 0.0 -0.08 0.00 0 0.0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/right_aileron.dae
+
+
+
+ 1 0 0 1.0
+ 1 0 0 1.0
+
+
+
+
+
+ 0.00000001
+
+ 0.000001
+ 0.0
+ 0.000001
+ 0.0
+ 0.0
+ 0.000001
+
+ 0 0.15 0 0.00 0 0.0
+
+
+ 0.07 0.0 -0.08 0.00 0 0.0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/left_flap.dae
+
+
+
+ 1 0 0 1.0
+ 1 0 0 1.0
+
+
+
+
+
+ 0.00000001
+
+ 0.000001
+ 0.0
+ 0.000001
+ 0.0
+ 0.0
+ 0.000001
+
+ 0 -0.15 0 0.00 0 0.0
+
+
+ 0.07 0.0 -0.08 0.00 0 0.0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/right_flap.dae
+
+
+
+ 1 0 0 1.0
+ 1 0 0 1.0
+
+
+
+
+
+ 0.00000001
+
+ 0.000001
+ 0.0
+ 0.000001
+ 0.0
+ 0.0
+ 0.000001
+
+ -0.5 0 0 0.00 0 0.0
+
+
+ 0.07 0.0 -0.08 0.00 0 0.0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/elevators.dae
+
+
+
+ 1 0 0 1.0
+ 1 0 0 1.0
+
+
+
+
+
+ 0.00000001
+
+ 0.000001
+ 0.0
+ 0.000001
+ 0.0
+ 0.0
+ 0.000001
+
+ -0.5 0 0.05 0 0 0
+
+
+ 0.07 0.0 -0.08 0.00 0 0.0
+
+
+ 0.1 0.1 0.1
+ https://fuel.gazebosim.org/1.0/frede791/models/Advanced%20Plane/tip/files/meshes/rudder.dae
+
+
+
+ 1 0 0 1.0
+ 1 0 0 1.0
+
+
+
+
+ base_link
+ left_elevon
+ -0.07 0.4 0.08 0.00 0 0.0
+
+ 0 1 0
+
+
+ -0.53
+ 0.53
+
+
+ 1.000
+
+
+
+
+ 1
+
+
+
+
+ servo_0
+ servo_0
+ 10
+ 0
+ 0
+
+
+ base_link
+ right_elevon
+ -0.07 -0.4 0.08 0.00 0 0.0
+
+ 0 1 0
+
+
+ -0.53
+ 0.53
+
+
+ 1.000
+
+
+
+
+ 1
+
+
+
+
+ servo_1
+ servo_1
+ 10
+ 0
+ 0
+
+
+ base_link
+ left_flap
+ -0.07 0.2 0.08 0.00 0 0.0
+
+ 0 1 0
+
+
+ -0.53
+ 0.53
+
+
+ 1.000
+
+
+
+
+ 1
+
+
+
+
+ servo_4
+ servo_4
+ 10
+ 0
+ 0
+
+
+ base_link
+ right_flap
+ -0.07 -0.2 0.08 0.00 0 0.0
+
+ 0 1 0
+
+
+ -0.53
+ 0.53
+
+
+ 1.000
+
+
+
+
+ 1
+
+
+
+
+ servo_5
+ servo_5
+ 10
+ 0
+ 0
+
+
+ base_link
+ elevator
+ -0.5 0 0 0 0 0
+
+ 0 1 0
+
+
+ -0.53
+ 0.53
+
+
+ 1.000
+
+
+
+
+ 1
+
+
+
+
+ servo_2
+ servo_2
+ 10
+ 0
+ 0
+
+
+ base_link
+ rudder
+ -0.5 0 0.05 0.00 0 0.0
+
+ 0 0 1
+
+
+ -0.53
+ 0.53
+
+
+ 1.000
+
+
+
+
+ 1
+
+
+
+
+ servo_3
+ servo_3
+ 10
+ 0
+ 0
+
+
+
+ 0.0
+ 0.15188
+ 6.5
+ 0.97
+ 5.015
+ 0.029
+ 0.075
+ -0.463966
+ -0.258244
+ -0.039250
+ 0.100826
+ 0.0
+ 0.065861
+ 0.0
+ -0.487407
+ 0.0
+ -0.040416
+ 0.055166
+ 0.0
+ 7.971792
+ 0.0
+ -12.140140
+ 0.0
+ 0.0
+ 0.230299
+ 0.0
+ 0.078165
+ 0.0
+ -0.089947
+ 0.3391428111
+ -3.85
+ -0.9233984055
+ 0
+ -0.12 0.0 0.0
+ 0.34
+ 0.22
+ 1.2041
+ 1 0 0
+ 0 0 1
+ base_link
+ 4
+
+ servo_0
+ 0
+ 1
+ -0.000059
+ 0.000171
+ -0.011940
+ -0.003331
+ 0.001498
+ -0.000057
+
+
+ servo_1
+ 1
+ 1
+ -0.000059
+ -0.000171
+ -0.011940
+ 0.003331
+ 0.001498
+ 0.000057
+
+
+ servo_2
+ -1
+ 2
+ 0.000274
+ 0
+ 0.010696
+ 0.0
+ -0.025798
+ 0.0
+
+
+ servo_3
+ 1
+ 3
+ 0.0
+ -0.003913
+ 0.0
+ -0.000257
+ 0.0
+ 0.001613
+
+
+
+ rotor_puller_joint
+ rotor_puller
+ cw
+ 0.0125
+ 0.025
+ 3500
+ 8.54858e-06
+ 0.01
+ command/motor_speed
+ 0
+ 8.06428e-05
+ 1e-06
+ 10
+ velocity
+
+
+
+