diff --git a/shared/protos/_generated/tunnelbroker.pb.h b/shared/protos/_generated/tunnelbroker.pb.h
--- a/shared/protos/_generated/tunnelbroker.pb.h
+++ b/shared/protos/_generated/tunnelbroker.pb.h
@@ -2224,6 +2224,7 @@
   enum DataCase {
     kMessagesToSend = 2,
     kProcessedMessages = 3,
+    kNewNotifyToken = 4,
     DATA_NOT_SET = 0,
   };
 
@@ -2305,6 +2306,7 @@
     kSessionIDFieldNumber = 1,
     kMessagesToSendFieldNumber = 2,
     kProcessedMessagesFieldNumber = 3,
+    kNewNotifyTokenFieldNumber = 4,
   };
   // string sessionID = 1;
   void clear_sessionid();
@@ -2358,6 +2360,26 @@
       ::tunnelbroker::ProcessedMessages* processedmessages);
   ::tunnelbroker::ProcessedMessages* unsafe_arena_release_processedmessages();
 
+  // string newNotifyToken = 4;
+  bool has_newnotifytoken() const;
+  private:
+  bool _internal_has_newnotifytoken() const;
+  public:
+  void clear_newnotifytoken();
+  const std::string& newnotifytoken() const;
+  void set_newnotifytoken(const std::string& value);
+  void set_newnotifytoken(std::string&& value);
+  void set_newnotifytoken(const char* value);
+  void set_newnotifytoken(const char* value, size_t size);
+  std::string* mutable_newnotifytoken();
+  std::string* release_newnotifytoken();
+  void set_allocated_newnotifytoken(std::string* newnotifytoken);
+  private:
+  const std::string& _internal_newnotifytoken() const;
+  void _internal_set_newnotifytoken(const std::string& value);
+  std::string* _internal_mutable_newnotifytoken();
+  public:
+
   void clear_data();
   DataCase data_case() const;
   // @@protoc_insertion_point(class_scope:tunnelbroker.MessageToTunnelbroker)
@@ -2365,6 +2387,7 @@
   class _Internal;
   void set_has_messagestosend();
   void set_has_processedmessages();
+  void set_has_newnotifytoken();
 
   inline bool has_data() const;
   inline void clear_has_data();
@@ -2378,6 +2401,7 @@
       ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
     ::tunnelbroker::MessagesToSend* messagestosend_;
     ::tunnelbroker::ProcessedMessages* processedmessages_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr newnotifytoken_;
   } data_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
@@ -2779,6 +2803,8 @@
   enum DataCase {
     kMessagesToDeliver = 1,
     kProcessedMessages = 2,
+    kNewNotifyTokenRequired = 3,
+    kPing = 4,
     DATA_NOT_SET = 0,
   };
 
@@ -2859,6 +2885,8 @@
   enum : int {
     kMessagesToDeliverFieldNumber = 1,
     kProcessedMessagesFieldNumber = 2,
+    kNewNotifyTokenRequiredFieldNumber = 3,
+    kPingFieldNumber = 4,
   };
   // .tunnelbroker.MessagesToDeliver messagesToDeliver = 1;
   bool has_messagestodeliver() const;
@@ -2896,6 +2924,42 @@
       ::tunnelbroker::ProcessedMessages* processedmessages);
   ::tunnelbroker::ProcessedMessages* unsafe_arena_release_processedmessages();
 
+  // .google.protobuf.Empty newNotifyTokenRequired = 3;
+  bool has_newnotifytokenrequired() const;
+  private:
+  bool _internal_has_newnotifytokenrequired() const;
+  public:
+  void clear_newnotifytokenrequired();
+  const PROTOBUF_NAMESPACE_ID::Empty& newnotifytokenrequired() const;
+  PROTOBUF_NAMESPACE_ID::Empty* release_newnotifytokenrequired();
+  PROTOBUF_NAMESPACE_ID::Empty* mutable_newnotifytokenrequired();
+  void set_allocated_newnotifytokenrequired(PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired);
+  private:
+  const PROTOBUF_NAMESPACE_ID::Empty& _internal_newnotifytokenrequired() const;
+  PROTOBUF_NAMESPACE_ID::Empty* _internal_mutable_newnotifytokenrequired();
+  public:
+  void unsafe_arena_set_allocated_newnotifytokenrequired(
+      PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired);
+  PROTOBUF_NAMESPACE_ID::Empty* unsafe_arena_release_newnotifytokenrequired();
+
+  // .google.protobuf.Empty ping = 4;
+  bool has_ping() const;
+  private:
+  bool _internal_has_ping() const;
+  public:
+  void clear_ping();
+  const PROTOBUF_NAMESPACE_ID::Empty& ping() const;
+  PROTOBUF_NAMESPACE_ID::Empty* release_ping();
+  PROTOBUF_NAMESPACE_ID::Empty* mutable_ping();
+  void set_allocated_ping(PROTOBUF_NAMESPACE_ID::Empty* ping);
+  private:
+  const PROTOBUF_NAMESPACE_ID::Empty& _internal_ping() const;
+  PROTOBUF_NAMESPACE_ID::Empty* _internal_mutable_ping();
+  public:
+  void unsafe_arena_set_allocated_ping(
+      PROTOBUF_NAMESPACE_ID::Empty* ping);
+  PROTOBUF_NAMESPACE_ID::Empty* unsafe_arena_release_ping();
+
   void clear_data();
   DataCase data_case() const;
   // @@protoc_insertion_point(class_scope:tunnelbroker.MessageToClient)
