diff --git a/Meshtastic/Protobufs/meshtastic/mesh.pb.swift b/Meshtastic/Protobufs/meshtastic/mesh.pb.swift
index f82adc83..fbbbd0a5 100644
--- a/Meshtastic/Protobufs/meshtastic/mesh.pb.swift
+++ b/Meshtastic/Protobufs/meshtastic/mesh.pb.swift
@@ -102,6 +102,10 @@ enum HardwareModel: SwiftProtobuf.Enum {
   /// B&Q Consulting Nano G1 Explorer: https://wiki.uniteng.com/en/meshtastic/nano-g1-explorer
   case nanoG1Explorer // = 17
 
+  ///
+  /// B&Q Consulting Nano G2 Ultra: https://wiki.uniteng.com/en/meshtastic/nano-g2-ultra
+  case nanoG2Ultra // = 18
+
   ///
   /// B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station
   case stationG1 // = 25
@@ -223,6 +227,7 @@ enum HardwareModel: SwiftProtobuf.Enum {
     case 15: self = .tloraV211P8
     case 16: self = .tloraT3S3
     case 17: self = .nanoG1Explorer
+    case 18: self = .nanoG2Ultra
     case 25: self = .stationG1
     case 26: self = .rak11310
     case 32: self = .loraRelayV1
@@ -270,6 +275,7 @@ enum HardwareModel: SwiftProtobuf.Enum {
     case .tloraV211P8: return 15
     case .tloraT3S3: return 16
     case .nanoG1Explorer: return 17
+    case .nanoG2Ultra: return 18
     case .stationG1: return 25
     case .rak11310: return 26
     case .loraRelayV1: return 32
@@ -322,6 +328,7 @@ extension HardwareModel: CaseIterable {
     .tloraV211P8,
     .tloraT3S3,
     .nanoG1Explorer,
+    .nanoG2Ultra,
     .stationG1,
     .rak11310,
     .loraRelayV1,
@@ -2109,7 +2116,7 @@ struct FromRadio {
   }
 
   ///
-  /// MQTT Client Proxy Message
+  /// MQTT Client Proxy Message (device sending to client / phone for publishing to MQTT)
   var mqttClientProxyMessage: MqttClientProxyMessage {
     get {
       if case .mqttClientProxyMessage(let v)? = _storage._payloadVariant {return v}
@@ -2168,7 +2175,7 @@ struct FromRadio {
     /// Device metadata message
     case metadata(DeviceMetadata)
     ///
-    /// MQTT Client Proxy Message
+    /// MQTT Client Proxy Message (device sending to client / phone for publishing to MQTT)
     case mqttClientProxyMessage(MqttClientProxyMessage)
 
   #if !swift(>=4.1)
@@ -2300,7 +2307,7 @@ struct ToRadio {
   }
 
   ///
-  /// MQTT Client Proxy Message
+  /// MQTT Client Proxy Message (for client / phone subscribed to MQTT sending to device)
   var mqttClientProxyMessage: MqttClientProxyMessage {
     get {
       if case .mqttClientProxyMessage(let v)? = payloadVariant {return v}
@@ -2334,7 +2341,7 @@ struct ToRadio {
     case disconnect(Bool)
     case xmodemPacket(XModem)
     ///
-    /// MQTT Client Proxy Message
+    /// MQTT Client Proxy Message (for client / phone subscribed to MQTT sending to device)
     case mqttClientProxyMessage(MqttClientProxyMessage)
 
   #if !swift(>=4.1)
@@ -2547,6 +2554,7 @@ extension HardwareModel: SwiftProtobuf._ProtoNameProviding {
     15: .same(proto: "TLORA_V2_1_1P8"),
     16: .same(proto: "TLORA_T3_S3"),
     17: .same(proto: "NANO_G1_EXPLORER"),
+    18: .same(proto: "NANO_G2_ULTRA"),
     25: .same(proto: "STATION_G1"),
     26: .same(proto: "RAK11310"),
     32: .same(proto: "LORA_RELAY_V1"),
diff --git a/Meshtastic/Protobufs/meshtastic/portnums.pb.swift b/Meshtastic/Protobufs/meshtastic/portnums.pb.swift
index 66a57e7b..29f7b471 100644
--- a/Meshtastic/Protobufs/meshtastic/portnums.pb.swift
+++ b/Meshtastic/Protobufs/meshtastic/portnums.pb.swift
@@ -87,10 +87,6 @@ enum PortNum: SwiftProtobuf.Enum {
   /// Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now
   case audioApp // = 9
 
-  ///
-  /// Payloads for clients with a network connection proxying MQTT pub/sub to the device
-  case mqttClientProxyApp // = 10
-
   ///
   /// Provides a 'ping' service that replies to any packet it receives.
   /// Also serves as a small example module.
@@ -175,7 +171,6 @@ enum PortNum: SwiftProtobuf.Enum {
     case 7: self = .textMessageCompressedApp
     case 8: self = .waypointApp
     case 9: self = .audioApp
-    case 10: self = .mqttClientProxyApp
     case 32: self = .replyApp
     case 33: self = .ipTunnelApp
     case 64: self = .serialApp
@@ -205,7 +200,6 @@ enum PortNum: SwiftProtobuf.Enum {
     case .textMessageCompressedApp: return 7
     case .waypointApp: return 8
     case .audioApp: return 9
-    case .mqttClientProxyApp: return 10
     case .replyApp: return 32
     case .ipTunnelApp: return 33
     case .serialApp: return 64
@@ -240,7 +234,6 @@ extension PortNum: CaseIterable {
     .textMessageCompressedApp,
     .waypointApp,
     .audioApp,
-    .mqttClientProxyApp,
     .replyApp,
     .ipTunnelApp,
     .serialApp,
@@ -277,7 +270,6 @@ extension PortNum: SwiftProtobuf._ProtoNameProviding {
     7: .same(proto: "TEXT_MESSAGE_COMPRESSED_APP"),
     8: .same(proto: "WAYPOINT_APP"),
     9: .same(proto: "AUDIO_APP"),
-    10: .same(proto: "MQTT_CLIENT_PROXY_APP"),
     32: .same(proto: "REPLY_APP"),
     33: .same(proto: "IP_TUNNEL_APP"),
     64: .same(proto: "SERIAL_APP"),
diff --git a/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift b/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift
index f41b4b80..4294c83b 100644
--- a/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift
+++ b/Meshtastic/Protobufs/meshtastic/telemetry.pb.swift
@@ -200,7 +200,7 @@ struct EnvironmentMetrics {
   var barometricPressure: Float = 0
 
   ///
-  /// Gas resistance in mOhm measured
+  /// Gas resistance in MOhm measured
   var gasResistance: Float = 0
 
   ///