diff --git a/packages/builder/src/builderStore/componentUtils.js b/packages/builder/src/builderStore/componentUtils.js
index 733ce0948e..a7ee3ff351 100644
--- a/packages/builder/src/builderStore/componentUtils.js
+++ b/packages/builder/src/builderStore/componentUtils.js
@@ -92,14 +92,7 @@ export const findAllMatchingComponents = (rootComponent, selector) => {
 }
 
 /**
- * Recurses through the component tree and finds all components.
- */
-export const findAllComponents = rootComponent => {
-  return findAllMatchingComponents(rootComponent, () => true)
-}
-
-/**
- * Finds the closest parent component which matches certain criteria
+ * Finds the closes parent component which matches certain criteria
  */
 export const findClosestMatchingComponent = (
   rootComponent,
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 85d5046d8c..52368a0723 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -1,7 +1,6 @@
 import { cloneDeep } from "lodash/fp"
 import { get } from "svelte/store"
 import {
-  findAllComponents,
   findAllMatchingComponents,
   findComponent,
   findComponentPath,
@@ -103,9 +102,6 @@ export const getAuthBindings = () => {
   return bindings
 }
 
-/**
- * Gets all bindings for environment variables
- */
 export const getEnvironmentBindings = () => {
   let envVars = get(environment).variables
   return envVars.map(variable => {
@@ -134,22 +130,26 @@ export const toBindingsArray = (valueMap, prefix, category) => {
     if (!binding) {
       return acc
     }
+
     let config = {
       type: "context",
       runtimeBinding: binding,
       readableBinding: `${prefix}.${binding}`,
       icon: "Brackets",
     }
+
     if (category) {
       config.category = category
     }
+
     acc.push(config)
+
     return acc
   }, [])
 }
 
 /**
- * Utility to covert a map of readable bindings to runtime
+ * Utility - coverting a map of readable bindings to runtime
  */
 export const readableToRuntimeMap = (bindings, ctx) => {
   if (!bindings || !ctx) {
@@ -162,7 +162,7 @@ export const readableToRuntimeMap = (bindings, ctx) => {
 }
 
 /**
- * Utility to covert a map of runtime bindings to readable bindings
+ * Utility - coverting a map of runtime bindings to readable
  */
 export const runtimeToReadableMap = (bindings, ctx) => {
   if (!bindings || !ctx) {
@@ -188,23 +188,15 @@ export const getComponentBindableProperties = (asset, componentId) => {
   if (!def?.context) {
     return []
   }
-  const contexts = Array.isArray(def.context) ? def.context : [def.context]
 
   // Get the bindings for the component
-  const componentContext = {
-    component,
-    definition: def,
-    contexts,
-  }
-  return generateComponentContextBindings(asset, componentContext)
+  return getProviderContextBindings(asset, component)
 }
 
 /**
- * Gets all component contexts available to a certain component. This handles
- * both global and local bindings, taking into account a component's position
- * in the component tree.
+ * Gets all data provider components above a component.
  */
-export const getComponentContexts = (
+export const getContextProviderComponents = (
   asset,
   componentId,
   type,
@@ -213,55 +205,30 @@ export const getComponentContexts = (
   if (!asset || !componentId) {
     return []
   }
-  let map = {}
 
-  // Processes all contexts exposed by a component
-  const processContexts = scope => component => {
+  // Get the component tree leading up to this component, ignoring the component
+  // itself
+  const path = findComponentPath(asset.props, componentId)
+  if (!options?.includeSelf) {
+    path.pop()
+  }
+
+  // Filter by only data provider components
+  return path.filter(component => {
     const def = store.actions.components.getDefinition(component._component)
     if (!def?.context) {
-      return
+      return false
     }
-    if (!map[component._id]) {
-      map[component._id] = {
-        component,
-        definition: def,
-        contexts: [],
-      }
+
+    // If no type specified, return anything that exposes context
+    if (!type) {
+      return true
     }
+
+    // Otherwise only match components with the specific context type
     const contexts = Array.isArray(def.context) ? def.context : [def.context]
-    contexts.forEach(context => {
-      // Ensure type matches
-      if (type && context.type !== type) {
-        return
-      }
-      // Ensure scope matches
-      let contextScope = context.scope || "global"
-      if (contextScope !== scope) {
-        return
-      }
-      // Ensure the context is compatible with the component's current settings
-      if (!isContextCompatibleWithComponent(context, component)) {
-        return
-      }
-      map[component._id].contexts.push(context)
-    })
-  }
-
-  // Process all global contexts
-  const allComponents = findAllComponents(asset.props)
-  allComponents.forEach(processContexts("global"))
-
-  // Process all local contexts
-  const localComponents = findComponentPath(asset.props, componentId)
-  localComponents.forEach(processContexts("local"))
-
-  // Exclude self if required
-  if (!options?.includeSelf) {
-    delete map[componentId]
-  }
-
-  // Only return components which provide at least 1 matching context
-  return Object.values(map).filter(x => x.contexts.length > 0)
+    return contexts.find(context => context.type === type) != null
+  })
 }
 
 /**
@@ -273,19 +240,20 @@ export const getActionProviders = (
   actionType,
   options = { includeSelf: false }
 ) => {
-  if (!asset) {
+  if (!asset || !componentId) {
     return []
   }
 
-  // Get all components
-  const components = findAllComponents(asset.props)
+  // Get the component tree leading up to this component, ignoring the component
+  // itself
+  const path = findComponentPath(asset.props, componentId)
+  if (!options?.includeSelf) {
+    path.pop()
+  }
 
   // Find matching contexts and generate bindings
   let providers = []
-  components.forEach(component => {
-    if (!options?.includeSelf && component._id === componentId) {
-      return
-    }
+  path.forEach(component => {
     const def = store.actions.components.getDefinition(component._component)
     const actions = (def?.actions || []).map(action => {
       return typeof action === "string" ? { type: action } : action
@@ -349,135 +317,142 @@ export const getDatasourceForProvider = (asset, component) => {
  * Gets all bindable data properties from component data contexts.
  */
 const getContextBindings = (asset, componentId) => {
-  // Get all available contexts for this component
-  const componentContexts = getComponentContexts(asset, componentId)
+  // Extract any components which provide data contexts
+  const dataProviders = getContextProviderComponents(asset, componentId)
 
-  // Generate bindings for each context
-  return componentContexts
-    .map(componentContext => {
-      return generateComponentContextBindings(asset, componentContext)
-    })
-    .flat()
+  // Generate bindings for all matching components
+  return getProviderContextBindings(asset, dataProviders)
 }
 
 /**
- * Generates a set of bindings for a given component context
+ * Gets the context bindings exposed by a set of data provider components.
  */
-const generateComponentContextBindings = (asset, componentContext) => {
-  const { component, definition, contexts } = componentContext
-  if (!component || !definition || !contexts?.length) {
+const getProviderContextBindings = (asset, dataProviders) => {
+  if (!asset || !dataProviders) {
     return []
   }
 
+  // Ensure providers is an array
+  if (!Array.isArray(dataProviders)) {
+    dataProviders = [dataProviders]
+  }
+
   // Create bindings for each data provider
   let bindings = []
-  contexts.forEach(context => {
-    if (!context?.type) {
-      return
-    }
+  dataProviders.forEach(component => {
+    const def = store.actions.components.getDefinition(component._component)
+    const contexts = Array.isArray(def.context) ? def.context : [def.context]
 
-    let schema
-    let table
-    let readablePrefix
-    let runtimeSuffix = context.suffix
-
-    if (context.type === "form") {
-      // Forms do not need table schemas
-      // Their schemas are built from their component field names
-      schema = buildFormSchema(component, asset)
-      readablePrefix = "Fields"
-    } else if (context.type === "static") {
-      // Static contexts are fully defined by the components
-      schema = {}
-      const values = context.values || []
-      values.forEach(value => {
-        schema[value.key] = {
-          name: value.label,
-          type: value.type || "string",
-        }
-      })
-    } else if (context.type === "schema") {
-      // Schema contexts are generated dynamically depending on their data
-      const datasource = getDatasourceForProvider(asset, component)
-      if (!datasource) {
+    // Create bindings for each context block provided by this data provider
+    contexts.forEach(context => {
+      if (!context?.type) {
         return
       }
-      const info = getSchemaForDatasource(asset, datasource)
-      schema = info.schema
-      table = info.table
 
-      // Determine what to prefix bindings with
-      if (datasource.type === "jsonarray") {
-        // For JSON arrays, use the array name as the readable prefix
-        const split = datasource.label.split(".")
-        readablePrefix = split[split.length - 1]
-      } else if (datasource.type === "viewV2") {
-        // For views, use the view name
-        const view = Object.values(table?.views || {}).find(
-          view => view.id === datasource.id
+      let schema
+      let table
+      let readablePrefix
+      let runtimeSuffix = context.suffix
+
+      if (context.type === "form") {
+        // Forms do not need table schemas
+        // Their schemas are built from their component field names
+        schema = buildFormSchema(component, asset)
+        readablePrefix = "Fields"
+      } else if (context.type === "static") {
+        // Static contexts are fully defined by the components
+        schema = {}
+        const values = context.values || []
+        values.forEach(value => {
+          schema[value.key] = {
+            name: value.label,
+            type: value.type || "string",
+          }
+        })
+      } else if (context.type === "schema") {
+        // Schema contexts are generated dynamically depending on their data
+        const datasource = getDatasourceForProvider(asset, component)
+        if (!datasource) {
+          return
+        }
+        const info = getSchemaForDatasource(asset, datasource)
+        schema = info.schema
+        table = info.table
+
+        // Determine what to prefix bindings with
+        if (datasource.type === "jsonarray") {
+          // For JSON arrays, use the array name as the readable prefix
+          const split = datasource.label.split(".")
+          readablePrefix = split[split.length - 1]
+        } else if (datasource.type === "viewV2") {
+          // For views, use the view name
+          const view = Object.values(table?.views || {}).find(
+            view => view.id === datasource.id
+          )
+          readablePrefix = view?.name
+        } else {
+          // Otherwise use the table name
+          readablePrefix = info.table?.name
+        }
+      }
+      if (!schema) {
+        return
+      }
+
+      const keys = Object.keys(schema).sort()
+
+      // Generate safe unique runtime prefix
+      let providerId = component._id
+      if (runtimeSuffix) {
+        providerId += `-${runtimeSuffix}`
+      }
+
+      if (!filterCategoryByContext(component, context)) {
+        return
+      }
+
+      const safeComponentId = makePropSafe(providerId)
+
+      // Create bindable properties for each schema field
+      keys.forEach(key => {
+        const fieldSchema = schema[key]
+
+        // Make safe runtime binding
+        const safeKey = key.split(".").map(makePropSafe).join(".")
+        const runtimeBinding = `${safeComponentId}.${safeKey}`
+
+        // Optionally use a prefix with readable bindings
+        let readableBinding = component._instanceName
+        if (readablePrefix) {
+          readableBinding += `.${readablePrefix}`
+        }
+        readableBinding += `.${fieldSchema.name || key}`
+
+        const bindingCategory = getComponentBindingCategory(
+          component,
+          context,
+          def
         )
-        readablePrefix = view?.name
-      } else {
-        // Otherwise use the table name
-        readablePrefix = info.table?.name
-      }
-    }
-    if (!schema) {
-      return
-    }
 
-    const keys = Object.keys(schema).sort()
-
-    // Generate safe unique runtime prefix
-    let providerId = component._id
-    if (runtimeSuffix) {
-      providerId += `-${runtimeSuffix}`
-    }
-    const safeComponentId = makePropSafe(providerId)
-
-    // Create bindable properties for each schema field
-    keys.forEach(key => {
-      const fieldSchema = schema[key]
-
-      // Make safe runtime binding
-      const safeKey = key.split(".").map(makePropSafe).join(".")
-      const runtimeBinding = `${safeComponentId}.${safeKey}`
-
-      // Optionally use a prefix with readable bindings
-      let readableBinding = component._instanceName
-      if (readablePrefix) {
-        readableBinding += `.${readablePrefix}`
-      }
-      readableBinding += `.${fieldSchema.name || key}`
-
-      // Determine which category this binding belongs in
-      const bindingCategory = getComponentBindingCategory(
-        component,
-        context,
-        definition
-      )
-
-      // Temporarily append scope for debugging
-      const scope = `[${(context.scope || "global").toUpperCase()}]`
-
-      // Create the binding object
-      bindings.push({
-        type: "context",
-        runtimeBinding,
-        readableBinding: `${scope} ${readableBinding}`,
-        // Field schema and provider are required to construct relationship
-        // datasource options, based on bindable properties
-        fieldSchema,
-        providerId,
-        // Table ID is used by JSON fields to know what table the field is in
-        tableId: table?._id,
-        component: component._component,
-        category: bindingCategory.category,
-        icon: bindingCategory.icon,
-        display: {
-          name: `${scope} ${fieldSchema.name || key}`,
-          type: fieldSchema.type,
-        },
+        // Create the binding object
+        bindings.push({
+          type: "context",
+          runtimeBinding,
+          readableBinding,
+          // Field schema and provider are required to construct relationship
+          // datasource options, based on bindable properties
+          fieldSchema,
+          providerId,
+          // Table ID is used by JSON fields to know what table the field is in
+          tableId: table?._id,
+          component: component._component,
+          category: bindingCategory.category,
+          icon: bindingCategory.icon,
+          display: {
+            name: fieldSchema.name || key,
+            type: fieldSchema.type,
+          },
+        })
       })
     })
   })
@@ -485,38 +460,25 @@ const generateComponentContextBindings = (asset, componentContext) => {
   return bindings
 }
 
-/**
- * Checks if a certain data context is compatible with a certain instance of a
- * configured component.
- */
-const isContextCompatibleWithComponent = (context, component) => {
-  if (!component) {
-    return false
-  }
-  const { _component, actionType } = component
-  const { type } = context
-
-  // Certain types of form blocks only allow certain contexts
+// Exclude a data context based on the component settings
+const filterCategoryByContext = (component, context) => {
+  const { _component } = component
   if (_component.endsWith("formblock")) {
     if (
-      (actionType === "Create" && type === "schema") ||
-      (actionType === "View" && type === "form")
+      (component.actionType === "Create" && context.type === "schema") ||
+      (component.actionType === "View" && context.type === "form")
     ) {
       return false
     }
   }
-
-  // Allow the context by default
   return true
 }
 
 // Enrich binding category information for certain components
 const getComponentBindingCategory = (component, context, def) => {
-  // Default category to component name
   let icon = def.icon
   let category = component._instanceName
 
-  // Form block edge case
   if (component._component.endsWith("formblock")) {
     if (context.type === "form") {
       category = `${component._instanceName} - Fields`
@@ -534,7 +496,7 @@ const getComponentBindingCategory = (component, context, def) => {
 }
 
 /**
- * Gets all bindable properties from the logged-in user.
+ * Gets all bindable properties from the logged in user.
  */
 export const getUserBindings = () => {
   let bindings = []
@@ -604,7 +566,6 @@ const getDeviceBindings = () => {
 
 /**
  * Gets all selected rows bindings for tables in the current asset.
- * TODO: remove in future because we don't need a separate store for this
  */
 const getSelectedRowsBindings = asset => {
   let bindings = []
@@ -647,9 +608,6 @@ const getSelectedRowsBindings = asset => {
   return bindings
 }
 
-/**
- * Generates a state binding for a certain key name
- */
 export const makeStateBinding = key => {
   return {
     type: "context",
@@ -704,9 +662,6 @@ const getUrlBindings = asset => {
   return urlParamBindings.concat([queryParamsBinding])
 }
 
-/**
- * Generates all bindings for role IDs
- */
 const getRoleBindings = () => {
   return (get(rolesStore) || []).map(role => {
     return {
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
index ce2cac9781..b05b127b1c 100644
--- a/packages/builder/src/builderStore/store/frontend.js
+++ b/packages/builder/src/builderStore/store/frontend.js
@@ -709,9 +709,10 @@ export const getFrontendStore = () => {
           else {
             if (setting.type === "dataProvider") {
               // Validate data provider exists, or else clear it
-              const providers = findAllMatchingComponents(
-                screen?.props,
-                component => component._component?.endsWith("/dataprovider")
+              const treeId = parent?._id || component._id
+              const path = findComponentPath(screen?.props, treeId)
+              const providers = path.filter(component =>
+                component._component?.endsWith("/dataprovider")
               )
               // Validate non-empty values
               const valid = providers?.some(dp => value.includes?.(dp._id))
@@ -733,16 +734,6 @@ export const getFrontendStore = () => {
           return null
         }
 
-        // Find all existing components of this type so that we can give this
-        // component a unique name
-        const screen = get(selectedScreen).props
-        const otherComponents = findAllMatchingComponents(
-          screen,
-          x => x._component === definition.component && x._id !== screen._id
-        )
-        let name = definition.friendlyName || definition.name
-        name = `${name} ${otherComponents.length + 1}`
-
         // Generate basic component structure
         let instance = {
           _id: Helpers.uuid(),
@@ -752,7 +743,7 @@ export const getFrontendStore = () => {
             hover: {},
             active: {},
           },
-          _instanceName: name,
+          _instanceName: `New ${definition.friendlyName || definition.name}`,
           ...presetProps,
         }
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
index bdcd3a7838..aa076fdd3e 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@@ -1,4 +1,5 @@
-import { getComponentContexts } from "builderStore/dataBinding"
+import { getContextProviderComponents } from "builderStore/dataBinding"
+import { store } from "builderStore"
 import { capitalise } from "helpers"
 
 // Generates bindings for all components that provider "datasource like"
@@ -7,49 +8,58 @@ import { capitalise } from "helpers"
 // Some examples are saving rows or duplicating rows.
 export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => {
   // Get all form context providers
-  const formComponentContexts = getComponentContexts(
+  const formComponents = getContextProviderComponents(
     asset,
     componentId,
     "form",
-    {
-      includeSelf: nested,
-    }
+    { includeSelf: nested }
   )
+
   // Get all schema context providers
-  const schemaComponentContexts = getComponentContexts(
+  const schemaComponents = getContextProviderComponents(
     asset,
     componentId,
     "schema",
-    {
-      includeSelf: nested,
-    }
+    { includeSelf: nested }
   )
 
+  // Generate contexts for all form providers
+  const formContexts = formComponents.map(component => ({
+    component,
+    context: extractComponentContext(component, "form"),
+  }))
+
+  // Generate contexts for all schema providers
+  const schemaContexts = schemaComponents.map(component => ({
+    component,
+    context: extractComponentContext(component, "schema"),
+  }))
+
   // Check for duplicate contexts by the same component. In this case, attempt
   // to label contexts with their suffixes
-  schemaComponentContexts.forEach(schemaContext => {
+  schemaContexts.forEach(schemaContext => {
     // Check if we have a form context for this component
     const id = schemaContext.component._id
-    const existing = formComponentContexts.find(x => x.component._id === id)
+    const existing = formContexts.find(x => x.component._id === id)
     if (existing) {
-      if (existing.contexts[0].suffix) {
-        const suffix = capitalise(existing.contexts[0].suffix)
+      if (existing.context.suffix) {
+        const suffix = capitalise(existing.context.suffix)
         existing.readableSuffix = ` - ${suffix}`
       }
-      if (schemaContext.contexts[0].suffix) {
-        const suffix = capitalise(schemaContext.contexts[0].suffix)
+      if (schemaContext.context.suffix) {
+        const suffix = capitalise(schemaContext.context.suffix)
         schemaContext.readableSuffix = ` - ${suffix}`
       }
     }
   })
 
   // Generate bindings for all contexts
-  const allContexts = formComponentContexts.concat(schemaComponentContexts)
-  return allContexts.map(({ component, contexts, readableSuffix }) => {
+  const allContexts = formContexts.concat(schemaContexts)
+  return allContexts.map(({ component, context, readableSuffix }) => {
     let readableBinding = component._instanceName
     let runtimeBinding = component._id
-    if (contexts[0].suffix) {
-      runtimeBinding += `-${contexts[0].suffix}`
+    if (context.suffix) {
+      runtimeBinding += `-${context.suffix}`
     }
     if (readableSuffix) {
       readableBinding += readableSuffix
@@ -60,3 +70,13 @@ export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => {
     }
   })
 }
+
+// Gets a context definition of a certain type from a component definition
+const extractComponentContext = (component, contextType) => {
+  const def = store.actions.components.getDefinition(component?._component)
+  if (!def) {
+    return null
+  }
+  const contexts = Array.isArray(def.context) ? def.context : [def.context]
+  return contexts.find(context => context?.type === contextType)
+}
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index 9fd220e798..83255ec325 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -1,16 +1,15 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
-  import { currentAsset } from "builderStore"
-  import { findAllMatchingComponents } from "builderStore/componentUtils"
+  import { currentAsset, store } from "builderStore"
+  import { findComponentPath } from "builderStore/componentUtils"
 
   export let value
 
   const getValue = component => `{{ literal ${makePropSafe(component._id)} }}`
 
-  $: providers = findAllMatchingComponents($currentAsset?.props, c =>
-    c._component?.endsWith("/dataprovider")
-  )
+  $: path = findComponentPath($currentAsset?.props, $store.selectedComponentId)
+  $: providers = path.filter(c => c._component?.endsWith("/dataprovider"))
 </script>
 
 <Select
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index 3eb69e9a3b..25aa37365c 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -1,5 +1,6 @@
 <script>
   import {
+    getContextProviderComponents,
     readableToRuntimeBinding,
     runtimeToReadableBinding,
   } from "builderStore/dataBinding"
@@ -29,7 +30,6 @@
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
-  import { findAllComponents } from "builderStore/componentUtils"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import DataSourceCategory from "components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
   import { API } from "api"
@@ -75,13 +75,12 @@
       ...query,
       type: "query",
     }))
-  $: dataProviders = findAllComponents($currentAsset.props)
-    .filter(component => {
-      return (
-        component._component?.endsWith("/dataprovider") &&
-        component._id !== $store.selectedComponentId
-      )
-    })
+  $: contextProviders = getContextProviderComponents(
+    $currentAsset,
+    $store.selectedComponentId
+  )
+  $: dataProviders = contextProviders
+    .filter(component => component._component?.endsWith("/dataprovider"))
     .map(provider => ({
       label: provider._instanceName,
       name: provider._instanceName,
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index fe95f5536c..2a9bc6f258 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -573,6 +573,7 @@
     "description": "A configurable data list that attaches to your backend tables.",
     "icon": "JourneyData",
     "illegalChildren": ["section"],
+    "requiredAncestors": ["dataprovider"],
     "hasChildren": true,
     "size": {
       "width": 400,
@@ -710,12 +711,10 @@
     ],
     "context": [
       {
-        "type": "schema",
-        "scope": "local"
+        "type": "schema"
       },
       {
         "type": "static",
-        "scope": "local",
         "values": [
           {
             "label": "Row index",
@@ -1565,6 +1564,7 @@
     "name": "Bar Chart",
     "description": "Bar chart",
     "icon": "GraphBarVertical",
+    "requiredAncestors": ["dataprovider"],
     "size": {
       "width": 600,
       "height": 400
@@ -1727,6 +1727,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -1880,6 +1881,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -2045,6 +2047,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -2174,6 +2177,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -2303,6 +2307,7 @@
       "width": 600,
       "height": 400
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "text",
@@ -4076,6 +4081,7 @@
       "width": 400,
       "height": 320
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "dataProvider",
@@ -4631,6 +4637,7 @@
     "name": "Table",
     "icon": "Table",
     "illegalChildren": ["section"],
+    "requiredAncestors": ["dataprovider"],
     "hasChildren": true,
     "showEmptyState": false,
     "size": {
@@ -4721,6 +4728,7 @@
     "name": "Date Range",
     "icon": "Calendar",
     "styles": ["size"],
+    "requiredAncestors": ["dataprovider"],
     "hasChildren": false,
     "size": {
       "width": 200,
@@ -4828,6 +4836,7 @@
       "width": 100,
       "height": 35
     },
+    "requiredAncestors": ["dataprovider"],
     "settings": [
       {
         "type": "dataProvider",
@@ -5602,38 +5611,7 @@
           }
         ]
       }
-    ],
-    "context": {
-      "type": "static",
-      "suffix": "provider",
-      "values": [
-        {
-          "label": "Rows",
-          "key": "rows",
-          "type": "array"
-        },
-        {
-          "label": "Extra Info",
-          "key": "info",
-          "type": "string"
-        },
-        {
-          "label": "Rows Length",
-          "key": "rowsLength",
-          "type": "number"
-        },
-        {
-          "label": "Schema",
-          "key": "schema",
-          "type": "object"
-        },
-        {
-          "label": "Page Number",
-          "key": "pageNumber",
-          "type": "number"
-        }
-      ]
-    }
+    ]
   },
   "cardsblock": {
     "block": true,
@@ -6036,8 +6014,7 @@
       },
       {
         "type": "schema",
-        "suffix": "repeater",
-        "scope": "local"
+        "suffix": "repeater"
       }
     ]
   },
@@ -6183,10 +6160,6 @@
         "type": "form",
         "suffix": "form"
       },
-      {
-        "type": "schema",
-        "suffix": "repeater"
-      },
       {
         "type": "static",
         "suffix": "form",
@@ -6503,23 +6476,6 @@
       "suffix": "repeater"
     }
   },
-  "grid": {
-    "name": "Grid",
-    "icon": "ViewGrid",
-    "hasChildren": true,
-    "settings": [
-      {
-        "type": "number",
-        "key": "cols",
-        "label": "Columns"
-      },
-      {
-        "type": "number",
-        "key": "rows",
-        "label": "Rows"
-      }
-    ]
-  },
   "gridblock": {
     "name": "Grid Block",
     "icon": "Table",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 6694022b98..63ce8dc152 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -9,7 +9,7 @@
 </script>
 
 <script>
-  import { getContext, setContext, onMount } from "svelte"
+  import { getContext, setContext, onMount, onDestroy } from "svelte"
   import { writable, get } from "svelte/store"
   import {
     enrichProps,
@@ -30,15 +30,6 @@
   import ScreenPlaceholder from "components/app/ScreenPlaceholder.svelte"
   import ComponentErrorState from "components/error-states/ComponentErrorState.svelte"
   import { BudibasePrefix } from "../stores/components.js"
-  import {
-    decodeJSBinding,
-    findHBSBlocks,
-    isJSBinding,
-  } from "@budibase/string-templates"
-  import {
-    getActionContextKey,
-    getActionDependentContextKeys,
-  } from "../utils/buttonActions.js"
 
   export let instance = {}
   export let isLayout = false
@@ -90,6 +81,7 @@
 
   // Keep track of stringified representations of context and instance
   // to avoid enriching bindings as much as possible
+  let lastContextKey
   let lastInstanceKey
 
   // Visibility flag used by conditional UI
@@ -106,13 +98,6 @@
   // We clear these whenever a new instance is received.
   let ephemeralStyles
 
-  // Single string of all HBS blocks, used to check if we use a certain binding
-  // or not
-  let bindingString = ""
-
-  // List of context keys which we use inside bindings
-  let knownContextKeyMap = {}
-
   // Set up initial state for each new component instance
   $: initialise(instance)
 
@@ -170,6 +155,9 @@
       hasMissingRequiredSettings)
   $: emptyState = empty && showEmptyState
 
+  // Enrich component settings
+  $: enrichComponentSettings($context, settingsDefinitionMap)
+
   // Evaluate conditional UI settings and store any component setting changes
   // which need to be made
   $: evaluateConditions(conditions)
@@ -218,7 +206,6 @@
     errorState,
     parent: id,
     ancestors: [...($component?.ancestors ?? []), instance._component],
-    path: [...($component?.path ?? []), id],
   })
 
   const initialise = (instance, force = false) => {
@@ -227,8 +214,7 @@
     }
 
     // Ensure we're processing a new instance
-    const stringifiedInstance = JSON.stringify(instance)
-    const instanceKey = Helpers.hashString(stringifiedInstance)
+    const instanceKey = Helpers.hashString(JSON.stringify(instance))
     if (instanceKey === lastInstanceKey && !force) {
       return
     } else {
@@ -288,54 +274,13 @@
       return missing
     })
 
-    // When considering bindings we can ignore children, so we remove that
-    // before storing the reference stringified version
-    const noChildren = JSON.stringify({ ...instance, _children: null })
-    const bindings = findHBSBlocks(noChildren).map(binding => {
-      let sanitizedBinding = binding.replace(/\\"/g, '"')
-      if (isJSBinding(sanitizedBinding)) {
-        return decodeJSBinding(sanitizedBinding)
-      } else {
-        return sanitizedBinding
-      }
-    })
-
-    // The known context key map is built up at runtime, as changes to keys are
-    // encountered. We manually seed this to the required action keys as these
-    // are not encountered at runtime and so need computed in advance.
-    knownContextKeyMap = generateActionKeyMap(instance, settingsDefinition)
-    bindingString = bindings.join(" ")
-
     // Run any migrations
     runMigrations(instance, settingsDefinition)
 
     // Force an initial enrichment of the new settings
-    enrichComponentSettings(get(context), settingsDefinitionMap)
-  }
-
-  // Extracts a map of all context keys which are required by action settings
-  // to provide the functions to evaluate at runtime. This needs done manually
-  // as the action definitions themselves do not specify bindings for action
-  // keys, meaning we cannot do this while doing the other normal bindings.
-  const generateActionKeyMap = (instance, settingsDefinition) => {
-    let map = {}
-    settingsDefinition.forEach(setting => {
-      if (setting.type === "event") {
-        instance[setting.key]?.forEach(action => {
-          // We depend on the actual action key
-          const actionKey = getActionContextKey(action)
-          if (actionKey) {
-            map[actionKey] = true
-          }
-
-          // We also depend on any manually declared context keys
-          getActionDependentContextKeys(action)?.forEach(key => {
-            map[key] = true
-          })
-        })
-      }
+    enrichComponentSettings(get(context), settingsDefinitionMap, {
+      force: true,
     })
-    return map
   }
 
   const runMigrations = (instance, settingsDefinition) => {
@@ -436,7 +381,17 @@
   }
 
   // Enriches any string component props using handlebars
-  const enrichComponentSettings = (context, settingsDefinitionMap) => {
+  const enrichComponentSettings = (
+    context,
+    settingsDefinitionMap,
+    options = { force: false }
+  ) => {
+    const contextChanged = context.key !== lastContextKey
+    if (!contextChanged && !options?.force) {
+      return
+    }
+    lastContextKey = context.key
+
     // Record the timestamp so we can reference it after enrichment
     latestUpdateTime = Date.now()
     const enrichmentTime = latestUpdateTime
@@ -551,46 +506,31 @@
     })
   }
 
-  const handleContextChange = key => {
-    // Check if we already know if this key is used
-    let used = knownContextKeyMap[key]
-
-    // If we don't know, check and cache
-    if (used == null) {
-      used = bindingString.indexOf(`[${key}]`) !== -1
-      knownContextKeyMap[key] = used
-    }
-
-    // Enrich settings if we use this key
-    if (used) {
-      enrichComponentSettings($context, settingsDefinitionMap)
-    }
-  }
-
-  // Register an unregister component instance
   onMount(() => {
-    if ($appStore.isDevApp) {
-      if (!componentStore.actions.isComponentRegistered(id)) {
-        componentStore.actions.registerInstance(id, {
-          component: instance._component,
-          getSettings: () => cachedSettings,
-          getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
-          getDataContext: () => get(context),
-          reload: () => initialise(instance, true),
-          setEphemeralStyles: styles => (ephemeralStyles = styles),
-          state: store,
-        })
-      }
-      return () => {
-        if (componentStore.actions.isComponentRegistered(id)) {
-          componentStore.actions.unregisterInstance(id)
-        }
-      }
+    if (
+      $appStore.isDevApp &&
+      !componentStore.actions.isComponentRegistered(id)
+    ) {
+      componentStore.actions.registerInstance(id, {
+        component: instance._component,
+        getSettings: () => cachedSettings,
+        getRawSettings: () => ({ ...staticSettings, ...dynamicSettings }),
+        getDataContext: () => get(context),
+        reload: () => initialise(instance, true),
+        setEphemeralStyles: styles => (ephemeralStyles = styles),
+        state: store,
+      })
     }
   })
 
-  // Observe changes to context
-  onMount(() => context.actions.observeChanges(handleContextChange))
+  onDestroy(() => {
+    if (
+      $appStore.isDevApp &&
+      componentStore.actions.isComponentRegistered(id)
+    ) {
+      componentStore.actions.unregisterInstance(id)
+    }
+  })
 </script>
 
 {#if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden}
diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte
index 1c6dfb32b7..342194d5e2 100644
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@@ -71,7 +71,7 @@
     datasource: dataSource || {},
     schema,
     rowsLength: $fetch.rows.length,
-    pageNumber: $fetch.pageNumber + 1,
+
     // Undocumented properties. These aren't supposed to be used in builder
     // bindings, but are used internally by other components
     id: $component?.id,
diff --git a/packages/client/src/components/app/EmptyPlaceholder.svelte b/packages/client/src/components/app/EmptyPlaceholder.svelte
index 2c3596aadf..7e9920510a 100644
--- a/packages/client/src/components/app/EmptyPlaceholder.svelte
+++ b/packages/client/src/components/app/EmptyPlaceholder.svelte
@@ -1,5 +1,6 @@
 <script>
   import { getContext } from "svelte"
+  import { Icon } from "@budibase/bbui"
 
   const component = getContext("component")
   const { builderStore, componentStore } = getContext("sdk")
@@ -9,7 +10,15 @@
 
 {#if $builderStore.inBuilder}
   <div class="component-placeholder">
-    {$component.name || definition?.name || "Component"}
+    <Icon name="Help" color="var(--spectrum-global-color-blue-600)" />
+    <span
+      class="spectrum-Link"
+      on:click={() => {
+        builderStore.actions.requestAddComponent()
+      }}
+    >
+      Add components inside your {definition?.name || $component.type}
+    </span>
   </div>
 {/if}
 
@@ -23,4 +32,14 @@
     font-size: var(--font-size-s);
     gap: var(--spacing-s);
   }
+
+  /* Common styles for all error states to use */
+  .component-placeholder :global(mark) {
+    background-color: var(--spectrum-global-color-gray-400);
+    padding: 0 4px;
+    border-radius: 2px;
+  }
+  .component-placeholder :global(.spectrum-Link) {
+    cursor: pointer;
+  }
 </style>
diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte
index 0a343cac51..30040bfe9c 100644
--- a/packages/client/src/components/app/GridBlock.svelte
+++ b/packages/client/src/components/app/GridBlock.svelte
@@ -19,36 +19,7 @@
   export let onRowClick = null
   export let buttons = null
 
-  const context = getContext("context")
-  const component = getContext("component")
-  const {
-    styleable,
-    API,
-    builderStore,
-    notificationStore,
-    enrichButtonActions,
-    ActionTypes,
-    createContextStore,
-    Provider,
-  } = getContext("sdk")
-
-  let grid
-
-  $: columnWhitelist = parsedColumns
-    ?.filter(col => col.active)
-    ?.map(col => col.field)
-  $: schemaOverrides = getSchemaOverrides(parsedColumns)
-  $: enrichedButtons = enrichButtons(buttons)
-  $: parsedColumns = getParsedColumns(columns)
-  $: actions = [
-    {
-      type: ActionTypes.RefreshDatasource,
-      callback: () => grid?.getContext()?.rows.actions.refreshData(),
-      metadata: { dataSource: table },
-    },
-  ]
-
-  // Parses columns to fix older formats
+  // parses columns to fix older formats
   const getParsedColumns = columns => {
     // If the first element has an active key all elements should be in the new format
     if (columns?.length && columns[0]?.active !== undefined) {
@@ -62,6 +33,28 @@
     }))
   }
 
+  $: parsedColumns = getParsedColumns(columns)
+
+  const context = getContext("context")
+  const component = getContext("component")
+  const {
+    styleable,
+    API,
+    builderStore,
+    notificationStore,
+    enrichButtonActions,
+    ActionTypes,
+    createContextStore,
+  } = getContext("sdk")
+
+  let grid
+
+  $: columnWhitelist = parsedColumns
+    ?.filter(col => col.active)
+    ?.map(col => col.field)
+  $: schemaOverrides = getSchemaOverrides(parsedColumns)
+  $: enrichedButtons = enrichButtons(buttons)
+
   const getSchemaOverrides = columns => {
     let overrides = {}
     columns?.forEach(column => {
@@ -85,6 +78,11 @@
         const id = get(component).id
         const gridContext = createContextStore(context)
         gridContext.actions.provideData(id, row)
+        gridContext.actions.provideAction(
+          id,
+          ActionTypes.RefreshDatasource,
+          () => grid?.getContext()?.rows.actions.refreshData()
+        )
         const fn = enrichButtonActions(settings.onClick, get(gridContext))
         return await fn?.({ row })
       },
@@ -96,31 +94,29 @@
   use:styleable={$component.styles}
   class:in-builder={$builderStore.inBuilder}
 >
-  <Provider {actions}>
-    <Grid
-      bind:this={grid}
-      datasource={table}
-      {API}
-      {stripeRows}
-      {initialFilter}
-      {initialSortColumn}
-      {initialSortOrder}
-      {fixedRowHeight}
-      {columnWhitelist}
-      {schemaOverrides}
-      canAddRows={allowAddRows}
-      canEditRows={allowEditRows}
-      canDeleteRows={allowDeleteRows}
-      canEditColumns={false}
-      canExpandRows={false}
-      canSaveSchema={false}
-      showControls={false}
-      notifySuccess={notificationStore.actions.success}
-      notifyError={notificationStore.actions.error}
-      buttons={enrichedButtons}
-      on:rowclick={e => onRowClick?.({ row: e.detail })}
-    />
-  </Provider>
+  <Grid
+    bind:this={grid}
+    datasource={table}
+    {API}
+    {stripeRows}
+    {initialFilter}
+    {initialSortColumn}
+    {initialSortOrder}
+    {fixedRowHeight}
+    {columnWhitelist}
+    {schemaOverrides}
+    canAddRows={allowAddRows}
+    canEditRows={allowEditRows}
+    canDeleteRows={allowDeleteRows}
+    canEditColumns={false}
+    canExpandRows={false}
+    canSaveSchema={false}
+    showControls={false}
+    notifySuccess={notificationStore.actions.success}
+    notifyError={notificationStore.actions.error}
+    buttons={enrichedButtons}
+    on:rowclick={e => onRowClick?.({ row: e.detail })}
+  />
 </div>
 
 <style>
diff --git a/packages/client/src/components/app/Repeater.svelte b/packages/client/src/components/app/Repeater.svelte
index 8796078311..39e11d12cf 100644
--- a/packages/client/src/components/app/Repeater.svelte
+++ b/packages/client/src/components/app/Repeater.svelte
@@ -2,7 +2,6 @@
   import { getContext } from "svelte"
   import Placeholder from "./Placeholder.svelte"
   import Container from "./Container.svelte"
-  import { ContextScopes } from "constants"
 
   export let dataProvider
   export let noRowsMessage
@@ -10,7 +9,6 @@
   export let hAlign
   export let vAlign
   export let gap
-  export let scope = ContextScopes.Local
 
   const { Provider } = getContext("sdk")
   const component = getContext("component")
@@ -24,7 +22,7 @@
     <Placeholder />
   {:else if rows.length > 0}
     {#each rows as row, index}
-      <Provider data={{ ...row, index }} {scope}>
+      <Provider data={{ ...row, index }}>
         <slot />
       </Provider>
     {/each}
diff --git a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
index b24c2f418a..50f2823b97 100644
--- a/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
+++ b/packages/client/src/components/app/blocks/MultiStepFormblock.svelte
@@ -1,6 +1,5 @@
 <script>
   import BlockComponent from "components/BlockComponent.svelte"
-  import { Helpers } from "@budibase/bbui"
   import { getContext, setContext } from "svelte"
   import { builderStore } from "stores"
   import { Utils } from "@budibase/frontend-core"
@@ -42,7 +41,7 @@
   let schema
 
   $: fetchSchema(dataSource)
-  $: enrichedSteps = enrichSteps(steps, schema, $component.id, $currentStep)
+  $: enrichedSteps = enrichSteps(steps, schema, $component.id)
   $: updateCurrentStep(enrichedSteps, $builderStore, $component)
 
   const updateCurrentStep = (steps, builderStore, component) => {
@@ -116,7 +115,6 @@
         dataSource,
       })
       return {
-        _stepId: Helpers.uuid(),
         fields: getDefaultFields(fields || [], schema),
         title: title ?? defaultProps.title,
         desc,
@@ -144,7 +142,7 @@
       },
     }}
   >
-    {#each enrichedSteps as step, stepIdx (step._stepId)}
+    {#each enrichedSteps as step, stepIdx}
       <BlockComponent
         type="formstep"
         props={{ step: stepIdx + 1, _instanceName: `Step ${stepIdx + 1}` }}
@@ -188,13 +186,12 @@
             </BlockComponent>
           </BlockComponent>
           <BlockComponent type="text" props={{ text: step.desc }} order={1} />
-
           <BlockComponent type="container" order={2}>
             <div
               class="form-block fields"
               class:mobile={$context.device.mobile}
             >
-              {#each step.fields as field, fieldIdx (`${field.field || field.name}_${fieldIdx}`)}
+              {#each step.fields as field, fieldIdx (`${field.field || field.name}_${stepIdx}_${fieldIdx}`)}
                 {#if getComponentForField(field)}
                   <BlockComponent
                     type={getComponentForField(field)}
diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte
index 7c58f90508..0597f9947f 100644
--- a/packages/client/src/components/app/blocks/TableBlock.svelte
+++ b/packages/client/src/components/app/blocks/TableBlock.svelte
@@ -231,7 +231,6 @@
           paginate,
           limit: rowCount,
         }}
-        context="provider"
         order={1}
       >
         <BlockComponent
diff --git a/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte b/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
index 5b89018fdf..26767f84b3 100644
--- a/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
+++ b/packages/client/src/components/app/blocks/form/FormBlockWrapper.svelte
@@ -10,7 +10,6 @@
   export let noRowsMessage
 
   const component = getContext("component")
-  const { ContextScopes } = getContext("sdk")
 
   $: providerId = `${$component.id}-provider`
   $: dataProvider = `{{ literal ${safe(providerId)} }}`
@@ -56,7 +55,6 @@
           noRowsMessage: noRowsMessage || "We couldn't find a row to display",
           direction: "column",
           hAlign: "center",
-          scope: ContextScopes.Global,
         }}
       >
         <slot />
diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index 464ca95829..2cbf2ec877 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -21,7 +21,6 @@
   export let editAutoColumns = false
 
   const context = getContext("context")
-  const component = getContext("component")
   const { API, fetchDatasourceSchema } = getContext("sdk")
 
   const getInitialFormStep = () => {
@@ -39,47 +38,28 @@
 
   $: fetchSchema(dataSource)
   $: schemaKey = generateSchemaKey(schema)
-  $: initialValues = getInitialValues(
-    actionType,
-    dataSource,
-    $component.path,
-    $context
-  )
+  $: initialValues = getInitialValues(actionType, dataSource, $context)
   $: resetKey = Helpers.hashString(
     schemaKey + JSON.stringify(initialValues) + disabled + readonly
   )
 
   // Returns the closes data context which isn't a built in context
-  const getInitialValues = (type, dataSource, path, context) => {
+  const getInitialValues = (type, dataSource, context) => {
     // Only inherit values for update forms
     if (type !== "Update") {
       return {}
     }
     // Only inherit values for forms targeting internal tables
-    const dsType = dataSource?.type
-    if (dsType !== "table" && dsType !== "viewV2") {
+    if (!dataSource?.tableId) {
       return {}
     }
-    // Look up the component tree and find something that is provided by an
-    // ancestor that matches our datasource. This is for backwards compatibility
-    // as previously we could use the "closest" context.
-    for (let id of path.reverse().slice(1)) {
-      // Check for matching view datasource
-      if (
-        dataSource.type === "viewV2" &&
-        context[id]?._viewId === dataSource.id
-      ) {
-        return context[id]
-      }
-      // Check for matching table datasource
-      if (
-        dataSource.type === "table" &&
-        context[id]?.tableId === dataSource.tableId
-      ) {
-        return context[id]
-      }
+    // Don't inherit values representing built in contexts
+    if (["user", "url"].includes(context.closestComponentId)) {
+      return {}
     }
-    return {}
+    // Always inherit the closest datasource
+    const closestContext = context[`${context.closestComponentId}`] || {}
+    return closestContext || {}
   }
 
   // Fetches the form schema from this form's dataSource
diff --git a/packages/client/src/components/context/Provider.svelte b/packages/client/src/components/context/Provider.svelte
index 1b6a073512..3fffaaf7fa 100644
--- a/packages/client/src/components/context/Provider.svelte
+++ b/packages/client/src/components/context/Provider.svelte
@@ -1,23 +1,20 @@
 <script>
   import { getContext, setContext, onDestroy } from "svelte"
   import { dataSourceStore, createContextStore } from "stores"
-  import { ActionTypes, ContextScopes } from "constants"
+  import { ActionTypes } from "constants"
   import { generate } from "shortid"
 
   export let data
   export let actions
   export let key
-  export let scope = ContextScopes.Global
 
-  let context = getContext("context")
+  // Clone and create new data context for this component tree
+  const context = getContext("context")
   const component = getContext("component")
-  const providerKey = key || $component.id
+  const newContext = createContextStore(context)
+  setContext("context", newContext)
 
-  // Create a new layer of context if we are only locally scoped
-  if (scope === ContextScopes.Local) {
-    context = createContextStore(context)
-    setContext("context", context)
-  }
+  const providerKey = key || $component.id
 
   // Generate a permanent unique ID for this component and use it to register
   // any datasource actions
@@ -33,7 +30,7 @@
   const provideData = newData => {
     const dataKey = JSON.stringify(newData)
     if (dataKey !== lastDataKey) {
-      context.actions.provideData(providerKey, newData, scope)
+      newContext.actions.provideData(providerKey, newData)
       lastDataKey = dataKey
     }
   }
@@ -43,7 +40,7 @@
     if (actionsKey !== lastActionsKey) {
       lastActionsKey = actionsKey
       newActions?.forEach(({ type, callback, metadata }) => {
-        context.actions.provideAction(providerKey, type, callback, scope)
+        newContext.actions.provideAction(providerKey, type, callback)
 
         // Register any "refresh datasource" actions with a singleton store
         // so we can easily refresh data at all levels for any datasource
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js
index 4c9df42809..a4d7411bbd 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -12,10 +12,5 @@ export const ActionTypes = {
   ScrollTo: "ScrollTo",
 }
 
-export const ContextScopes = {
-  Local: "local",
-  Global: "global",
-}
-
 export const DNDPlaceholderID = "dnd-placeholder"
 export const ScreenslotType = "screenslot"
diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js
index 2b8ba41cbd..04499c01ab 100644
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@@ -23,7 +23,7 @@ import { getAction } from "utils/getAction"
 import Provider from "components/context/Provider.svelte"
 import Block from "components/Block.svelte"
 import BlockComponent from "components/BlockComponent.svelte"
-import { ActionTypes, ContextScopes } from "./constants"
+import { ActionTypes } from "./constants"
 import { fetchDatasourceSchema } from "./utils/schema.js"
 import { getAPIKey } from "./utils/api.js"
 import { enrichButtonActions } from "./utils/buttonActions.js"
@@ -54,7 +54,6 @@ export default {
   linkable,
   getAction,
   fetchDatasourceSchema,
-  ContextScopes,
   getAPIKey,
   enrichButtonActions,
   processStringSync,
diff --git a/packages/client/src/stores/context.js b/packages/client/src/stores/context.js
index e54c773591..9c35bc4862 100644
--- a/packages/client/src/stores/context.js
+++ b/packages/client/src/stores/context.js
@@ -1,98 +1,59 @@
 import { writable, derived } from "svelte/store"
-import { ContextScopes } from "constants"
+import { Helpers } from "@budibase/bbui"
 
-export const createContextStore = parentContext => {
-  const context = writable({})
-  let observers = []
-
-  // Derive the total context state at this point in the tree
-  const contexts = parentContext ? [parentContext, context] : [context]
+export const createContextStore = oldContext => {
+  const newContext = writable({})
+  const contexts = oldContext ? [oldContext, newContext] : [newContext]
   const totalContext = derived(contexts, $contexts => {
-    return $contexts.reduce((total, context) => ({ ...total, ...context }), {})
+    // The key is the serialized representation of context
+    let key = ""
+    for (let i = 0; i < $contexts.length - 1; i++) {
+      key += $contexts[i].key
+    }
+    key = Helpers.hashString(
+      key + JSON.stringify($contexts[$contexts.length - 1])
+    )
+
+    // Reduce global state
+    const reducer = (total, context) => ({ ...total, ...context })
+    const context = $contexts.reduce(reducer, {})
+
+    return {
+      ...context,
+      key,
+    }
   })
 
-  // Subscribe to updates in the parent context, so that we can proxy on any
-  // change messages to our own subscribers
-  if (parentContext) {
-    parentContext.actions.observeChanges(key => {
-      broadcastChange(key)
-    })
-  }
-
-  // Provide some data in context
-  const provideData = (providerId, data, scope = ContextScopes.Global) => {
+  // Adds a data context layer to the tree
+  const provideData = (providerId, data) => {
     if (!providerId || data === undefined) {
       return
     }
+    newContext.update(state => {
+      state[providerId] = data
 
-    // Proxy message up the chain if we have a parent and are providing global
-    // context
-    if (scope === ContextScopes.Global && parentContext) {
-      parentContext.actions.provideData(providerId, data, scope)
-    }
+      // Keep track of the closest component ID so we can later hydrate a "data" prop.
+      // This is only required for legacy bindings that used "data" rather than a
+      // component ID.
+      state.closestComponentId = providerId
 
-    // Otherwise this is either the context root, or we're providing a local
-    // context override, so we need to update the local context instead
-    else {
-      context.update(state => {
-        state[providerId] = data
-        return state
-      })
-      broadcastChange(providerId)
-    }
+      return state
+    })
   }
 
-  // Provides some action in context
-  const provideAction = (
-    providerId,
-    actionType,
-    callback,
-    scope = ContextScopes.Global
-  ) => {
+  // Adds an action context layer to the tree
+  const provideAction = (providerId, actionType, callback) => {
     if (!providerId || !actionType) {
       return
     }
-
-    // Proxy message up the chain if we have a parent and are providing global
-    // context
-    if (scope === ContextScopes.Global && parentContext) {
-      parentContext.actions.provideAction(
-        providerId,
-        actionType,
-        callback,
-        scope
-      )
-    }
-
-    // Otherwise this is either the context root, or we're providing a local
-    // context override, so we need to update the local context instead
-    else {
-      const key = `${providerId}_${actionType}`
-      context.update(state => {
-        state[key] = callback
-        return state
-      })
-      broadcastChange(key)
-    }
-  }
-
-  const observeChanges = callback => {
-    observers.push(callback)
-    return () => {
-      observers = observers.filter(cb => cb !== callback)
-    }
-  }
-
-  const broadcastChange = key => {
-    observers.forEach(cb => cb(key))
+    newContext.update(state => {
+      state[`${providerId}_${actionType}`] = callback
+      return state
+    })
   }
 
   return {
     subscribe: totalContext.subscribe,
-    actions: {
-      provideData,
-      provideAction,
-      observeChanges,
-    },
+    actions: { provideData, provideAction },
   }
 }
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 68b7c84878..9b4640dbb4 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -17,54 +17,6 @@ import { ActionTypes } from "constants"
 import { enrichDataBindings } from "./enrichDataBinding"
 import { Helpers } from "@budibase/bbui"
 
-// Default action handler, which extracts an action from context that was
-// provided by another component and executes it with all action parameters
-const contextActionHandler = async (action, context) => {
-  const key = getActionContextKey(action)
-  const fn = context[key]
-  if (fn) {
-    return await fn(action.parameters)
-  }
-}
-
-// Generates the context key, which is the key that this action depends on in
-// context to provide the function it will run. This is broken out as a util
-// because we reuse this inside the core Component.svelte file to determine
-// what the required action context keys are for all action settings.
-export const getActionContextKey = action => {
-  const type = action?.["##eventHandlerType"]
-  const key = (componentId, type) => `${componentId}_${type}`
-  switch (type) {
-    case "Scroll To Field":
-      return key(action.parameters.componentId, ActionTypes.ScrollTo)
-    case "Update Field Value":
-      return key(action.parameters.componentId, ActionTypes.UpdateFieldValue)
-    case "Validate Form":
-      return key(action.parameters.componentId, ActionTypes.ValidateForm)
-    case "Refresh Data Provider":
-      return key(action.parameters.componentId, ActionTypes.RefreshDatasource)
-    case "Clear Form":
-      return key(action.parameters.componentId, ActionTypes.ClearForm)
-    case "Change Form Step":
-      return key(action.parameters.componentId, ActionTypes.ChangeFormStep)
-    default:
-      return null
-  }
-}
-
-// If button actions depend on context, they must declare which keys they need
-export const getActionDependentContextKeys = action => {
-  const type = action?.["##eventHandlerType"]
-  switch (type) {
-    case "Save Row":
-    case "Duplicate Row":
-      if (action.parameters?.providerId) {
-        return [action.parameters.providerId]
-      }
-  }
-  return []
-}
-
 const saveRowHandler = async (action, context) => {
   const { fields, providerId, tableId, notificationOverride } =
     action.parameters
@@ -80,21 +32,20 @@ const saveRowHandler = async (action, context) => {
     }
   }
   if (tableId) {
-    if (tableId.startsWith("view")) {
-      payload._viewId = tableId
-    } else {
-      payload.tableId = tableId
-    }
+    payload.tableId = tableId
   }
   try {
     const row = await API.saveRow(payload)
+
     if (!notificationOverride) {
       notificationStore.actions.success("Row saved")
     }
+
     // Refresh related datasources
     await dataSourceStore.actions.invalidateDataSource(tableId, {
       invalidateRelationships: true,
     })
+
     return { row }
   } catch (error) {
     // Abort next actions
@@ -113,11 +64,7 @@ const duplicateRowHandler = async (action, context) => {
       }
     }
     if (tableId) {
-      if (tableId.startsWith("view")) {
-        payload._viewId = tableId
-      } else {
-        payload.tableId = tableId
-      }
+      payload.tableId = tableId
     }
     delete payload._id
     delete payload._rev
@@ -126,10 +73,12 @@ const duplicateRowHandler = async (action, context) => {
       if (!notificationOverride) {
         notificationStore.actions.success("Row saved")
       }
+
       // Refresh related datasources
       await dataSourceStore.actions.invalidateDataSource(tableId, {
         invalidateRelationships: true,
       })
+
       return { row }
     } catch (error) {
       // Abort next actions
@@ -241,6 +190,17 @@ const navigationHandler = action => {
   routeStore.actions.navigate(url, peek, externalNewTab)
 }
 
+const scrollHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ScrollTo,
+    {
+      field: action.parameters.field,
+    }
+  )
+}
+
 const queryExecutionHandler = async action => {
   const { datasourceId, queryId, queryParams, notificationOverride } =
     action.parameters
@@ -276,6 +236,47 @@ const queryExecutionHandler = async action => {
   }
 }
 
+const executeActionHandler = async (
+  context,
+  componentId,
+  actionType,
+  params
+) => {
+  const fn = context[`${componentId}_${actionType}`]
+  if (fn) {
+    return await fn(params)
+  }
+}
+
+const updateFieldValueHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.UpdateFieldValue,
+    {
+      type: action.parameters.type,
+      field: action.parameters.field,
+      value: action.parameters.value,
+    }
+  )
+}
+
+const validateFormHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ValidateForm
+  )
+}
+
+const refreshDataProviderHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.RefreshDatasource
+  )
+}
+
 const logoutHandler = async action => {
   await authStore.actions.logOut()
   let redirectUrl = "/builder/auth/login"
@@ -292,6 +293,23 @@ const logoutHandler = async action => {
   }
 }
 
+const clearFormHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ClearForm
+  )
+}
+
+const changeFormStepHandler = async (action, context) => {
+  return await executeActionHandler(
+    context,
+    action.parameters.componentId,
+    ActionTypes.ChangeFormStep,
+    action.parameters
+  )
+}
+
 const closeScreenModalHandler = action => {
   let url
   if (action?.parameters) {
@@ -399,10 +417,16 @@ const handlerMap = {
   ["Duplicate Row"]: duplicateRowHandler,
   ["Delete Row"]: deleteRowHandler,
   ["Navigate To"]: navigationHandler,
+  ["Scroll To Field"]: scrollHandler,
   ["Execute Query"]: queryExecutionHandler,
   ["Trigger Automation"]: triggerAutomationHandler,
+  ["Validate Form"]: validateFormHandler,
+  ["Update Field Value"]: updateFieldValueHandler,
+  ["Refresh Data Provider"]: refreshDataProviderHandler,
   ["Log Out"]: logoutHandler,
+  ["Clear Form"]: clearFormHandler,
   ["Close Screen Modal"]: closeScreenModalHandler,
+  ["Change Form Step"]: changeFormStepHandler,
   ["Update State"]: updateStateHandler,
   ["Upload File to S3"]: s3UploadHandler,
   ["Export Data"]: exportDataHandler,
@@ -437,12 +461,7 @@ export const enrichButtonActions = (actions, context) => {
     return actions
   }
 
-  // Get handlers for each action. If no bespoke handler is configured, fall
-  // back to simply executing this action from context.
-  const handlers = actions.map(def => {
-    return handlerMap[def["##eventHandlerType"]] || contextActionHandler
-  })
-
+  const handlers = actions.map(def => handlerMap[def["##eventHandlerType"]])
   return async eventContext => {
     // Button context is built up as actions are executed.
     // Inherit any previous button context which may have come from actions
diff --git a/packages/client/src/utils/componentProps.js b/packages/client/src/utils/componentProps.js
index efe69938e7..38eaf77885 100644
--- a/packages/client/src/utils/componentProps.js
+++ b/packages/client/src/utils/componentProps.js
@@ -23,6 +23,16 @@ export const propsAreSame = (a, b) => {
  * Data bindings are enriched, and button actions are enriched.
  */
 export const enrichProps = (props, context, settingsDefinitionMap) => {
+  // Create context of all bindings and data contexts
+  // Duplicate the closest context as "data" which the builder requires
+  const totalContext = {
+    ...context,
+
+    // This is only required for legacy bindings that used "data" rather than a
+    // component ID.
+    data: context[context.closestComponentId],
+  }
+
   // We want to exclude any button actions from enrichment at this stage.
   // Extract top level button action settings.
   let normalProps = { ...props }
@@ -39,13 +49,13 @@ export const enrichProps = (props, context, settingsDefinitionMap) => {
   let rawConditions = normalProps._conditions
 
   // Enrich all props except button actions
-  let enrichedProps = enrichDataBindings(normalProps, context)
+  let enrichedProps = enrichDataBindings(normalProps, totalContext)
 
   // Enrich button actions.
   // Actions are enriched into a function at this stage, but actual data
   // binding enrichment is done dynamically at runtime.
   Object.keys(actionProps).forEach(prop => {
-    enrichedProps[prop] = enrichButtonActions(actionProps[prop], context)
+    enrichedProps[prop] = enrichButtonActions(actionProps[prop], totalContext)
   })
 
   // Conditions
@@ -56,7 +66,7 @@ export const enrichProps = (props, context, settingsDefinitionMap) => {
         // action
         condition.settingValue = enrichButtonActions(
           rawConditions[idx].settingValue,
-          context
+          totalContext
         )
 
         // Since we can't compare functions, we need to assume that conditions
diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js
index 79f837e864..475ef0e2a4 100644
--- a/packages/frontend-core/src/api/rows.js
+++ b/packages/frontend-core/src/api/rows.js
@@ -19,12 +19,11 @@ export const buildRowEndpoints = API => ({
    * @param suppressErrors whether or not to suppress error notifications
    */
   saveRow: async (row, suppressErrors = false) => {
-    const resourceId = row?._viewId || row?.tableId
-    if (!resourceId) {
+    if (!row?.tableId) {
       return
     }
     return await API.post({
-      url: `/api/${resourceId}/rows`,
+      url: `/api/${row._viewId || row.tableId}/rows`,
       body: row,
       suppressErrors,
     })
@@ -36,12 +35,11 @@ export const buildRowEndpoints = API => ({
    * @param suppressErrors whether or not to suppress error notifications
    */
   patchRow: async (row, suppressErrors = false) => {
-    const resourceId = row?._viewId || row?.tableId
-    if (!resourceId) {
+    if (!row?.tableId && !row?._viewId) {
       return
     }
     return await API.patch({
-      url: `/api/${resourceId}/rows`,
+      url: `/api/${row._viewId || row.tableId}/rows`,
       body: row,
       suppressErrors,
     })