@@ -2903,6 +2967,8 @@
   class _Internal;
   void set_has_messagestodeliver();
   void set_has_processedmessages();
+  void set_has_newnotifytokenrequired();
+  void set_has_ping();
 
   inline bool has_data() const;
   inline void clear_has_data();
@@ -2915,6 +2981,8 @@
       ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
     ::tunnelbroker::MessagesToDeliver* messagestodeliver_;
     ::tunnelbroker::ProcessedMessages* processedmessages_;
+    PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired_;
+    PROTOBUF_NAMESPACE_ID::Empty* ping_;
   } data_;
   mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
   ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
@@ -5693,6 +5761,116 @@
   return _internal_mutable_processedmessages();
 }
 
+// string newNotifyToken = 4;
+inline bool MessageToTunnelbroker::_internal_has_newnotifytoken() const {
+  return data_case() == kNewNotifyToken;
+}
+inline bool MessageToTunnelbroker::has_newnotifytoken() const {
+  return _internal_has_newnotifytoken();
+}
+inline void MessageToTunnelbroker::set_has_newnotifytoken() {
+  _oneof_case_[0] = kNewNotifyToken;
+}
+inline void MessageToTunnelbroker::clear_newnotifytoken() {
+  if (_internal_has_newnotifytoken()) {
+    data_.newnotifytoken_.Destroy(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
+    clear_has_data();
+  }
+}
+inline const std::string& MessageToTunnelbroker::newnotifytoken() const {
+  // @@protoc_insertion_point(field_get:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+  return _internal_newnotifytoken();
+}
+inline void MessageToTunnelbroker::set_newnotifytoken(const std::string& value) {
+  _internal_set_newnotifytoken(value);
+  // @@protoc_insertion_point(field_set:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+}
+inline std::string* MessageToTunnelbroker::mutable_newnotifytoken() {
+  // @@protoc_insertion_point(field_mutable:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+  return _internal_mutable_newnotifytoken();
+}
+inline const std::string& MessageToTunnelbroker::_internal_newnotifytoken() const {
+  if (_internal_has_newnotifytoken()) {
+    return data_.newnotifytoken_.Get();
+  }
+  return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited();
+}
+inline void MessageToTunnelbroker::_internal_set_newnotifytoken(const std::string& value) {
+  if (!_internal_has_newnotifytoken()) {
+    clear_data();
+    set_has_newnotifytoken();
+    data_.newnotifytoken_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  }
+  data_.newnotifytoken_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArena());
+}
+inline void MessageToTunnelbroker::set_newnotifytoken(std::string&& value) {
+  // @@protoc_insertion_point(field_set:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+  if (!_internal_has_newnotifytoken()) {
+    clear_data();
+    set_has_newnotifytoken();
+    data_.newnotifytoken_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  }
+  data_.newnotifytoken_.Set(
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::move(value), GetArena());
+  // @@protoc_insertion_point(field_set_rvalue:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+}
+inline void MessageToTunnelbroker::set_newnotifytoken(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  if (!_internal_has_newnotifytoken()) {
+    clear_data();
+    set_has_newnotifytoken();
+    data_.newnotifytoken_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  }
+  data_.newnotifytoken_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{},
+      ::std::string(value), GetArena());
+  // @@protoc_insertion_point(field_set_char:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+}
+inline void MessageToTunnelbroker::set_newnotifytoken(const char* value,
+                             size_t size) {
+  if (!_internal_has_newnotifytoken()) {
+    clear_data();
+    set_has_newnotifytoken();
+    data_.newnotifytoken_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  }
+  data_.newnotifytoken_.Set(
+      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, ::std::string(
+      reinterpret_cast<const char*>(value), size),
+      GetArena());
+  // @@protoc_insertion_point(field_set_pointer:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+}
+inline std::string* MessageToTunnelbroker::_internal_mutable_newnotifytoken() {
+  if (!_internal_has_newnotifytoken()) {
+    clear_data();
+    set_has_newnotifytoken();
+    data_.newnotifytoken_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  }
+  return data_.newnotifytoken_.Mutable(
+      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
+}
+inline std::string* MessageToTunnelbroker::release_newnotifytoken() {
+  // @@protoc_insertion_point(field_release:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+  if (_internal_has_newnotifytoken()) {
+    clear_has_data();
+    return data_.newnotifytoken_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  } else {
+    return nullptr;
+  }
+}
+inline void MessageToTunnelbroker::set_allocated_newnotifytoken(std::string* newnotifytoken) {
+  if (has_data()) {
+    clear_data();
+  }
+  if (newnotifytoken != nullptr) {
+    set_has_newnotifytoken();
+    data_.newnotifytoken_.UnsafeSetDefault(newnotifytoken);
+    ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena();
+    if (arena != nullptr) {
+      arena->Own(newnotifytoken);
+    }
+  }
+  // @@protoc_insertion_point(field_set_allocated:tunnelbroker.MessageToTunnelbroker.newNotifyToken)
+}
+
 inline bool MessageToTunnelbroker::has_data() const {
   return data_case() != DATA_NOT_SET;
 }
@@ -6156,6 +6334,136 @@
   return _internal_mutable_processedmessages();
 }
 
+// .google.protobuf.Empty newNotifyTokenRequired = 3;
+inline bool MessageToClient::_internal_has_newnotifytokenrequired() const {
+  return data_case() == kNewNotifyTokenRequired;
+}
+inline bool MessageToClient::has_newnotifytokenrequired() const {
+  return _internal_has_newnotifytokenrequired();
+}
+inline void MessageToClient::set_has_newnotifytokenrequired() {
+  _oneof_case_[0] = kNewNotifyTokenRequired;
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::release_newnotifytokenrequired() {
+  // @@protoc_insertion_point(field_release:tunnelbroker.MessageToClient.newNotifyTokenRequired)
+  if (_internal_has_newnotifytokenrequired()) {
+    clear_has_data();
+      PROTOBUF_NAMESPACE_ID::Empty* temp = data_.newnotifytokenrequired_;
+    if (GetArena() != nullptr) {
+      temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
+    }
+    data_.newnotifytokenrequired_ = nullptr;
+    return temp;
+  } else {
+    return nullptr;
+  }
+}
+inline const PROTOBUF_NAMESPACE_ID::Empty& MessageToClient::_internal_newnotifytokenrequired() const {
+  return _internal_has_newnotifytokenrequired()
+      ? *data_.newnotifytokenrequired_
+      : reinterpret_cast< PROTOBUF_NAMESPACE_ID::Empty&>(PROTOBUF_NAMESPACE_ID::_Empty_default_instance_);
+}
+inline const PROTOBUF_NAMESPACE_ID::Empty& MessageToClient::newnotifytokenrequired() const {
+  // @@protoc_insertion_point(field_get:tunnelbroker.MessageToClient.newNotifyTokenRequired)
+  return _internal_newnotifytokenrequired();
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::unsafe_arena_release_newnotifytokenrequired() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:tunnelbroker.MessageToClient.newNotifyTokenRequired)
+  if (_internal_has_newnotifytokenrequired()) {
+    clear_has_data();
+    PROTOBUF_NAMESPACE_ID::Empty* temp = data_.newnotifytokenrequired_;
+    data_.newnotifytokenrequired_ = nullptr;
+    return temp;
+  } else {
+    return nullptr;
+  }
+}
+inline void MessageToClient::unsafe_arena_set_allocated_newnotifytokenrequired(PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired) {
+  clear_data();
+  if (newnotifytokenrequired) {
+    set_has_newnotifytokenrequired();
+    data_.newnotifytokenrequired_ = newnotifytokenrequired;
+  }
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:tunnelbroker.MessageToClient.newNotifyTokenRequired)
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::_internal_mutable_newnotifytokenrequired() {
+  if (!_internal_has_newnotifytokenrequired()) {
+    clear_data();
+    set_has_newnotifytokenrequired();
+    data_.newnotifytokenrequired_ = CreateMaybeMessage< PROTOBUF_NAMESPACE_ID::Empty >(GetArena());
+  }
+  return data_.newnotifytokenrequired_;
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::mutable_newnotifytokenrequired() {
+  // @@protoc_insertion_point(field_mutable:tunnelbroker.MessageToClient.newNotifyTokenRequired)
+  return _internal_mutable_newnotifytokenrequired();
+}
+
+// .google.protobuf.Empty ping = 4;
+inline bool MessageToClient::_internal_has_ping() const {
+  return data_case() == kPing;
+}
+inline bool MessageToClient::has_ping() const {
+  return _internal_has_ping();
+}
+inline void MessageToClient::set_has_ping() {
+  _oneof_case_[0] = kPing;
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::release_ping() {
+  // @@protoc_insertion_point(field_release:tunnelbroker.MessageToClient.ping)
+  if (_internal_has_ping()) {
+    clear_has_data();
+      PROTOBUF_NAMESPACE_ID::Empty* temp = data_.ping_;
+    if (GetArena() != nullptr) {
+      temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
+    }
+    data_.ping_ = nullptr;
+    return temp;
+  } else {
+    return nullptr;
+  }
+}
+inline const PROTOBUF_NAMESPACE_ID::Empty& MessageToClient::_internal_ping() const {
+  return _internal_has_ping()
+      ? *data_.ping_
+      : reinterpret_cast< PROTOBUF_NAMESPACE_ID::Empty&>(PROTOBUF_NAMESPACE_ID::_Empty_default_instance_);
+}
+inline const PROTOBUF_NAMESPACE_ID::Empty& MessageToClient::ping() const {
+  // @@protoc_insertion_point(field_get:tunnelbroker.MessageToClient.ping)
+  return _internal_ping();
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::unsafe_arena_release_ping() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:tunnelbroker.MessageToClient.ping)
+  if (_internal_has_ping()) {
+    clear_has_data();
+    PROTOBUF_NAMESPACE_ID::Empty* temp = data_.ping_;
+    data_.ping_ = nullptr;
+    return temp;
+  } else {
+    return nullptr;
+  }
+}
+inline void MessageToClient::unsafe_arena_set_allocated_ping(PROTOBUF_NAMESPACE_ID::Empty* ping) {
+  clear_data();
+  if (ping) {
+    set_has_ping();
+    data_.ping_ = ping;
+  }
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:tunnelbroker.MessageToClient.ping)
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::_internal_mutable_ping() {
+  if (!_internal_has_ping()) {
+    clear_data();
+    set_has_ping();
+    data_.ping_ = CreateMaybeMessage< PROTOBUF_NAMESPACE_ID::Empty >(GetArena());
+  }
+  return data_.ping_;
+}
+inline PROTOBUF_NAMESPACE_ID::Empty* MessageToClient::mutable_ping() {
+  // @@protoc_insertion_point(field_mutable:tunnelbroker.MessageToClient.ping)
+  return _internal_mutable_ping();
+}
+
 inline bool MessageToClient::has_data() const {
   return data_case() != DATA_NOT_SET;
 }
diff --git a/shared/protos/_generated/tunnelbroker.pb.cc b/shared/protos/_generated/tunnelbroker.pb.cc
--- a/shared/protos/_generated/tunnelbroker.pb.cc
+++ b/shared/protos/_generated/tunnelbroker.pb.cc
@@ -388,6 +388,7 @@
   PROTOBUF_FIELD_OFFSET(::tunnelbroker::MessageToTunnelbroker, sessionid_),
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
+  ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   PROTOBUF_FIELD_OFFSET(::tunnelbroker::MessageToTunnelbroker, data_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::tunnelbroker::MessageToClientStruct, _internal_metadata_),
@@ -411,6 +412,8 @@
   ~0u,  // no _weak_field_map_
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
+  ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
+  ::PROTOBUF_NAMESPACE_ID::internal::kInvalidFieldOffsetTag,
   PROTOBUF_FIELD_OFFSET(::tunnelbroker::MessageToClient, data_),
   ~0u,  // no _has_bits_
   PROTOBUF_FIELD_OFFSET(::tunnelbroker::CheckRequest, _internal_metadata_),
@@ -459,14 +462,14 @@
   { 78, -1, sizeof(::tunnelbroker::MessageToTunnelbrokerStruct)},
   { 87, -1, sizeof(::tunnelbroker::MessagesToSend)},
   { 93, -1, sizeof(::tunnelbroker::MessageToTunnelbroker)},
-  { 102, -1, sizeof(::tunnelbroker::MessageToClientStruct)},
-  { 111, -1, sizeof(::tunnelbroker::MessagesToDeliver)},
-  { 117, -1, sizeof(::tunnelbroker::MessageToClient)},
-  { 125, -1, sizeof(::tunnelbroker::CheckRequest)},
-  { 132, -1, sizeof(::tunnelbroker::CheckResponse)},
-  { 138, -1, sizeof(::tunnelbroker::NewPrimaryRequest)},
-  { 145, -1, sizeof(::tunnelbroker::NewPrimaryResponse)},
-  { 151, -1, sizeof(::tunnelbroker::PongRequest)},
+  { 103, -1, sizeof(::tunnelbroker::MessageToClientStruct)},
+  { 112, -1, sizeof(::tunnelbroker::MessagesToDeliver)},
+  { 118, -1, sizeof(::tunnelbroker::MessageToClient)},
+  { 128, -1, sizeof(::tunnelbroker::CheckRequest)},
+  { 135, -1, sizeof(::tunnelbroker::CheckResponse)},
+  { 141, -1, sizeof(::tunnelbroker::NewPrimaryRequest)},
+  { 148, -1, sizeof(::tunnelbroker::NewPrimaryResponse)},
+  { 154, -1, sizeof(::tunnelbroker::PongRequest)},
 };
 
 static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = {
@@ -521,53 +524,56 @@
   "\022\n\ntoDeviceID\030\002 \001(\t\022\017\n\007payload\030\003 \001(\t\022\022\n\n"
   "blobHashes\030\004 \003(\t\"M\n\016MessagesToSend\022;\n\010me"
   "ssages\030\001 \003(\0132).tunnelbroker.MessageToTun"
-  "nelbrokerStruct\"\250\001\n\025MessageToTunnelbroke"
+  "nelbrokerStruct\"\302\001\n\025MessageToTunnelbroke"
   "r\022\021\n\tsessionID\030\001 \001(\t\0226\n\016messagesToSend\030\002"
   " \001(\0132\034.tunnelbroker.MessagesToSendH\000\022<\n\021"
   "processedMessages\030\003 \001(\0132\037.tunnelbroker.P"
-  "rocessedMessagesH\000B\006\n\004data\"e\n\025MessageToC"
-  "lientStruct\022\021\n\tmessageID\030\001 \001(\t\022\024\n\014fromDe"
-  "viceID\030\002 \001(\t\022\017\n\007payload\030\003 \001(\t\022\022\n\nblobHas"
-  "hes\030\004 \003(\t\"J\n\021MessagesToDeliver\0225\n\010messag"
-  "es\030\001 \003(\0132#.tunnelbroker.MessageToClientS"
-  "truct\"\225\001\n\017MessageToClient\022<\n\021messagesToD"
-  "eliver\030\001 \001(\0132\037.tunnelbroker.MessagesToDe"
-  "liverH\000\022<\n\021processedMessages\030\002 \001(\0132\037.tun"
-  "nelbroker.ProcessedMessagesH\000B\006\n\004data\"3\n"
-  "\014CheckRequest\022\016\n\006userId\030\001 \001(\t\022\023\n\013deviceT"
-  "oken\030\002 \001(\t\"K\n\rCheckResponse\022:\n\021checkResp"
-  "onseType\030\001 \001(\0162\037.tunnelbroker.CheckRespo"
-  "nseType\"8\n\021NewPrimaryRequest\022\016\n\006userId\030\001"
-  " \001(\t\022\023\n\013deviceToken\030\002 \001(\t\"%\n\022NewPrimaryR"
-  "esponse\022\017\n\007success\030\001 \001(\010\"2\n\013PongRequest\022"
-  "\016\n\006userId\030\001 \001(\t\022\023\n\013deviceToken\030\002 \001(\t*n\n\021"
-  "CheckResponseType\022\030\n\024PRIMARY_DOESNT_EXIS"
-  "T\020\000\022\022\n\016PRIMARY_ONLINE\020\001\022\023\n\017PRIMARY_OFFLI"
-  "NE\020\002\022\026\n\022CURRENT_IS_PRIMARY\020\0032\237\005\n\023Tunnelb"
-  "rokerService\022W\n\032CheckIfPrimaryDeviceOnli"
-  "ne\022\032.tunnelbroker.CheckRequest\032\033.tunnelb"
-  "roker.CheckResponse\"\000\022]\n\026BecomeNewPrimar"
-  "yDevice\022\037.tunnelbroker.NewPrimaryRequest"
-  "\032 .tunnelbroker.NewPrimaryResponse\"\000\022\?\n\010"
-  "SendPong\022\031.tunnelbroker.PongRequest\032\026.go"
-  "ogle.protobuf.Empty\"\000\022c\n\020SessionSignatur"
-  "e\022%.tunnelbroker.SessionSignatureRequest"
-  "\032&.tunnelbroker.SessionSignatureResponse"
-  "\"\000\022Q\n\nNewSession\022\037.tunnelbroker.NewSessi"
-  "onRequest\032 .tunnelbroker.NewSessionRespo"
-  "nse\"\000\022;\n\004Send\022\031.tunnelbroker.SendRequest"
-  "\032\026.google.protobuf.Empty\"\000\022>\n\003Get\022\030.tunn"
-  "elbroker.GetRequest\032\031.tunnelbroker.GetRe"
-  "sponse\"\0000\001\022Z\n\016MessagesStream\022#.tunnelbro"
-  "ker.MessageToTunnelbroker\032\035.tunnelbroker"
-  ".MessageToClient\"\000(\0010\001b\006proto3"
+  "rocessedMessagesH\000\022\030\n\016newNotifyToken\030\004 \001"
+  "(\tH\000B\006\n\004data\"e\n\025MessageToClientStruct\022\021\n"
+  "\tmessageID\030\001 \001(\t\022\024\n\014fromDeviceID\030\002 \001(\t\022\017"
+  "\n\007payload\030\003 \001(\t\022\022\n\nblobHashes\030\004 \003(\t\"J\n\021M"
+  "essagesToDeliver\0225\n\010messages\030\001 \003(\0132#.tun"
+  "nelbroker.MessageToClientStruct\"\367\001\n\017Mess"
+  "ageToClient\022<\n\021messagesToDeliver\030\001 \001(\0132\037"
+  ".tunnelbroker.MessagesToDeliverH\000\022<\n\021pro"
+  "cessedMessages\030\002 \001(\0132\037.tunnelbroker.Proc"
+  "essedMessagesH\000\0228\n\026newNotifyTokenRequire"
+  "d\030\003 \001(\0132\026.google.protobuf.EmptyH\000\022&\n\004pin"
+  "g\030\004 \001(\0132\026.google.protobuf.EmptyH\000B\006\n\004dat"
+  "a\"3\n\014CheckRequest\022\016\n\006userId\030\001 \001(\t\022\023\n\013dev"
+  "iceToken\030\002 \001(\t\"K\n\rCheckResponse\022:\n\021check"
+  "ResponseType\030\001 \001(\0162\037.tunnelbroker.CheckR"
+  "esponseType\"8\n\021NewPrimaryRequest\022\016\n\006user"
+  "Id\030\001 \001(\t\022\023\n\013deviceToken\030\002 \001(\t\"%\n\022NewPrim"
+  "aryResponse\022\017\n\007success\030\001 \001(\010\"2\n\013PongRequ"
+  "est\022\016\n\006userId\030\001 \001(\t\022\023\n\013deviceToken\030\002 \001(\t"
+  "*n\n\021CheckResponseType\022\030\n\024PRIMARY_DOESNT_"
+  "EXIST\020\000\022\022\n\016PRIMARY_ONLINE\020\001\022\023\n\017PRIMARY_O"
+  "FFLINE\020\002\022\026\n\022CURRENT_IS_PRIMARY\020\0032\237\005\n\023Tun"
+  "nelbrokerService\022W\n\032CheckIfPrimaryDevice"
+  "Online\022\032.tunnelbroker.CheckRequest\032\033.tun"
+  "nelbroker.CheckResponse\"\000\022]\n\026BecomeNewPr"
+  "imaryDevice\022\037.tunnelbroker.NewPrimaryReq"
+  "uest\032 .tunnelbroker.NewPrimaryResponse\"\000"
+  "\022\?\n\010SendPong\022\031.tunnelbroker.PongRequest\032"
+  "\026.google.protobuf.Empty\"\000\022c\n\020SessionSign"
+  "ature\022%.tunnelbroker.SessionSignatureReq"
+  "uest\032&.tunnelbroker.SessionSignatureResp"
+  "onse\"\000\022Q\n\nNewSession\022\037.tunnelbroker.NewS"
+  "essionRequest\032 .tunnelbroker.NewSessionR"
+  "esponse\"\000\022;\n\004Send\022\031.tunnelbroker.SendReq"
+  "uest\032\026.google.protobuf.Empty\"\000\022>\n\003Get\022\030."
+  "tunnelbroker.GetRequest\032\031.tunnelbroker.G"
+  "etResponse\"\0000\001\022Z\n\016MessagesStream\022#.tunne"
+  "lbroker.MessageToTunnelbroker\032\035.tunnelbr"
+  "oker.MessageToClient\"\000(\0010\001b\006proto3"
   ;
 static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_tunnelbroker_2eproto_deps[1] = {
   &::descriptor_table_google_2fprotobuf_2fempty_2eproto,
 };
 static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_tunnelbroker_2eproto_once;
 const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_tunnelbroker_2eproto = {
-  false, false, 2710, descriptor_table_protodef_tunnelbroker_2eproto, "tunnelbroker.proto", 
+  false, false, 2834, descriptor_table_protodef_tunnelbroker_2eproto, "tunnelbroker.proto", 
   &descriptor_table_tunnelbroker_2eproto_once, descriptor_table_tunnelbroker_2eproto_deps, 1, 20,
   schemas, file_default_instances, TableStruct_tunnelbroker_2eproto::offsets,
   file_level_metadata_tunnelbroker_2eproto, file_level_enum_descriptors_tunnelbroker_2eproto, file_level_service_descriptors_tunnelbroker_2eproto,
@@ -3637,6 +3643,10 @@
       _internal_mutable_processedmessages()->::tunnelbroker::ProcessedMessages::MergeFrom(from._internal_processedmessages());
       break;
     }
+    case kNewNotifyToken: {
+      _internal_set_newnotifytoken(from._internal_newnotifytoken());
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -3688,6 +3698,10 @@
       }
       break;
     }
+    case kNewNotifyToken: {
+      data_.newnotifytoken_.Destroy(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArena());
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -3737,6 +3751,15 @@
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
+      // string newNotifyToken = 4;
+      case 4:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) {
+          auto str = _internal_mutable_newnotifytoken();
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
+          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "tunnelbroker.MessageToTunnelbroker.newNotifyToken"));
+          CHK_(ptr);
+        } else goto handle_unusual;
+        continue;
       default: {
       handle_unusual:
         if ((tag & 7) == 4 || tag == 0) {
@@ -3791,6 +3814,16 @@
         3, _Internal::processedmessages(this), target, stream);
   }
 
