diff --git a/Gemfile.lock b/Gemfile.lock
index 2589b5bf32..e1a408ae99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.8.1)
     minitest (5.14.0)
     mocha (1.11.2)
     msgpack (1.3.3)
@@ -285,8 +285,9 @@ GEM
     nakayoshi_fork (0.0.4)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     opencensus (0.5.0)
     opencensus-stackdriver (0.3.2)
       concurrent-ruby (~> 1.0)
@@ -309,6 +310,7 @@ GEM
       multi_json (~> 1.0)
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
+    racc (1.6.2)
     rack (2.2.3)
     rack-attack (5.4.2)
       rack (>= 1.0, < 3)
@@ -325,7 +327,7 @@ GEM
     rb-fsevent (0.9.8)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbtrace (0.4.12)
+    rbtrace (0.4.14)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
diff --git a/spec/v3/services/installation/find_spec.rb b/spec/v3/services/installation/find_spec.rb
index 9462d0ba16..7db97f122f 100644
--- a/spec/v3/services/installation/find_spec.rb
+++ b/spec/v3/services/installation/find_spec.rb
@@ -62,6 +62,7 @@
           "@type"             => "allowance",
           "id"                => 1
         },
+        "custom_keys" => [],
         "allow_migration" => false,
         "recently_signed_up" => false,
         "secure_user_hash" => nil,
diff --git a/spec/v3/services/organization/find_spec.rb b/spec/v3/services/organization/find_spec.rb
index f93bb1a5b3..fd62a9c60a 100644
--- a/spec/v3/services/organization/find_spec.rb
+++ b/spec/v3/services/organization/find_spec.rb
@@ -28,7 +28,8 @@
         "@type"             => "allowance",
         "@representation"   => "minimal",
         "id"                => org.id
-      }
+      },
+      "custom_keys"      => []
     }}
   end
 
@@ -63,7 +64,8 @@
         "@type"             => "allowance",
         "@representation"   => "minimal",
         "id"                => org.id
-      }
+      },
+      "custom_keys"      => []
     }}
   end
 
diff --git a/spec/v3/services/organizations/for_current_user_spec.rb b/spec/v3/services/organizations/for_current_user_spec.rb
index b60480f37d..a554f7453d 100644
--- a/spec/v3/services/organizations/for_current_user_spec.rb
+++ b/spec/v3/services/organizations/for_current_user_spec.rb
@@ -64,7 +64,8 @@
           "@type"             => "allowance",
           "@representation"   => "minimal",
           "id"                => org.id
-        }
+        },
+        "custom_keys"     => []
       }]
     }}
   end
diff --git a/spec/v3/services/owner/find_spec.rb b/spec/v3/services/owner/find_spec.rb
index ffc531639d..fed9efe7ce 100644
--- a/spec/v3/services/owner/find_spec.rb
+++ b/spec/v3/services/owner/find_spec.rb
@@ -28,7 +28,8 @@
           "@type"             => "allowance",
           "@representation"   => "minimal",
           "id"                => org.id
-        }
+        },
+        "custom_keys"      => []
       }}
     end
 
@@ -54,7 +55,8 @@
           "@type"             => "allowance",
           "@representation"   => "minimal",
           "id"                => org.id
-        }
+        },
+        "custom_keys"      => []
       }}
     end
 
@@ -86,6 +88,7 @@
           "@representation"   => "minimal",
           "id"                => org.id
         },
+        "custom_keys"         => [],
         "repositories"        => [{
           "@type"             => "repository",
           "@href"             => "/v3/repo/#{repo.id}",
@@ -232,7 +235,8 @@
           "@type"             => "allowance",
           "@representation"   => "minimal",
           "id"                => org.id
-        }
+        },
+        "custom_keys"      => []
       }}
     end
 
@@ -263,6 +267,7 @@
           "@representation"   => "minimal",
           "id"                => org.id
         },
+        "custom_keys"    => [],
         "@warnings"      => [{
           "@type"        => "warning",
           "message"      => "query parameter organization.id not safelisted, ignored",
@@ -302,6 +307,7 @@
           "@representation"   => "minimal",
           "id"                => user.id
         },
+        "custom_keys"    => [],
         "recently_signed_up"=>false,
         "secure_user_hash" => nil,
         "ro_mode" => false,
@@ -334,6 +340,7 @@
           "@representation"   => "minimal",
           "id"                => user.id
         },
+        "custom_keys"    => [],
         "recently_signed_up"=>false,
         "secure_user_hash" => nil,
         "ro_mode" => false,
@@ -366,6 +373,7 @@
           "@representation"   => "minimal",
           "id"                => user.id
         },
+        "custom_keys"      => [],
         "recently_signed_up"=>false,
         "secure_user_hash" => nil,
         "ro_mode" => false,
@@ -402,6 +410,7 @@
           "@representation"   => "minimal",
           "id"                => user.id
         },
+        "custom_keys"      => [],
         "recently_signed_up"=>false,
         "secure_user_hash" => nil,
         "ro_mode"          => false,
diff --git a/spec/v3/services/user/find_spec.rb b/spec/v3/services/user/find_spec.rb
index 5639d24680..b544918ccf 100644
--- a/spec/v3/services/user/find_spec.rb
+++ b/spec/v3/services/user/find_spec.rb
@@ -42,6 +42,7 @@
         "@representation"       => "minimal",
         "id"                    => user.id
       },
+      "custom_keys" => [],
       "recently_signed_up"=>false,
       "secure_user_hash" => nil,
       "ro_mode" => false,
diff --git a/spec/v3/services/v2_subscription/executions_spec.rb b/spec/v3/services/v2_subscription/executions_spec.rb
index df5c5647ca..2a0d433435 100644
--- a/spec/v3/services/v2_subscription/executions_spec.rb
+++ b/spec/v3/services/v2_subscription/executions_spec.rb
@@ -175,6 +175,7 @@
                 "@representation"=>"minimal",
                 "id"=>1
               },
+              "custom_keys" => [],
               "email"=>"sven@fuchs.com",
               "is_syncing"=>nil,
               "synced_at"=>nil,