diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3aab8bc9f5..70127a84cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,38 @@
 # Release Notes
 
+## 4.50.0 (2024-02-26)
+
+### What's new
+- Add `hex_to_rgb` modifier. [#9582](https://github.com/statamic/cms/issues/9582) by @DanielDarrenJones
+- Add UI mode option to forms fieldtype config. [#9591](https://github.com/statamic/cms/issues/9591) by @jacksleight
+- First invalid field will be scrolled into view when submitting publish forms. [#9577](https://github.com/statamic/cms/issues/9577) by @jacksleight
+- Add Antlers shorthand parameter value syntax. [#9505](https://github.com/statamic/cms/issues/9505) by @JohnathonKoster
+- Hooks. [#9481](https://github.com/statamic/cms/issues/9481) by @ryanmitchell
+- Add `Entry::findOrFail`. [#9506](https://github.com/statamic/cms/issues/9506) by @benfurfie
+
+### What's fixed
+- Fix field conditions in Grid fields. [#9586](https://github.com/statamic/cms/issues/9586) by @duncanmcclean
+- Fix pixel gap on relationship fieldtype items. [#9579](https://github.com/statamic/cms/issues/9579) by @jasonvarga
+- Use static_cache store for nocache. [#9527](https://github.com/statamic/cms/issues/9527) by @ryanmitchell
+- Make tags using old-style __call method compatible with Macroable. [#9553](https://github.com/statamic/cms/issues/9553) by @SylvesterDamgaard
+- Fix `locales` tag inside replicator, bard, and grid. [#9566](https://github.com/statamic/cms/issues/9566) by @aerni
+- Add `accepted_if` validation to Bard `enable_input_rules` [#9555](https://github.com/statamic/cms/issues/9555) by @robdekort
+- Add `accepted_if` validation rule [#9557](https://github.com/statamic/cms/issues/9557) by @robdekort
+- Fix modal height UI issue. [#9538](https://github.com/statamic/cms/issues/9538) by @JohnathonKoster
+- Fix arrays being returned by translations. [#9525](https://github.com/statamic/cms/issues/9525) by @duncanmcclean
+- Fix Stache pathing issue on Windows. [#9537](https://github.com/statamic/cms/issues/9537) by @JohnathonKoster
+- Antlers: Resolve values from augmented values when there is more data to process. [#9548](https://github.com/statamic/cms/issues/9548) by @JohnathonKoster
+- Antlers: Stop double-initial execution of tags within conditions. [#9504](https://github.com/statamic/cms/issues/9504) by @JohnathonKoster
+- Fix error in event listener when uploading file in front-end forms. [#9542](https://github.com/statamic/cms/issues/9542) by @ryanmitchell
+- Drop Laravel 6 mail view. [#9545](https://github.com/statamic/cms/issues/9545) by @duncanmcclean
+- Remove any uploaded assets when submission silently fails or validation fails. [#9549](https://github.com/statamic/cms/issues/9549) by @ryanmitchell
+- Check if form request wantsJson. [#9533](https://github.com/statamic/cms/issues/9533) by @ryanmitchell
+- Pass parent field and index down to imported fields. [#9550](https://github.com/statamic/cms/issues/9550) by @jacksleight
+- Fix protection redirect URLs when they contain query parameters. [#9543](https://github.com/statamic/cms/issues/9543) by @duncanmcclean
+- Fix issues when saving entries with `JsonResource::withoutWrapping()`. [#9519](https://github.com/statamic/cms/issues/9519) by @duncanmcclean
+
+
+
 ## 4.49.0 (2024-02-16)
 
 ### What's new
diff --git a/resources/css/components/items.css b/resources/css/components/items.css
index 2bbc020678..c1cffcce6a 100644
--- a/resources/css/components/items.css
+++ b/resources/css/components/items.css
@@ -2,7 +2,7 @@
     @apply text-sm outline-none flex w-full justify-between rounded border bg-white shadow-sm items-center;
 
     .item-move {
-        @apply w-4 border-r rounded-l p-2;
+        @apply w-4 self-stretch border-r rounded-l p-2;
         cursor: grab;
         background: theme('colors.gray.200') url('../../svg/icons/light/drag-dots.svg') center center no-repeat;
         background-size: 7px 17px;
diff --git a/resources/css/core/utilities.css b/resources/css/core/utilities.css
index 22a0f1ec64..c2845dacee 100644
--- a/resources/css/core/utilities.css
+++ b/resources/css/core/utilities.css
@@ -90,3 +90,7 @@
 [x-cloak] {
     display: none
 }
+
+.-max-h-screen-px {
+    max-height: calc(100vh - 1px) !important;
+}
diff --git a/resources/js/app.js b/resources/js/app.js
index cb0b340799..968c30a852 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -66,6 +66,7 @@ Vue.prototype.$events = new Vue();
 Vue.prototype.$echo = Statamic.$echo;
 Vue.prototype.$bard = Statamic.$bard;
 Vue.prototype.$keys = Statamic.$keys;
+Vue.prototype.$reveal = Statamic.$reveal;
 
 import Moment from 'moment';
 window.moment = Vue.moment = Vue.prototype.$moment = Moment;
diff --git a/resources/js/bootstrap/fieldtypes.js b/resources/js/bootstrap/fieldtypes.js
index d65917d3ef..2608b7a861 100644
--- a/resources/js/bootstrap/fieldtypes.js
+++ b/resources/js/bootstrap/fieldtypes.js
@@ -15,6 +15,7 @@ import AssetsFieldtype from '../components/fieldtypes/assets/AssetsFieldtype.vue
 import AssetsIndexFieldtype from '../components/fieldtypes/assets/AssetsIndexFieldtype.vue';
 import AssetFolderFieldtype from '../components/fieldtypes/AssetFolderFieldtype.vue';
 import BardFieldtype from '../components/fieldtypes/bard/BardFieldtype.vue';
+import BardSet from '../components/fieldtypes/bard/Set.vue';
 import BardButtonsSettingFieldtype from '../components/fieldtypes/bard/BardButtonsSettingFieldtype.vue';
 import ButtonGroupFieldtype from '../components/fieldtypes/ButtonGroupFieldtype.vue';
 import CheckboxesFieldtype from '../components/fieldtypes/CheckboxesFieldtype.vue';
@@ -44,6 +45,7 @@ import RangeFieldtype from '../components/fieldtypes/RangeFieldtype.vue';
 import RelationshipFieldtype from '../components/fieldtypes/relationship/RelationshipFieldtype.vue';
 import RelationshipIndexFieldtype from '../components/fieldtypes/relationship/RelationshipIndexFieldtype.vue';
 import Replicator from '../components/fieldtypes/replicator/Replicator.vue';
+import ReplicatorSet from '../components/fieldtypes/replicator/Set.vue';
 import ReplicatorIndex from '../components/fieldtypes/replicator/ReplicatorIndex.vue';
 import SectionFieldtype from '../components/fieldtypes/SectionFieldtype.vue';
 import SelectFieldtype from '../components/fieldtypes/SelectFieldtype.vue';
@@ -74,6 +76,7 @@ Vue.component('assets-fieldtype', AssetsFieldtype);
 Vue.component('assets-fieldtype-index', AssetsIndexFieldtype);
 Vue.component('asset_folder-fieldtype', AssetFolderFieldtype);
 Vue.component('bard-fieldtype', BardFieldtype);
+Vue.component('bard-fieldtype-set', BardSet);
 Vue.component('bard_buttons_setting-fieldtype', BardButtonsSettingFieldtype);
 Vue.component('button_group-fieldtype', ButtonGroupFieldtype);
 Vue.component('checkboxes-fieldtype', CheckboxesFieldtype);
@@ -103,6 +106,7 @@ Vue.component('range-fieldtype', RangeFieldtype);
 Vue.component('relationship-fieldtype', RelationshipFieldtype);
 Vue.component('relationship-fieldtype-index', RelationshipIndexFieldtype);
 Vue.component('replicator-fieldtype', Replicator);
+Vue.component('replicator-fieldtype-set', ReplicatorSet);
 Vue.component('replicator-fieldtype-index', ReplicatorIndex);
 Vue.component('section-fieldtype', SectionFieldtype);
 Vue.component('select-fieldtype', SelectFieldtype);
diff --git a/resources/js/bootstrap/globals.js b/resources/js/bootstrap/globals.js
index 3285c41f21..7a5b554862 100644
--- a/resources/js/bootstrap/globals.js
+++ b/resources/js/bootstrap/globals.js
@@ -108,3 +108,16 @@ export function escapeHtml(string) {
 export function replicatorPreviewHtml(html) {
     return new PreviewHtml(html);
 }
+
+export function closestVm(el, name) {
+    let parent = el;
+    while (parent) {
+        if (parent.__vue__) break;
+        parent = parent.parentElement;
+    }
+    let vm = parent.__vue__;
+    while (vm !== vm.$root) {
+        if (!name || name === vm.$options.name) return vm;
+        vm = vm.$parent;
+    }
+}
\ No newline at end of file
diff --git a/resources/js/components/Reveal.js b/resources/js/components/Reveal.js
new file mode 100644
index 0000000000..8fc136229c
--- /dev/null
+++ b/resources/js/components/Reveal.js
@@ -0,0 +1,35 @@
+import { closestVm } from '../bootstrap/globals';
+
+class Reveal {
+    element(el) {
+        if (!el) return;
+        let parent = el;
+        while (parent) {
+            if (parent.matches('.tab-panel')) {
+                closestVm(parent, 'publish-tabs').setActive(parent.dataset.tabHandle);
+            }
+            if (parent.matches('.replicator-set')) {
+                closestVm(parent, 'replicator-fieldtype-set').expand();
+            }
+            if (parent.matches('.bard-set')) {
+                closestVm(parent, 'bard-fieldtype-set').expand();
+            }
+            parent = parent.parentElement;
+        }
+        Vue.nextTick(() => {
+            el.scrollIntoView({
+                block: 'center',
+            });
+        });
+    }
+
+    invalid() {
+        Vue.nextTick(() => {
+            const el = document.querySelector('.publish-field.has-error:not(:has(.publish-field.has-error))');
+            if (!el) return;
+            this.element(el);
+        });
+    }
+}
+
+export default Reveal;
diff --git a/resources/js/components/SessionExpiry.vue b/resources/js/components/SessionExpiry.vue
index e03d568603..e40cda9a46 100644
--- a/resources/js/components/SessionExpiry.vue
+++ b/resources/js/components/SessionExpiry.vue
@@ -5,6 +5,7 @@
         <button v-if="isWarning" class="session-expiry-stripe" @click="extend" v-text="warningText" />
 
         <modal name="session-timeout-login" v-if="isShowingLogin" height="auto" width="500px" :adaptive="true">
+            <div class="-max-h-screen-px">
             <div class="flex items-center p-6 bg-gray-200 border-b text-center">
                 {{ __('Resume Your Session') }}
             </div>
@@ -42,6 +43,7 @@
                     </div>
                 </div>
             </div>
+            </div>
         </modal>
 
     </div>
diff --git a/resources/js/components/Statamic.js b/resources/js/components/Statamic.js
index 5a9ffe667d..75d6d71404 100644
--- a/resources/js/components/Statamic.js
+++ b/resources/js/components/Statamic.js
@@ -3,6 +3,7 @@ import Echo from './Echo';
 import Bard from './Bard';
 import Keys from './keys/Keys';
 import Hooks from './Hooks';
+import Reveal from './Reveal';
 import Components from './Components';
 import FieldConditions from './FieldConditions';
 import Callbacks from './Callbacks';
@@ -10,6 +11,7 @@ const echo = new Echo;
 const bard = new Bard;
 const keys = new Keys;
 const hooks = new Hooks;
+const reveal = new Reveal;
 const components = new Components;
 const conditions = new FieldConditions;
 const callbacks = new Callbacks;
@@ -49,6 +51,10 @@ export default new Vue({
             return hooks;
         },
 
+        $reveal() {
+            return reveal;
+        },
+
         $conditions() {
             return conditions;
         },
diff --git a/resources/js/components/blueprints/SuggestsConditionalFields.js b/resources/js/components/blueprints/SuggestsConditionalFields.js
index b66a516125..6b45727472 100644
--- a/resources/js/components/blueprints/SuggestsConditionalFields.js
+++ b/resources/js/components/blueprints/SuggestsConditionalFields.js
@@ -49,7 +49,7 @@ export default {
                             : [field]
                     );
                 }, [])
-                .map(handle => prefix ? `${prefix}${handle}` : handle);
+                .map(field => prefix ? { ...field, handle: prefix + field.handle } : field);
         }
 
     }
diff --git a/resources/js/components/data-list/ColumnPicker.vue b/resources/js/components/data-list/ColumnPicker.vue
index 6eebcb4110..a7200ab668 100644
--- a/resources/js/components/data-list/ColumnPicker.vue
+++ b/resources/js/components/data-list/ColumnPicker.vue
@@ -9,7 +9,7 @@
         </button>
 
         <modal v-if="open" name="column-picker" @closed="open = false" draggable=".modal-drag-handle" click-to-close>
-            <div class="flex flex-col h-full">
+            <div class="flex flex-col h-full -max-h-screen-px">
 
                 <header class="modal-drag-handle p-4 bg-gray-200 border-b flex items-center justify-between cursor-grab active:cursor-grabbing">
                     <h2>{{ __('Customize Columns') }}</h2>
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index d93cd6d022..5c22989513 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -617,6 +617,7 @@ export default {
                 this.error = message;
                 this.errors = errors;
                 this.$toast.error(message);
+                this.$reveal.invalid();
             } else if (e.response) {
                 this.$toast.error(e.response.data.message);
             } else {
diff --git a/resources/js/components/field-validation/Rules.js b/resources/js/components/field-validation/Rules.js
index abfb7aeeae..65274d8eb3 100644
--- a/resources/js/components/field-validation/Rules.js
+++ b/resources/js/components/field-validation/Rules.js
@@ -10,6 +10,11 @@ export default [
         label: 'Accepted',
         value: 'accepted'
     },
+    {
+        label: 'Accepted If',
+        value: 'accepted_if:',
+        example: 'accepted_if:anotherfield,value,...'
+    },
     {
         label: 'Active URL',
         value: 'active_url'
diff --git a/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue b/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
index 1f1220517b..62ed949877 100644
--- a/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
+++ b/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
@@ -4,6 +4,7 @@
         :fields="fields"
         :editing-field="editingField"
         :can-define-localizable="false"
+        :suggestable-condition-fields="suggestableConditionFields"
         @field-created="fieldCreated"
         @field-updated="fieldUpdated"
         @field-linked="fieldLinked"
@@ -17,10 +18,15 @@
 <script>
 import Fields from '../../blueprints/Fields.vue';
 import {Sortable, Plugins} from '@shopify/draggable';
+import SuggestsConditionalFields from '../../blueprints/SuggestsConditionalFields';
 
 export default {
 
-    mixins: [Fieldtype],
+    mixins: [Fieldtype, SuggestsConditionalFields],
+
+    inject: {
+        suggestableConditionFieldsProvider: { default: null }
+    },
 
     components: {
         Fields,
@@ -33,6 +39,12 @@ export default {
         }
     },
 
+    computed: {
+        fieldsForConditionSuggestions() {
+            return this.fields;
+        },
+    },
+
     mounted() {
         this.makeSortable();
     },
diff --git a/resources/js/components/modals/KeyboardShortcutsModal.vue b/resources/js/components/modals/KeyboardShortcutsModal.vue
index d8d6bcc7c2..23a7cc5390 100644
--- a/resources/js/components/modals/KeyboardShortcutsModal.vue
+++ b/resources/js/components/modals/KeyboardShortcutsModal.vue
@@ -1,5 +1,6 @@
 <template>
     <modal v-if="open" name="keyboard-shortcuts" width="380" height="auto" :adaptive="true" @closed="open = false" click-to-close>
+        <div class="-max-h-screen-px">
         <h1 class="p-4 bg-gray-200 border-b text-center">
             {{ __('Keyboard Shortcuts') }}
         </h1>
@@ -47,6 +48,7 @@
                 <span class="shortcut-value">{{ __('Close Modal') }}</span>
             </div>
         </div>
+        </div>
     </modal>
 </template>
 
diff --git a/resources/js/components/publish/Tabs.vue b/resources/js/components/publish/Tabs.vue
index b6d01146e4..da4f427b15 100644
--- a/resources/js/components/publish/Tabs.vue
+++ b/resources/js/components/publish/Tabs.vue
@@ -63,6 +63,7 @@
                     :role="showTabs && 'tabpanel'"
                     :id="showTabs && tabPanelId(tab.handle)"
                     :aria-labelledby="showTabs && tabId(tab.handle)"
+                    :data-tab-handle="tab.handle"
                     tabindex="0"
                     :key="tab.handle"
                     v-for="tab in mainTabs"
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index 9dca80133b..4b9b6eb11a 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -507,6 +507,7 @@ export default {
                 this.error = message;
                 this.errors = errors;
                 this.$toast.error(message);
+                this.$reveal.invalid();
             } else {
                 this.$toast.error(__('Something went wrong'));
             }
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index 5f8e1f629d..15e0822e57 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -123,6 +123,7 @@ export default {
                     this.error = message;
                     this.errors = errors;
                     this.$toast.error(message);
+                    this.$reveal.invalid();
                 } else {
                     this.$toast.error(__('Something went wrong'));
                 }
diff --git a/resources/views/addons/index.blade.php b/resources/views/addons/index.blade.php
index cec1e466f2..331587496d 100644
--- a/resources/views/addons/index.blade.php
+++ b/resources/views/addons/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Addons'))
 
diff --git a/resources/views/addons/settings.blade.php b/resources/views/addons/settings.blade.php
index 450e2b0068..6b1510bf5e 100644
--- a/resources/views/addons/settings.blade.php
+++ b/resources/views/addons/settings.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Addon Settings'))
 
diff --git a/resources/views/assets/browse.blade.php b/resources/views/assets/browse.blade.php
index f67a60b5dd..9ccadf0d70 100644
--- a/resources/views/assets/browse.blade.php
+++ b/resources/views/assets/browse.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb('Assets', $container['title']))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
index c89aaeb30e..4056034f64 100644
--- a/resources/views/assets/containers/blueprints/edit.blade.php
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/assets/containers/create.blade.php b/resources/views/assets/containers/create.blade.php
index 619de5ed34..ec60d541f8 100644
--- a/resources/views/assets/containers/create.blade.php
+++ b/resources/views/assets/containers/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Asset Container'))
 
diff --git a/resources/views/assets/containers/edit.blade.php b/resources/views/assets/containers/edit.blade.php
index 1de86d4e9a..38c22225a9 100644
--- a/resources/views/assets/containers/edit.blade.php
+++ b/resources/views/assets/containers/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Asset Container'))
 
diff --git a/resources/views/assets/containers/index.blade.php b/resources/views/assets/containers/index.blade.php
index 28372c6982..87065f1229 100644
--- a/resources/views/assets/containers/index.blade.php
+++ b/resources/views/assets/containers/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Asset Containers'))
 
diff --git a/resources/views/assets/index.blade.php b/resources/views/assets/index.blade.php
index 5bf5bb0105..ae8bdb91f4 100644
--- a/resources/views/assets/index.blade.php
+++ b/resources/views/assets/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Assets'))
 
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 5a18356659..21647d0700 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::outside')
 @section('title', __('Log in'))
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 353ee5016c..0c06c1066d 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::outside')
 
 @section('content')
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index a34fd5a869..cf80d74a09 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::outside')
 
 @section('content')
diff --git a/resources/views/auth/unauthorized.blade.php b/resources/views/auth/unauthorized.blade.php
index 7c316c5c4a..ac074e1364 100644
--- a/resources/views/auth/unauthorized.blade.php
+++ b/resources/views/auth/unauthorized.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::outside')
 @section('title', __('Unauthorized'))
 
diff --git a/resources/views/blueprints/edit.blade.php b/resources/views/blueprints/edit.blade.php
index c5039088c0..2279d5ae0e 100644
--- a/resources/views/blueprints/edit.blade.php
+++ b/resources/views/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
index 77bf411694..a479d0db46 100644
--- a/resources/views/blueprints/index.blade.php
+++ b/resources/views/blueprints/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Blueprints'))
 
diff --git a/resources/views/collections/blueprints/create.blade.php b/resources/views/collections/blueprints/create.blade.php
index f499ec074d..df8df5e720 100644
--- a/resources/views/collections/blueprints/create.blade.php
+++ b/resources/views/collections/blueprints/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Blueprint'))
 
diff --git a/resources/views/collections/blueprints/edit.blade.php b/resources/views/collections/blueprints/edit.blade.php
index cc3e4a51ed..83c66e01fd 100644
--- a/resources/views/collections/blueprints/edit.blade.php
+++ b/resources/views/collections/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/collections/blueprints/index.blade.php b/resources/views/collections/blueprints/index.blade.php
index 7c1863c8c2..99f786adf5 100644
--- a/resources/views/collections/blueprints/index.blade.php
+++ b/resources/views/collections/blueprints/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Blueprints'))
 
diff --git a/resources/views/collections/create.blade.php b/resources/views/collections/create.blade.php
index 97160cd89b..0ac3159c7c 100644
--- a/resources/views/collections/create.blade.php
+++ b/resources/views/collections/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Collection'))
 
diff --git a/resources/views/collections/edit.blade.php b/resources/views/collections/edit.blade.php
index 17fe2d16e0..4d136aca7f 100644
--- a/resources/views/collections/edit.blade.php
+++ b/resources/views/collections/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Collection'))
 
diff --git a/resources/views/collections/empty.blade.php b/resources/views/collections/empty.blade.php
index b82fe23559..b1f9bdb30d 100644
--- a/resources/views/collections/empty.blade.php
+++ b/resources/views/collections/empty.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($collection->title(), 'Collections'))
 
diff --git a/resources/views/collections/index.blade.php b/resources/views/collections/index.blade.php
index ce0c98ac48..790ac82b35 100644
--- a/resources/views/collections/index.blade.php
+++ b/resources/views/collections/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Collections'))
 
diff --git a/resources/views/collections/scaffold.blade.php b/resources/views/collections/scaffold.blade.php
index ac09426a46..4d1b1a0184 100644
--- a/resources/views/collections/scaffold.blade.php
+++ b/resources/views/collections/scaffold.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Scaffold Collection'))
 
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index bea51b6367..bb879129e9 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Dashboard'))
 
diff --git a/resources/views/duplicates.blade.php b/resources/views/duplicates.blade.php
index 31ee07775d..f5ced94f0e 100644
--- a/resources/views/duplicates.blade.php
+++ b/resources/views/duplicates.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Duplicate IDs'))
 
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index 1faf8dabba..447eeddb1c 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,4 +1,7 @@
-<?php $authed = \Statamic\Facades\User::current(); ?>
+@php
+use function Statamic\trans as __;
+$authed = \Statamic\Facades\User::current();
+@endphp
 
 @extends($authed ? 'statamic::layout' : 'statamic::outside')
 
diff --git a/resources/views/fields/index.blade.php b/resources/views/fields/index.blade.php
index 77531ecaf5..646236a136 100644
--- a/resources/views/fields/index.blade.php
+++ b/resources/views/fields/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Fields'))
 
diff --git a/resources/views/fieldsets/create.blade.php b/resources/views/fieldsets/create.blade.php
index d3c988d9ac..ce2113b33b 100644
--- a/resources/views/fieldsets/create.blade.php
+++ b/resources/views/fieldsets/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Fieldset'))
 
diff --git a/resources/views/fieldsets/edit.blade.php b/resources/views/fieldsets/edit.blade.php
index 3500daf6bb..f22cc64f9f 100644
--- a/resources/views/fieldsets/edit.blade.php
+++ b/resources/views/fieldsets/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Fieldset'))
 
diff --git a/resources/views/fieldsets/index.blade.php b/resources/views/fieldsets/index.blade.php
index fa74e11489..9c6ccb1c00 100644
--- a/resources/views/fieldsets/index.blade.php
+++ b/resources/views/fieldsets/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Fieldsets'))
 
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 3c40b230d7..bf36f2de20 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/forms/create.blade.php b/resources/views/forms/create.blade.php
index b9a97d63fa..246cbe1641 100644
--- a/resources/views/forms/create.blade.php
+++ b/resources/views/forms/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Form'))
 
diff --git a/resources/views/forms/edit.blade.php b/resources/views/forms/edit.blade.php
index f063be49f6..743431b68e 100644
--- a/resources/views/forms/edit.blade.php
+++ b/resources/views/forms/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Form'))
 
diff --git a/resources/views/forms/index.blade.php b/resources/views/forms/index.blade.php
index 51800b7a0a..78effd3191 100644
--- a/resources/views/forms/index.blade.php
+++ b/resources/views/forms/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Forms'))
 
diff --git a/resources/views/forms/show.blade.php b/resources/views/forms/show.blade.php
index c6553bdbc4..5da84e66f5 100644
--- a/resources/views/forms/show.blade.php
+++ b/resources/views/forms/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($form->title(), 'Forms'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/forms/widget.blade.php b/resources/views/forms/widget.blade.php
index 99ed15935a..cb0554df83 100644
--- a/resources/views/forms/widget.blade.php
+++ b/resources/views/forms/widget.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="card p-0 overflow-hidden">
     <div class="flex justify-between items-center p-4">
         <h2>
diff --git a/resources/views/globals/blueprints/edit.blade.php b/resources/views/globals/blueprints/edit.blade.php
index d1f0e32578..f6eb5baf42 100644
--- a/resources/views/globals/blueprints/edit.blade.php
+++ b/resources/views/globals/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/globals/configure.blade.php b/resources/views/globals/configure.blade.php
index 61281a9668..00504e3d68 100644
--- a/resources/views/globals/configure.blade.php
+++ b/resources/views/globals/configure.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Global Set'))
 
diff --git a/resources/views/globals/create.blade.php b/resources/views/globals/create.blade.php
index c2dc4d825b..43a5e09992 100644
--- a/resources/views/globals/create.blade.php
+++ b/resources/views/globals/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Global Set'))
 @section('content')
diff --git a/resources/views/globals/edit.blade.php b/resources/views/globals/edit.blade.php
index 61399ffbc5..81b9f46dbb 100644
--- a/resources/views/globals/edit.blade.php
+++ b/resources/views/globals/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Global Set'))
 
diff --git a/resources/views/globals/index.blade.php b/resources/views/globals/index.blade.php
index 385a290a75..e2dab2ebab 100644
--- a/resources/views/globals/index.blade.php
+++ b/resources/views/globals/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Global Sets'))
 
diff --git a/resources/views/impersonator/terminate.blade.php b/resources/views/impersonator/terminate.blade.php
index ee771d4021..6ad42b2baf 100644
--- a/resources/views/impersonator/terminate.blade.php
+++ b/resources/views/impersonator/terminate.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <style>
   #__impersonator-link__ {
     position: fixed;
diff --git a/resources/views/licensing.blade.php b/resources/views/licensing.blade.php
index c3afa90132..1734be7b43 100644
--- a/resources/views/licensing.blade.php
+++ b/resources/views/licensing.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Licensing'))
 
diff --git a/resources/views/nav/index.blade.php b/resources/views/nav/index.blade.php
index e0f3b94f47..b52015c7d2 100644
--- a/resources/views/nav/index.blade.php
+++ b/resources/views/nav/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('CP Nav Preferences'))
 
diff --git a/resources/views/navigation/blueprints/edit.blade.php b/resources/views/navigation/blueprints/edit.blade.php
index fb2af09835..a93911340a 100644
--- a/resources/views/navigation/blueprints/edit.blade.php
+++ b/resources/views/navigation/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/navigation/create.blade.php b/resources/views/navigation/create.blade.php
index e9b6a720e1..2430ba0c64 100644
--- a/resources/views/navigation/create.blade.php
+++ b/resources/views/navigation/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Navigation'))
 
diff --git a/resources/views/navigation/edit.blade.php b/resources/views/navigation/edit.blade.php
index 611c25573e..8eb010c017 100644
--- a/resources/views/navigation/edit.blade.php
+++ b/resources/views/navigation/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Navigation'))
 
diff --git a/resources/views/navigation/index.blade.php b/resources/views/navigation/index.blade.php
index fae54938a8..e4f60f9ca9 100644
--- a/resources/views/navigation/index.blade.php
+++ b/resources/views/navigation/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Navigation'))
 
diff --git a/resources/views/partials/breadcrumb.blade.php b/resources/views/partials/breadcrumb.blade.php
index de0d5e6ea8..75361b5945 100644
--- a/resources/views/partials/breadcrumb.blade.php
+++ b/resources/views/partials/breadcrumb.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="flex">
     <a href="{{ $url }}" class="flex-initial flex p-2 -m-2 items-center text-xs text-gray-700 hover:text-gray-900">
         <div class="h-6 rotate-180 svg-icon using-svg">
diff --git a/resources/views/partials/create-first.blade.php b/resources/views/partials/create-first.blade.php
index d9eee4af74..a0d111ee9d 100644
--- a/resources/views/partials/create-first.blade.php
+++ b/resources/views/partials/create-first.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="no-results border-dashed border-2">
     <div class="text-center max-w-md mx-auto mt-10 rounded-lg px-8 py-30">
 
diff --git a/resources/views/partials/docs-callout.blade.php b/resources/views/partials/docs-callout.blade.php
index f2126ce278..16e87fb4af 100644
--- a/resources/views/partials/docs-callout.blade.php
+++ b/resources/views/partials/docs-callout.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @if (config('statamic.cp.link_to_docs'))
     <div class="flex justify-center text-center mt-16">
         <div class="bg-white rounded-full px-6 py-2 shadow-sm text-sm text-gray-700">{{ $text ?? __('Learn more about') }} <a href="{{ $url }}" target="_blank" rel="noopener noopener" class="text-blue hover:text-blue-700">{{ $topic }}</a></div>
diff --git a/resources/views/partials/global-header.blade.php b/resources/views/partials/global-header.blade.php
index 373c0137fc..e1b340d8d3 100644
--- a/resources/views/partials/global-header.blade.php
+++ b/resources/views/partials/global-header.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="global-header">
     <div class="lg:min-w-xl pl-2 md:pl-6 h-full flex items-center">
         <button class="nav-toggle hidden md:flex ml-1 shrink-0" @click="toggleNav" aria-label="{{ __('Toggle Nav') }}">@cp_svg('icons/light/burger', 'h-4 w-4')</button>
diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php
index 3ef85b2479..03f4173694 100644
--- a/resources/views/partials/head.blade.php
+++ b/resources/views/partials/head.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 <meta name="viewport" content="width=device-width">
diff --git a/resources/views/partials/licensing-alerts.blade.php b/resources/views/partials/licensing-alerts.blade.php
index e39a4f9450..a2f056d040 100644
--- a/resources/views/partials/licensing-alerts.blade.php
+++ b/resources/views/partials/licensing-alerts.blade.php
@@ -1,3 +1,4 @@
+@php use function Statamic\trans as __; @endphp
 @inject('licenses', 'Statamic\Licensing\LicenseManager')
 
 @if ($licenses->requestFailed())
diff --git a/resources/views/playground.blade.php b/resources/views/playground.blade.php
index e35ecc00a8..54b472ab09 100644
--- a/resources/views/playground.blade.php
+++ b/resources/views/playground.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 
 @section('nontent')
diff --git a/resources/views/preferences/edit.blade.php b/resources/views/preferences/edit.blade.php
index 8d113eea0c..c57eeed95f 100644
--- a/resources/views/preferences/edit.blade.php
+++ b/resources/views/preferences/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', $title)
 
diff --git a/resources/views/preferences/index.blade.php b/resources/views/preferences/index.blade.php
index 4858af0d17..d4d66df7b7 100644
--- a/resources/views/preferences/index.blade.php
+++ b/resources/views/preferences/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Preferences'))
 
diff --git a/resources/views/roles/create.blade.php b/resources/views/roles/create.blade.php
index e1eceff987..b07ba247f6 100644
--- a/resources/views/roles/create.blade.php
+++ b/resources/views/roles/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb(__('Create Role'), __('Roles & Permissions')))
 
diff --git a/resources/views/roles/edit.blade.php b/resources/views/roles/edit.blade.php
index 525a9c18f1..b24b0309fb 100644
--- a/resources/views/roles/edit.blade.php
+++ b/resources/views/roles/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb(__('Configure Role'), __('Permissions')))
 
diff --git a/resources/views/roles/index.blade.php b/resources/views/roles/index.blade.php
index ab033947e8..937e014613 100644
--- a/resources/views/roles/index.blade.php
+++ b/resources/views/roles/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Roles'))
 
diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php
index 1f8a29d27c..cbafc216b0 100644
--- a/resources/views/settings/edit.blade.php
+++ b/resources/views/settings/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('content-class', 'publishing')
 @section('title', __('Settings'))
diff --git a/resources/views/taxonomies/blueprints/create.blade.php b/resources/views/taxonomies/blueprints/create.blade.php
index f499ec074d..df8df5e720 100644
--- a/resources/views/taxonomies/blueprints/create.blade.php
+++ b/resources/views/taxonomies/blueprints/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Blueprint'))
 
diff --git a/resources/views/taxonomies/blueprints/edit.blade.php b/resources/views/taxonomies/blueprints/edit.blade.php
index 4f27e0686e..f2aef8b6db 100644
--- a/resources/views/taxonomies/blueprints/edit.blade.php
+++ b/resources/views/taxonomies/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/taxonomies/blueprints/index.blade.php b/resources/views/taxonomies/blueprints/index.blade.php
index 56dcaacff5..d4656e70fe 100644
--- a/resources/views/taxonomies/blueprints/index.blade.php
+++ b/resources/views/taxonomies/blueprints/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Blueprints'))
 
diff --git a/resources/views/taxonomies/create.blade.php b/resources/views/taxonomies/create.blade.php
index 69fb399176..fe3b35c3db 100644
--- a/resources/views/taxonomies/create.blade.php
+++ b/resources/views/taxonomies/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create Taxonomy'))
 
diff --git a/resources/views/taxonomies/edit.blade.php b/resources/views/taxonomies/edit.blade.php
index be6cf92636..5ec975ac36 100644
--- a/resources/views/taxonomies/edit.blade.php
+++ b/resources/views/taxonomies/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure Taxonomy'))
 
diff --git a/resources/views/taxonomies/empty.blade.php b/resources/views/taxonomies/empty.blade.php
index c362cafd05..345c1d8116 100644
--- a/resources/views/taxonomies/empty.blade.php
+++ b/resources/views/taxonomies/empty.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($taxonomy->title(), 'Taxonomies'))
 
diff --git a/resources/views/taxonomies/index.blade.php b/resources/views/taxonomies/index.blade.php
index e8f7fc0301..63fe6a32be 100644
--- a/resources/views/taxonomies/index.blade.php
+++ b/resources/views/taxonomies/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Taxonomies'))
 
diff --git a/resources/views/taxonomies/show.blade.php b/resources/views/taxonomies/show.blade.php
index 56a106c9aa..f0f983efe4 100644
--- a/resources/views/taxonomies/show.blade.php
+++ b/resources/views/taxonomies/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($taxonomy->title(), 'Taxonomies'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/terms/edit.blade.php b/resources/views/terms/edit.blade.php
index 98e9c80e52..bcf3e9e6a6 100644
--- a/resources/views/terms/edit.blade.php
+++ b/resources/views/terms/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::layout')
 @section('title', __('Edit Term'))
diff --git a/resources/views/updater/index.blade.php b/resources/views/updater/index.blade.php
index 1b7ca45da3..56fda6c5d9 100644
--- a/resources/views/updater/index.blade.php
+++ b/resources/views/updater/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Updater'))
 
diff --git a/resources/views/updater/show.blade.php b/resources/views/updater/show.blade.php
index 2eb22b4d0c..cd79a1c3a7 100644
--- a/resources/views/updater/show.blade.php
+++ b/resources/views/updater/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Updater'))
 
diff --git a/resources/views/usergroups/blueprints/edit.blade.php b/resources/views/usergroups/blueprints/edit.blade.php
index 074b725907..42d91d8ef1 100644
--- a/resources/views/usergroups/blueprints/edit.blade.php
+++ b/resources/views/usergroups/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/usergroups/create.blade.php b/resources/views/usergroups/create.blade.php
index a9269eec9c..111978837a 100644
--- a/resources/views/usergroups/create.blade.php
+++ b/resources/views/usergroups/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Create User Group'))
 
diff --git a/resources/views/usergroups/edit.blade.php b/resources/views/usergroups/edit.blade.php
index 2fdb8be1fc..cb80fb45cd 100644
--- a/resources/views/usergroups/edit.blade.php
+++ b/resources/views/usergroups/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Configure User Group'))
 
diff --git a/resources/views/usergroups/index.blade.php b/resources/views/usergroups/index.blade.php
index bfa9e74897..a0e36a5d96 100644
--- a/resources/views/usergroups/index.blade.php
+++ b/resources/views/usergroups/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('User Groups'))
 
diff --git a/resources/views/usergroups/show.blade.php b/resources/views/usergroups/show.blade.php
index ecc2850ad2..8aa906d1ba 100644
--- a/resources/views/usergroups/show.blade.php
+++ b/resources/views/usergroups/show.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb($group->title(), 'User Group'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/users/blueprints/edit.blade.php b/resources/views/users/blueprints/edit.blade.php
index 69140ea1c5..fc111367b7 100644
--- a/resources/views/users/blueprints/edit.blade.php
+++ b/resources/views/users/blueprints/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit Blueprint'))
 
diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index 085e4dd97d..2542a5cac8 100644
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @inject('str', 'Statamic\Support\Str')
 @extends('statamic::layout')
 @section('title', __('Create User'))
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 856a61c8f0..6138df9584 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Edit User'))
 
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 1711ca295d..3ae95b9ddc 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Users'))
 @section('wrapper_class', 'max-w-full')
diff --git a/resources/views/utilities/cache.blade.php b/resources/views/utilities/cache.blade.php
index 4a5401d6f5..5df2e72db5 100644
--- a/resources/views/utilities/cache.blade.php
+++ b/resources/views/utilities/cache.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Cache Manager'))
 
diff --git a/resources/views/utilities/email.blade.php b/resources/views/utilities/email.blade.php
index 0655b38046..a8ec55dcab 100644
--- a/resources/views/utilities/email.blade.php
+++ b/resources/views/utilities/email.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb(__('Email'), __('Utilities')))
 
@@ -29,10 +31,49 @@
     <p class="text-sm text-gray mb-4">{!! __('statamic::messages.email_utility_configuration_description', ['path' => config_path('mail.php')]) !!}</p>
     <div class="card p-0">
         <table class="data-table">
-            @if (config('mail.mailers'))
-                @include('statamic::utilities.partials.email-l7')
-            @else
-                @include('statamic::utilities.partials.email-l6')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Default Mailer') }}</th>
+                <td><code>{{ config('mail.default') }}</code></td>
+            </tr>
+            @if (config('mail.default') == 'smtp')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
+                <td><code>{{ config('mail.mailers.smtp.host') }}</code></td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
+                <td><code>{{ config('mail.mailers.smtp.port') }}</code></td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.encryption'))
+                        <code>{{ config('mail.mailers.smtp.encryption') }}</code>
+                    @endif
+                </td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.username'))
+                        <code>{{ config('mail.mailers.smtp.username') }}</code>
+                    @endif
+                </td>
+            </tr>
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
+                <td>
+                    @if (config('mail.mailers.smtp.password'))
+                        <code>{{ config('mail.mailers.smtp.password') }}</code>
+                    @endif
+                </td>
+            </tr>
+            @endif
+            @if (config('mail.default') == 'sendmail')
+            <tr>
+                <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
+                <td><code>{{ config('mail.mailers.sendmail.path') }}</code></td>
+            </tr>
             @endif
             <tr>
                 <th class="pl-4 py-2 w-1/4">{{ __('Default From Address') }}</th>
diff --git a/resources/views/utilities/git.blade.php b/resources/views/utilities/git.blade.php
index 572a80bdeb..2d082b71b2 100644
--- a/resources/views/utilities/git.blade.php
+++ b/resources/views/utilities/git.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', Statamic::crumb('Git', __('Utilities')))
 
diff --git a/resources/views/utilities/index.blade.php b/resources/views/utilities/index.blade.php
index d41c006eb1..1d267c6aef 100644
--- a/resources/views/utilities/index.blade.php
+++ b/resources/views/utilities/index.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Utilities'))
 
diff --git a/resources/views/utilities/partials/email-l6.blade.php b/resources/views/utilities/partials/email-l6.blade.php
deleted file mode 100644
index e03b6ef10c..0000000000
--- a/resources/views/utilities/partials/email-l6.blade.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Driver') }}</th>
-    <td><code>{{ config('mail.driver') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
-    <td><code>{{ config('mail.host') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
-    <td><code>{{ config('mail.port') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
-    <td>
-        @if (config('mail.encryption'))
-            <code>{{ config('mail.encryption') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
-    <td>
-        @if (config('mail.username'))
-            <code>{{ config('mail.username') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
-    <td>
-        @if (config('mail.password'))
-            <code>{{ config('mail.password') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
-    <td><code>{{ config('mail.sendmail') }}</code></td>
-</tr>
diff --git a/resources/views/utilities/partials/email-l7.blade.php b/resources/views/utilities/partials/email-l7.blade.php
deleted file mode 100644
index 7c6f611cfb..0000000000
--- a/resources/views/utilities/partials/email-l7.blade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Default Mailer') }}</th>
-    <td><code>{{ config('mail.default') }}</code></td>
-</tr>
-@if (config('mail.default') == 'smtp')
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Host') }}</th>
-    <td><code>{{ config('mail.mailers.smtp.host') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Port') }}</th>
-    <td><code>{{ config('mail.mailers.smtp.port') }}</code></td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Encryption') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.encryption'))
-            <code>{{ config('mail.mailers.smtp.encryption') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Username') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.username'))
-            <code>{{ config('mail.mailers.smtp.username') }}</code>
-        @endif
-    </td>
-</tr>
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Password') }}</th>
-    <td>
-        @if (config('mail.mailers.smtp.password'))
-            <code>{{ config('mail.mailers.smtp.password') }}</code>
-        @endif
-    </td>
-</tr>
-@endif
-@if (config('mail.default') == 'sendmail')
-<tr>
-    <th class="pl-4 py-2 w-1/4">{{ __('Sendmail') }}</th>
-    <td><code>{{ config('mail.mailers.sendmail.path') }}</code></td>
-</tr>
-@endif
diff --git a/resources/views/utilities/phpinfo.blade.php b/resources/views/utilities/phpinfo.blade.php
index b91ad7d4ce..2dab6292c5 100644
--- a/resources/views/utilities/phpinfo.blade.php
+++ b/resources/views/utilities/phpinfo.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('PHP Info'))
 
diff --git a/resources/views/utilities/search.blade.php b/resources/views/utilities/search.blade.php
index 1c209804c7..01e2b09c22 100644
--- a/resources/views/utilities/search.blade.php
+++ b/resources/views/utilities/search.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 @extends('statamic::layout')
 @section('title', __('Rebuild Search'))
 
diff --git a/resources/views/widgets/getting-started.blade.php b/resources/views/widgets/getting-started.blade.php
index 8c3d2fd6ae..f6fdd9aaba 100644
--- a/resources/views/widgets/getting-started.blade.php
+++ b/resources/views/widgets/getting-started.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="card p-0 content">
     <div class="py-6 px-8 border-b">
         <h1>{{ __('statamic::messages.getting_started_widget_header') }}</h1>
diff --git a/resources/views/widgets/updater.blade.php b/resources/views/widgets/updater.blade.php
index b5ca176973..8926c024a9 100644
--- a/resources/views/widgets/updater.blade.php
+++ b/resources/views/widgets/updater.blade.php
@@ -1,3 +1,5 @@
+@php use function Statamic\trans as __; @endphp
+
 <div class="card p-0 h-full">
     <header class="flex justify-between items-center p-4 border-b">
         <h2 class="flex items-center">
diff --git a/src/Assets/Asset.php b/src/Assets/Asset.php
index 79c74ef161..72de11eba3 100644
--- a/src/Assets/Asset.php
+++ b/src/Assets/Asset.php
@@ -17,6 +17,7 @@
 use Statamic\Contracts\Search\Searchable as SearchableContract;
 use Statamic\Data\ContainsData;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Data\HasDirtyState;
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\AssetContainerBlueprintFound;
@@ -46,7 +47,7 @@
 
 class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, ContainsQueryableValues, ResolvesValuesContract, SearchableContract
 {
-    use ContainsData, FluentlyGetsAndSets, HasAugmentedInstance,
+    use ContainsData, FluentlyGetsAndSets, HasAugmentedInstance, HasDirtyState,
         Searchable,
         TracksQueriedColumns, TracksQueriedRelations {
             set as traitSet;
@@ -65,7 +66,6 @@ class Asset implements Arrayable, ArrayAccess, AssetContract, Augmentable, Conta
     protected $withEvents = true;
     protected $shouldHydrate = true;
     protected $removedData = [];
-    protected $original = [];
 
     public function syncOriginal()
     {
@@ -1054,6 +1054,14 @@ public function getQueryableValue(string $field)
         return $field->fieldtype()->toQueryableValue($value);
     }
 
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'path' => $this->path(),
+            'data' => $this->data()->toArray(),
+        ]);
+    }
+
     public function getCpSearchResultBadge(): string
     {
         return $this->container()->title();
diff --git a/src/Assets/Uploader.php b/src/Assets/Uploader.php
index e618a09009..e34d6d3126 100644
--- a/src/Assets/Uploader.php
+++ b/src/Assets/Uploader.php
@@ -16,7 +16,13 @@ public function upload(UploadedFile $file)
 
         $this->write($source, $path = $this->uploadPath($file));
 
-        app('files')->delete($source);
+        if (app()->runningInConsole()) {
+            app('files')->delete($source);
+
+            return $path;
+        }
+
+        dispatch(fn () => app('files')->delete($source))->afterResponse();
 
         return $path;
     }
diff --git a/src/Auth/Eloquent/User.php b/src/Auth/Eloquent/User.php
index f63ef51c0c..d2b01637ae 100644
--- a/src/Auth/Eloquent/User.php
+++ b/src/Auth/Eloquent/User.php
@@ -364,4 +364,11 @@ public function __set($key, $value)
 
         return $this->$key = $value;
     }
+
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'email' => $this->email(),
+        ], $this->model()->attributesToArray());
+    }
 }
diff --git a/src/Auth/File/User.php b/src/Auth/File/User.php
index 18ace15810..e19d2107f2 100644
--- a/src/Auth/File/User.php
+++ b/src/Auth/File/User.php
@@ -356,4 +356,16 @@ public function fresh()
     {
         return Facades\User::find($this->id);
     }
+
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'email' => $this->email(),
+            'groups' => $this->get('groups', []),
+            'password_hash' => $this->passwordHash(),
+            'permissions' => $this->get('permissions', []),
+            'roles' => $this->get('roles', []),
+            'super' => $this->get('super', false),
+        ], $this->data()->toArray());
+    }
 }
diff --git a/src/Auth/Protect/Protection.php b/src/Auth/Protect/Protection.php
index 1f8a5b0592..993b2dcfb8 100644
--- a/src/Auth/Protect/Protection.php
+++ b/src/Auth/Protect/Protection.php
@@ -67,7 +67,7 @@ public function protect()
 
     protected function url()
     {
-        return URL::tidy(request()->url());
+        return URL::tidy(request()->fullUrl());
     }
 
     protected function log($message)
diff --git a/src/Auth/User.php b/src/Auth/User.php
index 371e5d421c..1ef800a0ce 100644
--- a/src/Auth/User.php
+++ b/src/Auth/User.php
@@ -21,6 +21,7 @@
 use Statamic\Contracts\Search\Searchable as SearchableContract;
 use Statamic\Data\ContainsComputedData;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Data\HasDirtyState;
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Data\TracksQueriedRelations;
 use Statamic\Events\UserCreated;
@@ -39,7 +40,7 @@
 
 abstract class User implements Arrayable, ArrayAccess, Augmentable, Authenticatable, AuthorizableContract, CanResetPasswordContract, ContainsQueryableValues, HasLocalePreference, ResolvesValuesContract, SearchableContract, UserContract
 {
-    use Authorizable, CanResetPassword, ContainsComputedData, HasAugmentedInstance, HasAvatar, Notifiable, ResolvesValues, Searchable, TracksQueriedColumns, TracksQueriedRelations;
+    use Authorizable, CanResetPassword, ContainsComputedData, HasAugmentedInstance, HasAvatar, HasDirtyState, Notifiable, ResolvesValues, Searchable, TracksQueriedColumns, TracksQueriedRelations;
 
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
@@ -193,6 +194,8 @@ public function save()
             UserSaved::dispatch($this);
         }
 
+        $this->syncOriginal();
+
         return $this;
     }
 
diff --git a/src/Data/HasDirtyState.php b/src/Data/HasDirtyState.php
new file mode 100644
index 0000000000..02949f26ae
--- /dev/null
+++ b/src/Data/HasDirtyState.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Statamic\Data;
+
+use Statamic\Support\Arr;
+
+trait HasDirtyState
+{
+    protected array $original = [];
+
+    abstract public function getCurrentDirtyStateAttributes(): array;
+
+    /**
+     * Determine if the item or any of the given attribute(s) have been modified.
+     *
+     * @param  null|string|array  $attributes
+     */
+    public function isDirty($attributes = null): bool
+    {
+        $currentValues = $this->getCurrentDirtyStateAttributes();
+        $originalValues = $this->getOriginal();
+
+        if (! $attributes) {
+            return json_encode($currentValues) !== json_encode($originalValues);
+        }
+
+        return collect($attributes)->contains(function ($property) use ($currentValues, $originalValues) {
+            // In an asset, the data key holds all the data. It would be a breaking
+            // change to make it the root level, so we'll support both for now.
+            if (! array_key_exists($property, $currentValues)) {
+                $property = 'data.'.$property;
+            }
+
+            return data_get($currentValues, $property) !== data_get($originalValues, $property);
+        });
+    }
+
+    /**
+     * Determine if the item or all the given attribute(s) have remained the same.
+     *
+     * @param  null|string|array  $attributes
+     */
+    public function isClean($attributes = null): bool
+    {
+        return ! $this->isDirty($attributes);
+    }
+
+    public function syncOriginal(): static
+    {
+        $this->original = $this->getCurrentDirtyStateAttributes();
+
+        return $this;
+    }
+
+    public function getOriginal($key = null, $fallback = null)
+    {
+        return Arr::get($this->original, $key, $fallback);
+    }
+}
diff --git a/src/Data/SyncsOriginalState.php b/src/Data/SyncsOriginalState.php
index d1017497b0..4c6f41e84a 100644
--- a/src/Data/SyncsOriginalState.php
+++ b/src/Data/SyncsOriginalState.php
@@ -4,6 +4,10 @@
 
 use Statamic\Support\Arr;
 
+/**
+ * @deprecated
+ * @see \Statamic\Data\HasDirtyState
+ */
 trait SyncsOriginalState
 {
     protected $original = [];
diff --git a/src/Entries/Entry.php b/src/Entries/Entry.php
index fd76d84dd1..819ff7f3e3 100644
--- a/src/Entries/Entry.php
+++ b/src/Entries/Entry.php
@@ -23,6 +23,7 @@
 use Statamic\Data\ContainsData;
 use Statamic\Data\ExistsAsFile;
 use Statamic\Data\HasAugmentedInstance;
+use Statamic\Data\HasDirtyState;
 use Statamic\Data\HasOrigin;
 use Statamic\Data\Publishable;
 use Statamic\Data\TracksLastModified;
@@ -56,6 +57,7 @@ class Entry implements Arrayable, ArrayAccess, Augmentable, ContainsQueryableVal
 {
     use ContainsComputedData, ContainsData, ExistsAsFile, FluentlyGetsAndSets, HasAugmentedInstance, Localizable, Publishable, Revisable, Searchable, TracksLastModified, TracksQueriedColumns, TracksQueriedRelations;
 
+    use HasDirtyState;
     use HasOrigin {
         value as originValue;
         values as originValues;
@@ -173,6 +175,19 @@ public function newAugmentedInstance(): Augmented
         return new AugmentedEntry($this);
     }
 
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'collection' => $this->collectionHandle(),
+            'locale' => $this->locale(),
+            'origin' => $this->hasOrigin() ? $this->origin()->id() : null,
+            'slug' => $this->slug(),
+            'date' => optional($this->date())->format('Y-m-d-Hi'),
+            'published' => $this->published(),
+            'path' => $this->initialPath() ?? $this->path(),
+        ], $this->data()->except(['updated_at'])->toArray());
+    }
+
     public function delete()
     {
         if (EntryDeleting::dispatch($this) === false) {
@@ -384,6 +399,8 @@ public function save()
 
         $stack->pop();
 
+        $this->syncOriginal();
+
         return true;
     }
 
diff --git a/src/Exceptions/EntryNotFoundException.php b/src/Exceptions/EntryNotFoundException.php
new file mode 100644
index 0000000000..5e042adddd
--- /dev/null
+++ b/src/Exceptions/EntryNotFoundException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Exceptions;
+
+class EntryNotFoundException extends \Exception
+{
+    protected $entry;
+
+    public function __construct($entry)
+    {
+        parent::__construct("Entry [{$entry}] not found");
+
+        $this->entry = $entry;
+    }
+}
diff --git a/src/Facades/Entry.php b/src/Facades/Entry.php
index 32c9f30a12..9453af9bd5 100644
--- a/src/Facades/Entry.php
+++ b/src/Facades/Entry.php
@@ -10,6 +10,7 @@
  * @method static \Statamic\Entries\EntryCollection whereCollection(string $handle)
  * @method static \Statamic\Entries\EntryCollection whereInCollection(array $handles)
  * @method static null|\Statamic\Contracts\Entries\Entry find($id)
+ * @method static \Statamic\Contracts\Entries\Entry findOrFail($id)
  * @method static null|\Statamic\Contracts\Entries\Entry findByUri(string $uri, string $site)
  * @method static \Statamic\Contracts\Entries\Entry make()
  * @method static \Statamic\Contracts\Entries\QueryBuilder query()
diff --git a/src/Fields/Fields.php b/src/Fields/Fields.php
index 56b41bdb0f..d80c256a93 100644
--- a/src/Fields/Fields.php
+++ b/src/Fields/Fields.php
@@ -260,7 +260,10 @@ private function getReferencedField(array $config): Field
             $field->setConfig(array_merge($field->config(), $overrides));
         }
 
-        return $field->setParent($this->parent)->setHandle($config['handle']);
+        return $field
+            ->setParent($this->parent)
+            ->setParentField($this->parentField, $this->parentIndex)
+            ->setHandle($config['handle']);
     }
 
     private function getImportedFields(array $config): array
@@ -291,7 +294,11 @@ private function getImportedFields(array $config): array
             }
 
             return $fields;
-        })->each->setParent($this->parent)->all();
+        })->each(function ($field) {
+            $field
+                ->setParent($this->parent)
+                ->setParentField($this->parentField, $this->parentIndex);
+        })->all();
     }
 
     public function meta()
diff --git a/src/Fieldtypes/Bard.php b/src/Fieldtypes/Bard.php
index 5bea35aca1..4add244408 100644
--- a/src/Fieldtypes/Bard.php
+++ b/src/Fieldtypes/Bard.php
@@ -113,6 +113,7 @@ protected function configFieldItems(): array
                         'instructions' => __('statamic::fieldtypes.bard.config.enable_input_rules'),
                         'type' => 'toggle',
                         'default' => true,
+                        'validate' => 'accepted_if:smart_typography,true',
                     ],
                     'enable_paste_rules' => [
                         'display' => __('Enable Paste Rules'),
diff --git a/src/Forms/Fieldtype.php b/src/Forms/Fieldtype.php
index 8ff9b21478..384f8d5dac 100644
--- a/src/Forms/Fieldtype.php
+++ b/src/Forms/Fieldtype.php
@@ -32,6 +32,17 @@ protected function configFieldItems(): array
                 'default' => 1,
                 'instructions' => __('statamic::fieldtypes.form.config.max_items'),
             ],
+            'mode' => [
+                'display' => __('UI Mode'),
+                'instructions' => __('statamic::fieldtypes.relationship.config.mode'),
+                'type' => 'radio',
+                'default' => 'default',
+                'options' => [
+                    'default' => __('Stack Selector'),
+                    'select' => __('Select Dropdown'),
+                    'typeahead' => __('Typeahead Field'),
+                ],
+            ],
             'query_scopes' => [
                 'display' => __('Query Scopes'),
                 'instructions' => __('statamic::fieldtypes.form.config.query_scopes'),
diff --git a/src/Http/Controllers/CP/Collections/EntriesController.php b/src/Http/Controllers/CP/Collections/EntriesController.php
index 5102b70e41..2b3c5b8ad4 100644
--- a/src/Http/Controllers/CP/Collections/EntriesController.php
+++ b/src/Http/Controllers/CP/Collections/EntriesController.php
@@ -259,13 +259,12 @@ public function update(Request $request, $collection, $entry)
 
         [$values] = $this->extractFromFields($entry, $blueprint);
 
-        return (new EntryResource($entry->fresh()))
-            ->additional([
-                'saved' => $saved,
-                'data' => [
-                    'values' => $values,
-                ],
-            ]);
+        return [
+            'data' => array_merge((new EntryResource($entry->fresh()))->resolve()['data'], [
+                'values' => $values,
+            ]),
+            'saved' => $saved,
+        ];
     }
 
     public function create(Request $request, $collection, $site)
diff --git a/src/Http/Controllers/FormController.php b/src/Http/Controllers/FormController.php
index 1cacb10437..c86f61554b 100644
--- a/src/Http/Controllers/FormController.php
+++ b/src/Http/Controllers/FormController.php
@@ -10,6 +10,7 @@
 use Statamic\Events\FormSubmitted;
 use Statamic\Events\SubmissionCreated;
 use Statamic\Exceptions\SilentFormFailureException;
+use Statamic\Facades\Asset;
 use Statamic\Facades\Form;
 use Statamic\Facades\Site;
 use Statamic\Forms\Exceptions\FileContentTypeRequiredException;
@@ -50,7 +51,9 @@ public function submit(FrontendFormRequest $request, $form)
         try {
             throw_if(Arr::get($values, $form->honeypot()), new SilentFormFailureException);
 
-            $values = array_merge($values, $submission->uploadFiles($assets));
+            $uploadedAssets = $submission->uploadFiles($assets);
+
+            $values = array_merge($values, $uploadedAssets);
 
             $submission->data(
                 $fields->addValues($values)->process()->values()
@@ -60,8 +63,14 @@ public function submit(FrontendFormRequest $request, $form)
             // If they want to add validation errors, they can throw an exception.
             throw_if(FormSubmitted::dispatch($submission) === false, new SilentFormFailureException);
         } catch (ValidationException $e) {
+            $this->removeUploadedAssets($uploadedAssets);
+
             return $this->formFailure($params, $e->errors(), $form->handle());
         } catch (SilentFormFailureException $e) {
+            if (isset($uploadedAssets)) {
+                $this->removeUploadedAssets($uploadedAssets);
+            }
+
             return $this->formSuccess($params, $submission, true);
         }
 
@@ -98,7 +107,7 @@ private function validateContentType($request, $form)
      */
     private function formFailure($params, $errors, $form)
     {
-        if (request()->ajax()) {
+        if (request()->ajax() || request()->wantsJson()) {
             return response([
                 'errors' => (new MessageBag($errors))->all(),
                 'error' => collect($errors)->map(function ($errors, $field) {
@@ -156,4 +165,20 @@ private function formSuccessRedirect($params, $submission)
 
         return $redirect;
     }
+
+    /**
+     * Remove any uploaded assets
+     *
+     * Triggered by a validation exception or silent failure
+     */
+    private function removeUploadedAssets(array $assets)
+    {
+        collect($assets)
+            ->flatten()
+            ->each(function ($id) {
+                if ($asset = Asset::find($id)) {
+                    $asset->delete();
+                }
+            });
+    }
 }
diff --git a/src/Http/Requests/FrontendFormRequest.php b/src/Http/Requests/FrontendFormRequest.php
index f4537dfe99..1627659af1 100644
--- a/src/Http/Requests/FrontendFormRequest.php
+++ b/src/Http/Requests/FrontendFormRequest.php
@@ -60,7 +60,7 @@ public function validator()
 
     protected function failedValidation(Validator $validator)
     {
-        if ($this->ajax()) {
+        if (! $this->isPrecognitive() && ($this->ajax() || $this->wantsJson())) {
             $errors = $validator->errors();
 
             $response = response([
diff --git a/src/Modifiers/CoreModifiers.php b/src/Modifiers/CoreModifiers.php
index 5858cae1d1..1b1cf546cb 100644
--- a/src/Modifiers/CoreModifiers.php
+++ b/src/Modifiers/CoreModifiers.php
@@ -957,6 +957,23 @@ private function renderMLAStyleHeadline($value)
         return $headline;
     }
 
+    /**
+     * Converts a hex color to rgb values.
+     *
+     * @return string
+     */
+    public function hexToRgb($value)
+    {
+        // Remove the hash (#) if present
+        $hex = ltrim($value, '#');
+
+        // Parse the hex value into RGB components
+        $rgb = sscanf($hex, '%02x%02x%02x');
+
+        // Return the RGB values as a comma-separated string
+        return implode(', ', $rgb);
+    }
+
     /**
      * Get the date difference in hours.
      *
diff --git a/src/Stache/Indexes/Index.php b/src/Stache/Indexes/Index.php
index 6b5d751176..c147917cd0 100644
--- a/src/Stache/Indexes/Index.php
+++ b/src/Stache/Indexes/Index.php
@@ -131,9 +131,15 @@ abstract public function getItems();
 
     public function cacheKey()
     {
+        $replacements = ['::', '->'];
+
+        if (windows_os()) {
+            $replacements[1] = '-]';
+        }
+
         return vsprintf('stache::indexes::%s::%s', [
             $this->store->key(),
-            str_replace(['.', '/'], ['::', '->'], $this->name),
+            str_replace(['.', '/'], $replacements, $this->name),
         ]);
     }
 
diff --git a/src/Stache/Repositories/EntryRepository.php b/src/Stache/Repositories/EntryRepository.php
index f3d3d738ac..06167fb3e7 100644
--- a/src/Stache/Repositories/EntryRepository.php
+++ b/src/Stache/Repositories/EntryRepository.php
@@ -6,6 +6,7 @@
 use Statamic\Contracts\Entries\EntryRepository as RepositoryContract;
 use Statamic\Contracts\Entries\QueryBuilder;
 use Statamic\Entries\EntryCollection;
+use Statamic\Exceptions\EntryNotFoundException;
 use Statamic\Stache\Query\EntryQueryBuilder;
 use Statamic\Stache\Stache;
 use Statamic\Support\Arr;
@@ -43,6 +44,17 @@ public function find($id): ?Entry
         return $this->query()->where('id', $id)->first();
     }
 
+    public function findOrFail($id): Entry
+    {
+        $entry = $this->find($id);
+
+        if (! $entry) {
+            throw new EntryNotFoundException($id);
+        }
+
+        return $entry;
+    }
+
     public function findByUri(string $uri, ?string $site = null): ?Entry
     {
         $site = $site ?? $this->stache->sites()->first();
diff --git a/src/Stache/Stores/BasicStore.php b/src/Stache/Stores/BasicStore.php
index f12eed78f0..ae099d5149 100644
--- a/src/Stache/Stores/BasicStore.php
+++ b/src/Stache/Stores/BasicStore.php
@@ -24,6 +24,10 @@ public function getItem($key)
         }
 
         if ($item = $this->getCachedItem($key)) {
+            if (method_exists($item, 'syncOriginal')) {
+                $item->syncOriginal();
+            }
+
             return $item;
         }
 
@@ -31,6 +35,10 @@ public function getItem($key)
 
         $this->cacheItem($item);
 
+        if (method_exists($item, 'syncOriginal')) {
+            $item->syncOriginal();
+        }
+
         return $item;
     }
 
diff --git a/src/Stache/Stores/NavTreeStore.php b/src/Stache/Stores/NavTreeStore.php
index 3c91ad6660..9f2a5d422c 100644
--- a/src/Stache/Stores/NavTreeStore.php
+++ b/src/Stache/Stores/NavTreeStore.php
@@ -26,8 +26,7 @@ public function makeItemFromFile($path, $contents)
     {
         return $this
             ->newTreeClassByPath($path)
-            ->tree(YAML::file($path)->parse($contents)['tree'] ?? [])
-            ->syncOriginal();
+            ->tree(YAML::file($path)->parse($contents)['tree'] ?? []);
     }
 
     protected function newTreeClassByPath($path)
diff --git a/src/Stache/Stores/TaxonomyTermsStore.php b/src/Stache/Stores/TaxonomyTermsStore.php
index bf38d8dccb..f9873c63c7 100644
--- a/src/Stache/Stores/TaxonomyTermsStore.php
+++ b/src/Stache/Stores/TaxonomyTermsStore.php
@@ -60,7 +60,6 @@ public function makeItemFromFile($path, $contents)
         }
 
         $term->dataForLocale($term->defaultLocale(), $data);
-        $term->syncOriginal();
 
         return $term;
     }
diff --git a/src/StaticCaching/NoCache/Session.php b/src/StaticCaching/NoCache/Session.php
index cf727fdcba..bf42e198af 100644
--- a/src/StaticCaching/NoCache/Session.php
+++ b/src/StaticCaching/NoCache/Session.php
@@ -4,10 +4,10 @@
 
 use Illuminate\Pagination\AbstractPaginator;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Str;
 use Statamic\Facades\Cascade;
 use Statamic\Facades\Data;
+use Statamic\Facades\StaticCache;
 
 class Session
 {
@@ -48,7 +48,7 @@ public function regions(): Collection
 
     public function region(string $key): Region
     {
-        if ($this->regions->contains($key) && ($region = Cache::get('nocache::region.'.$key))) {
+        if ($this->regions->contains($key) && ($region = StaticCache::cacheStore()->get('nocache::region.'.$key))) {
             return $region;
         }
 
@@ -101,16 +101,18 @@ public function write()
             return;
         }
 
-        Cache::forever('nocache::urls', collect(Cache::get('nocache::urls', []))->push($this->url)->unique()->all());
+        $store = StaticCache::cacheStore();
 
-        Cache::forever('nocache::session.'.md5($this->url), [
+        $store->forever('nocache::urls', collect($store->get('nocache::urls', []))->push($this->url)->unique()->all());
+
+        $store->forever('nocache::session.'.md5($this->url), [
             'regions' => $this->regions,
         ]);
     }
 
     public function restore()
     {
-        $session = Cache::get('nocache::session.'.md5($this->url));
+        $session = StaticCache::cacheStore()->get('nocache::session.'.md5($this->url));
 
         $this->regions = $this->regions->merge($session['regions'] ?? []);
         $this->cascade = $this->restoreCascade();
@@ -139,6 +141,6 @@ private function resolvePageAndPathForPagination(): void
 
     private function cacheRegion(Region $region)
     {
-        Cache::forever('nocache::region.'.$region->key(), $region);
+        StaticCache::cacheStore()->forever('nocache::region.'.$region->key(), $region);
     }
 }
diff --git a/src/StaticCaching/StaticCacheManager.php b/src/StaticCaching/StaticCacheManager.php
index d61c50046e..cdcca1374a 100644
--- a/src/StaticCaching/StaticCacheManager.php
+++ b/src/StaticCaching/StaticCacheManager.php
@@ -30,6 +30,16 @@ public function createNullDriver()
     }
 
     public function createFileDriver(array $config)
+    {
+        return new FileCacher(new Writer, $this->cacheStore(), $config);
+    }
+
+    public function createApplicationDriver(array $config)
+    {
+        return new ApplicationCacher($this->app[Repository::class], $config);
+    }
+
+    public function cacheStore()
     {
         try {
             $store = Cache::store('static_cache');
@@ -37,12 +47,7 @@ public function createFileDriver(array $config)
             $store = Cache::store();
         }
 
-        return new FileCacher(new Writer, $store, $config);
-    }
-
-    public function createApplicationDriver(array $config)
-    {
-        return new ApplicationCacher($this->app[Repository::class], $config);
+        return $store;
     }
 
     protected function getConfig($name)
@@ -62,13 +67,13 @@ public function flush()
     {
         $this->driver()->flush();
 
-        collect(Cache::get('nocache::urls', []))->each(function ($url) {
-            $session = Cache::get($sessionKey = 'nocache::session.'.md5($url));
-            collect($session['regions'] ?? [])->each(fn ($region) => Cache::forget('nocache::region.'.$region));
-            Cache::forget($sessionKey);
+        collect($this->cacheStore()->get('nocache::urls', []))->each(function ($url) {
+            $session = $this->cacheStore()->get($sessionKey = 'nocache::session.'.md5($url));
+            collect($session['regions'] ?? [])->each(fn ($region) => $this->cacheStore()->forget('nocache::region.'.$region));
+            $this->cacheStore()->forget($sessionKey);
         });
 
-        Cache::forget('nocache::urls');
+        $this->cacheStore()->forget('nocache::urls');
     }
 
     public function nocacheJs(string $js)
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index fafdcd9156..99c120da33 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -5,7 +5,7 @@
 use Statamic\Contracts\Data\Localization;
 use Statamic\Contracts\Structures\Tree as Contract;
 use Statamic\Data\ExistsAsFile;
-use Statamic\Data\SyncsOriginalState;
+use Statamic\Data\HasDirtyState;
 use Statamic\Facades\Blink;
 use Statamic\Facades\Entry;
 use Statamic\Facades\Site;
@@ -14,7 +14,7 @@
 
 abstract class Tree implements Contract, Localization
 {
-    use ExistsAsFile, FluentlyGetsAndSets, SyncsOriginalState;
+    use ExistsAsFile, FluentlyGetsAndSets, HasDirtyState;
 
     protected $handle;
     protected $locale;
@@ -22,7 +22,6 @@ abstract class Tree implements Contract, Localization
     protected $cachedFlattenedPages;
     protected $withEntries = false;
     protected $uriCacheEnabled = true;
-    protected $syncOriginalProperties = ['tree'];
 
     public function idKey()
     {
@@ -378,15 +377,10 @@ public function withEntries()
         return $this;
     }
 
-    public function __sleep()
+    public function getCurrentDirtyStateAttributes(): array
     {
-        $vars = Arr::except(get_object_vars($this), ['original']);
-
-        return array_keys($vars);
-    }
-
-    public function __wakeup()
-    {
-        $this->syncOriginal();
+        return [
+            'tree' => $this->tree,
+        ];
     }
 }
diff --git a/src/Support/Traits/Hookable.php b/src/Support/Traits/Hookable.php
new file mode 100644
index 0000000000..15cd8175b3
--- /dev/null
+++ b/src/Support/Traits/Hookable.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Statamic\Support\Traits;
+
+use Closure;
+use Illuminate\Pipeline\Pipeline;
+
+trait Hookable
+{
+    private static $hooks = [];
+
+    public static function hook(string $name, Closure $hook)
+    {
+        static::$hooks[static::class][$name][] = $hook;
+    }
+
+    protected function runHooks(string $name, $payload = null)
+    {
+        $closures = collect(
+            static::$hooks[static::class][$name] ?? []
+        )->map->bindTo($this, $this);
+
+        if (debugbar()->isEnabled()) {
+            $message = vsprintf('Hook: %s (Listeners: %s)', [
+                static::class.'@'.$name,
+                $closures->count(),
+            ]);
+
+            debugbar()->addMessage($message, 'hooks');
+        }
+
+        return (new Pipeline)
+            ->send($payload)
+            ->through($closures->all())
+            ->thenReturn();
+    }
+}
diff --git a/src/Tags/Asset.php b/src/Tags/Asset.php
index 0d346f976f..bb6f98e64c 100644
--- a/src/Tags/Asset.php
+++ b/src/Tags/Asset.php
@@ -21,7 +21,7 @@ class Asset extends Assets
      *
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         $value = Arr::get($this->context, $this->method);
         $value = (array) $value;
diff --git a/src/Tags/Assets.php b/src/Tags/Assets.php
index b1d3c396b6..9ef77dcc8b 100644
--- a/src/Tags/Assets.php
+++ b/src/Tags/Assets.php
@@ -27,7 +27,7 @@ class Assets extends Tags
      *
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         $value = Arr::get($this->context, $this->method);
 
diff --git a/src/Tags/Collection/Collection.php b/src/Tags/Collection/Collection.php
index dc3b316c60..a16155ec8e 100644
--- a/src/Tags/Collection/Collection.php
+++ b/src/Tags/Collection/Collection.php
@@ -15,13 +15,11 @@ class Collection extends Tags
     /**
      * {{ collection:* }} ... {{ /collection:* }}.
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $this->params['from'] = $this->method;
 
-        return $this->output(
-            $this->entries()->get()
-        );
+        return $this->index();
     }
 
     /**
@@ -33,9 +31,11 @@ public function index()
             return $this->context->value('collection');
         }
 
-        return $this->output(
-            $this->entries()->get()
-        );
+        $results = $this->entries()->get();
+
+        $results = $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -53,9 +53,11 @@ public function next()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->next($this->currentEntry())
-        );
+        $results = $this->entries()->next($this->currentEntry());
+
+        $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -65,9 +67,11 @@ public function previous()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->previous($this->currentEntry())
-        );
+        $results = $this->entries()->previous($this->currentEntry());
+
+        $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -77,9 +81,11 @@ public function older()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->older($this->currentEntry())
-        );
+        $results = $this->entries()->older($this->currentEntry());
+
+        $results = $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     /**
@@ -89,9 +95,11 @@ public function newer()
     {
         $this->params['from'] = $this->currentEntry()->collection()->handle();
 
-        return $this->output(
-            $this->entries()->newer($this->currentEntry())
-        );
+        $results = $this->entries()->newer($this->currentEntry());
+
+        $results = $this->runHooks('fetched-entries', $results);
+
+        return $this->output($results);
     }
 
     protected function entries()
diff --git a/src/Tags/FluentTag.php b/src/Tags/FluentTag.php
index b4c15bdde3..d8b9c4337e 100644
--- a/src/Tags/FluentTag.php
+++ b/src/Tags/FluentTag.php
@@ -149,7 +149,7 @@ public function getIterator()
      * Allow calls to tag params.
      *
      * @param  string  $param
-     * @param  array  $value
+     * @param  mixed  $value
      * @return $this
      */
     public function param($param, $value = true)
diff --git a/src/Tags/Glide.php b/src/Tags/Glide.php
index bfd584c92a..1f89c2ea49 100644
--- a/src/Tags/Glide.php
+++ b/src/Tags/Glide.php
@@ -28,7 +28,7 @@ class Glide extends Tags
      * @param  array  $args
      * @return string
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $tag = explode(':', $this->tag, 2)[1];
 
diff --git a/src/Tags/Locales.php b/src/Tags/Locales.php
index f339bff5de..71a246a07b 100644
--- a/src/Tags/Locales.php
+++ b/src/Tags/Locales.php
@@ -158,7 +158,7 @@ private function getData()
             return $this->data;
         }
 
-        $id = $this->params->get('id', $this->context->value('id'));
+        $id = $this->params->get('id') ?? $this->context->value('page.id') ?? $this->context->value('id');
 
         $data = Data::find($id);
 
diff --git a/src/Tags/ParentTags.php b/src/Tags/ParentTags.php
index 640622803a..9a53a1ebd5 100644
--- a/src/Tags/ParentTags.php
+++ b/src/Tags/ParentTags.php
@@ -22,7 +22,7 @@ class ParentTags extends Tags
      * @param  array  $args
      * @return mixed
      */
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $var_name = Stringy::removeLeft($this->tag, 'parent:');
 
diff --git a/src/Tags/Scope.php b/src/Tags/Scope.php
index 1bf769b23d..54edc29879 100644
--- a/src/Tags/Scope.php
+++ b/src/Tags/Scope.php
@@ -6,7 +6,7 @@
 
 class Scope extends Tags
 {
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         throw_unless($this->isPair, new \Exception('Scope tag must be a pair'));
 
diff --git a/src/Tags/Section.php b/src/Tags/Section.php
index fc596799a7..1051ae8aa6 100644
--- a/src/Tags/Section.php
+++ b/src/Tags/Section.php
@@ -6,7 +6,7 @@
 
 class Section extends Tags
 {
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $name = explode(':', $this->tag)[1];
 
diff --git a/src/Tags/Tags.php b/src/Tags/Tags.php
index ac43708882..1d476090c4 100644
--- a/src/Tags/Tags.php
+++ b/src/Tags/Tags.php
@@ -8,10 +8,11 @@
 use Statamic\Extend\RegistersItself;
 use Statamic\Facades\Antlers;
 use Statamic\Support\Arr;
+use Statamic\Support\Traits\Hookable;
 
 abstract class Tags
 {
-    use HasAliases, HasHandle, Macroable, RegistersItself;
+    use HasAliases, HasHandle, Hookable, Macroable, RegistersItself;
 
     protected static $binding = 'tags';
 
@@ -92,6 +93,8 @@ public function setProperties($properties)
         $this->setParameters($properties['params']);
         $this->tag = array_get($properties, 'tag');
         $this->method = array_get($properties, 'tag_method');
+
+        $this->runHooks('init');
     }
 
     public function setParser($parser)
@@ -137,7 +140,7 @@ public function __call($method, $args)
         if (static::hasMacro($method)) {
             $macro = static::$macros[$method];
 
-            if ($macro instanceof Closure) {
+            if ($macro instanceof \Closure) {
                 $macro = $macro->bindTo($this, static::class);
             }
 
diff --git a/src/Tags/Theme.php b/src/Tags/Theme.php
index b7c84999a9..808bc101ed 100644
--- a/src/Tags/Theme.php
+++ b/src/Tags/Theme.php
@@ -20,7 +20,7 @@ class Theme extends Tags
      * @param  array  $arguments  Unused
      * @return string
      */
-    public function __call($method, $arguments)
+    public function wildcard($method)
     {
         return $this->path($method);
     }
diff --git a/src/Tags/Yields.php b/src/Tags/Yields.php
index dd7445dee9..063fe12d67 100644
--- a/src/Tags/Yields.php
+++ b/src/Tags/Yields.php
@@ -8,7 +8,7 @@ class Yields extends Tags
 {
     protected static $aliases = ['yield'];
 
-    public function __call($method, $args)
+    public function wildcard($method)
     {
         $name = explode(':', $this->tag)[1];
 
diff --git a/src/Taxonomies/Term.php b/src/Taxonomies/Term.php
index 6ff5b264cf..53138586d9 100644
--- a/src/Taxonomies/Term.php
+++ b/src/Taxonomies/Term.php
@@ -4,7 +4,7 @@
 
 use Statamic\Contracts\Taxonomies\Term as TermContract;
 use Statamic\Data\ExistsAsFile;
-use Statamic\Data\SyncsOriginalState;
+use Statamic\Data\HasDirtyState;
 use Statamic\Events\TermBlueprintFound;
 use Statamic\Events\TermCreated;
 use Statamic\Events\TermCreating;
@@ -22,7 +22,7 @@
 
 class Term implements TermContract
 {
-    use ExistsAsFile, FluentlyGetsAndSets, SyncsOriginalState;
+    use ExistsAsFile, FluentlyGetsAndSets, HasDirtyState;
 
     protected $taxonomy;
     protected $slug;
@@ -31,7 +31,6 @@ class Term implements TermContract
     protected $data;
     protected $afterSaveCallbacks = [];
     protected $withEvents = true;
-    protected $syncOriginalProperties = ['slug'];
 
     public function __construct()
     {
@@ -282,6 +281,14 @@ public function set($key, $value)
         return $this;
     }
 
+    public function getCurrentDirtyStateAttributes(): array
+    {
+        return array_merge([
+            'slug' => $this->slug(),
+            'taxonomy' => $this->taxonomyHandle(),
+        ], $this->data()->except(['updated_at'])->toArray());
+    }
+
     public function __call($method, $args)
     {
         $default = $this->inDefaultLocale();
diff --git a/src/View/Antlers/Language/Errors/AntlersErrorCodes.php b/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
index 48c48af3c7..2073858334 100644
--- a/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
+++ b/src/View/Antlers/Language/Errors/AntlersErrorCodes.php
@@ -129,4 +129,6 @@ class AntlersErrorCodes
     const TYPE_MODIFIER_UNEXPECTED_TOKEN_METHOD_SYNTAX = 'ANTLR_129';
     const TYPE_RUNTIME_ATTEMPTING_TO_RENDER_OBJECT_AS_STRING = 'ANTLR_130';
     const TYPE_UNPAIRED_CLOSING_TAG = 'ANTLR_131';
+    const TYPE_UNEXPECTED_CHARACTER_WHILE_PARSING_SHORTHAND_PARAMETER = 'ANTLR_132';
+    const TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER = 'ANTLR_133';
 }
diff --git a/src/View/Antlers/Language/Parser/AntlersNodeParser.php b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
index 532f976670..32bf6dc1c3 100644
--- a/src/View/Antlers/Language/Parser/AntlersNodeParser.php
+++ b/src/View/Antlers/Language/Parser/AntlersNodeParser.php
@@ -372,6 +372,15 @@ private function throwConditionWithoutExpression(AntlersNode $node)
         );
     }
 
+    private function isValidShorthandCharacter($char)
+    {
+        if (ctype_alpha($char) || $char == '_' || $char == '-' || ctype_digit($char)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Parses the content of the provided node, and returns any parameters.
      *
@@ -389,6 +398,7 @@ private function getParameters(AntlersNode $node)
         StringUtilities::prepareSplit($content);
         $chars = StringUtilities::split(trim($content));
         $parameters = [];
+        $parsingShorthandVariable = false;
 
         $hasFoundName = false;
         $currentChars = [];
@@ -443,6 +453,89 @@ private function getParameters(AntlersNode $node)
                 $ignorePrevious = false;
             }
 
+            if ($current == DocumentParser::Punctuation_Colon && $next == DocumentParser::Punctuation_Dollar) {
+                $startAt = $i;
+                $parsingShorthandVariable = true;
+                $currentChars = [];
+
+                $currentChars[] = $current;
+                $currentChars[] = $next;
+
+                if ($i + 2 < $charCount) {
+                    $peek = $chars[$i + 2];
+
+                    if (ctype_digit($peek)) {
+                        throw ErrorFactory::makeSyntaxError(
+                            AntlersErrorCodes::TYPE_UNEXPECTED_CHARACTER_WHILE_PARSING_SHORTHAND_PARAMETER,
+                            $node,
+                            'Shorthand variable parameters cannot start with a number.'
+                        );
+                    } elseif (ctype_space($peek)) {
+                        throw ErrorFactory::makeSyntaxError(
+                            AntlersErrorCodes::TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER,
+                            $node,
+                            'Unexpected end of input while parsing shorthand variable parameter.'
+                        );
+                    }
+                } else {
+                    throw ErrorFactory::makeSyntaxError(
+                        AntlersErrorCodes::TYPE_UNEXPECTED_EOI_PARSING_SHORTHAND_PARAMETER,
+                        $node,
+                        'Unexpected end of input while parsing shorthand variable parameter.'
+                    );
+                }
+
+                $i += 1;
+
+                continue;
+            }
+
+            if ($parsingShorthandVariable && ! ctype_space($current) && ! $this->isValidShorthandCharacter($current)) {
+                throw ErrorFactory::makeSyntaxError(
+                    AntlersErrorCodes::TYPE_UNEXPECTED_CHARACTER_WHILE_PARSING_SHORTHAND_PARAMETER,
+                    $node,
+                    'Unexpected character while parsing shorthand variable parameter.'
+                );
+            }
+
+            if ((ctype_space($current) || $next == null) && $parsingShorthandVariable) {
+                $endAt = $i;
+
+                if ($next == null) {
+                    $currentChars[] = $current;
+                    $endAt += 1;
+                }
+
+                $parameterNode = new ParameterNode();
+                $parameterNode->isVariableReference = true;
+
+                $name = implode('', array_slice($currentChars, 2));
+
+                $parameterNode->name = $name;
+                $parameterNode->value = $name;
+                $parameterNode->startPosition = $node->relativePositionFromOffset($startAt, $nameStart);
+
+                if (in_array($name, ['as', 'scope', 'handle_prefix'])) {
+                    $node->hasScopeAdjustingParameters = true;
+                }
+
+                $parameterNode->endPosition = $node->relativePositionFromOffset($endAt, $endAt);
+                $parameterNode->parent = $node;
+
+                $parameters[] = $parameterNode;
+
+                if ($next == null) {
+                    break;
+                }
+
+                $currentChars = [];
+                $hasFoundName = false;
+                $parsingShorthandVariable = false;
+                $name = '';
+
+                continue;
+            }
+
             if ($hasFoundName == false && ctype_space($current)) {
                 // Flush the buffer.
                 $currentChars = [];
diff --git a/src/View/Antlers/Language/Runtime/ConditionProcessor.php b/src/View/Antlers/Language/Runtime/ConditionProcessor.php
index 3d22965796..8a2a43319a 100644
--- a/src/View/Antlers/Language/Runtime/ConditionProcessor.php
+++ b/src/View/Antlers/Language/Runtime/ConditionProcessor.php
@@ -104,7 +104,6 @@ public function process(ConditionNode $node, $data)
                 }
 
                 if ($result == true) {
-
                     $this->processor->setIsConditionProcessor($condValueToRestore);
 
                     return $branch;
diff --git a/src/View/Antlers/Language/Runtime/PathDataManager.php b/src/View/Antlers/Language/Runtime/PathDataManager.php
index 32dd2ff48e..be8b289b5e 100644
--- a/src/View/Antlers/Language/Runtime/PathDataManager.php
+++ b/src/View/Antlers/Language/Runtime/PathDataManager.php
@@ -476,6 +476,15 @@ private function checkForValueIntercept($pathItem)
         }
     }
 
+    private function collapseValues(bool $isFinal)
+    {
+        if (! $isFinal && $this->reducedVar instanceof Values) {
+            $this->lockData();
+            $this->reducedVar = self::reduce($this->reducedVar, true, $this->shouldDoValueIntercept);
+            $this->unlockData();
+        }
+    }
+
     private function collapseQueryBuilder($builder)
     {
         $this->reducedVar = $builder->get();
@@ -616,6 +625,8 @@ public function getData(VariableReference $path, $data, $isForArrayIndex = false
                             $this->unlockData();
                         }
 
+                        $this->collapseValues($pathItem->isFinal);
+
                         continue;
                     } else {
                         if ($this->cascade != null) {
@@ -660,6 +671,8 @@ public function getData(VariableReference $path, $data, $isForArrayIndex = false
 
                 $this->reduceVar($pathItem, $data);
 
+                $this->collapseValues($pathItem->isFinal);
+
                 if ($pathItem->isFinal && $this->reducedVar instanceof Builder && ! $wasBuilderGoingIntoLast) {
                     $this->encounteredBuilderOnFinalPart = true;
                 }
diff --git a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
index 1be0064e03..f39a8ed31f 100644
--- a/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
+++ b/src/View/Antlers/Language/Runtime/Sandbox/Environment.php
@@ -1567,7 +1567,11 @@ public function getValue($val)
             $varName = $this->nameOf($val);
 
             if ($val->isInterpolationReference) {
-                $interpolationValue = $this->adjustValue($this->nodeProcessor->reduceInterpolatedVariable($val), $val);
+                if (array_key_exists($varName->normalizedReference, $this->data)) {
+                    $interpolationValue = $this->adjustValue($this->data[$varName->normalizedReference], $val);
+                } else {
+                    $interpolationValue = $this->adjustValue($this->nodeProcessor->reduceInterpolatedVariable($val), $val);
+                }
 
                 // If the currently active node is an instance of ArithmeticNodeContract,
                 // we will ask the runtime type coercion to convert whatever value
diff --git a/tests/Antlers/Parser/NodeParametersTest.php b/tests/Antlers/Parser/NodeParametersTest.php
index a17dcc47f7..18bf2151fd 100644
--- a/tests/Antlers/Parser/NodeParametersTest.php
+++ b/tests/Antlers/Parser/NodeParametersTest.php
@@ -265,4 +265,67 @@ public function test_double_braces_inside_a_parameter_emits_final_literal_node_i
         $this->assertSame(' <div class="list-of-classes">     ', $nodes[0]->content);
         $this->assertSame('FINAL_LITERAL </div> ', $nodes[2]->content);
     }
+
+    public function test_shorthand_variable_syntax()
+    {
+        $template = <<<'EOT'
+{{ tag_name :$class }}
+EOT;
+
+        $nodes = $this->parseNodes($template);
+
+        $this->assertCount(1, $nodes);
+        $this->assertInstanceOf(AntlersNode::class, $nodes[0]);
+
+        $this->assertCount(1, $nodes[0]->parameters);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[0], 'class', 'class');
+        $this->assertTrue($nodes[0]->parameters[0]->isVariableReference);
+    }
+
+    public function test_multiple_shorthand_variable_parameters()
+    {
+        $template = <<<'EOT'
+{{ tag_name :$class :$another_one }}
+EOT;
+
+        $nodes = $this->parseNodes($template);
+
+        $this->assertCount(1, $nodes);
+        $this->assertInstanceOf(AntlersNode::class, $nodes[0]);
+
+        $this->assertCount(2, $nodes[0]->parameters);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[0], 'class', 'class');
+        $this->assertTrue($nodes[0]->parameters[0]->isVariableReference);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[1], 'another_one', 'another_one');
+        $this->assertTrue($nodes[0]->parameters[1]->isVariableReference);
+    }
+
+    public function test_it_parses_shorthand_parameters_and_regular_parameters()
+    {
+        $template = <<<'EOT'
+{{ tag_name this="that" :$class cool="beans" :$another_one lucky="egg" }}
+EOT;
+
+        $nodes = $this->parseNodes($template);
+
+        $this->assertCount(1, $nodes);
+        $this->assertInstanceOf(AntlersNode::class, $nodes[0]);
+
+        $this->assertCount(5, $nodes[0]->parameters);
+
+        $this->assertParameterNameValue($nodes[0]->parameters[0], 'this', 'that');
+        $this->assertParameterNameValue($nodes[0]->parameters[1], 'class', 'class');
+        $this->assertParameterNameValue($nodes[0]->parameters[2], 'cool', 'beans');
+        $this->assertParameterNameValue($nodes[0]->parameters[3], 'another_one', 'another_one');
+        $this->assertParameterNameValue($nodes[0]->parameters[4], 'lucky', 'egg');
+
+        $this->assertFalse($nodes[0]->parameters[0]->isVariableReference);
+        $this->assertTrue($nodes[0]->parameters[1]->isVariableReference);
+        $this->assertFalse($nodes[0]->parameters[2]->isVariableReference);
+        $this->assertTrue($nodes[0]->parameters[3]->isVariableReference);
+        $this->assertFalse($nodes[0]->parameters[4]->isVariableReference);
+    }
 }
diff --git a/tests/Antlers/Parser/ParserErrorsTest.php b/tests/Antlers/Parser/ParserErrorsTest.php
index a8d763f729..ff79c84100 100644
--- a/tests/Antlers/Parser/ParserErrorsTest.php
+++ b/tests/Antlers/Parser/ParserErrorsTest.php
@@ -194,4 +194,24 @@ public function test_modifier_method_syntax_with_extra_tokens_throws_error()
     {
         $this->assertThrowsParserError('{{ title | modifier_name(param1, param2) : something_else }}');
     }
+
+    public function test_shorthand_parameters_cannot_have_special_characters()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$thing="that" }}');
+    }
+
+    public function test_shorthand_parameters_cannot_start_with_numbers()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$1thing }}');
+    }
+
+    public function test_incomplete_shorthand_parameters_throws_error()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$ }}');
+    }
+
+    public function test_incomplete_shorthand_parameters_throws_error_two()
+    {
+        $this->assertThrowsParserError('{{ tag_name :$}}');
+    }
 }
diff --git a/tests/Antlers/Runtime/ParametersTest.php b/tests/Antlers/Runtime/ParametersTest.php
index 379300b940..76e64a826a 100644
--- a/tests/Antlers/Runtime/ParametersTest.php
+++ b/tests/Antlers/Runtime/ParametersTest.php
@@ -3,6 +3,9 @@
 namespace Tests\Antlers\Runtime;
 
 use Carbon\Carbon;
+use Statamic\Fields\Field;
+use Statamic\Fields\Value;
+use Statamic\Fieldtypes\Group;
 use Statamic\Tags\Tags;
 use Tests\Antlers\Fixtures\Addon\Tags\EchoMethod;
 use Tests\Antlers\Fixtures\Addon\Tags\TestTags as Test;
@@ -335,6 +338,29 @@ public function index()
         $this->assertSame('123:456', $result);
     }
 
+    public function test_shorthand_parameter_variable_syntax()
+    {
+        $data = [
+            'name' => 'Bacon',
+        ];
+
+        (new class extends Tags
+        {
+            protected static $handle = 'test';
+
+            public function index()
+            {
+                return 'From the tag! '.$this->params->get('name');
+            }
+        })::register();
+
+        $template = <<<'EOT'
+{{ test :$name }}
+EOT;
+
+        $this->assertSame('From the tag! Bacon', $this->renderString($template, $data, true));
+    }
+
     public function test_numeric_literals_inside_variable_bindings_stay_numbers()
     {
         (new class extends Tags
@@ -365,4 +391,61 @@ public function index()
             'Floats'
         );
     }
+
+    public function test_values_objects_are_resolved_when_processing_tag_params()
+    {
+        (new class extends Tags
+        {
+            protected static $handle = 'test';
+
+            public function index()
+            {
+                return $this->params->get('param');
+            }
+        })::register();
+
+        $theGroup = new Group();
+
+        $theField = new Field('the_group', [
+            'type' => 'group',
+            'fields' => [
+                ['handle' => 'one', 'field' => ['type' => 'text']],
+                ['handle' => 'two', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        $theGroup->setField($theField);
+
+        $theValue = new Value([
+            'one' => 'One',
+            'two' => 'Two',
+        ], 'the_group', $theGroup);
+
+        $data = [
+            'thing' => [
+                [
+                    'the_group' => $theValue,
+                ],
+            ],
+        ];
+
+        $template = <<<'EOT'
+{{ thing scope="block" }}
+{{ test :param="block:the_group:two" }}
+{{ /thing }}
+EOT;
+
+        $this->assertSame('Two', trim($this->renderString($template, $data, true)));
+
+        // Test when the group is the first part of the path.
+        $data = [
+            'the_group' => $theValue,
+        ];
+
+        $template = <<<'EOT'
+{{ test :param="the_group:one" }}
+EOT;
+
+        $this->assertSame('One', trim($this->renderString($template, $data, true)));
+    }
 }
diff --git a/tests/Antlers/Sandbox/ConditionalsTest.php b/tests/Antlers/Sandbox/ConditionalsTest.php
index 7c905b4e87..f355bae547 100644
--- a/tests/Antlers/Sandbox/ConditionalsTest.php
+++ b/tests/Antlers/Sandbox/ConditionalsTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Antlers\Sandbox;
 
+use Statamic\Tags\Tags;
 use Tests\Antlers\ParserTestCase;
 
 class ConditionalsTest extends ParserTestCase
@@ -47,6 +48,59 @@ public function test_sandbox_will_defer_collapsing_arrays()
         $this->assertSame('no', $this->renderString($template, $data));
     }
 
+    public function test_tags_are_not_initially_evaluated_twice()
+    {
+        $template = <<<'EOT'
+{{ if {switch between='yes|no'} == 'yes' }}yes{{ else }}no{{ /if }}{{ if {switch between='yes|no'} == 'yes' }}yes{{ else }}no{{ /if }}
+EOT;
+
+        $this->assertSame('yesno', $this->renderString($template, [], true));
+    }
+
+    public function test_tags_are_evaluated_twice_if_called_twice()
+    {
+        $template = <<<'EOT'
+{{ if {switch between='yes|no'} == 'yes' && {switch between='yes|no'} == 'no' }}yes{{ else }}no{{ /if }}{{ if {switch between='yes|no'} == 'yes' && {switch between='yes|no'} == 'no' }}yes{{ else }}no{{ /if }}{{ if {switch between='yes|no'} == 'no' && {switch between='yes|no'} == 'yes' }}yes{{ else }}no{{ /if }}
+EOT;
+
+        $this->assertSame('yesyesno', $this->renderString($template, [], true));
+    }
+
+    public function test_value_adjustments_inside_of_conditionals()
+    {
+        $template = <<<'EOT'
+{{ if 'bob' == 'bo{c}' }}yes{{ else }}no{{ /if }}
+EOT;
+        $this->assertSame('yes', $this->renderString($template, ['c' => 'b'], false));
+    }
+
+    public function test_many_tag_value_adjustments_inside_of_conditionals()
+    {
+        $template = <<<'EOT'
+{{ if 'one_{switch between='yes|no'}' == 'one_yes' && 'two_{switch between='yes|no'}' == 'two_no' }}yes{{ else }}no{{ /if }}
+EOT;
+
+        $this->assertSame('yes', $this->renderString($template, [], true));
+    }
+
+    public function test_value_adjustments_resolved_tag_values()
+    {
+        (new class extends Tags
+        {
+            protected static $handle = 'the_tag';
+
+            public function index()
+            {
+                return 'bob';
+            }
+        })::register();
+
+        $template = <<<'EOT'
+{{ if 'bob' == '{the_tag}' }}yes{{ else }}no{{ /if }}
+EOT;
+        $this->assertSame('yes', $this->renderString($template, [], true));
+    }
+
     public function test_sandbox_evaluates_simple_boolean_expressions()
     {
         $result = $this->getBoolResult('true == false', []);
diff --git a/tests/Assets/AssetTest.php b/tests/Assets/AssetTest.php
index 8129503f9f..94cb4e69ad 100644
--- a/tests/Assets/AssetTest.php
+++ b/tests/Assets/AssetTest.php
@@ -2160,6 +2160,73 @@ public function augment($values)
         ], Arr::only($asset->selectedQueryRelations(['charlie'])->toArray(), ['alfa', 'bravo', 'charlie']));
     }
 
+    /**
+     * @test
+     */
+    public function it_has_a_dirty_state()
+    {
+        $container = Facades\AssetContainer::make('test')->disk('test');
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+
+        $asset = (new Asset)->container($container)->path('test.jpg');
+
+        $asset->data([
+            'title' => 'English',
+            'food' => 'Burger',
+            'drink' => 'Water',
+        ])->save();
+
+        $this->assertFalse($asset->isDirty());
+        $this->assertFalse($asset->isDirty('title'));
+        $this->assertFalse($asset->isDirty('food'));
+        $this->assertFalse($asset->isDirty(['title']));
+        $this->assertFalse($asset->isDirty(['food']));
+        $this->assertFalse($asset->isDirty(['title', 'food']));
+        $this->assertTrue($asset->isClean());
+        $this->assertTrue($asset->isClean('title'));
+        $this->assertTrue($asset->isClean('food'));
+        $this->assertTrue($asset->isClean(['title']));
+        $this->assertTrue($asset->isClean(['food']));
+        $this->assertTrue($asset->isClean(['title', 'food']));
+
+        $asset->merge(['title' => 'French']);
+
+        $this->assertTrue($asset->isDirty());
+        $this->assertTrue($asset->isDirty('title'));
+        $this->assertFalse($asset->isDirty('food'));
+        $this->assertTrue($asset->isDirty(['title']));
+        $this->assertFalse($asset->isDirty(['food']));
+        $this->assertTrue($asset->isDirty(['title', 'food']));
+        $this->assertFalse($asset->isClean());
+        $this->assertFalse($asset->isClean('title'));
+        $this->assertTrue($asset->isClean('food'));
+        $this->assertFalse($asset->isClean(['title']));
+        $this->assertTrue($asset->isClean(['food']));
+        $this->assertFalse($asset->isClean(['title', 'food']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (AssetSaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->asset->isDirty());
+        });
+
+        $container = Facades\AssetContainer::make('test')->disk('test');
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+        $asset = $container->makeAsset('test.jpg');
+
+        $asset
+            ->set('foo', 'bar')
+            ->save();
+
+        $this->assertFalse($asset->isDirty());
+        $this->assertEquals(1, $eventsHandled);
+    }
+
     /** @test */
     public function it_augments_in_the_parser()
     {
diff --git a/tests/Auth/Eloquent/EloquentUserTest.php b/tests/Auth/Eloquent/EloquentUserTest.php
index 47cd74ec49..653223752a 100644
--- a/tests/Auth/Eloquent/EloquentUserTest.php
+++ b/tests/Auth/Eloquent/EloquentUserTest.php
@@ -6,7 +6,6 @@
 use Illuminate\Foundation\Testing\WithFaker;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Event;
 use Statamic\Auth\Eloquent\User as EloquentUser;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
@@ -43,10 +42,6 @@ public function setUp(): void
         }
 
         $this->loadMigrationsFrom($tmpDir);
-
-        // Prevent the anonymous role classes throwing errors when getting serialized
-        // during event handling unrelated to these tests.
-        Event::fake();
     }
 
     private static function migrationsDir()
diff --git a/tests/Auth/PermissibleContractTests.php b/tests/Auth/PermissibleContractTests.php
index 4834fc4e3b..79a2c4925c 100644
--- a/tests/Auth/PermissibleContractTests.php
+++ b/tests/Auth/PermissibleContractTests.php
@@ -3,6 +3,7 @@
 namespace Tests\Auth;
 
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Event;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
 use Statamic\Contracts\Auth\Role as RoleContract;
@@ -17,6 +18,10 @@ abstract protected function createPermissible();
     /** @test */
     public function it_gets_and_assigns_roles()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $roleA = new class extends Role
         {
             public function handle(?string $handle = null)
@@ -78,6 +83,10 @@ public function handle(?string $handle = null)
     /** @test */
     public function it_removes_a_role_assignment()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $roleA = new class extends Role
         {
             public function handle(?string $handle = null)
@@ -124,6 +133,10 @@ public function handle(?string $handle = null)
     /** @test */
     public function it_checks_if_it_has_a_role()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $roleA = new class extends Role
         {
             public function handle(?string $handle = null)
@@ -228,6 +241,10 @@ public function it_gets_and_checks_permissions()
     /** @test */
     public function it_checks_if_it_has_super_permissions_through_roles_and_groups()
     {
+        // Prevent the anonymous role classes throwing errors when getting serialized
+        // during event handling unrelated to this test.
+        Event::fake();
+
         $superRole = new class extends Role
         {
             public function handle(?string $handle = null)
diff --git a/tests/Auth/UserContractTests.php b/tests/Auth/UserContractTests.php
index 41bfc36125..8e02a3a981 100644
--- a/tests/Auth/UserContractTests.php
+++ b/tests/Auth/UserContractTests.php
@@ -5,10 +5,13 @@
 use BadMethodCallException;
 use Facades\Statamic\Fields\BlueprintRepository;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Hash;
 use Mockery;
 use Statamic\Auth\File\Role;
 use Statamic\Auth\File\UserGroup;
+use Statamic\Events\UserSaved;
+use Statamic\Events\UserSaving;
 use Statamic\Facades;
 use Statamic\Facades\Blueprint;
 use Statamic\Fields\Fieldtype;
@@ -513,6 +516,66 @@ public function additionalToArrayValues()
         return [];
     }
 
+    /**
+     * @test
+     */
+    public function it_has_a_dirty_state()
+    {
+        $user = $this->makeUser();
+        $user->email('test@test.com');
+        $user->save();
+
+        $this->assertFalse($user->isDirty());
+        $this->assertFalse($user->isDirty('email'));
+        $this->assertFalse($user->isDirty('name'));
+        $this->assertFalse($user->isDirty(['email']));
+        $this->assertFalse($user->isDirty(['name']));
+        $this->assertFalse($user->isDirty(['email', 'name']));
+        $this->assertTrue($user->isClean());
+        $this->assertTrue($user->isClean('email'));
+        $this->assertTrue($user->isClean('name'));
+        $this->assertTrue($user->isClean(['email']));
+        $this->assertTrue($user->isClean(['name']));
+        $this->assertTrue($user->isClean(['email', 'name']));
+
+        $user->email('test@tester.com');
+
+        $this->assertTrue($user->isDirty());
+        $this->assertTrue($user->isDirty('email'));
+        $this->assertFalse($user->isDirty('name'));
+        $this->assertTrue($user->isDirty(['email']));
+        $this->assertFalse($user->isDirty(['name']));
+        $this->assertTrue($user->isDirty(['email', 'name']));
+        $this->assertFalse($user->isClean());
+        $this->assertFalse($user->isClean('email'));
+        $this->assertTrue($user->isClean('name'));
+        $this->assertFalse($user->isClean(['email']));
+        $this->assertTrue($user->isClean(['name']));
+        $this->assertFalse($user->isClean(['email', 'name']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (UserSaving $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->user->isDirty());
+        });
+        Event::listen(function (UserSaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->user->isDirty());
+        });
+
+        $user = $this->makeUser();
+        $user->email('test@test.com');
+        $user->save();
+
+        $this->assertFalse($user->isDirty());
+        $this->assertEquals(2, $eventsHandled);
+    }
+
     private function createRole($handle)
     {
         $class = new class($handle) extends Role
diff --git a/tests/Data/Entries/EntryTest.php b/tests/Data/Entries/EntryTest.php
index 779855bad7..8aeaadaa40 100644
--- a/tests/Data/Entries/EntryTest.php
+++ b/tests/Data/Entries/EntryTest.php
@@ -2253,6 +2253,77 @@ public function it_gets_preview_targets()
         ], $entryDe->previewTargets()->all());
     }
 
+    /**
+     * @test
+     */
+    public function it_has_a_dirty_state()
+    {
+        $collection = tap(Collection::make('test'))->save();
+        $entry = tap((new Entry)->collection($collection)->locale('en')->id('en')->data([
+            'title' => 'English',
+            'food' => 'Burger',
+            'drink' => 'Water',
+        ]))->save();
+
+        $this->assertFalse($entry->isDirty());
+        $this->assertFalse($entry->isDirty('title'));
+        $this->assertFalse($entry->isDirty('food'));
+        $this->assertFalse($entry->isDirty(['title']));
+        $this->assertFalse($entry->isDirty(['food']));
+        $this->assertFalse($entry->isDirty(['title', 'food']));
+        $this->assertTrue($entry->isClean());
+        $this->assertTrue($entry->isClean('title'));
+        $this->assertTrue($entry->isClean('food'));
+        $this->assertTrue($entry->isClean(['title']));
+        $this->assertTrue($entry->isClean(['food']));
+        $this->assertTrue($entry->isClean(['title', 'food']));
+
+        $entry->merge(['title' => 'French']);
+
+        $this->assertTrue($entry->isDirty());
+        $this->assertTrue($entry->isDirty('title'));
+        $this->assertFalse($entry->isDirty('food'));
+        $this->assertTrue($entry->isDirty(['title']));
+        $this->assertFalse($entry->isDirty(['food']));
+        $this->assertTrue($entry->isDirty(['title', 'food']));
+        $this->assertFalse($entry->isClean());
+        $this->assertFalse($entry->isClean('title'));
+        $this->assertTrue($entry->isClean('food'));
+        $this->assertFalse($entry->isClean(['title']));
+        $this->assertTrue($entry->isClean(['food']));
+        $this->assertFalse($entry->isClean(['title', 'food']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (EntryCreating $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+        Event::listen(function (EntrySaving $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+        Event::listen(function (EntryCreated $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+        Event::listen(function (EntrySaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->entry->isDirty());
+        });
+
+        $collection = (new Collection)->handle('pages')->save();
+        $entry = (new Entry)->id('a')->collection($collection);
+        $entry->save();
+
+        $this->assertFalse($entry->isDirty());
+        $this->assertEquals(4, $eventsHandled);
+    }
+
     /** @test */
     public function it_gets_all_descendants()
     {
diff --git a/tests/Data/Taxonomies/TermTest.php b/tests/Data/Taxonomies/TermTest.php
index 31c6de4e3c..418d89e144 100644
--- a/tests/Data/Taxonomies/TermTest.php
+++ b/tests/Data/Taxonomies/TermTest.php
@@ -316,6 +316,82 @@ public function it_gets_preview_targets()
         ], $termDe->previewTargets()->all());
     }
 
+    /** @test */
+    public function it_has_a_dirty_state()
+    {
+        tap(Taxonomy::make('tags')->sites(['en', 'fr']))->save();
+
+        $term = (new Term)
+            ->taxonomy('tags')
+            ->slug('test');
+
+        $term->data([
+            'title' => 'English',
+            'food' => 'Burger',
+            'drink' => 'Water',
+        ])->save();
+
+        $this->assertFalse($term->isDirty());
+        $this->assertFalse($term->isDirty('title'));
+        $this->assertFalse($term->isDirty('food'));
+        $this->assertFalse($term->isDirty(['title']));
+        $this->assertFalse($term->isDirty(['food']));
+        $this->assertFalse($term->isDirty(['title', 'food']));
+        $this->assertTrue($term->isClean());
+        $this->assertTrue($term->isClean('title'));
+        $this->assertTrue($term->isClean('food'));
+        $this->assertTrue($term->isClean(['title']));
+        $this->assertTrue($term->isClean(['food']));
+        $this->assertTrue($term->isClean(['title', 'food']));
+
+        $term->merge(['title' => 'French']);
+
+        $this->assertTrue($term->isDirty());
+        $this->assertTrue($term->isDirty('title'));
+        $this->assertFalse($term->isDirty('food'));
+        $this->assertTrue($term->isDirty(['title']));
+        $this->assertFalse($term->isDirty(['food']));
+        $this->assertTrue($term->isDirty(['title', 'food']));
+        $this->assertFalse($term->isClean());
+        $this->assertFalse($term->isClean('title'));
+        $this->assertTrue($term->isClean('food'));
+        $this->assertFalse($term->isClean(['title']));
+        $this->assertTrue($term->isClean(['food']));
+        $this->assertFalse($term->isClean(['title', 'food']));
+    }
+
+    /** @test */
+    public function it_syncs_original_at_the_right_time()
+    {
+        $eventsHandled = 0;
+
+        Event::listen(function (TermCreating $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+        Event::listen(function (TermSaving $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+        Event::listen(function (TermCreated $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+        Event::listen(function (TermSaved $event) use (&$eventsHandled) {
+            $eventsHandled++;
+            $this->assertTrue($event->term->isDirty());
+        });
+
+        tap(Taxonomy::make('tags'))->save();
+
+        $term = (new Term)->taxonomy('tags')->slug('test');
+        $term->dataForLocale('en', ['title' => 'The title']);
+        $term->save();
+
+        $this->assertFalse($term->isDirty());
+        $this->assertEquals(4, $eventsHandled);
+    }
+
     /** @test */
     public function it_gets_and_sets_the_layout()
     {
diff --git a/tests/Fields/FieldsTest.php b/tests/Fields/FieldsTest.php
index 2f54f6ee1f..db5ab5a85f 100644
--- a/tests/Fields/FieldsTest.php
+++ b/tests/Fields/FieldsTest.php
@@ -1003,4 +1003,58 @@ public function it_sets_the_parentindex_on_all_fields()
         $this->assertEquals(1, $collection['one']->parentIndex());
         $this->assertEquals(1, $collection['two']->parentIndex());
     }
+
+    /**
+     * @test
+     */
+    public function it_sets_the_parentfield_and_parentindex_on_imported_fields()
+    {
+        $fieldset = (new Fieldset)->setHandle('partial')->setContents([
+            'fields' => [
+                ['handle' => 'bar', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        FieldsetRepository::shouldReceive('find')->with('partial')->once()->andReturn($fieldset);
+
+        $parentField = new Field('foo', ['type' => 'replicator']);
+
+        $fields = new Fields(
+            [['import' => 'partial']],
+            null,
+            $parentField,
+            1,
+        );
+
+        $collection = $fields->all();
+        $this->assertEquals($parentField, $collection['bar']->parentField());
+        $this->assertEquals(1, $collection['bar']->parentIndex());
+    }
+
+    /**
+     * @test
+     */
+    public function it_sets_the_parentfield_and_parentindex_on_referenced_fields()
+    {
+        $fieldset = (new Fieldset)->setHandle('partial')->setContents([
+            'fields' => [
+                ['handle' => 'bar', 'field' => ['type' => 'text']],
+            ],
+        ]);
+
+        FieldsetRepository::shouldReceive('find')->with('partial')->once()->andReturn($fieldset);
+
+        $parentField = new Field('foo', ['type' => 'replicator']);
+
+        $fields = new Fields(
+            [['handle' => 'bar', 'field' => 'partial.bar']],
+            null,
+            $parentField,
+            1,
+        );
+
+        $collection = $fields->all();
+        $this->assertEquals($parentField, $collection['bar']->parentField());
+        $this->assertEquals(1, $collection['bar']->parentIndex());
+    }
 }
diff --git a/tests/Modifiers/HexToRgbTest.php b/tests/Modifiers/HexToRgbTest.php
new file mode 100644
index 0000000000..8ebeda7571
--- /dev/null
+++ b/tests/Modifiers/HexToRgbTest.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Tests\Modifiers;
+
+use Statamic\Modifiers\Modify;
+use Tests\TestCase;
+
+class HexToRgbTest extends TestCase
+{
+    /** @test */
+    public function it_converts_hex_values_to_rgb(): void
+    {
+        $modified = $this->modify('#FF269E');
+        $this->assertEquals('255, 38, 158', $modified);
+
+        $modified = $this->modify('01D7B0');
+        $this->assertEquals('1, 215, 176', $modified);
+
+        $modified = $this->modify('##B8FFF3');
+        $this->assertEquals('184, 255, 243', $modified);
+    }
+
+    private function modify(string $value)
+    {
+        return Modify::value($value)->hexToRgb()->fetch();
+    }
+}
diff --git a/tests/Stache/Repositories/EntryRepositoryTest.php b/tests/Stache/Repositories/EntryRepositoryTest.php
index 4a9262f3a8..2e475af271 100644
--- a/tests/Stache/Repositories/EntryRepositoryTest.php
+++ b/tests/Stache/Repositories/EntryRepositoryTest.php
@@ -4,6 +4,7 @@
 
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Entries\EntryCollection;
+use Statamic\Exceptions\EntryNotFoundException;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Entry as EntryAPI;
 use Statamic\Stache\Repositories\EntryRepository;
@@ -136,6 +137,24 @@ public function it_gets_entry_by_id()
         $this->assertNull($this->repo->find('unknown'));
     }
 
+    /** @test */
+    public function test_find_or_fail_gets_entry()
+    {
+        $entry = $this->repo->findOrFail('alphabetical-bravo');
+
+        $this->assertInstanceOf(Entry::class, $entry);
+        $this->assertEquals('Bravo', $entry->get('title'));
+    }
+
+    /** @test */
+    public function test_find_or_fail_throws_exception_when_entry_does_not_exist()
+    {
+        $this->expectException(EntryNotFoundException::class);
+        $this->expectExceptionMessage('Entry [does-not-exist] not found');
+
+        $this->repo->findOrFail('does-not-exist');
+    }
+
     /**
      * @test
      *
diff --git a/tests/StaticCaching/ManagerTest.php b/tests/StaticCaching/ManagerTest.php
index be865df05e..3b770f3ba7 100644
--- a/tests/StaticCaching/ManagerTest.php
+++ b/tests/StaticCaching/ManagerTest.php
@@ -21,6 +21,7 @@ public function it_flushes()
         $mock = Mockery::mock(Cacher::class)->shouldReceive('flush')->once()->getMock();
         StaticCache::extend('test', fn () => $mock);
 
+        Cache::shouldReceive('store')->andReturnSelf();
         Cache::shouldReceive('get')->with('nocache::urls', [])->once()->andReturn(['/one', '/two']);
         Cache::shouldReceive('get')->with('nocache::session.'.md5('/one'))->once()->andReturn(['regions' => ['r1', 'r2']]);
         Cache::shouldReceive('get')->with('nocache::session.'.md5('/two'))->once()->andReturn(['regions' => ['r3', 'r4']]);
diff --git a/tests/StaticCaching/NoCacheSessionTest.php b/tests/StaticCaching/NoCacheSessionTest.php
index d5022fc16f..68a35d658b 100644
--- a/tests/StaticCaching/NoCacheSessionTest.php
+++ b/tests/StaticCaching/NoCacheSessionTest.php
@@ -80,6 +80,8 @@ public function it_writes()
 
         // Testing that the cache key used is unique to the url.
         // The contents aren't really important.
+        Cache::shouldReceive('store')
+            ->andReturnSelf();
 
         Cache::shouldReceive('forever')
             ->with('nocache::session.'.md5('/'), Mockery::any())
diff --git a/tests/Support/HookableTest.php b/tests/Support/HookableTest.php
new file mode 100644
index 0000000000..6435c08bea
--- /dev/null
+++ b/tests/Support/HookableTest.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace Tests\Support;
+
+use Statamic\Support\Traits\Hookable;
+use Tests\TestCase;
+use Tests\TestDependency;
+
+class HookableTest extends TestCase
+{
+    /** @test */
+    public function hooks_can_be_run()
+    {
+        $test = $this;
+
+        TestHookable::hook('constructed', function ($payload, $next) use ($test) {
+            $test->assertEquals('initial', $payload);
+            $test->assertInstanceOf(TestHookable::class, $this);
+            $this->setFoo('bar');
+
+            return $next($payload);
+        });
+
+        // Do it twice to ensure that they are executed in order
+        // and the payload is passed along through the closures.
+        TestHookable::hook('constructed', function ($payload, $next) use ($test) {
+            $test->assertInstanceOf(TestHookable::class, $this);
+            $test->assertEquals('initial', $payload);
+            $this->setFoo($this->foo.'baz');
+
+            return $next($payload);
+        });
+
+        $class = app(TestHookable::class);
+
+        $this->assertEquals('barbaz', $class->foo);
+    }
+
+    /** @test */
+    public function hooks_from_one_class_dont_happen_on_another()
+    {
+        $hooksRan = 0;
+
+        TestHookable::hook('constructed', function ($payload, $next) use (&$hooksRan) {
+            $this->setFoo('bar');
+            $hooksRan++;
+
+            return $next($this);
+        });
+
+        AnotherTestHookable::hook('constructed', function ($payload, $next) use (&$hooksRan) {
+            $this->setFoo($this->foo.'baz');
+            $hooksRan++;
+
+            return $next($this);
+        });
+
+        $class = app(AnotherTestHookable::class);
+
+        $this->assertEquals(1, $hooksRan);
+        $this->assertEquals('baz', $class->foo);
+    }
+}
+
+class TestHookable
+{
+    use Hookable;
+
+    public $dependency;
+    public $foo = 'initial';
+
+    public function __construct(TestDependency $dependency)
+    {
+        $this->dependency = $dependency;
+
+        $this->runHooks('constructed', $this->foo);
+    }
+
+    public function setFoo(string $foo)
+    {
+        $this->foo = $foo;
+    }
+}
+
+class AnotherTestHookable
+{
+    use Hookable;
+    public $foo = '';
+
+    public function __construct()
+    {
+        $this->runHooks('constructed');
+    }
+
+    public function setFoo(string $foo)
+    {
+        $this->foo = $foo;
+    }
+}
diff --git a/tests/Tags/Form/FormCreateTest.php b/tests/Tags/Form/FormCreateTest.php
index 557a6314a7..d097f5d699 100644
--- a/tests/Tags/Form/FormCreateTest.php
+++ b/tests/Tags/Form/FormCreateTest.php
@@ -2,6 +2,11 @@
 
 namespace Tests\Tags\Form;
 
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\ValidationException;
+use Statamic\Facades\AssetContainer;
 use Statamic\Facades\Form;
 use Statamic\Statamic;
 
@@ -822,4 +827,108 @@ public function it_fetches_form_data()
         $this->assertEquals($form['honeypot'], 'winnie');
         $this->assertEquals($form['js_driver'], 'alpine');
     }
+
+    /** @test */
+    public function it_uploads_assets()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->save();
+
+        $this->createForm([
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'display' => 'One',
+                            'instructions' => 'One Instructions',
+                            'fields' => [
+                                ['handle' => 'alpha', 'field' => ['type' => 'text']],
+                                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'alpha' => 'test',
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ]);
+
+        Storage::disk('avatars')->assertExists('avatar.jpg');
+    }
+
+    /** @test */
+    public function it_removes_any_uploaded_assets_when_a_submission_silently_fails()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->save();
+
+        Event::listen(function (\Statamic\Events\FormSubmitted $event) {
+            return false;
+        });
+
+        $this->createForm([
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'display' => 'One',
+                            'instructions' => 'One Instructions',
+                            'fields' => [
+                                ['handle' => 'alpha', 'field' => ['type' => 'text']],
+                                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'alpha' => 'test',
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ]);
+
+        Storage::disk('avatars')->assertMissing('avatar.jpg');
+    }
+
+    /** @test */
+    public function it_removes_any_uploaded_assets_when_a_listener_throws_a_validation_exception()
+    {
+        Storage::fake('avatars');
+        AssetContainer::make('avatars')->disk('avatars')->save();
+
+        Event::listen(function (\Statamic\Events\FormSubmitted $event) {
+            throw ValidationException::withMessages(['custom' => 'This is a custom message']);
+        });
+
+        $this->createForm([
+            'tabs' => [
+                'main' => [
+                    'sections' => [
+                        [
+                            'display' => 'One',
+                            'instructions' => 'One Instructions',
+                            'fields' => [
+                                ['handle' => 'alpha', 'field' => ['type' => 'text']],
+                                ['handle' => 'bravo', 'field' => ['type' => 'assets', 'container' => 'avatars']],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ], 'survey');
+
+        $this
+            ->post('/!/forms/survey', [
+                'alpha' => 'test',
+                'bravo' => UploadedFile::fake()->image('avatar.jpg'),
+            ]);
+
+        Storage::disk('avatars')->assertMissing('avatar.jpg');
+    }
 }
diff --git a/tests/Tags/LoaderTest.php b/tests/Tags/LoaderTest.php
new file mode 100644
index 0000000000..c5c3705bca
--- /dev/null
+++ b/tests/Tags/LoaderTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Tests\Tags;
+
+use Statamic\Facades\Antlers;
+use Tests\Fixtures\Addon\Tags\TestTags;
+use Tests\TestCase;
+
+class LoaderTest extends TestCase
+{
+    /** @test */
+    public function loading_a_tag_will_run_the_init_hook()
+    {
+        TestTags::register();
+        $test = $this;
+        $tag = null;
+
+        // This hook should add to the tag's params, which we can assert about later.
+        TestTags::hook('init', function ($payload, $next) use (&$tag, $test) {
+            $test->assertInstanceOf(TestTags::class, $this);
+            $this->params['alfa'] = 'bravo';
+            $tag = $this;
+
+            return $next($payload);
+        });
+
+        $this->assertEquals('bar', (string) Antlers::parse('{{ test :variable="foo" }}', ['foo' => 'bar']));
+        $this->assertEquals(['variable' => 'bar', 'alfa' => 'bravo'], $tag->params->all());
+    }
+}
diff --git a/tests/Tags/LocalesTagTest.php b/tests/Tags/LocalesTagTest.php
index 2667efacd5..9787e81080 100644
--- a/tests/Tags/LocalesTagTest.php
+++ b/tests/Tags/LocalesTagTest.php
@@ -449,4 +449,36 @@ public function it_displays_nothing_when_context_id_is_null()
             $this->tag('{{ locales }}you should not see this{{ /locales }}', ['id' => $value])
         );
     }
+
+    /** @test */
+    public function it_prefers_page_id_over_id()
+    {
+        (new EntryFactory)
+            ->collection('test')
+            ->locale('english')
+            ->id('1')
+            ->data(['title' => 'hello'])
+            ->create();
+
+        $this->assertEquals(
+            '<hello>',
+            $this->tag('{{ locales }}<{{ title }}>{{ /locales }}', ['page' => ['id' => '1']])
+        );
+    }
+
+    /** @test */
+    public function it_prefers_id_param_over_page_id()
+    {
+        (new EntryFactory)
+            ->collection('test')
+            ->locale('english')
+            ->id('1')
+            ->data(['title' => 'hello'])
+            ->create();
+
+        $this->assertEquals(
+            '<hello>',
+            $this->tag('{{ locales id="1" }}<{{ title }}>{{ /locales }}', ['page' => ['id' => '7']])
+        );
+    }
 }