diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index eccc783dfb..d86d301507 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -22,6 +22,7 @@ jobs:
         env:
           PAYLOAD_BRANCH: ${{ github.head_ref }}
           PAYLOAD_PR_NUMBER: ${{ github.event.pull_request.number }}
+          PAYLOAD_LICENSE_TYPE: "free"
         with:
           repository: budibase/budibase-deploys
           event: featurebranch-qa-deploy
diff --git a/lerna.json b/lerna.json
index 754041d6ef..3396c082bf 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.31.3",
+  "version": "2.31.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",
diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts
index 1ee644bc6f..49f8044e8f 100644
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@@ -266,7 +266,7 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
 // All of the machinery in this file is to make sure that flags have their
 // default values set correctly and their types flow through the system.
 export const flags = new FlagSet({
-  DEFAULT_VALUES: Flag.boolean(false),
+  DEFAULT_VALUES: Flag.boolean(env.isDev()),
   SQS: Flag.boolean(env.isDev()),
   [FeatureFlag.ENRICHED_RELATIONSHIPS]: Flag.boolean(false),
 })
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index a7e98e1c3f..3eefb373ca 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -57,6 +57,7 @@ export const getBindableProperties = (asset, componentId) => {
   const stateBindings = getStateBindings()
   const selectedRowsBindings = getSelectedRowsBindings(asset)
   const roleBindings = getRoleBindings()
+  const embedBindings = getEmbedBindings()
   return [
     ...contextBindings,
     ...urlBindings,
@@ -65,6 +66,7 @@ export const getBindableProperties = (asset, componentId) => {
     ...deviceBindings,
     ...selectedRowsBindings,
     ...roleBindings,
+    ...embedBindings,
   ]
 }
 
@@ -813,6 +815,25 @@ export const getActionBindings = (actions, actionId) => {
   return bindings
 }
 
+/**
+ * Gets all device bindings for embeds.
+ */
+const getEmbedBindings = () => {
+  let bindings = []
+  const safeEmbed = makePropSafe("embed")
+
+  bindings = [
+    {
+      type: "context",
+      runtimeBinding: `${safeEmbed}`,
+      readableBinding: `ParentWindow`,
+      category: "Embed",
+      icon: "DistributeVertically",
+    },
+  ]
+  return bindings
+}
+
 /**
  * Gets the schema for a certain datasource plus.
  * The options which can be passed in are:
diff --git a/packages/builder/src/helpers/utils.js b/packages/builder/src/helpers/utils.js
index a1f9b34e3d..f3d48331e7 100644
--- a/packages/builder/src/helpers/utils.js
+++ b/packages/builder/src/helpers/utils.js
@@ -7,10 +7,22 @@ import {
   FIELDS,
   isAutoColumnUserRelationship,
 } from "constants/backend"
+import { isEnabled } from "helpers/featureFlags"
 
 export function getAutoColumnInformation(enabled = true) {
   let info = {}
-  for (let [key, subtype] of Object.entries(AUTO_COLUMN_SUB_TYPES)) {
+  for (const [key, subtype] of Object.entries(AUTO_COLUMN_SUB_TYPES)) {
+    // Because it's possible to replicate the functionality of CREATED_AT and
+    // CREATED_BY columns, we disable their creation when the DEFAULT_VALUES
+    // feature flag is enabled.
+    if (isEnabled("DEFAULT_VALUES")) {
+      if (
+        subtype === AUTO_COLUMN_SUB_TYPES.CREATED_AT ||
+        subtype === AUTO_COLUMN_SUB_TYPES.CREATED_BY
+      ) {
+        continue
+      }
+    }
     info[subtype] = { enabled, name: AUTO_COLUMN_DISPLAY_NAMES[key] }
   }
   return info
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
index 6d3441400f..d77744a809 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
@@ -49,7 +49,7 @@
     right: 0;
     left: 0;
     bottom: 0;
-    z-index: 999;
+    z-index: 9000;
     position: absolute;
     background: rgba(255, 255, 255, 0.1);
     display: flex;
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 2f8ba36cf7..f1e4f10403 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -42,6 +42,7 @@
   import FreeFooter from "components/FreeFooter.svelte"
   import MaintenanceScreen from "components/MaintenanceScreen.svelte"
   import SnippetsProvider from "./context/SnippetsProvider.svelte"
+  import EmbedProvider from "./context/EmbedProvider.svelte"
 
   // Provide contexts
   setContext("sdk", SDK)
@@ -160,116 +161,119 @@
     {#if $environmentStore.maintenance.length > 0}
       <MaintenanceScreen maintenanceList={$environmentStore.maintenance} />
     {:else}
-      <DeviceBindingsProvider>
-        <UserBindingsProvider>
-          <StateBindingsProvider>
-            <RowSelectionProvider>
-              <QueryParamsProvider>
-                <SnippetsProvider>
-                  <!-- Settings bar can be rendered outside of device preview -->
-                  <!-- Key block needs to be outside the if statement or it breaks -->
-                  {#key $builderStore.selectedComponentId}
-                    {#if $builderStore.inBuilder}
-                      <SettingsBar />
-                    {/if}
-                  {/key}
-
-                  <!-- Clip boundary for selection indicators -->
-                  <div
-                    id="clip-root"
-                    class:preview={$builderStore.inBuilder}
-                    class:tablet-preview={$builderStore.previewDevice ===
-                      "tablet"}
-                    class:mobile-preview={$builderStore.previewDevice ===
-                      "mobile"}
-                  >
-                    <!-- Actual app -->
-                    <div id="app-root">
-                      {#if showDevTools}
-                        <DevToolsHeader />
+      <EmbedProvider>
+        <DeviceBindingsProvider>
+          <UserBindingsProvider>
+            <StateBindingsProvider>
+              <RowSelectionProvider>
+                <QueryParamsProvider>
+                  <SnippetsProvider>
+                    <!-- Settings bar can be rendered outside of device preview -->
+                    <!-- Key block needs to be outside the if statement or it breaks -->
+                    {#key $builderStore.selectedComponentId}
+                      {#if $builderStore.inBuilder}
+                        <SettingsBar />
                       {/if}
+                    {/key}
 
-                      <div id="app-body">
-                        {#if permissionError}
-                          <div class="error">
-                            <Layout justifyItems="center" gap="S">
-                              <!-- eslint-disable-next-line svelte/no-at-html-tags -->
-                              {@html ErrorSVG}
-                              <Heading size="L">
-                                You don't have permission to use this app
-                              </Heading>
-                              <Body size="S">
-                                Ask your administrator to grant you access
-                              </Body>
-                            </Layout>
-                          </div>
-                        {:else if !$screenStore.activeLayout}
-                          <div class="error">
-                            <Layout justifyItems="center" gap="S">
-                              <!-- eslint-disable-next-line svelte/no-at-html-tags -->
-                              {@html ErrorSVG}
-                              <Heading size="L">
-                                Something went wrong rendering your app
-                              </Heading>
-                              <Body size="S">
-                                Get in touch with support if this issue persists
-                              </Body>
-                            </Layout>
-                          </div>
-                        {:else if embedNoScreens}
-                          <div class="error">
-                            <Layout justifyItems="center" gap="S">
-                              <!-- eslint-disable-next-line svelte/no-at-html-tags -->
-                              {@html ErrorSVG}
-                              <Heading size="L">
-                                This Budibase app is not publicly accessible
-                              </Heading>
-                            </Layout>
-                          </div>
-                        {:else}
-                          <CustomThemeWrapper>
-                            {#key $screenStore.activeLayout._id}
-                              <Component
-                                isLayout
-                                instance={$screenStore.activeLayout.props}
-                              />
-                            {/key}
-
-                            <!-- Layers on top of app -->
-                            <NotificationDisplay />
-                            <ConfirmationDisplay />
-                            <PeekScreenDisplay />
-                          </CustomThemeWrapper>
+                    <!-- Clip boundary for selection indicators -->
+                    <div
+                      id="clip-root"
+                      class:preview={$builderStore.inBuilder}
+                      class:tablet-preview={$builderStore.previewDevice ===
+                        "tablet"}
+                      class:mobile-preview={$builderStore.previewDevice ===
+                        "mobile"}
+                    >
+                      <!-- Actual app -->
+                      <div id="app-root">
+                        {#if showDevTools}
+                          <DevToolsHeader />
                         {/if}
 
-                        {#if showDevTools}
-                          <DevTools />
+                        <div id="app-body">
+                          {#if permissionError}
+                            <div class="error">
+                              <Layout justifyItems="center" gap="S">
+                                <!-- eslint-disable-next-line svelte/no-at-html-tags -->
+                                {@html ErrorSVG}
+                                <Heading size="L">
+                                  You don't have permission to use this app
+                                </Heading>
+                                <Body size="S">
+                                  Ask your administrator to grant you access
+                                </Body>
+                              </Layout>
+                            </div>
+                          {:else if !$screenStore.activeLayout}
+                            <div class="error">
+                              <Layout justifyItems="center" gap="S">
+                                <!-- eslint-disable-next-line svelte/no-at-html-tags -->
+                                {@html ErrorSVG}
+                                <Heading size="L">
+                                  Something went wrong rendering your app
+                                </Heading>
+                                <Body size="S">
+                                  Get in touch with support if this issue
+                                  persists
+                                </Body>
+                              </Layout>
+                            </div>
+                          {:else if embedNoScreens}
+                            <div class="error">
+                              <Layout justifyItems="center" gap="S">
+                                <!-- eslint-disable-next-line svelte/no-at-html-tags -->
+                                {@html ErrorSVG}
+                                <Heading size="L">
+                                  This Budibase app is not publicly accessible
+                                </Heading>
+                              </Layout>
+                            </div>
+                          {:else}
+                            <CustomThemeWrapper>
+                              {#key $screenStore.activeLayout._id}
+                                <Component
+                                  isLayout
+                                  instance={$screenStore.activeLayout.props}
+                                />
+                              {/key}
+
+                              <!-- Layers on top of app -->
+                              <NotificationDisplay />
+                              <ConfirmationDisplay />
+                              <PeekScreenDisplay />
+                            </CustomThemeWrapper>
+                          {/if}
+
+                          {#if showDevTools}
+                            <DevTools />
+                          {/if}
+                        </div>
+
+                        {#if !$builderStore.inBuilder && $featuresStore.logoEnabled}
+                          <FreeFooter />
                         {/if}
                       </div>
 
-                      {#if !$builderStore.inBuilder && $featuresStore.logoEnabled}
-                        <FreeFooter />
+                      <!-- Preview and dev tools utilities  -->
+                      {#if $appStore.isDevApp}
+                        <SelectionIndicator />
+                      {/if}
+                      {#if $builderStore.inBuilder || $devToolsStore.allowSelection}
+                        <HoverIndicator />
+                      {/if}
+                      {#if $builderStore.inBuilder}
+                        <DNDHandler />
+                        <GridDNDHandler />
                       {/if}
                     </div>
-
-                    <!-- Preview and dev tools utilities  -->
-                    {#if $appStore.isDevApp}
-                      <SelectionIndicator />
-                    {/if}
-                    {#if $builderStore.inBuilder || $devToolsStore.allowSelection}
-                      <HoverIndicator />
-                    {/if}
-                    {#if $builderStore.inBuilder}
-                      <DNDHandler />
-                      <GridDNDHandler />
-                    {/if}
-                  </div>
-                </SnippetsProvider>
-              </QueryParamsProvider>
-            </RowSelectionProvider>
-          </StateBindingsProvider>
-        </UserBindingsProvider>
-      </DeviceBindingsProvider>
+                  </SnippetsProvider>
+                </QueryParamsProvider>
+              </RowSelectionProvider>
+            </StateBindingsProvider>
+          </UserBindingsProvider>
+        </DeviceBindingsProvider>
+      </EmbedProvider>
     {/if}
   </div>
   <KeyboardManager />
diff --git a/packages/client/src/components/context/EmbedProvider.svelte b/packages/client/src/components/context/EmbedProvider.svelte
new file mode 100644
index 0000000000..5c402ec75d
--- /dev/null
+++ b/packages/client/src/components/context/EmbedProvider.svelte
@@ -0,0 +1,43 @@
+<script>
+  import Provider from "./Provider.svelte"
+  import { onMount } from "svelte"
+
+  let data = {}
+
+  function extractDomainFromUrl(url) {
+    const { hostname } = new URL(url)
+    const parts = hostname.split(".")
+    const tld = parts.slice(-2).join(".")
+    return tld
+  }
+
+  function handleMessage(event) {
+    if (event.data?.type !== "bb-parent-window-event") {
+      return
+    }
+
+    // Validate the event origin to ensure it's coming from a trusted source
+    // Allow different subdomains but must match TLD
+    const appOrigin = extractDomainFromUrl(window.location.origin)
+    const eventOrigin = extractDomainFromUrl(event.origin)
+
+    if (appOrigin === eventOrigin) {
+      data = event.data
+    } else {
+      console.error(
+        `Embedded budibase app domain ${appOrigin} does not match origin of event ${eventOrigin}.
+        Top level domains must match`
+      )
+    }
+  }
+
+  onMount(() => {
+    window.addEventListener("message", handleMessage)
+
+    return () => window.removeEventListener("message", handleMessage)
+  })
+</script>
+
+<Provider key="embed" {data}>
+  <slot />
+</Provider>