diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index df6497b0b377efd98a67f65bc7b9411942dc33a0..e84ee8c5cdfaa4b6c9fb8c1b0fef80d03fc56508 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -716,6 +716,7 @@ void Vehicle::_setCapabilities(uint64_t capabilityBits)
         _supportsMissionItemInt = true;
     }
     _vehicleCapabilitiesKnown = true;
+    emit capabilitiesKnownChanged(true);
 
     qCDebug(VehicleLog) << QString("Vehicle %1 MISSION_ITEM_INT").arg(_supportsMissionItemInt ? QStringLiteral("supports") : QStringLiteral("does not support"));
 }
diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h
index faddcdf143f0faaab30c941e78620199e848ea4b..9cbd85c01316d3d69087160e01c7c25da8af8ff5 100644
--- a/src/Vehicle/Vehicle.h
+++ b/src/Vehicle/Vehicle.h
@@ -673,6 +673,7 @@ public:
     const QVariantList& toolBarIndicators   ();
     const QVariantList& cameraList          (void) const;
 
+    bool capabilitiesKnown(void) const { return _vehicleCapabilitiesKnown; }
     bool supportsMissionItemInt(void) const { return _supportsMissionItemInt; }
 
     /// @true: When flying a mission the vehicle is always facing towards the next waypoint
@@ -682,6 +683,8 @@ public:
     /// @return: true: initial request is complete, false: initial request is still in progress;
     bool initialPlanRequestComplete(void) const { return _initialPlanRequestComplete; }
 
+    void forceInitialPlanRequestComplete(void) { _initialPlanRequestComplete = true; }
+
     void _setFlying(bool flying);
     void _setLanding(bool landing);
     void _setHomePosition(QGeoCoordinate& homeCoord);
@@ -712,6 +715,7 @@ signals:
     void defaultHoverSpeedChanged(double hoverSpeed);
     void firmwareTypeChanged(void);
     void vehicleTypeChanged(void);
+    void capabilitiesKnownChanged(bool capabilitiesKnown);
 
     void messagesReceivedChanged    ();
     void messagesSentChanged        ();