diff --git a/src/mesh/generated/localonly.pb.h b/src/mesh/generated/localonly.pb.h
index d2b9dfcae..1e4aa633c 100644
--- a/src/mesh/generated/localonly.pb.h
+++ b/src/mesh/generated/localonly.pb.h
@@ -157,7 +157,7 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define LocalConfig_size                         391
-#define LocalModuleConfig_size                   380
+#define LocalModuleConfig_size                   412
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/mesh/generated/mesh.pb.h b/src/mesh/generated/mesh.pb.h
index d1f3e5bf5..5ff84a223 100644
--- a/src/mesh/generated/mesh.pb.h
+++ b/src/mesh/generated/mesh.pb.h
@@ -84,6 +84,8 @@ typedef enum _HardwareModel {
     HardwareModel_HELTEC_V3 = 43,
     /* New Heltec Wireless Stick Lite with ESP32-S3 CPU */
     HardwareModel_HELTEC_WSL_V3 = 44,
+    /* New BETAFPV ELRS Micro TX Module 2.4G with ESP32 CPU */
+    HardwareModel_BETAFPV_2400_TX = 45,
     /* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */
     HardwareModel_PRIVATE_HW = 255
 } HardwareModel;
@@ -439,9 +441,10 @@ typedef struct _Waypoint {
     bool locked;
     /* Name of the waypoint - max 30 chars */
     char name[30];
-    /* *
- Description of the waypoint - max 100 chars */
+    /* Description of the waypoint - max 100 chars */
     char description[100];
+    /* Designator icon for the waypoint in the form of a unicode emoji */
+    uint32_t emoji;
 } Waypoint;
 
 typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t;
@@ -778,7 +781,7 @@ extern "C" {
 #define RouteDiscovery_init_default              {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_default                     {0, {RouteDiscovery_init_default}}
 #define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
-#define Waypoint_init_default                    {0, 0, 0, 0, 0, "", ""}
+#define Waypoint_init_default                    {0, 0, 0, 0, 0, "", "", 0}
 #define MeshPacket_init_default                  {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0, false, DeviceMetrics_init_default}
 #define MyNodeInfo_init_default                  {0, 0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
@@ -792,7 +795,7 @@ extern "C" {
 #define RouteDiscovery_init_zero                 {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_zero                        {0, {RouteDiscovery_init_zero}}
 #define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0}
-#define Waypoint_init_zero                       {0, 0, 0, 0, 0, "", ""}
+#define Waypoint_init_zero                       {0, 0, 0, 0, 0, "", "", 0}
 #define MeshPacket_init_zero                     {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0, false, DeviceMetrics_init_zero}
 #define MyNodeInfo_init_zero                     {0, 0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
@@ -850,6 +853,7 @@ extern "C" {
 #define Waypoint_locked_tag                      5
 #define Waypoint_name_tag                        6
 #define Waypoint_description_tag                 7
+#define Waypoint_emoji_tag                       8
 #define MeshPacket_from_tag                      1
 #define MeshPacket_to_tag                        2
 #define MeshPacket_channel_tag                   3
@@ -980,7 +984,8 @@ X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       3) \
 X(a, STATIC,   SINGULAR, UINT32,   expire,            4) \
 X(a, STATIC,   SINGULAR, BOOL,     locked,            5) \
 X(a, STATIC,   SINGULAR, STRING,   name,              6) \
-X(a, STATIC,   SINGULAR, STRING,   description,       7)
+X(a, STATIC,   SINGULAR, STRING,   description,       7) \
+X(a, STATIC,   SINGULAR, FIXED32,  emoji,             8)
 #define Waypoint_CALLBACK NULL
 #define Waypoint_DEFAULT NULL
 
@@ -1133,7 +1138,7 @@ extern const pb_msgdesc_t Compressed_msg;
 #define Routing_size                             42
 #define ToRadio_size                             324
 #define User_size                                77
-#define Waypoint_size                            156
+#define Waypoint_size                            161
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/src/mesh/generated/module_config.pb.h b/src/mesh/generated/module_config.pb.h
index da13ac706..bd4e90832 100644
--- a/src/mesh/generated/module_config.pb.h
+++ b/src/mesh/generated/module_config.pb.h
@@ -80,7 +80,7 @@ typedef struct _ModuleConfig_MQTTConfig {
     bool enabled;
     /* The server to use for our MQTT global message gateway feature.
  If not set, the default server will be used */
-    char address[32];
+    char address[64];
     /* MQTT username to use (most useful for a custom MQTT server).
  If using a custom server, this will be honoured even if empty.
  If using the default server, this will only be honoured if set, otherwise the device will use the default username */
@@ -553,13 +553,13 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg;
 #define ModuleConfig_AudioConfig_size            19
 #define ModuleConfig_CannedMessageConfig_size    49
 #define ModuleConfig_ExternalNotificationConfig_size 40
-#define ModuleConfig_MQTTConfig_size             169
+#define ModuleConfig_MQTTConfig_size             201
 #define ModuleConfig_RangeTestConfig_size        10
 #define ModuleConfig_RemoteHardwareConfig_size   2
 #define ModuleConfig_SerialConfig_size           26
 #define ModuleConfig_StoreForwardConfig_size     22
 #define ModuleConfig_TelemetryConfig_size        18
-#define ModuleConfig_size                        172
+#define ModuleConfig_size                        204
 
 #ifdef __cplusplus
 } /* extern "C" */