diff --git a/kong/db/declarative/export.lua b/kong/db/declarative/export.lua
index 2cf37c9fe1c..7eb6412d5fe 100644
--- a/kong/db/declarative/export.lua
+++ b/kong/db/declarative/export.lua
@@ -409,7 +409,8 @@ end
 
 
 local function export_config_sync()
-  return export_from_db_impl(sync_emitter.new(), false, false, true)
+  -- XXX EE: has extra parameter @skip_ttl
+  return export_from_db_impl(sync_emitter.new(), false, false, false, true)
 end
 
 
diff --git a/kong/db/declarative/import.lua b/kong/db/declarative/import.lua
index af12780eed1..b9740026da8 100644
--- a/kong/db/declarative/import.lua
+++ b/kong/db/declarative/import.lua
@@ -439,10 +439,17 @@ end
 --     _transform: true,
 --   }
 local function load_into_cache(entities, meta, hash)
+  meta = meta or {}
+
   local default_workspace_id = assert(find_ws(entities, "default"))
   local should_transform = meta._transform == nil and true or meta._transform
 
+  local fallback_workspace = meta._workspace  -- XXX EE
+                             and find_ws(entities, meta._workspace)
+                             or  default_workspace_id
+
   assert(type(default_workspace_id) == "string")
+  assert(type(fallback_workspace) == "string")
 
   -- set it for insert_entity_for_txn()
   kong.default_workspace = default_workspace_id
@@ -470,7 +477,7 @@ local function load_into_cache(entities, meta, hash)
 
     for _, item in pairs(items) do
       if not schema.workspaceable or item.ws_id == null or item.ws_id == nil then
-        item.ws_id = default_workspace_id
+        item.ws_id = fallback_workspace     -- XXX EE
       end
 
       assert(type(item.ws_id) == "string")
diff --git a/kong/enterprise_edition/counters/sales/init.lua b/kong/enterprise_edition/counters/sales/init.lua
index bbfbe9b120c..b57f4f95b05 100644
--- a/kong/enterprise_edition/counters/sales/init.lua
+++ b/kong/enterprise_edition/counters/sales/init.lua
@@ -195,7 +195,8 @@ local function get_plugins_count()
     ["kafka-upstream"] = 0,
   }
 
-  for plugin, err in kong.db.plugins:each(1000, GLOBAL_QUERY_OPTS) do
+  -- like each(page_size,)
+  for plugin, err in kong.db.plugins:each(nil, GLOBAL_QUERY_OPTS) do
     if err then
       kong.log.err("failed to list plugins: ", err)
       return nil
diff --git a/kong/enterprise_edition/tls/plugins/sni_filter.lua b/kong/enterprise_edition/tls/plugins/sni_filter.lua
index 0203770b57c..756fedb0cdd 100644
--- a/kong/enterprise_edition/tls/plugins/sni_filter.lua
+++ b/kong/enterprise_edition/tls/plugins/sni_filter.lua
@@ -244,7 +244,7 @@ local function each_enabled_plugin(entity, plugin_name)
     }
   }
 
-  local iter = entity:each(1000, options)
+  local iter = entity:each(nil, options)  -- like each(page_size,)
   local function iterator()
     local element, err = iter()
     if err then return nil, err end
diff --git a/kong/keyring/strategies/cluster.lua b/kong/keyring/strategies/cluster.lua
index adae97627f1..fbd24325d16 100644
--- a/kong/keyring/strategies/cluster.lua
+++ b/kong/keyring/strategies/cluster.lua
@@ -178,7 +178,7 @@ function _M.init(config)
 
   load_envelope_keys(config)
 
-  local r, err = kong.db.keyring_meta:each(1)
+  local r, err = kong.db.keyring_meta:each()
   if err then
     error(err)
   end
diff --git a/kong/plugins/acme/api.lua b/kong/plugins/acme/api.lua
index 8891117044b..00fe5de30bd 100644
--- a/kong/plugins/acme/api.lua
+++ b/kong/plugins/acme/api.lua
@@ -23,7 +23,7 @@ local ngx_timer_at = ngx.timer.at
 local ngx_re_match = ngx.re.match
 
 local function find_plugin()
-  for plugin, err in kong.db.plugins:each(1000) do
+  for plugin, err in kong.db.plugins:each() do  -- like each(page_size)
     if err then
       return nil, err
     end