+  // string newNotifyToken = 4;
+  if (_internal_has_newnotifytoken()) {
+    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
+      this->_internal_newnotifytoken().data(), static_cast<int>(this->_internal_newnotifytoken().length()),
+      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
+      "tunnelbroker.MessageToTunnelbroker.newNotifyToken");
+    target = stream->WriteStringMaybeAliased(
+        4, this->_internal_newnotifytoken(), target);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -3829,6 +3862,13 @@
           *data_.processedmessages_);
       break;
     }
+    // string newNotifyToken = 4;
+    case kNewNotifyToken: {
+      total_size += 1 +
+        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
+          this->_internal_newnotifytoken());
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -3876,6 +3916,10 @@
       _internal_mutable_processedmessages()->::tunnelbroker::ProcessedMessages::MergeFrom(from._internal_processedmessages());
       break;
     }
+    case kNewNotifyToken: {
+      _internal_set_newnotifytoken(from._internal_newnotifytoken());
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -4426,6 +4470,8 @@
  public:
   static const ::tunnelbroker::MessagesToDeliver& messagestodeliver(const MessageToClient* msg);
   static const ::tunnelbroker::ProcessedMessages& processedmessages(const MessageToClient* msg);
+  static const PROTOBUF_NAMESPACE_ID::Empty& newnotifytokenrequired(const MessageToClient* msg);
+  static const PROTOBUF_NAMESPACE_ID::Empty& ping(const MessageToClient* msg);
 };
 
 const ::tunnelbroker::MessagesToDeliver&
