diff --git a/js/fc.js b/js/fc.js
index fdbd9c83f..e9017ed00 100644
--- a/js/fc.js
+++ b/js/fc.js
@@ -281,7 +281,7 @@ var FC = {
             packetCount: 0,
             hwVersion: 0
         };
-        
+
         this.ADSB_VEHICLES = {
             vehiclesCount: 0,
             callsignLength: 0,
@@ -585,7 +585,7 @@ var FC = {
             sensitivityEnd: null,
             correctionCenter: null,
             correctionEnd: null,
-            weightCenter: null, 
+            weightCenter: null,
             weightEnd: null
         };
 
@@ -838,7 +838,7 @@ var FC = {
         var calibrated = true;
         var flagNames = FC.getArmingFlags();
 
-        if (this.CALIBRATION_DATA.accGain.X === 4096 && this.CALIBRATION_DATA.accGain.Y === 4096 && this.CALIBRATION_DATA.accGain.Z === 4096 && 
+        if (this.CALIBRATION_DATA.accGain.X === 4096 && this.CALIBRATION_DATA.accGain.Y === 4096 && this.CALIBRATION_DATA.accGain.Z === 4096 &&
             this.CALIBRATION_DATA.accZero.X === 0 && this.CALIBRATION_DATA.accZero.Y === 0 && this.CALIBRATION_DATA.accZero.Z === 0
            ) {
             calibrated = false;
@@ -870,7 +870,8 @@ var FC = {
             'Level',
             'Heading Hold',
             'Velocity Z',
-            'Nav Heading'
+            'Nav Heading',
+            'Auto Speed'
         ];
     },
     getRthAltControlMode: function () {
diff --git a/js/flightModes.js b/js/flightModes.js
index 3a489118c..1e5fd52f8 100644
--- a/js/flightModes.js
+++ b/js/flightModes.js
@@ -300,6 +300,11 @@ var FLIGHT_MODES = [
         boxId: 59,
         boxName: "GIMBAL HEADTRACKER",
         permanentId: 68
+    },
+    {
+        boxId: 60,
+        boxName: "AUTO SPEED",
+        permanentId: 69
     }
 ];
 
diff --git a/js/logicConditionOperators.js b/js/logicConditionOperators.js
index c4793f8e6..4cc9749e7 100644
--- a/js/logicConditionOperators.js
+++ b/js/logicConditionOperators.js
@@ -345,6 +345,12 @@ const LOGIC_OPERATORS = {
         hasOperand: [true, false],
         output: "boolean"
     },
+    61: {
+        name: "Disable Auto Speed Airspeed",
+        operandType: "Set Flight Parameter",
+        hasOperand: [true, false],
+        output: "boolean"
+    },
 };
 
 export { LOGIC_OPERATORS };
\ No newline at end of file
diff --git a/js/serial_backend.js b/js/serial_backend.js
index fb8d4f4cd..29a16577d 100755
--- a/js/serial_backend.js
+++ b/js/serial_backend.js
@@ -32,7 +32,7 @@ var SerialBackend = (function () {
 
     var publicScope = {},
         privateScope = {};
-        
+
     privateScope.isDemoRunning = false;
 
     privateScope.isWirelessMode = false;
@@ -43,12 +43,12 @@ var SerialBackend = (function () {
      * Handle "Wireless" mode with strict queueing of messages
      */
     publicScope.init = function() {
-        
+
         privateScope.$port = $('#port'),
         privateScope.$baud = $('#baud'),
         publicScope.$portOverride = $('#port-override'),
         mspHelper.setSensorStatusEx(privateScope.sensor_status_ex);
-        
+
         $('#wireless-mode').on('change', function () {
             var $this = $(this);
 
@@ -100,7 +100,7 @@ var SerialBackend = (function () {
             }, 5000);
         };
 
-    
+
         GUI.updateManualPortVisibility = function(){
             var selected_port = privateScope.$port.find('option:selected');
             if (selected_port.data().isManual || selected_port.data().isTcp || selected_port.data().isUdp) {
@@ -121,7 +121,7 @@ var SerialBackend = (function () {
             }
             else {
                 privateScope.$baud.show();
-            }        
+            }
 
             if (selected_port.data().isBle || selected_port.data().isTcp || selected_port.data().isUdp || selected_port.data().isSitl) {
                 $('.tab_firmware_flasher').hide();
@@ -135,9 +135,9 @@ var SerialBackend = (function () {
                 type = ConnectionType.TCP;
             } else if (selected_port.data().isUdp) {
                 type = ConnectionType.UDP;
-            } 
+            }
             CONFIGURATOR.connection = connectionFactory(type, CONFIGURATOR.connection);
-            
+
         };
 
         GUI.updateManualPortVisibility();
@@ -145,8 +145,8 @@ var SerialBackend = (function () {
         publicScope.$portOverride.on('change', function () {
             store.set('portOverride', publicScope.$portOverride.val());
         });
-        
-        publicScope.$portOverride.val(store.get('portOverride', ''));        
+
+        publicScope.$portOverride.val(store.get('portOverride', ''));
 
         privateScope.$port.on('change', function (target) {
             GUI.updateManualPortVisibility();
@@ -156,7 +156,7 @@ var SerialBackend = (function () {
         privateScope.reopenTab = null;
         privateScope.reConnect()
     });
-    
+
     privateScope.reConnect = function() {
         if (groundstation.isActivated()) {
             groundstation.deactivate();
@@ -169,7 +169,7 @@ var SerialBackend = (function () {
                 var selected_port = privateScope.$port.find('option:selected').data().isManual ?
                     publicScope.$portOverride.val() :
                         String(privateScope.$port.val());
-                
+
                 if (selected_port === 'DFU') {
                     GUI.log(i18n.getMessage('dfu_connect_message'));
                 }
@@ -188,7 +188,7 @@ var SerialBackend = (function () {
                             CONFIGURATOR.connection.connect("127.0.0.1:5760", {}, privateScope.onOpen);
                         } else if (selected_port == 'sitl-demo') {
                             SITLProcess.stop();
-                            SITLProcess.start("demo.bin");                        
+                            SITLProcess.start("demo.bin");
                             this.isDemoRunning = true;
 
                             // Wait 1 sec until SITL is ready
@@ -309,7 +309,7 @@ var SerialBackend = (function () {
                     } else {
                         $(`#tabs ul.mode-connected .tab_setup a`).trigger('click');
                     }
-                    
+
                     update.firmwareVersion();
                 });
             });
@@ -369,7 +369,7 @@ var SerialBackend = (function () {
                 // variable isn't stored yet, saving
                 store.set('last_used_port', GUI.connected_to);
             }
-        
+
 
             store.set('last_used_bps', CONFIGURATOR.connection.bitrate);
             store.set('wireless_mode_enabled', $('#wireless-mode').is(":checked"));
@@ -410,7 +410,7 @@ var SerialBackend = (function () {
             // upgrade to MSPv2 if possible.
             MSP.protocolVersion = MSP.constants.PROTOCOL_V2;
             MSP.send_message(MSPCodes.MSP_API_VERSION, false, false, function () {
-                
+
                 if (FC.CONFIG.apiVersion === "0.0.0") {
                     GUI.log("<span style='color: red; font-weight: bolder'><strong>" + i18n.getMessage("illegalStateRestartRequired") + "</strong></span>");
                     FC.restartRequired = true;
@@ -425,14 +425,14 @@ var SerialBackend = (function () {
 
                             GUI.log(i18n.getMessage('fcInfoReceived', [FC.CONFIG.flightControllerIdentifier, FC.CONFIG.flightControllerVersion]));
                             if (semver.gte(FC.CONFIG.flightControllerVersion, CONFIGURATOR.minfirmwareVersionAccepted) && semver.lt(FC.CONFIG.flightControllerVersion, CONFIGURATOR.maxFirmwareVersionAccepted)) {
-                                if (CONFIGURATOR.connection.type == ConnectionType.BLE && semver.lt(FC.CONFIG.flightControllerVersion, "5.0.0")) {  
+                                if (CONFIGURATOR.connection.type == ConnectionType.BLE && semver.lt(FC.CONFIG.flightControllerVersion, "5.0.0")) {
                                     privateScope.onBleNotSupported();
                                 } else {
                                     mspHelper.getCraftName(function(name) {
                                         if (name) {
                                             FC.CONFIG.name = name;
                                         }
-                                        privateScope.onValidFirmware();  
+                                        privateScope.onValidFirmware();
                                     });
                                 }
                             } else  {
@@ -468,7 +468,7 @@ var SerialBackend = (function () {
         $('.mode-disconnected').hide();
         $('.mode-connected').show();
 
-        
+
         MSP.send_message(MSPCodes.MSP_BOXIDS, false, false, function () {
             FC.generateAuxConfig();
         });
@@ -482,13 +482,13 @@ var SerialBackend = (function () {
             /*
             * Init PIDs bank with a length that depends on the version
             */
-            let pidCount = 11;
+            let pidCount = 12;
 
             for (let i = 0; i < pidCount; i++) {
                 FC.PIDs.push(new Array(4));
             }
 
-            
+
             interval.add('msp-load-update', function () {
                 $('#msp-version').text("MSP version: " + MSP.protocolVersion.toFixed(0));
                 $('#msp-load').text("MSP load: " + mspQueue.getLoad().toFixed(1));
diff --git a/tabs/auxiliary.js b/tabs/auxiliary.js
index b931bdf54..2835fa0bb 100644
--- a/tabs/auxiliary.js
+++ b/tabs/auxiliary.js
@@ -56,14 +56,14 @@ auxiliaryTab.initialize = function (callback) {
         modeSections["Flight Modes"] = ["ANGLE", "HORIZON", "MANUAL", "ANGLE HOLD"];
         modeSections["Navigation Modes"] = ["NAV COURSE HOLD", "NAV CRUISE", "NAV POSHOLD", "NAV RTH", "NAV WP", "GCS NAV"];
         modeSections["Flight Mode Modifiers"] = ["NAV ALTHOLD", "HEADING HOLD", "AIR MODE", "SOARING", "SURFACE", "TURN ASSIST"];
-        modeSections["Fixed Wing"] = ["AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL TRIM", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON"];
+        modeSections["Fixed Wing"] = ["AUTO TUNE", "SERVO AUTOTRIM", "AUTO LEVEL TRIM", "AUTO SPEED", "NAV LAUNCH", "LOITER CHANGE", "FLAPERON"];
         modeSections["Multi-rotor"] = ["FPV ANGLE MIX", "TURTLE", "MC BRAKING", "HEADFREE", "HEADADJ"];
         modeSections["OSD Modes"] = ["OSD OFF", "OSD ALT 1", "OSD ALT 2", "OSD ALT 3"];
         modeSections["FPV Camera Modes"] = ["CAMSTAB", "CAMERA CONTROL 1", "CAMERA CONTROL 2", "CAMERA CONTROL 3"];
         modeSections["VTOL"] = ["MIXER PROFILE 2", "MIXER TRANSITION"];
         modeSections["Beeper"] = ["BEEPER", "BEEPER MUTE"];
         modeSections["Gimbal"] = ["GIMBAL LEVEL TILT", "GIMBAL LEVEL ROLL", "GIMBAL LEVEL PAN", "GIMBAL HEADTRACKER", "GIMBAL CENTER"];
-        modeSections["Misc Modes"] = ["LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "MISSION CHANGE", "BLACKBOX", "FAILSAFE", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2", "USER3", "USER4"];
+        modeSections["Misc Modes"] = ["LEDS OFF", "LIGHTS", "HOME RESET", "WP PLANNER", "MISSION CHANGE", "BLACKBOX", "FAILSAFE", "MULTI FUNCTION", "KILLSWITCH", "TELEMETRY", "MSP RC OVERRIDE", "USER1", "USER2", "USER3", "USER4"];
 
     function sort_modes_for_display() {
         // Sort the modes
diff --git a/tabs/osd.js b/tabs/osd.js
index e64066b34..6ff59ab87 100644
--- a/tabs/osd.js
+++ b/tabs/osd.js
@@ -1630,6 +1630,23 @@ OSD.constants = {
                         }
                     }
                 },
+                {
+                    name: 'AUTO SPEED',
+                    id: 170,
+                    // min_version: '10.0.0',
+                    preview: function(osd_data) {
+                        switch (OSD.data.preferences.units) {
+                            case 0: // Imperial
+                            case 2: // Metric + MPH
+                            case 3: // UK
+                                return FONT.embed_dot('G:127') + FONT.symbol(SYM.MPH_3D);
+                            case 4: // GA
+                                return FONT.embed_dot('G:110') + FONT.symbol(SYM.KT_3D);
+                            default: // Metric
+                                return FONT.embed_dot('G:204') + FONT.symbol(SYM.KMH_3D);
+                        }
+                    }
+                },
                 {
                     name: 'GPS_MAX_SPEED',
                     id: 125,
@@ -1907,7 +1924,7 @@ OSD.constants = {
                 {
                     name: 'GPS_EXTRA_STATS',
                     id: 169,
-                    min_version: '9.0.1',                    
+                    min_version: '9.0.1',
                    preview: '0' + FONT.symbol(SYM.SYM_HUD_SIGNAL_3) + '0' + FONT.symbol(SYM.SYM_HUD_SIGNAL_3) + '0' + FONT.symbol(SYM.SYM_HUD_SIGNAL_3) + '0'+ FONT.symbol(SYM.SYM_HUD_SIGNAL_3) + FONT.symbol(SYM.SNR) + '99'
                 }
             ]
@@ -2448,7 +2465,7 @@ OSD.reload = function(callback) {
                 MSP.promise(MSPCodes.MSP2_INAV_OSD_PREFERENCES).then(function (resp) {
                     OSD.data.supported = true;
                     OSD.msp.decodePreferences(resp);
-                    
+
                     MSP.promise(MSPCodes.MSP2_INAV_CUSTOM_OSD_ELEMENTS).then(() => {
                         mspHelper.loadOsdCustomElements(() => {
                             MSP.promise(MSPCodes.MSP2_INAV_LOGIC_CONDITIONS_CONFIGURED).then(() => {
@@ -2465,7 +2482,7 @@ OSD.reload = function(callback) {
         });
     });
 
-    
+
 };
 
 OSD.updateSelectedLayout = function(new_layout) {
@@ -3703,13 +3720,13 @@ osdTab.initialize = function (callback) {
                 $fontPicker.removeClass('active');
                 $(this).addClass('active');
                 store.set('osd_font', $(this).data('font-file'));
-                
+
                 import(`./../resources/osd/analogue/${$(this).data('font-file')}.mcm?raw`).then(({default: data}) => {
                     FONT.parseMCMFontFile(data);
                     FONT.preview($preview);
                     OSD.GUI.update();
                 });
-                
+
             });
 
             // load the last selected font when we change tabs
diff --git a/tabs/pid_tuning.html b/tabs/pid_tuning.html
index 2a3621014..b3f5d2445 100644
--- a/tabs/pid_tuning.html
+++ b/tabs/pid_tuning.html
@@ -48,18 +48,18 @@
                             </div>
                             <div class="clear-both"></div>
                         </div>
-        
+
                         <div class="pid-sliders-axis" data-axis="pitch">
                             <div style="padding: 1em;" data-i18n="ezTuneAxisRatioTips"></div>
                             <div class="pid-slider-row">
-        
+
                                 <span data-i18n="ezTuneAxisRatio" class="bold"></span>
                                 <div class="number no-border">
                                     <input id="ez_tune_axis_ratio" type="number" class="ez-element" />
                                 </div>
                                 <div class="clear-both"></div>
                             </div>
-        
+
                             <div style="padding: 1em;" data-i18n="ezTuneResponseTips"></div>
                             <div class="pid-slider-row">
                                 <span data-i18n="ezTuneResponse" class="bold"></span>
@@ -68,7 +68,7 @@
                                 </div>
                                 <div class="clear-both"></div>
                             </div>
-        
+
                             <div style="padding: 1em;" data-i18n="ezTuneDampingTips"></div>
                             <div class="pid-slider-row">
                                 <span data-i18n="ezTuneDamping" class="bold"></span>
@@ -77,7 +77,7 @@
                                 </div>
                                 <div class="clear-both"></div>
                             </div>
-        
+
                             <div style="padding: 1em;" data-i18n="ezTuneStabilityTips"></div>
                             <div class="pid-slider-row">
                                 <span data-i18n="ezTuneStability" class="bold"></span>
@@ -86,7 +86,7 @@
                                 </div>
                                 <div class="clear-both"></div>
                             </div>
-        
+
                             <div style="padding: 1em;" data-i18n="ezTuneAggressivenessTips"></div>
                             <div class="pid-slider-row">
                                 <span data-i18n="ezTuneAggressiveness" class="bold"></span>
@@ -95,9 +95,9 @@
                                 </div>
                                 <div class="clear-both"></div>
                             </div>
-        
+
                         </div>
-        
+
                         <div class="pid-sliders-axis" data-axis="yaw">
                             <div style="padding: 1em;" data-i18n="ezTuneRateTips"></div>
                             <div class="pid-slider-row">
@@ -107,7 +107,7 @@
                                 </div>
                                 <div class="clear-both"></div>
                             </div>
-        
+
                             <div style="padding: 1em;" data-i18n="ezTuneExpoTips"></div>
                             <div class="pid-slider-row">
                                 <span data-i18n="ezTuneExpo" class="bold"></span>
@@ -117,7 +117,7 @@
                                 <div class="clear-both"></div>
                             </div>
                         </div>
-        
+
                         <div class="pid-sliders-axis" data-axis="3">
                             <div style="padding: 1em;" data-i18n="ezTuneSnappinessTips"></div>
                             <div class="pid-slider-row">
@@ -129,7 +129,7 @@
                             </div>
                         </div>
                     </div>
-        
+
                     <div class="ez-tune-preview">
                         <h2 data-i18n="ezTunePidPreview"></h2>
                         <table>
@@ -191,7 +191,7 @@ <h2 data-i18n="ezTuneRatePreview"></h2>
                             </div>
                         </div>
                     </div>
-        
+
                 </div>
             </div>
 
@@ -373,7 +373,15 @@ <h3 data-i18n="axisYaw"></h3>
                             <td></td>
                         </tr>
                         <tr class="HEADING" data-pid-bank-position="10">
-                            <!-- 8 -->
+                            <!-- 10 -->
+                            <td></td>
+                            <td><input class="controlProfileHighlight" type="number" name="p" step="1" min="0" max="255" /></td>
+                            <td><input class="controlProfileHighlight" type="number" name="i" step="1" min="0" max="255" /></td>
+                            <td><input class="controlProfileHighlight" type="number" name="d" step="1" min="0" max="255" /></td>
+                            <td></td>
+                        </tr>
+                        <tr class="SPEED" data-pid-bank-position="11">
+                            <!-- 11 -->
                             <td></td>
                             <td><input class="controlProfileHighlight" type="number" name="p" step="1" min="0" max="255" /></td>
                             <td><input class="controlProfileHighlight" type="number" name="i" step="1" min="0" max="255" /></td>
@@ -517,7 +525,7 @@ <h3 data-i18n="pidTuning_Manual_Rates"></h3>
                     </div>
                     <div class="clear-both"></div>
                 </div>
-                
+
             </div>
 
             <div class="pid-sliders-axis not-for-multirotor" data-axis="3">
@@ -551,7 +559,7 @@ <h3 data-i18n="pidTuning_Other"></h3>
                         <input id="heading_hold_rate_limit" class="controlProfileHighlightActive rate-tpa_input" data-setting="heading_hold_rate_limit" type="number" data-presentation="range" />
                     </div>
                     <div class="clear-both"></div>
-                </div>       
+                </div>
             </div>
 
             <div class="tab_subtitle" style="margin-top: 1em;" data-i18n="pidTuning_Limits"></div>
@@ -564,14 +572,14 @@ <h3 data-i18n="pidTuning_Max_Inclination_Angle"></h3>
                         <input id="max_angle_inclination_rll" class="controlProfileHighlightActive rate-tpa_input" data-setting="max_angle_inclination_rll" type="number" data-presentation="range" />
                     </div>
                     <div class="clear-both"></div>
-                </div>   
+                </div>
                 <div class="pid-slider-row">
                     <span data-i18n="pidTuning_Max_Pitch"></span>
                     <div class="number no-border">
                         <input id="max_angle_inclination_pit" class="controlProfileHighlightActive rate-tpa_input" data-setting="max_angle_inclination_pit" type="number" data-presentation="range" />
                     </div>
                     <div class="clear-both"></div>
-                </div>       
+                </div>
             </div>
 
             <div class="clear-both"></div>
@@ -686,7 +694,7 @@ <h3 data-i18n="pidTuning_RateDynamics_Weight"></h3>
                     </tbody>
                 </table>
             </div>
-            
+
             <div class="clear-both not-for-ez-tune"></div>
             <div class="tab_subtitle not-for-ez-tune" data-i18n="pidTuning_advancedFilters" style="margin-top: 1em;"></div>
             <div class="clear-both not-for-ez-tune"></div>