diff --git a/protos/rendezvous.proto b/protos/rendezvous.proto
index a2b1d6527..b2e5c0157 100644
--- a/protos/rendezvous.proto
+++ b/protos/rendezvous.proto
@@ -28,6 +28,7 @@ message PunchHoleRequest {
   bool force_relay = 8;
   int32 upnp_port = 9;
   bytes socket_addr_v6 = 10;
+  string switch_code = 11;
 }
 
 message ControlPermissions {
@@ -152,6 +153,7 @@ message RequestRelay {
   string token = 8;
   ControlPermissions control_permissions = 9;
   ControlledContext controlled_context = 10;
+  string switch_code = 11;
 }
 
 message RelayResponse {
diff --git a/src/config.rs b/src/config.rs
index 1391ed4ab..e6824c920 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2918,6 +2918,7 @@ pub mod keys {
     pub const OPTION_DIRECT_SERVER: &str = "direct-server";
     pub const OPTION_DIRECT_ACCESS_PORT: &str = "direct-access-port";
     pub const OPTION_WHITELIST: &str = "whitelist";
+    pub const OPTION_ID_WHITELIST: &str = "id-whitelist";
     pub const OPTION_ALLOW_AUTO_DISCONNECT: &str = "allow-auto-disconnect";
     pub const OPTION_AUTO_DISCONNECT_TIMEOUT: &str = "auto-disconnect-timeout";
     pub const OPTION_ALLOW_ONLY_CONN_WINDOW_OPEN: &str = "allow-only-conn-window-open";
@@ -3151,6 +3152,7 @@ pub mod keys {
         OPTION_DIRECT_SERVER,
         OPTION_DIRECT_ACCESS_PORT,
         OPTION_WHITELIST,
+        OPTION_ID_WHITELIST,
         OPTION_ALLOW_AUTO_DISCONNECT,
         OPTION_AUTO_DISCONNECT_TIMEOUT,
         OPTION_ALLOW_ONLY_CONN_WINDOW_OPEN,