@@ -4436,6 +4482,14 @@
 MessageToClient::_Internal::processedmessages(const MessageToClient* msg) {
   return *msg->data_.processedmessages_;
 }
+const PROTOBUF_NAMESPACE_ID::Empty&
+MessageToClient::_Internal::newnotifytokenrequired(const MessageToClient* msg) {
+  return *msg->data_.newnotifytokenrequired_;
+}
+const PROTOBUF_NAMESPACE_ID::Empty&
+MessageToClient::_Internal::ping(const MessageToClient* msg) {
+  return *msg->data_.ping_;
+}
 void MessageToClient::set_allocated_messagestodeliver(::tunnelbroker::MessagesToDeliver* messagestodeliver) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArena();
   clear_data();
@@ -4466,6 +4520,52 @@
   }
   // @@protoc_insertion_point(field_set_allocated:tunnelbroker.MessageToClient.processedMessages)
 }
+void MessageToClient::set_allocated_newnotifytokenrequired(PROTOBUF_NAMESPACE_ID::Empty* newnotifytokenrequired) {
+  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArena();
+  clear_data();
+  if (newnotifytokenrequired) {
+    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
+      reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(newnotifytokenrequired)->GetArena();
+    if (message_arena != submessage_arena) {
+      newnotifytokenrequired = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
+          message_arena, newnotifytokenrequired, submessage_arena);
+    }
+    set_has_newnotifytokenrequired();
+    data_.newnotifytokenrequired_ = newnotifytokenrequired;
+  }
+  // @@protoc_insertion_point(field_set_allocated:tunnelbroker.MessageToClient.newNotifyTokenRequired)
+}
+void MessageToClient::clear_newnotifytokenrequired() {
+  if (_internal_has_newnotifytokenrequired()) {
+    if (GetArena() == nullptr) {
+      delete data_.newnotifytokenrequired_;
+    }
+    clear_has_data();
+  }
+}
+void MessageToClient::set_allocated_ping(PROTOBUF_NAMESPACE_ID::Empty* ping) {
+  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArena();
+  clear_data();
+  if (ping) {
+    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
+      reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(ping)->GetArena();
+    if (message_arena != submessage_arena) {
+      ping = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
+          message_arena, ping, submessage_arena);
+    }
+    set_has_ping();
+    data_.ping_ = ping;
+  }
+  // @@protoc_insertion_point(field_set_allocated:tunnelbroker.MessageToClient.ping)
+}
+void MessageToClient::clear_ping() {
+  if (_internal_has_ping()) {
+    if (GetArena() == nullptr) {
+      delete data_.ping_;
+    }
+    clear_has_data();
+  }
+}
 MessageToClient::MessageToClient(::PROTOBUF_NAMESPACE_ID::Arena* arena)
   : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
   SharedCtor();