diff --git a/kong/plugins/ai-semantic-cache/api.lua b/kong/plugins/ai-semantic-cache/api.lua
index 211d887fa38..083059f9d3b 100644
--- a/kong/plugins/ai-semantic-cache/api.lua
+++ b/kong/plugins/ai-semantic-cache/api.lua
@@ -17,7 +17,7 @@ local SEMANTIC_CACHE_NAMESPACE_PREFIX = "kong_semantic_cache:"
 
 
 local function each_by_name(entity, name)
-  local iter = entity:each(1000)
+  local iter = entity:each()  -- like each(page_size)
   local function iterator()
     local element, err = iter()
     if err then return nil, err end
diff --git a/kong/plugins/degraphql/handler.lua b/kong/plugins/degraphql/handler.lua
index 95442046652..3b2404703a6 100644
--- a/kong/plugins/degraphql/handler.lua
+++ b/kong/plugins/degraphql/handler.lua
@@ -70,7 +70,7 @@ function DeGraphQLHandler:update_router(force)
 
   local routers = {}
 
-  for route, err in kong.db.degraphql_routes:each(1000) do
+  for route, err in kong.db.degraphql_routes:each() do  -- like each(page_size)
     if err then
       kong.log.err("Degraphql plugin could not load routes: ", err)
       -- Break when error and try again on the next update_router
diff --git a/kong/plugins/graphql-proxy-cache-advanced/api.lua b/kong/plugins/graphql-proxy-cache-advanced/api.lua
index b1650c29217..a1e8be961d2 100644
--- a/kong/plugins/graphql-proxy-cache-advanced/api.lua
+++ b/kong/plugins/graphql-proxy-cache-advanced/api.lua
@@ -22,7 +22,7 @@ end
 
 
 local function each_by_name(entity, name)
-  local iter = entity:each(1000)
+  local iter = entity:each()  -- like each(page_size)
   local function iterator()
     local element, err = iter()
     if err then return nil, err end
diff --git a/kong/plugins/proxy-cache-advanced/api.lua b/kong/plugins/proxy-cache-advanced/api.lua
index 691ba23c12e..b8629e5d38d 100644
--- a/kong/plugins/proxy-cache-advanced/api.lua
+++ b/kong/plugins/proxy-cache-advanced/api.lua
@@ -22,7 +22,7 @@ end
 
 
 local function each_by_name(entity, name)
-  local iter = entity:each(1000)
+  local iter = entity:each()  -- like each(page_size)
   local function iterator()
     local element, err = iter()
     if err then return nil, err end
diff --git a/spec-ee/02-integration/01-rbac/01-rbac_spec.lua b/spec-ee/02-integration/01-rbac/01-rbac_spec.lua
index 52dea1ac769..bfde9eac5a0 100644
--- a/spec-ee/02-integration/01-rbac/01-rbac_spec.lua
+++ b/spec-ee/02-integration/01-rbac/01-rbac_spec.lua
@@ -673,7 +673,9 @@ for _, strategy in spec_helpers.each_strategy() do
     end)
     describe("check_cascade", function()
       local entities
+      local old_conf
       setup(function()
+        old_conf = kong.configuration
         kong.configuration= {
           rbac = "both",
         }
@@ -703,7 +705,7 @@ for _, strategy in spec_helpers.each_strategy() do
         }
       end)
       teardown(function()
-        kong.configuration = nil
+        kong.configuration = old_conf
       end)
 
       it("all entities allowed", function()
diff --git a/spec/02-integration/04-admin_api/15-off_spec.lua b/spec/02-integration/04-admin_api/15-off_spec.lua
index b4a8ee3a5d3..d2e74291c54 100644
--- a/spec/02-integration/04-admin_api/15-off_spec.lua
+++ b/spec/02-integration/04-admin_api/15-off_spec.lua
@@ -951,6 +951,7 @@ describe("Admin API #off", function()
         local config = assert(lyaml.load(json.config))
         config.workspaces[1].id = "<uuid>" -- see below
         config.workspaces[1].created_at = 12345 -- see below
+        config.workspaces[1].ws_id = nil -- see below
         config.consumers[1].ws_id = "<uuid>" -- see below
         assert:set_parameter("TableFormatLevel", -1)
         assert.same({