diff --git a/protobufs b/protobufs
index 99bd42baf..6cb18782b 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 99bd42baf8dd2e8ca0eec70f05e1cf7f1a40a283
+Subproject commit 6cb18782b1c446a4ca4797dcf5bb2da765b6e5a0
diff --git a/src/mesh/generated/meshtastic/mesh.pb.h b/src/mesh/generated/meshtastic/mesh.pb.h
index 998b64faa..a6b36a875 100644
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/src/mesh/generated/meshtastic/mesh.pb.h
@@ -73,6 +73,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_SENSELORA_S3 = 28,
     /* Canary Radio Company - CanaryOne: https://canaryradio.io/products/canaryone */
     meshtastic_HardwareModel_CANARYONE = 29,
+    /* Waveshare RP2040 LoRa - https://www.waveshare.com/rp2040-lora.htm */
+    meshtastic_HardwareModel_RP2040_LORA = 30,
     /* ---------------------------------------------------------------------------
  Less common/prototype boards listed here (needs one more byte over the air)
  --------------------------------------------------------------------------- */
diff --git a/src/mesh/generated/meshtastic/storeforward.pb.h b/src/mesh/generated/meshtastic/storeforward.pb.h
index e6cb51f61..151f6211b 100644
--- a/src/mesh/generated/meshtastic/storeforward.pb.h
+++ b/src/mesh/generated/meshtastic/storeforward.pb.h
@@ -62,9 +62,9 @@ typedef struct _meshtastic_StoreAndForward_Statistics {
     uint32_t requests_history;
     /* Is the heartbeat enabled on the server? */
     bool heartbeat;
-    /* Is the heartbeat enabled on the server? */
+    /* Maximum number of messages the server will return. */
     uint32_t return_max;
-    /* Is the heartbeat enabled on the server? */
+    /* Maximum history window in minutes the server will return messages from. */
     uint32_t return_window;
 } meshtastic_StoreAndForward_Statistics;
 
@@ -74,18 +74,20 @@ typedef struct _meshtastic_StoreAndForward_History {
     uint32_t history_messages;
     /* The window of messages that was used to filter the history client requested */
     uint32_t window;
-    /* The window of messages that was used to filter the history client requested */
+    /* Index in the packet history of the last message sent in a previous request to the server.
+ Will be sent to the client before sending the history and can be set in a subsequent request to avoid getting packets the server already sent to the client. */
     uint32_t last_request;
 } meshtastic_StoreAndForward_History;
 
 /* TODO: REPLACE */
 typedef struct _meshtastic_StoreAndForward_Heartbeat {
-    /* Number of that will be sent to the client */
+    /* Period in seconds that the heartbeat is sent out that will be sent to the client */
     uint32_t period;
     /* If set, this is not the primary Store & Forward router on the mesh */
     uint32_t secondary;
 } meshtastic_StoreAndForward_Heartbeat;
 
+typedef PB_BYTES_ARRAY_T(237) meshtastic_StoreAndForward_text_t;
 /* TODO: REPLACE */
 typedef struct _meshtastic_StoreAndForward {
     /* TODO: REPLACE */
@@ -98,8 +100,8 @@ typedef struct _meshtastic_StoreAndForward {
         meshtastic_StoreAndForward_History history;
         /* TODO: REPLACE */
         meshtastic_StoreAndForward_Heartbeat heartbeat;
-        /* Empty Payload */
-        bool empty;
+        /* Text from history message. */
+        meshtastic_StoreAndForward_text_t text;
     } variant;
 } meshtastic_StoreAndForward;
 
@@ -148,7 +150,7 @@ extern "C" {
 #define meshtastic_StoreAndForward_stats_tag     2
 #define meshtastic_StoreAndForward_history_tag   3
 #define meshtastic_StoreAndForward_heartbeat_tag 4
-#define meshtastic_StoreAndForward_empty_tag     5
+#define meshtastic_StoreAndForward_text_tag      5
 
 /* Struct field encoding specification for nanopb */
 #define meshtastic_StoreAndForward_FIELDLIST(X, a) \
@@ -156,7 +158,7 @@ X(a, STATIC,   SINGULAR, UENUM,    rr,                1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,stats,variant.stats),   2) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,history,variant.history),   3) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,heartbeat,variant.heartbeat),   4) \
-X(a, STATIC,   ONEOF,    BOOL,     (variant,empty,variant.empty),   5)
+X(a, STATIC,   ONEOF,    BYTES,    (variant,text,variant.text),   5)
 #define meshtastic_StoreAndForward_CALLBACK NULL
 #define meshtastic_StoreAndForward_DEFAULT NULL
 #define meshtastic_StoreAndForward_variant_stats_MSGTYPE meshtastic_StoreAndForward_Statistics
@@ -204,7 +206,7 @@ extern const pb_msgdesc_t meshtastic_StoreAndForward_Heartbeat_msg;
 #define meshtastic_StoreAndForward_Heartbeat_size 12
 #define meshtastic_StoreAndForward_History_size  18
 #define meshtastic_StoreAndForward_Statistics_size 50
-#define meshtastic_StoreAndForward_size          54
+#define meshtastic_StoreAndForward_size          242
 
 #ifdef __cplusplus
 } /* extern "C" */