@@ -4485,6 +4585,14 @@
       _internal_mutable_processedmessages()->::tunnelbroker::ProcessedMessages::MergeFrom(from._internal_processedmessages());
       break;
     }
+    case kNewNotifyTokenRequired: {
+      _internal_mutable_newnotifytokenrequired()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_newnotifytokenrequired());
+      break;
+    }
+    case kPing: {
+      _internal_mutable_ping()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_ping());
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -4534,6 +4642,18 @@
       }
       break;
     }
+    case kNewNotifyTokenRequired: {
+      if (GetArena() == nullptr) {
+        delete data_.newnotifytokenrequired_;
+      }
+      break;
+    }
+    case kPing: {
+      if (GetArena() == nullptr) {
+        delete data_.ping_;
+      }
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -4573,6 +4693,20 @@
           CHK_(ptr);
         } else goto handle_unusual;
         continue;
+      // .google.protobuf.Empty newNotifyTokenRequired = 3;
+      case 3:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) {
+          ptr = ctx->ParseMessage(_internal_mutable_newnotifytokenrequired(), ptr);
+          CHK_(ptr);
+        } else goto handle_unusual;
+        continue;
+      // .google.protobuf.Empty ping = 4;
+      case 4:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 34)) {
+          ptr = ctx->ParseMessage(_internal_mutable_ping(), ptr);
+          CHK_(ptr);
+        } else goto handle_unusual;
+        continue;
       default: {
       handle_unusual:
         if ((tag & 7) == 4 || tag == 0) {
@@ -4617,6 +4751,22 @@
         2, _Internal::processedmessages(this), target, stream);
   }
 
+  // .google.protobuf.Empty newNotifyTokenRequired = 3;
+  if (_internal_has_newnotifytokenrequired()) {
+    target = stream->EnsureSpace(target);
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
+      InternalWriteMessage(
+        3, _Internal::newnotifytokenrequired(this), target, stream);
+  }
+
+  // .google.protobuf.Empty ping = 4;
+  if (_internal_has_ping()) {
+    target = stream->EnsureSpace(target);
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
+      InternalWriteMessage(
+        4, _Internal::ping(this), target, stream);
+  }
+
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
     target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
@@ -4648,6 +4798,20 @@
           *data_.processedmessages_);
       break;
     }
+    // .google.protobuf.Empty newNotifyTokenRequired = 3;
+    case kNewNotifyTokenRequired: {
+      total_size += 1 +
+        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
+          *data_.newnotifytokenrequired_);
+      break;
+    }
+    // .google.protobuf.Empty ping = 4;
+    case kPing: {
+      total_size += 1 +
+        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
+          *data_.ping_);
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
@@ -4692,6 +4856,14 @@
       _internal_mutable_processedmessages()->::tunnelbroker::ProcessedMessages::MergeFrom(from._internal_processedmessages());
       break;
     }
+    case kNewNotifyTokenRequired: {
+      _internal_mutable_newnotifytokenrequired()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_newnotifytokenrequired());
+      break;
+    }
+    case kPing: {
+      _internal_mutable_ping()->PROTOBUF_NAMESPACE_ID::Empty::MergeFrom(from._internal_ping());
+      break;
+    }
     case DATA_NOT_SET: {
       break;
     }
diff --git a/shared/protos/tunnelbroker.proto b/shared/protos/tunnelbroker.proto
--- a/shared/protos/tunnelbroker.proto
+++ b/shared/protos/tunnelbroker.proto
@@ -109,6 +109,7 @@
   oneof data {
     MessagesToSend messagesToSend = 2;
     ProcessedMessages processedMessages = 3;
+    string newNotifyToken = 4;
   }
 }
 
@@ -129,6 +130,8 @@
   oneof data {
     MessagesToDeliver messagesToDeliver = 1;
     ProcessedMessages processedMessages = 2;
+    google.protobuf.Empty newNotifyTokenRequired = 3;
+    google.protobuf.Empty ping = 4;
   }
 }