diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 658db16b1652..a1b290f04c7f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,16 @@ jobs:
         JS_SETUP: yes
         KAFKA_HOSTNAME: kafka
         STRIPE_PRIVATE_KEY: ${{ secrets.STRIPE_PRIVATE_KEY }}
-      run: scripts/docker test --exitfirst -vv --reusedb=1 --divided-we-run=${{ matrix.DIVIDED_WE_RUN }} --showlocals --max-test-time=29 -p no:cacheprovider
+      run: >-
+        scripts/docker test
+        --exitfirst
+        --verbosity=2
+        --reusedb=1
+        --no-migrations
+        --divided-we-run=${{ matrix.DIVIDED_WE_RUN }}
+        --showlocals
+        --max-test-time=29
+        -p no:cacheprovider
     - name: "Codecov upload"
       env:
         TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/corehq/apps/accounting/static/accounting/js/renew_plan_selection.js b/corehq/apps/accounting/static/accounting/js/renew_plan_selection.js
index 5a92e11666dd..e5221bbf1fcf 100644
--- a/corehq/apps/accounting/static/accounting/js/renew_plan_selection.js
+++ b/corehq/apps/accounting/static/accounting/js/renew_plan_selection.js
@@ -4,6 +4,7 @@ hqDefine('accounting/js/renew_plan_selection', [
     'knockout',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/accounting/templates/accounting/accounting_admins.html b/corehq/apps/accounting/templates/accounting/accounting_admins.html
index c2210bd509ac..eedd1a187ea6 100644
--- a/corehq/apps/accounting/templates/accounting/accounting_admins.html
+++ b/corehq/apps/accounting/templates/accounting/accounting_admins.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main "hqwebapp/js/bootstrap3/crud_paginated_list_init" %}
+{% js_entry_b3 "hqwebapp/js/bootstrap3/crud_paginated_list_init" %}
 
 {% block pagination_header %}
   <h2>{% trans 'Manage Accounting Admins' %}</h2>
diff --git a/corehq/apps/app_manager/fixtures/mobile_ucr.py b/corehq/apps/app_manager/fixtures/mobile_ucr.py
index dd557a7752a2..36842704397d 100644
--- a/corehq/apps/app_manager/fixtures/mobile_ucr.py
+++ b/corehq/apps/app_manager/fixtures/mobile_ucr.py
@@ -139,12 +139,7 @@ def _get_apps(self, restore_state, restore_user):
 
         if app_aware_sync_app:
             apps = [app_aware_sync_app]
-        elif (
-            toggles.RESTORE_ACCESSIBLE_REPORTS_ONLY.enabled(restore_user.domain)
-            and restore_state.params.is_webapps
-            # only way to reliably know that this is a web apps restore, not live preview
-            and not restore_user.request_user.can_view_apps(restore_user.domain)
-        ):
+        elif toggles.RESTORE_ACCESSIBLE_REPORTS_ONLY.enabled(restore_user.domain):
             apps = []
             for app in get_web_apps_available_to_user(restore_user.domain, restore_user._couch_user):
                 if not is_remote_app(app):
diff --git a/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html b/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
index 97bd7effe71f..02f4a7979d41 100644
--- a/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+++ b/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
@@ -38,7 +38,6 @@
   {% initial_page_data 'intro_only' intro_only %}
   {% initial_page_data 'langs' app.langs %}
   {% initial_page_data 'latest_build_id' latest_build_id %}
-  {% initial_page_data 'sms_contacts' sms_contacts %}
   {% initial_page_data 'confirm' confirm %}
   {% initial_page_data 'upstream_url' upstream_url_template %}
   {% initial_page_data 'show_release_mode' show_release_mode %}
diff --git a/corehq/apps/app_manager/templates/app_manager/apps_base.html b/corehq/apps/app_manager/templates/app_manager/apps_base.html
index 36d8fd9304f3..5f60ee676667 100644
--- a/corehq/apps/app_manager/templates/app_manager/apps_base.html
+++ b/corehq/apps/app_manager/templates/app_manager/apps_base.html
@@ -62,8 +62,6 @@
   {% endcompress %}
 
   {% include 'hqwebapp/includes/atwho.html' %}
-  <script src="{% static 'bootstrap3-typeahead/bootstrap3-typeahead.min.js' %}"></script>
-  <script src="{% static 'hqwebapp/js/bootstrap-multi-typeahead.js' %}"></script>
 
   {% include 'hqwebapp/includes/ui_element_js.html' %}
   {% compress js %}
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html b/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html
index b06eae5f116a..3930b79d85e7 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html
@@ -12,11 +12,15 @@
               </span>
       </label>
     </div>
-    <form method="post" action="{% url "send_to_recipients" domain %}">{% csrf_token %}
+    <form method="post" action="{% url "send_to_recipients" domain %}">
+      {% csrf_token %}
       <div class="form-group">
         <label>{% trans "Send to" %}</label>
-        <input type="text" name="recipients" value="" class="form-control"
-               data-bind="multiTypeahead: $root.recipients" />
+        <select name="recipients" id="sms-recipients" class="form-control" multiple data-bind="staticSelect2: {}">
+          {% for contact in sms_contacts %}
+            <option>{{ contact }}</option>
+          {% endfor %}
+        </select>
       </div>
       <div class="form-group">
                 <textarea class="bitly form-control vertical-resize" name="message"
diff --git a/corehq/apps/app_manager/views/releases.py b/corehq/apps/app_manager/views/releases.py
index f8446951c3ea..fbf517406a9e 100644
--- a/corehq/apps/app_manager/views/releases.py
+++ b/corehq/apps/app_manager/views/releases.py
@@ -208,10 +208,7 @@ def get_releases_context(request, domain, app_id):
         'can_view_cloudcare': has_privilege(request, privileges.CLOUDCARE),
         'has_mobile_workers': get_doc_count_in_domain_by_class(domain, CommCareUser) > 0,
         'latest_released_version': get_latest_released_app_version(domain, app_id),
-        'sms_contacts': (
-            get_sms_autocomplete_context(request, domain)['sms_contacts']
-            if can_send_sms else []
-        ),
+        'sms_contacts': get_sms_autocomplete_context(domain) if can_send_sms else [],
         'build_profile_access': build_profile_access,
         'application_profile_url': reverse(LanguageProfilesView.urlname, args=[domain, app_id]),
         'latest_build_id': get_latest_build_id(domain, app_id),
diff --git a/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html b/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
index 2aa7572acf89..ff428c2be8d5 100644
--- a/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
+++ b/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -27,56 +27,56 @@
   <!--/ko-->
 </div>
 <!--ko if: !$root._.isEmpty(result.errors)-->
-<div class="alert alert-warning">
-  <ul class="list-unstyled">
-    <!--ko foreach: result.errors-->
-    <!--ko if: rows-->
-    <li>
-      <!--ko if: column-->
-      <p><strong>
-        <!-- ko if: rows.length == 1-->
-        {% blocktrans %}
-          <span data-bind="text: rows.length"></span> row had an invalid
-          "<span data-bind="text: column"></span>" cell and was not saved
-        {% endblocktrans %}
+  <!--ko foreach: result.errors-->
+    <div class="alert alert-warning">
+      <!--ko if: rows-->
+        <!--ko if: column-->
+          <h6>
+            <!-- ko if: rows.length == 1-->
+            {% blocktrans %}
+              <span data-bind="text: rows.length"></span> row had an invalid
+              "<span data-bind="text: column"></span>" cell and was not saved
+            {% endblocktrans %}
+            <!--/ko-->
+            <!-- ko if: rows.length > 1-->
+            {% blocktrans %}
+              <span data-bind="text: rows.length"></span> rows had invalid
+              "<span data-bind="text: column"></span>" cells and were not saved
+            {% endblocktrans %}
+            <!--/ko-->
+          </h6>
         <!--/ko-->
-        <!-- ko if: rows.length > 1-->
-        {% blocktrans %}
-          <span data-bind="text: rows.length"></span> rows had invalid
-          "<span data-bind="text: column"></span>" cells and were not saved
-        {% endblocktrans %}
+        <!--ko if: !column -->
+          <h6 data-bind="text: title"></h6>
         <!--/ko-->
-      </strong></p>
-      <!--/ko-->
-      <!--ko if: !column -->
-      <p><strong data-bind="text: title"></strong></p>
-      <!--/ko-->
-      <p data-bind="text: description">
-      </p>
-      <p data-bind="visible: sample, text: sample">
-      </p>
-      <div data-bind="visible: rows.length">
-        <button type="button"
-                class="btn btn-outline-primary btn-sm"
-                data-bs-toggle="collapse"
-                data-bind="attr: {
-                  'data-bs-target': '#rowDetailsCollapse-' + $parentContext.$index(),
-                  'aria-controls': 'rowDetailsCollapse-' + $parentContext.$index()
-                }"
-                aria-expanded="false">
-          {% trans "Toggle Affected Row(s)" %}
-        </button>
-        <div class="collapse"
-             data-bind="attr: { id: 'rowDetailsCollapse-' + $parentContext.$index() }">
-          <div class="card card-body mt-3"
-               data-bind="text: rows.join(', ')"></div>
+        <p data-bind="text: description"></p>
+        <p data-bind="visible: sample, text: sample"></p>
+        <div data-bind="visible: rows.length">
+          <button
+              type="button"
+              class="btn btn-outline-primary btn-sm"
+              data-bs-toggle="collapse"
+              data-bind="attr: {
+                'data-bs-target': '#rowDetailsCollapse-' + $parentContext.$index() + '-' + $index(),
+                'aria-controls': 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index()
+              }"
+              aria-expanded="false"
+          >
+            {% trans "Toggle Affected Row(s)" %}
+          </button>
+          <div
+              class="collapse"
+              data-bind="attr: { id: 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index() }"
+          >
+            <div
+                class="card card-body mt-3"
+                data-bind="text: rows.join(', ')"
+            ></div>
+          </div>
         </div>
-      </div>
-    </li>
-    <!--/ko-->
-    <!--/ko-->
-  </ul>
-</div>
+      <!--/ko-->
+    </div>
+  <!--/ko-->
 <!--/ko-->
 <!--/ko-->
 <!--ko if: state == $root.states.SUCCESS && !result-->
diff --git a/corehq/apps/case_search/tests/test_filter_dsl.py b/corehq/apps/case_search/tests/test_filter_dsl.py
index 5f1ecaedc0e8..99fc54566dac 100644
--- a/corehq/apps/case_search/tests/test_filter_dsl.py
+++ b/corehq/apps/case_search/tests/test_filter_dsl.py
@@ -81,14 +81,20 @@ def test_datetime_system_property_filter_optimized(self, mock_get_timezone):
 
     @freeze_time('2023-05-16T13:01:51Z')
     @flag_enabled('CASE_SEARCH_INDEXED_METADATA')
-    @patch("corehq.apps.case_search.xpath_functions.comparison.get_timezone_for_domain",
-           return_value=pytz.timezone('America/Los_Angeles'))
-    def test_system_date_property_comparison(self, mock_get_timezone):
+    def test_system_datetime_property_comparison(self):
         parsed = parse_xpath("last_modified < datetime-add(now(), 'weeks', -2)")
         expected_filter = filters.date_range('modified_on', lt='2023-05-02T13:01:51+00:00')
         built_filter = build_filter_from_ast(parsed, SearchFilterContext("domain"))
         self.checkQuery(built_filter, expected_filter, is_raw_query=True)
 
+    @freeze_time('2023-05-16T13:01:51Z')
+    @flag_enabled('CASE_SEARCH_INDEXED_METADATA')
+    def test_system_datetime_property_match(self):
+        parsed = parse_xpath("last_modified = now()")
+        expected_filter = filters.term('modified_on', '2023-05-16T13:01:51+00:00')
+        built_filter = build_filter_from_ast(parsed, SearchFilterContext("domain"))
+        self.checkQuery(built_filter, expected_filter, is_raw_query=True)
+
     def test_not_filter(self):
         parsed = parse_xpath("not(name = 'farid')")
         expected_filter = filters.NOT(case_property_query('name', 'farid'))
diff --git a/corehq/apps/case_search/xpath_functions/comparison.py b/corehq/apps/case_search/xpath_functions/comparison.py
index a5edcc57fb9c..59c3fb69a89a 100644
--- a/corehq/apps/case_search/xpath_functions/comparison.py
+++ b/corehq/apps/case_search/xpath_functions/comparison.py
@@ -126,6 +126,8 @@ def _create_system_datetime_query(domain, meta_property, op, value, node):
         raise CaseFilterError(str(e), serialize(node))
 
     if isinstance(date_or_datetime, datetime):
+        if op == EQ:
+            return filters.term(meta_property.es_field_name, value)
         range_kwargs = {RANGE_OP_MAPPING[op]: date_or_datetime}
     else:
         timezone = get_timezone_for_domain(domain)
diff --git a/corehq/apps/cleanup/migrations/0017_delete_oauth_integrations_models.py b/corehq/apps/cleanup/migrations/0017_delete_oauth_integrations_models.py
new file mode 100644
index 000000000000..1469eaaee38a
--- /dev/null
+++ b/corehq/apps/cleanup/migrations/0017_delete_oauth_integrations_models.py
@@ -0,0 +1,50 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cleanup', '0016_add_deletedsqldoc'),
+    ]
+
+    operations = [
+        migrations.RunSQL("""
+            DROP TABLE IF EXISTS "oauth_integrations_googleapitoken" CASCADE;
+            DROP TABLE IF EXISTS "oauth_integrations_livegooglesheetrefreshstatus" CASCADE;
+            DROP TABLE IF EXISTS "oauth_integrations_livegooglesheetschedule" CASCADE;
+        """),
+    ]
+
+
+"""
+Dropped entities can be checked with the following query:
+    select pg_describe_object(classid, objid, objsubid)
+    from pg_depend
+    where refobjid in (
+        'oauth_integrations_googleapitoken'::regclass,
+        'oauth_integrations_livegooglesheetrefreshstatus'::regclass,
+        'oauth_integrations_livegooglesheetschedule'::regclass
+    );
+Example output (from staging, the same as a local dev setup):
+ type oauth_integrations_livegooglesheetschedule
+ type oauth_integrations_livegooglesheetrefreshstatus
+ type oauth_integrations_googleapitoken
+ toast table pg_toast.pg_toast_2980995
+ toast table pg_toast.pg_toast_2980982
+ toast table pg_toast.pg_toast_2892669
+ sequence oauth_integrations_livegooglesheetschedule_id_seq
+ sequence oauth_integrations_livegooglesheetrefreshstatus_id_seq
+ sequence oauth_integrations_googleapitoken_id_seq
+ index oauth_integrations_livegoo_schedule_id_064aa4f4
+ index oauth_integrations_livegoo_export_config_id_200127ab
+ index oauth_integrations_liveg_export_config_id_200127ab_like
+ index oauth_integrations_googleapitoken_user_id_9d01255f
+ default value for column id of table oauth_integrations_livegooglesheetschedule
+ default value for column id of table oauth_integrations_livegooglesheetrefreshstatus
+ default value for column id of table oauth_integrations_googleapitoken
+ constraint oauth_integrations_livegooglesheetschedule_pkey on table oauth_integrations_livegooglesheetschedule
+ constraint oauth_integrations_livegooglesheetrefreshstatus_pkey on table oauth_integrations_livegooglesheetrefreshstatus
+ constraint oauth_integrations_l_schedule_id_064aa4f4_fk_oauth_int on table oauth_integrations_livegooglesheetrefreshstatus
+ constraint oauth_integrations_googleapitoken_pkey on table oauth_integrations_googleapitoken
+ constraint oauth_integrations_g_user_id_9d01255f_fk_auth_user on table oauth_integrations_googleapitoken
+"""
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
index 3c74c1a2906f..e13f019daf84 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/web_form_session.js
@@ -10,6 +10,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
     'cloudcare/js/form_entry/utils',
     'cloudcare/js/form_entry/form_ui',
     'cloudcare/js/formplayer/utils/utils',
+    'cloudcare/js/formplayer/users/models',
 ], function (
     $,
     ko,
@@ -20,7 +21,8 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
     taskQueue,
     formEntryUtils,
     formUI,
-    utils
+    utils,
+    UsersModels
 ) {
     function WebFormSession(params) {
         var self = {};
@@ -478,6 +480,7 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
         };
 
         self.changeLang = function (lang) {
+            updateDisplayOptionLang(lang);
             self.serverRequest(
                 {
                     'action': constants.CHANGE_LOCALE,
@@ -623,9 +626,16 @@ hqDefine("cloudcare/js/form_entry/web_form_session", [
             var urlObject = utils.currentUrlToObject();
             urlObject.changeLang = lang;
             menusController.selectMenu(urlObject);
+            updateDisplayOptionLang(lang);
         });
     }
 
+    function updateDisplayOptionLang(lang) {
+        var displayOptions = UsersModels.getCurrentUser().displayOptions;
+        displayOptions.language = lang;
+        UsersModels.saveDisplayOptions(displayOptions);
+    }
+
     return {
         WebFormSession: WebFormSession,
         applyLangListener: applyLangListener,
diff --git a/corehq/apps/domain/migrations/0015_delete_projectlimit.py b/corehq/apps/domain/migrations/0015_delete_projectlimit.py
new file mode 100644
index 000000000000..63f7c46ecad8
--- /dev/null
+++ b/corehq/apps/domain/migrations/0015_delete_projectlimit.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2.16 on 2024-11-25 15:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('domain', '0014_appreleasemodesetting'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='ProjectLimit',
+        ),
+    ]
diff --git a/corehq/apps/domain/models.py b/corehq/apps/domain/models.py
index 29550b52f21e..73ade2f0348f 100644
--- a/corehq/apps/domain/models.py
+++ b/corehq/apps/domain/models.py
@@ -1107,20 +1107,6 @@ def disallowed_ucr_expressions(cls, domain_name):
         return restricted_expressions - allowed_expressions_for_domain
 
 
-class ProjectLimitType():
-    LIVE_GOOGLE_SHEETS = 'lgs'
-
-    CHOICES = (
-        (LIVE_GOOGLE_SHEETS, "Live Google Sheets"),
-    )
-
-
-class ProjectLimit(models.Model):
-    domain = models.CharField(max_length=256, db_index=True)
-    limit_type = models.CharField(max_length=5, choices=ProjectLimitType.CHOICES)
-    limit_value = models.IntegerField(default=20)
-
-
 class OperatorCallLimitSettings(models.Model):
     CALL_LIMIT_MINIMUM = 1
     CALL_LIMIT_MAXIMUM = 1000
diff --git a/corehq/apps/domain/static/domain/js/internal_settings.js b/corehq/apps/domain/static/domain/js/internal_settings.js
index 200edf2fc51f..64701c565208 100644
--- a/corehq/apps/domain/static/domain/js/internal_settings.js
+++ b/corehq/apps/domain/static/domain/js/internal_settings.js
@@ -5,6 +5,7 @@ hqDefine("domain/js/internal_settings", [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/multiselect_utils',
     'jquery-ui/ui/widgets/datepicker',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/calendar_fixture.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/calendar_fixture.html
deleted file mode 100644
index f8f7f5dc9b70..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/calendar_fixture.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-{% block page_content %}
-  <h1>{% trans "Calendar Fixture Settings" %}</h1>
-  {% crispy form %}
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
deleted file mode 100644
index b6222342b255..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
+++ /dev/null
@@ -1,155 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load hq_shared_tags %}
-{% load i18n %}
-
-{% js_entry_b3 'domain/js/bootstrap3/case_search_main' %}
-
-{% block page_content %}
-  {% include 'domain/admin/partials/bootstrap3/case_search_templates.html' %}
-  {% initial_page_data 'case_types' case_types %}
-  {% initial_page_data 'values' values %}
-  {% registerurl 'case_search_config' request.domain %}
-  <h1>{% trans "Enable Case Search" %}</h1>
-
-  <div class="row">
-    <div class="col-sm-6">
-      <form id="case-search-config">
-        {% csrf_token %}
-        <div data-bind="saveButton: saveButton"></div>
-        <p class="spacer"></p>
-
-        <p>
-          {% blocktrans %}Enabling case search for the project will allow mobile users to look up cases
-            that don't necessarily belong to them, and claim them. Possible applications range from cases
-            for patients who move from one location to another, and other lost-to-follow-up scenarios, to
-            any scenario involving searching for information, products, people or items.{% endblocktrans %}
-        </p>
-        <p class="text-danger">
-          {% blocktrans %}WARNING: Enabling Case Search allows users to read the data of
-            other users' cases, and take ownership of them, from modules whose case lists are configured
-            for searching.{% endblocktrans %}
-        </p>
-
-        <p>
-          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>
-          <label for="enable">{% trans "Enable Case Search" %}</label>
-        </p>
-
-        {% if request.user.is_superuser %}
-          <div data-bind="visible: toggleEnabled">
-            {% blocktrans %}
-              Visit <a href='{{ case_search_url }}' target='_blank'>Case Search</a> to test out your configuration.
-            {% endblocktrans %}
-          </div>
-        {% endif %}
-
-        <div id="fuzzies_div" data-bind="visible: toggleEnabled">
-          <h2>{% trans "Fuzzy Search Properties" %}</h2>
-          <p>
-            {% blocktrans %}
-              Add a list of all fuzzy search properties by case type below. These are
-              properties that might be spelled inexactly by a user, e.g. "name".
-              <br><br>
-              When working with related case properties, add them to the case type that
-              you will be searching on, not the related case type. For example, if fuzzy matching
-              on the parent's case name, add <strong>parent/name</strong> here as a property of
-              the child case type.
-            {% endblocktrans %}
-          </p>
-
-          <div data-bind="template: { name: 'case_type_template',
-                                    foreach: fuzzyProperties,
-                                    as: 'caseTypeProps' }"></div>
-          <button type="button"
-                  class="btn btn-primary"
-                  data-bind="click: $root.addCaseType">
-            <i class="fa fa-plus"></i> {% trans "Add case type" %}
-          </button>
-        </div>
-
-        <div data-bind="visible: toggleEnabled">
-          <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
-          <p>
-            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>
-            <label for="sync-web-apps">
-              {% blocktrans %}
-                Update case search data immediately on web apps form submission.
-              {% endblocktrans %}
-            </label>
-          </p>
-          <p class="help-block">
-            {% blocktrans %}
-              This will slow down submissions but prevent case search data from going stale.
-            {% endblocktrans %}
-          </p>
-        </div>
-
-        <div data-bind="visible: toggleEnabled">
-          <h2>{% trans "Sync Cases On Form Entry" %}</h2>
-          <p>
-            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>
-            <label for="sync-case-on-form-entry">
-              {% blocktrans %}
-                Update local case data immediately before entering a web apps form.
-              {% endblocktrans %}
-            </label>
-          </p>
-          <p class="help-block">
-            {% blocktrans %}
-              This will slow down form entry, but will prevent stale case data from populating the form.
-            {% endblocktrans %}
-          </p>
-        </div>
-
-        <div data-bind="visible: toggleEnabled">
-          <h2>{% trans "Remove Special Characters" %}</h2>
-          <p>
-            {% blocktrans %}
-              Remove characters from incoming search queries for particular case properties. For example, you can remove '+' from phone numbers or '-' from ID queries.
-            {% endblocktrans %}
-          </p>
-          <table class="table table-striped">
-            <thead>
-            <th>
-              Case Type
-            </th>
-            <th>
-              Case Property
-            </th>
-            <th>
-              String to remove
-            </th>
-            <th></th>
-            </thead>
-            <tbody data-bind="foreach: ignorePatterns">
-            <tr>
-              <td>
-                <select class="form-control" data-bind="options: $root.caseTypes, value: caseType"></select>
-              </td>
-              <td>
-                <input type="text" class="form-control" data-bind="value: caseProperty" placeholder="e.g. name" />
-              </td>
-              <td>
-                <input type="text" class="form-control" data-bind="value: regex" placeholder="e.g. +" />
-              </td>
-              <td>
-                <button type="button"
-                        class="btn btn-danger pull-right"
-                        data-bind="click: function(){$parent.removeIgnorePatterns($data); $parent.change();}">
-                  <i class="fa-regular fa-trash-can"></i>
-                </button>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-          <button type="button"
-                  class="btn btn-primary"
-                  data-bind="click: addIgnorePatterns">
-            <i class="fa fa-plus"></i> {% trans "Add case property" %}
-          </button>
-        </div>
-      </form>
-    </div>
-  </div>
-
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/global_sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/global_sms_rates.html
index b60eba5477dc..9c30739c0247 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/global_sms_rates.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/global_sms_rates.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
+{% js_entry_b3 'smsbillables/js/rate_calc' %}
 
 {% block title %}{% trans "SMS Pricing" %}{% endblock %}
 
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
deleted file mode 100644
index c41d0d1377a8..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
-{% load hq_shared_tags %}
-
-{% block page_content %}
-
-  {% initial_page_data 'domain' domain %}
-
-  {% include "domain/admin/partials/bootstrap3/project_limits_table.html" %}
-
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_rates.html
index 9cf73ea711e5..2e520d03f6ce 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_rates.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_rates.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
+{% js_entry_b3 'smsbillables/js/rate_calc' %}
 
 {% block page_content %}
   <div class="well">
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html
deleted file mode 100644
index 4a8c2cddf31f..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "hqwebapp/bootstrap5/base_section.html" %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-{% block page_content %}
-  <h1>{% trans "Calendar Fixture Settings" %}</h1>
-  {% crispy form %}  {# todo B5: crispy #}
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html
index a6a16ec4bd51..e2d80da9fdc7 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+{% js_entry 'smsbillables/js/rate_calc' %}
 
 {% block title %}{% trans "SMS Pricing" %}{% endblock %}
 
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html
index df9504a25988..393524df7134 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+{% js_entry 'smsbillables/js/rate_calc' %}
 
 {% block page_content %}
   <div class="card">  {# todo B5: css-well #}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html b/corehq/apps/domain/templates/domain/admin/case_search.html
similarity index 78%
rename from corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
rename to corehq/apps/domain/templates/domain/admin/case_search.html
index 3d4cf1376ffc..99e9971a9c58 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
+++ b/corehq/apps/domain/templates/domain/admin/case_search.html
@@ -5,7 +5,7 @@
 {% js_entry 'domain/js/bootstrap5/case_search_main' %}
 
 {% block page_content %}
-  {% include 'domain/admin/partials/bootstrap5/case_search_templates.html' %}
+  {% include 'domain/admin/partials/case_search_templates.html' %}
   {% initial_page_data 'case_types' case_types %}
   {% initial_page_data 'values' values %}
   {% registerurl 'case_search_config' request.domain %}
@@ -31,19 +31,23 @@ <h1>{% trans "Enable Case Search" %}</h1>
         </p>
 
         <p>
-          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>  {# todo B5: css-checkbox #}
-          <label for="enable">{% trans "Enable Case Search" %}</label>
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" id="enable" data-bind="checked: toggleEnabled"/>
+            <label class="form-check-label" for="enable">
+              {% trans "Enable Case Search" %}
+            </label>
+          </div>
         </p>
 
         {% if request.user.is_superuser %}
-          <div data-bind="visible: toggleEnabled">
+          <div data-bind="visible: toggleEnabled" class="mb-3">
             {% blocktrans %}
               Visit <a href='{{ case_search_url }}' target='_blank'>Case Search</a> to test out your configuration.
             {% endblocktrans %}
           </div>
         {% endif %}
 
-        <div id="fuzzies_div" data-bind="visible: toggleEnabled">
+        <div id="fuzzies_div" data-bind="visible: toggleEnabled" class="mb-3">
           <h2>{% trans "Fuzzy Search Properties" %}</h2>
           <p>
             {% blocktrans %}
@@ -67,15 +71,17 @@ <h2>{% trans "Fuzzy Search Properties" %}</h2>
           </button>
         </div>
 
-        <div data-bind="visible: toggleEnabled">
+        <div data-bind="visible: toggleEnabled" class="mb-3">
           <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
           <p>
-            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>  {# todo B5: css-checkbox #}
-            <label for="sync-web-apps">
-              {% blocktrans %}
-                Update case search data immediately on web apps form submission.
-              {% endblocktrans %}
-            </label>
+            <div class="form-check">
+              <input class="form-check-input" type="checkbox" id="sync-web-apps" data-bind="checked: synchronousWebApps"/>
+              <label class="form-check-label" for="sync-web-apps">
+                {% blocktrans %}
+                  Update case search data immediately on web apps form submission.
+                {% endblocktrans %}
+              </label>
+            </div>
           </p>
           <p class="help-block">
             {% blocktrans %}
@@ -84,15 +90,17 @@ <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
           </p>
         </div>
 
-        <div data-bind="visible: toggleEnabled">
+        <div data-bind="visible: toggleEnabled" class="mb-3">
           <h2>{% trans "Sync Cases On Form Entry" %}</h2>
           <p>
-            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>  {# todo B5: css-checkbox #}
-            <label for="sync-case-on-form-entry">
-              {% blocktrans %}
-                Update local case data immediately before entering a web apps form.
-              {% endblocktrans %}
-            </label>
+            <div class="form-check">
+              <input class="form-check-input" type="checkbox" id="sync-case-on-form-entry" data-bind="checked: syncCaseOnFormEntry"/>
+              <label class="form-check-label" for="sync-case-on-form-entry">
+                {% blocktrans %}
+                  Update local case data immediately before entering a web apps form.
+                {% endblocktrans %}
+              </label>
+            </div>
           </p>
           <p class="help-block">
             {% blocktrans %}
@@ -101,7 +109,7 @@ <h2>{% trans "Sync Cases On Form Entry" %}</h2>
           </p>
         </div>
 
-        <div data-bind="visible: toggleEnabled">
+        <div data-bind="visible: toggleEnabled" class="mb-3">
           <h2>{% trans "Remove Special Characters" %}</h2>
           <p>
             {% blocktrans %}
diff --git a/corehq/apps/domain/templates/domain/admin/partials/bootstrap3/case_search_templates.html b/corehq/apps/domain/templates/domain/admin/partials/bootstrap3/case_search_templates.html
deleted file mode 100644
index 01d747a182f5..000000000000
--- a/corehq/apps/domain/templates/domain/admin/partials/bootstrap3/case_search_templates.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% load i18n %}
-
-<div id="property_template" class="hide">
-  <div class="form-group form-inline clearfix">
-    <label>{% trans "Case property" %}
-      <input type="text" class="form-control" data-bind="value: property.name" placeholder="e.g. name" />
-    </label>
-    <button type="button"
-            class="btn btn-danger pull-right"
-            data-bind="click: function(){$parent.removeProperty($data); $root.change();}">
-      <i class="fa-regular fa-trash-can"></i>
-    </button>
-  </div>
-</div>
-
-<div id="case_type_template" class="hide">
-  <div class="panel panel-default">
-    <div class="panel-heading clearfix form-inline">
-      <strong>{% trans "Case type" %}</strong>
-      <select class="form-control" data-bind="options: $root.caseTypes, value: caseType"></select>
-      <button type="button"
-              class="btn btn-danger pull-right"
-              data-bind="click: $root.removeCaseType">
-        <i class="fa-regular fa-trash-can"></i>
-      </button>
-    </div>
-    <div class="panel-body">
-      <div data-bind="template: { name: 'property_template', foreach: properties, as: 'property' }"></div>
-      <button type="button"
-              class="btn btn-primary"
-              data-bind="click: addProperty">
-        <i class="fa fa-plus"></i> {% trans "Add case property" %}
-      </button>
-    </div>
-  </div>
-
-</div>
diff --git a/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html b/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html
index 6cb3dcc1263e..e5f0426735e1 100644
--- a/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html
+++ b/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html
@@ -23,8 +23,8 @@ <h1>{{ header }}</h1>
           <td>{{ rate_info.key }}</td>
           <td>
             {{ rate_info.percent_usage }}%
-            <div class="progress">  {# todo B5: css-progress #}
-              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>  {# todo B5: inline-style #}
+            <div class="progress" role="progressbar" aria-label="Percent Usage" aria-valuemin="0" aria-valuemax="100">
+              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>
             </div>
           </td>
           <td>{{ rate_info.current_usage }}</td>
diff --git a/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html b/corehq/apps/domain/templates/domain/admin/partials/case_search_templates.html
similarity index 51%
rename from corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html
rename to corehq/apps/domain/templates/domain/admin/partials/case_search_templates.html
index 7e5eb3531828..9c0d2b9ac42e 100644
--- a/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html
+++ b/corehq/apps/domain/templates/domain/admin/partials/case_search_templates.html
@@ -1,29 +1,36 @@
 {% load i18n %}
 
 <div id="property_template" class="d-none">
-  <div class="form-group form-inline clearfix">  {# todo B5: css-form-group, css-form-inline #}
-    <label>{% trans "Case property" %}
+  <div class="row mb-3">
+    <div class="col-md-10">
       <input type="text" class="form-control" data-bind="value: property.name" placeholder="e.g. name" />
-    </label>
-    <button type="button"
-            class="btn btn-outline-danger float-end"
-            data-bind="click: function(){$parent.removeProperty($data); $root.change();}">
-      <i class="fa-regular fa-trash-can"></i>
-    </button>
-  </div>
-</div>
-
-<div id="case_type_template" class="d-none">
-  <div class="card ">  {# todo B5: css-panel #}
-    <div class="card-header clearfix form-inline">  {# todo B5: css-form-inline #}
-      <strong>{% trans "Case type" %}</strong>
-      <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
+    </div>
+    <div class="col-md-2">
       <button type="button"
               class="btn btn-outline-danger float-end"
-              data-bind="click: $root.removeCaseType">
+              data-bind="click: function(){$parent.removeProperty($data); $root.change();}">
         <i class="fa-regular fa-trash-can"></i>
       </button>
     </div>
+  </div>
+</div>
+
+<div id="case_type_template" class="d-none">
+  <div class="card mb-3">
+    <div class="card-header">
+      <div class="row mb-3">
+        <div class="col-md-10">
+          <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
+        </div>
+        <div class="col-md-2">
+          <button type="button"
+                  class="btn btn-outline-danger float-end"
+                  data-bind="click: $root.removeCaseType">
+            <i class="fa-regular fa-trash-can"></i>
+          </button>
+        </div>
+      </div>
+    </div>
     <div class="card-body">
       <div data-bind="template: { name: 'property_template', foreach: properties, as: 'property' }"></div>
       <button type="button"
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html b/corehq/apps/domain/templates/domain/admin/project_limits.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html
rename to corehq/apps/domain/templates/domain/admin/project_limits.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
index fb1641b34d7c..172907bb1ec1 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'accounting/js/widgets' %}
+{% js_entry_b3 'accounting/js/widgets' %}
 
 {% block plan_breadcrumbs %}{% endblock %}
 
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/internal_settings.html b/corehq/apps/domain/templates/domain/bootstrap3/internal_settings.html
index a8f02c328f1f..b4c75803049b 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/internal_settings.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/internal_settings.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'domain/js/internal_settings' %}
+{% js_entry_b3 'domain/js/internal_settings' %}
 
 {% block stylesheets %}
   {{ block.super }}
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
index e5e3c46b8a6c..cc3429d38c5f 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
@@ -4,7 +4,7 @@
 {% load compress %}
 {% load menu_tags %}
 
-{% requirejs_main 'accounting/js/renew_plan_selection' %}
+{% js_entry_b3 'accounting/js/renew_plan_selection' %}
 
 {% block plan_breadcrumbs %}{% endblock %}
 
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
index 58d9b04f14f2..ccfb5bb916ed 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'accounting/js/widgets' %}
+{% js_entry 'accounting/js/widgets' %}
 
 {% block plan_breadcrumbs %}{% endblock %}
 
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html
index fc1cc9fba803..af437f557b2e 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'domain/js/internal_settings' %}
+{% js_entry 'domain/js/internal_settings' %}
 
 {% block stylesheets %}
   {{ block.super }}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
index 7e518d29499a..aa350bf3efc0 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 'domain/js/bootstrap5/internal_subscription_management' %}
+{% js_entry 'domain/js/bootstrap5/internal_subscription_management' %}
 
 {% block page_content %}
   {% blocktrans %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
index b00b78e6366c..2afee1bcb594 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
@@ -4,7 +4,7 @@
 {% load compress %}
 {% load menu_tags %}
 
-{% requirejs_main_b5 'accounting/js/renew_plan_selection' %}
+{% js_entry 'accounting/js/renew_plan_selection' %}
 
 {% block plan_breadcrumbs %}{% endblock %}
 
diff --git a/corehq/apps/domain/tests/test_deletion_models.py b/corehq/apps/domain/tests/test_deletion_models.py
index 19fbf4af2b01..e62a6b197b20 100644
--- a/corehq/apps/domain/tests/test_deletion_models.py
+++ b/corehq/apps/domain/tests/test_deletion_models.py
@@ -38,7 +38,6 @@
     'telerivet',
     'toggle_ui',
     'sso',
-    'oauth_integrations',
 }
 
 IGNORE_MODELS = {
@@ -54,7 +53,6 @@
     'cleanup.DeletedCouchDoc',
     'cleanup.DeletedSQLDoc',
     'domain.DomainAuditRecordEntry',
-    'domain.ProjectLimit',
     'domain.SuperuserProjectEntryRecord',
     'dropbox.DropboxUploadHelper',
     'export.DefaultExportSettings',
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index d4044a973a2b..0c7885e09ec8 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -41,7 +41,7 @@
     BaseAdminProjectSettingsView,
     BaseProjectSettingsView,
 )
-from corehq.apps.hqwebapp.decorators import use_jquery_ui, use_multiselect
+from corehq.apps.hqwebapp.decorators import use_bootstrap5, use_jquery_ui, use_multiselect
 from corehq.apps.hqwebapp.tasks import send_html_email_async, send_mail_async
 from corehq.apps.hqwebapp.views import BasePageView
 from corehq.apps.receiverwrapper.rate_limiter import domain_case_rate_limiter, submission_rate_limiter
@@ -286,10 +286,11 @@ def page_context(self):
 
 @method_decorator(always_allow_project_access, name='dispatch')
 @method_decorator(require_superuser, name='dispatch')
+@method_decorator(use_bootstrap5, name='dispatch')
 class ProjectLimitsView(BaseAdminProjectSettingsView):
     urlname = 'internal_project_limits_summary'
     page_title = gettext_lazy("Project Limits")
-    template_name = 'domain/admin/bootstrap3/project_limits.html'
+    template_name = 'domain/admin/project_limits.html'
 
     @property
     def page_context(self):
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index bd09d997d8ee..53aeda64fd85 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -324,10 +324,11 @@ def post(self, request, *args, **kwargs):
         return self.get(request, *args, **kwargs)
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 class CaseSearchConfigView(BaseAdminProjectSettingsView):
     urlname = 'case_search_config'
     page_title = gettext_lazy('Case Search')
-    template_name = 'domain/admin/bootstrap3/case_search.html'
+    template_name = 'domain/admin/case_search.html'
 
     @method_decorator(domain_admin_required)
     @method_decorator(toggles.SYNC_SEARCH_CASE_CLAIM.required_decorator())
diff --git a/corehq/apps/dump_reload/sql/dump.py b/corehq/apps/dump_reload/sql/dump.py
index bd09a7635e07..f683e2d94816 100644
--- a/corehq/apps/dump_reload/sql/dump.py
+++ b/corehq/apps/dump_reload/sql/dump.py
@@ -215,7 +215,6 @@
     FilteredModelIteratorBuilder('domain.AllowedUCRExpressionSettings', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('domain.DomainAuditRecordEntry', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('domain.OperatorCallLimitSettings', SimpleFilter('domain')),
-    FilteredModelIteratorBuilder('domain.ProjectLimit', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('domain.SMSAccountConfirmationSettings', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('domain.SuperuserProjectEntryRecord', SimpleFilter('domain')),
     FilteredModelIteratorBuilder('domain.TransferDomainRequest', SimpleFilter('domain')),
diff --git a/corehq/apps/dump_reload/tests/test_dump_models.py b/corehq/apps/dump_reload/tests/test_dump_models.py
index 0bf30270d94b..f5c9c3eea1c8 100644
--- a/corehq/apps/dump_reload/tests/test_dump_models.py
+++ b/corehq/apps/dump_reload/tests/test_dump_models.py
@@ -137,9 +137,6 @@
     "oauth2_provider.Grant",
     "oauth2_provider.IDToken",
     "oauth2_provider.RefreshToken",
-    "oauth_integrations.GoogleApiToken",
-    "oauth_integrations.LiveGoogleSheetRefreshStatus",
-    "oauth_integrations.LiveGoogleSheetSchedule",
     "registration.AsyncSignupRequest",
     "registration.RegistrationRequest",
     "reminders.EmailUsage",
diff --git a/corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js b/corehq/apps/enterprise/static/enterprise/js/project_dashboard.js
similarity index 97%
rename from corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
rename to corehq/apps/enterprise/static/enterprise/js/project_dashboard.js
index 63acd7307e88..ce0a586b4ba6 100644
--- a/corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+++ b/corehq/apps/enterprise/static/enterprise/js/project_dashboard.js
@@ -1,4 +1,4 @@
-hqDefine("enterprise/js/enterprise_dashboard", [
+hqDefine("enterprise/js/project_dashboard", [
     'jquery',
     'knockout',
     'underscore',
@@ -232,6 +232,7 @@ hqDefine("enterprise/js/enterprise_dashboard", [
     }
 
     $(function () {
+        const metricType = initialPageData.get('metric_type');
         const datePicker = tempusDominus.createDefaultDateRangePicker(
             document.getElementById("id_date_range"),
             moment().subtract(30, "days"),
@@ -256,7 +257,7 @@ hqDefine("enterprise/js/enterprise_dashboard", [
             dateRangeModal
         );
 
-        kissmetrics.track.event("[Enterprise Dashboard] Visited page");
+        kissmetrics.track.event(`[${metricType}] Visited page`);
         $(".report-panel").each(function () {
             var $element = $(this),
                 slug = $element.data("slug");
@@ -264,7 +265,7 @@ hqDefine("enterprise/js/enterprise_dashboard", [
             updateDisplayTotal($element);
 
             $element.find(".btn-primary").click(function () {
-                kissmetrics.track.event("[Enterprise Dashboard] Clicked Email Report for " + slug);
+                kissmetrics.track.event(`[${metricType}] Clicked Email Report for ` + slug);
                 var $button = $(this);
                 $button.disableButton();
                 const requestParams = {
diff --git a/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html b/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html
deleted file mode 100644
index f666a63d66e4..000000000000
--- a/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "hqwebapp/bootstrap5/base_section.html" %}
-{% load hq_shared_tags %}
-{% load i18n %}
-
-{% block page_title %}{{ account.name }}{% endblock %}
-
-{% js_entry 'enterprise/js/enterprise_dashboard' %}
-
-{% block page_content %}
-  {% registerurl "enterprise_dashboard_email" domain "---" %}
-  {% registerurl "enterprise_dashboard_total" domain "---" %}
-
-  {% initial_page_data 'max_date_range_days' max_date_range_days %}
-
-  <div class="row">
-    {% for report in reports %}
-      <div class="col-md-6 col-lg-6 col-xl-3">
-        <div class="card text-center report-panel mb-3" data-slug="{{ report.slug }}" id="{{ report.slug }}">
-          <div class="card-header">
-            <div class="fs-4">{{ report.title }}</div>
-            {% if report.title == "Mobile Form Submissions" %}
-              <button id="form_submission_dateRangeDisplay" type="button" data-bind="text: presetText" data-bs-toggle="modal" data-bs-target="#enterpriseFormsDaterange" data-sender="form_submission" class="btn btn-link fs-6">&nbsp;</button>
-            {% elif report.title == "SMS Usage" %}
-              <button id="sms_dateRangeDisplay" type="button" data-bind="text: presetText" data-bs-toggle="modal" data-bs-target="#enterpriseFormsDaterange" data-sender="sms" class="btn btn-link fs-6">&nbsp;</button>
-            {% else %}
-               <div class="form-control-plaintext fs-6">{{ report.subtitle|default:"&nbsp;" }}</div>
-            {% endif %}
-          </div>
-          <div class="card-body">
-            <h1 class="card-text total">
-              <i class="fa fa-spin fa-spinner"></i>
-            </h1>
-            <br>
-            <button class="btn btn-primary btn-lg">
-              <i class="fa fa-envelope"></i>
-              {% trans "Email Report" %}
-            </button>
-          </div>
-        </div>
-      </div>
-    {% endfor %}
-  </div>
-
-  {% include 'enterprise/partials/date_range_modal.html' %}
-{% endblock %}
diff --git a/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html b/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html
index 7801b0adbd89..f3fe9b0539af 100644
--- a/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html
+++ b/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 "hqwebapp/js/bootstrap5/widgets" %}
+{% js_entry "hqwebapp/js/bootstrap5/widgets" %}
 
 {% block page_content %}
   <p class="lead">
diff --git a/corehq/apps/enterprise/templates/enterprise/partials/project_tile.html b/corehq/apps/enterprise/templates/enterprise/partials/project_tile.html
new file mode 100644
index 000000000000..334ca899dbf4
--- /dev/null
+++ b/corehq/apps/enterprise/templates/enterprise/partials/project_tile.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+
+<div class="col-md-6 col-lg-6 col-xl-3">
+    <div class="card text-center report-panel mb-3" data-slug="{{ report.slug }}" id="{{ report.slug }}">
+        <div class="card-header">
+        <div class="fs-4">{{ report.title }}</div>
+        {% if report.title == "Mobile Form Submissions" %}
+            <button id="form_submission_dateRangeDisplay" type="button" data-bind="text: presetText" data-bs-toggle="modal" data-bs-target="#enterpriseFormsDaterange" data-sender="form_submission" class="btn btn-link fs-6">&nbsp;</button>
+        {% elif report.title == "SMS Usage" %}
+            <button id="sms_dateRangeDisplay" type="button" data-bind="text: presetText" data-bs-toggle="modal" data-bs-target="#enterpriseFormsDaterange" data-sender="sms" class="btn btn-link fs-6">&nbsp;</button>
+        {% else %}
+            <div class="form-control-plaintext fs-6">{{ report.subtitle|default:"&nbsp;" }}</div>
+        {% endif %}
+        </div>
+        <div class="card-body">
+        <h1 class="card-text total">
+            <i class="fa fa-spin fa-spinner"></i>
+        </h1>
+        <br>
+        <button class="btn btn-primary btn-lg">
+            <i class="fa fa-envelope"></i>
+            {% trans "Email Report" %}
+        </button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/corehq/apps/enterprise/templates/enterprise/project_dashboard.html b/corehq/apps/enterprise/templates/enterprise/project_dashboard.html
new file mode 100644
index 000000000000..18d91f0e9a47
--- /dev/null
+++ b/corehq/apps/enterprise/templates/enterprise/project_dashboard.html
@@ -0,0 +1,23 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% block page_title %}{{ current_page.title }}{% endblock %}
+
+{% js_entry 'enterprise/js/project_dashboard' %}
+
+{% block page_content %}
+  {% registerurl "enterprise_dashboard_email" domain "---" %}
+  {% registerurl "enterprise_dashboard_total" domain "---" %}
+
+  {% initial_page_data 'max_date_range_days' max_date_range_days %}
+  {% initial_page_data 'metric_type' metric_type %}
+
+  <div class="row">
+    {% for report in reports %}
+      {% include 'enterprise/partials/project_tile.html' with report=report %}
+    {% endfor %}
+  </div>
+
+  {% include 'enterprise/partials/date_range_modal.html' %}
+{% endblock %}
diff --git a/corehq/apps/enterprise/urls.py b/corehq/apps/enterprise/urls.py
index dd1a69aced04..3e87dcaf078e 100644
--- a/corehq/apps/enterprise/urls.py
+++ b/corehq/apps/enterprise/urls.py
@@ -6,13 +6,14 @@
     add_enterprise_permissions_domain,
     disable_enterprise_permissions,
     edit_enterprise_settings,
-    enterprise_dashboard,
+    platform_overview,
     enterprise_dashboard_download,
     enterprise_dashboard_email,
     enterprise_dashboard_total,
     enterprise_permissions,
     enterprise_settings,
     remove_enterprise_permissions_domain,
+    security_center,
     update_enterprise_permissions_source_domain,
     ManageEnterpriseMobileWorkersView,
 )
@@ -28,7 +29,7 @@
 ]
 
 domain_specific = [
-    url(r'^dashboard/$', enterprise_dashboard, name='enterprise_dashboard'),
+    url(r'^dashboard/$', platform_overview, name='platform_overview'),
     url(r'^dashboard/(?P<slug>[^/]*)/download/(?P<export_hash>[\w\-]+)/$', enterprise_dashboard_download,
         name='enterprise_dashboard_download'),
     url(r'^dashboard/(?P<slug>[^/]*)/email/$', enterprise_dashboard_email,
@@ -43,6 +44,7 @@
         name='remove_enterprise_permissions_domain'),
     url(r'^permissions/source/$', update_enterprise_permissions_source_domain,
         name='update_enterprise_permissions_source_domain'),
+    url(r'^security_center/$', security_center, name='security_center'),
     url(r'^settings/$', enterprise_settings, name='enterprise_settings'),
     url(r'^settings/edit/$', edit_enterprise_settings, name='edit_enterprise_settings'),
     url(r'^billing_statements/$', EnterpriseBillingStatementsView.as_view(),
diff --git a/corehq/apps/enterprise/views.py b/corehq/apps/enterprise/views.py
index 0d1d5a524efb..8f2c9354595e 100644
--- a/corehq/apps/enterprise/views.py
+++ b/corehq/apps/enterprise/views.py
@@ -54,11 +54,13 @@
 
 from corehq.apps.export.utils import get_default_export_settings_if_available
 
+from corehq.apps.hqwebapp.context import get_page_context, Section
 from corehq.apps.hqwebapp.decorators import use_bootstrap5, use_tempusdominus
 from corehq.apps.hqwebapp.views import CRUDPaginatedViewMixin
 from corehq.apps.users.decorators import require_can_edit_or_view_web_users
 
 from corehq.const import USER_DATE_FORMAT
+from corehq import toggles
 
 
 @use_tempusdominus
@@ -66,13 +68,22 @@
 @always_allow_project_access
 @require_enterprise_admin
 @login_and_domain_required
-def enterprise_dashboard(request, domain):
+def platform_overview(request, domain):
     if not has_privilege(request, privileges.PROJECT_ACCESS):
         return HttpResponseRedirect(reverse(EnterpriseBillingStatementsView.urlname, args=(domain,)))
 
-    context = {
-        'account': request.account,
-        'domain': domain,
+    context = get_page_context(
+        page_url=reverse('platform_overview', args=(domain,)),
+        page_title=_('Platform Overview for {}').format(request.account.name),
+        page_name=_('Platform Overview'),
+        domain=domain,
+        section=Section(
+            _('Enterprise Console'),
+            reverse('platform_overview', args=(domain,)),
+        ),
+    )
+
+    context.update({
         'max_date_range_days': EnterpriseFormReport.MAX_DATE_RANGE_DAYS,
         'reports': [EnterpriseReport.create(slug, request.account.id, request.couch_user) for slug in (
             EnterpriseReport.DOMAINS,
@@ -82,12 +93,39 @@ def enterprise_dashboard(request, domain):
             EnterpriseReport.ODATA_FEEDS,
             EnterpriseReport.SMS,
         )],
-        'current_page': {
-            'page_name': _('Enterprise Dashboard'),
-            'title': _('Enterprise Dashboard'),
-        }
-    }
-    return render(request, "enterprise/enterprise_dashboard.html", context)
+        'metric_type': 'Platform Overview',
+    })
+
+    return render(request, "enterprise/project_dashboard.html", context)
+
+
+@use_tempusdominus
+@use_bootstrap5
+@always_allow_project_access
+@require_enterprise_admin
+@login_and_domain_required
+@toggles.ENTERPRISE_DASHBOARD_IMPROVEMENTS.required_decorator()
+def security_center(request, domain):
+    if not has_privilege(request, privileges.PROJECT_ACCESS):
+        return HttpResponseRedirect(reverse(EnterpriseBillingStatementsView.urlname, args=(domain,)))
+
+    context = get_page_context(
+        page_url=reverse('security_center', args=(domain,)),
+        page_title=_('Security Center for {}').format(request.account.name),
+        page_name=_('Security Center'),
+        domain=domain,
+        section=Section(
+            _('Enterprise Console'),
+            reverse('platform_overview', args=(domain,)),
+        ),
+    )
+
+    context.update({
+        'reports': [],
+        'metric_type': 'Security Center',
+    })
+
+    return render(request, "enterprise/project_dashboard.html", context)
 
 
 @require_enterprise_admin
@@ -223,7 +261,7 @@ class BaseEnterpriseAdminView(BaseDomainView):
 
     @property
     def section_url(self):
-        return reverse('enterprise_dashboard', args=(self.domain,))
+        return reverse('platform_overview', args=(self.domain,))
 
     @property
     def page_url(self):
diff --git a/corehq/apps/es/management/commands/elastic_sync_multiplexed.py b/corehq/apps/es/management/commands/elastic_sync_multiplexed.py
index 5acc94919540..99f7781f4e18 100644
--- a/corehq/apps/es/management/commands/elastic_sync_multiplexed.py
+++ b/corehq/apps/es/management/commands/elastic_sync_multiplexed.py
@@ -161,17 +161,23 @@ def display_source_destination_doc_count(self, adapter):
         """
         es_manager.index_refresh(adapter.primary.index_name)
         es_manager.index_refresh(adapter.secondary.index_name)
-
         self.perform_cleanup(adapter)
 
+        def get_doc_count(_adapter):
+            return {_adapter.index_name: _adapter.count({})}
+
         greenlets = gevent.joinall([
-            gevent.spawn(adapter.count, {}),
-            gevent.spawn(adapter.secondary.count, {})
+            gevent.spawn(get_doc_count, adapter.primary),
+            gevent.spawn(get_doc_count, adapter.secondary)
         ])
-        primary_count, secondary_count = [g.get() for g in greenlets]
+        counts = {}
+        for greenlet in greenlets:
+            counts.update(greenlet.get())
 
-        print(f"\nDoc Count In Old Index '{adapter.primary.index_name}' - {primary_count}")
-        print(f"\nDoc Count In New Index '{adapter.secondary.index_name}' - {secondary_count}\n\n")
+        print(f"\nDoc Count In Old Index '{adapter.primary.index_name}' - {counts[adapter.primary.index_name]}")
+        print(
+            f"\nDoc Count In New Index '{adapter.secondary.index_name}' - {counts[adapter.secondary.index_name]}\n"
+        )
 
     def display_backfill_subindex_doc_counts_for_domain(self, source_adapter, destination_adapter, domain):
         if not destination_adapter.parent_index_cname:
diff --git a/corehq/apps/export/views/download.py b/corehq/apps/export/views/download.py
index b59d24a130bb..91c5609188e0 100644
--- a/corehq/apps/export/views/download.py
+++ b/corehq/apps/export/views/download.py
@@ -445,6 +445,7 @@ def parent_pages(self):
 
 @require_POST
 @login_and_domain_required
+@location_safe
 def prepare_form_multimedia(request, domain):
     """Gets the download_id for the multimedia zip and sends it to the
     exportDownloadService in download_export.ng.js to begin polling for the
diff --git a/corehq/apps/export/views/list.py b/corehq/apps/export/views/list.py
index 2512d3cac3e2..425b3032b100 100644
--- a/corehq/apps/export/views/list.py
+++ b/corehq/apps/export/views/list.py
@@ -22,7 +22,7 @@
 from corehq.apps.accounting.decorators import requires_privilege_with_fallback
 from corehq.apps.export.exceptions import ExportTooLargeException
 from corehq.apps.export.views.download import DownloadDETSchemaView
-from couchexport.models import Format, IntegrationFormat
+from couchexport.models import Format
 from couchexport.writers import XlsLengthException
 from dimagi.utils.couch import CriticalSection
 from dimagi.utils.logging import notify_exception
@@ -359,8 +359,7 @@ def bulk_download_url(self):
     def _should_appear_in_list(self, export):
         return (export['is_daily_saved_export']
                 and not export['export_format'] == "html"
-                and not export['is_odata_config']
-                and not IntegrationFormat.is_integration_format(export['export_format']))
+                and not export['is_odata_config'])
 
     def _edit_view(self, export):
         from corehq.apps.export.views.edit import EditFormDailySavedExportView, EditCaseDailySavedExportView
@@ -400,8 +399,7 @@ def create_export_form_title(self):
 
     def _should_appear_in_list(self, export):
         return (not export['is_daily_saved_export']
-            and not export['is_odata_config']
-            and not IntegrationFormat.is_integration_format(export['export_format']))
+            and not export['is_odata_config'])
 
     def _edit_view(self, export):
         from corehq.apps.export.views.edit import EditNewCustomFormExportView
@@ -418,8 +416,7 @@ class CaseExportListHelper(ExportListHelper):
 
     def _should_appear_in_list(self, export):
         return (not export['is_daily_saved_export']
-            and not export['is_odata_config']
-            and not IntegrationFormat.is_integration_format(export['export_format']))
+            and not export['is_odata_config'])
 
     def _edit_view(self, export):
         from corehq.apps.export.views.edit import EditNewCustomCaseExportView
@@ -451,8 +448,7 @@ def _priv_check(self):
     def _should_appear_in_list(self, export):
         return (export['is_daily_saved_export']
                 and export['export_format'] == "html"
-                and not export['is_odata_config']
-                and not IntegrationFormat.is_integration_format(export['export_format']))
+                and not export['is_odata_config'])
 
     def _edit_view(self, export):
         from corehq.apps.export.views.edit import EditFormFeedView, EditCaseFeedView
diff --git a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
index a20193a968d3..ace49da31263 100644
--- a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
+++ b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
@@ -9,6 +9,7 @@ hqDefine("fixtures/js/lookup-manage", [
     "hqwebapp/js/initial_page_data",
     "hqwebapp/js/bootstrap3/hq.helpers",
     "hqwebapp/js/bootstrap3/knockout_bindings.ko",
+    "commcarehq",
 ], function (
     $,
     _,
@@ -62,7 +63,7 @@ hqDefine("fixtures/js/lookup-manage", [
 
     function makeDataType(o, app) {
         var self = ko.mapping.fromJS(o),
-            raw_fields = self.fields();
+            rawFields = self.fields();
         self.original_tag = self.tag();
         self.original_visibility = self.is_global();
         self.isVisible = ko.observable(true);
@@ -76,7 +77,7 @@ hqDefine("fixtures/js/lookup-manage", [
         }, self);
         self.aboutToDelete = ko.observable(false);
         self.addField = function (data, event, o) {
-            var i, field;
+            var field;
             if (o) {
                 field = {
                     tag: ko.observable(o.tag),
@@ -97,7 +98,8 @@ hqDefine("fixtures/js/lookup-manage", [
                 };
             }
             field.isDuplicate = ko.computed(function () {
-                var j, noRepeats = true;
+                var j,
+                    noRepeats = true;
                 var curVal = field.tag();
                 for (j = 0; j < self.fields().length; j += 1) {
                     var thatField = self.fields()[j];
@@ -116,18 +118,18 @@ hqDefine("fixtures/js/lookup-manage", [
                 return curVal.startsWith('xml');
             });
             field.remove_if_new = function () {
-                if (field.is_new() == true) {
+                if (field.is_new()) {
                     self.fields.remove(field);
                 }
             };
             self.fields.push(field);
         };
-        for (var i = 0; i < raw_fields.length; i += 1) {
-            var tag = raw_fields[i].name();
-            var with_props = !!raw_fields[i].properties().length;
+        for (var i = 0; i < rawFields.length; i += 1) {
+            var tag = rawFields[i].name();
+            var withProps = !!rawFields[i].properties().length;
             self.addField(undefined, undefined, {
                 tag: tag,
-                with_props: with_props,
+                with_props: withProps,
             });
         }
 
@@ -144,13 +146,13 @@ hqDefine("fixtures/js/lookup-manage", [
                 data: JSON.stringify(self.serialize()),
                 dataType: 'json',
                 error: function (data) {
-                    var error_message;
-                    if (data.responseText == "DuplicateFixture") {
-                        error_message = "Can not create table with ID '" + self.tag() + "'. Table IDs should be unique.";
+                    var errorMessage;
+                    if (data.responseText === "DuplicateFixture") {
+                        errorMessage = _.template(gettext("Can not create table with ID '<%= tag %>'. Table IDs should be unique."))({ tag: self.tag() });
                     } else {
-                        error_message = somethingWentWrong;
+                        errorMessage = somethingWentWrong;
                     }
-                    $("#FailText").text(error_message);
+                    $("#FailText").text(errorMessage);
                     $("#editFailure").removeClass('hide');
                     self.cancel();
                     self.saveState('saved');
@@ -222,13 +224,14 @@ hqDefine("fixtures/js/lookup-manage", [
                 is_global: self.is_global(),
                 description: self.description(),
                 fields: (function () {
-                    var fields = {},
-                        i;
-                    for (i = 0; i < self.fields().length; i += 1) {
+                    var fields = {};
+                    for (var i = 0; i < self.fields().length; i += 1) {
                         var field = self.fields()[i];
                         var patch;
-                        if (field.is_new() == true) {
-                            if (field.remove() == true) continue;
+                        if (field.is_new()) {
+                            if (field.remove()) {
+                                continue;
+                            }
                             patch = {
                                 "is_new": 1,
                             };
@@ -308,19 +311,20 @@ hqDefine("fixtures/js/lookup-manage", [
                 }
             }
             if ($elem.hasClass("select-bulk")) {
-                var table_id = $elem[0].value;
+                const tableId = $elem[0].value;
                 if ($elem[0].checked) {
-                    self.selectedTables.push(table_id);
+                    self.selectedTables.push(tableId);
                 } else {
-                    self.selectedTables.splice(self.selectedTables().indexOf(table_id), 1);
+                    self.selectedTables.splice(self.selectedTables().indexOf(tableId), 1);
                 }
             }
         };
 
-        self.downloadExcels = function (element, event) {
+        self.downloadExcels = function () {
             var tables = [];
-            if (self.selectedTables().length < 1)
+            if (self.selectedTables().length < 1) {
                 return;
+            }
             for (var i in self.selectedTables()) {
                 tables.push(self.selectedTables()[i]);
             }
@@ -337,7 +341,7 @@ hqDefine("fixtures/js/lookup-manage", [
                     success: function (response) {
                         self.setupDownload(response.download_url);
                     },
-                    error: function (response) {
+                    error: function () {
                         self.downloadError();
                     },
                 });
@@ -345,10 +349,10 @@ hqDefine("fixtures/js/lookup-manage", [
         };
 
         self.setupDownload = function (downloadUrl) {
-            var keep_polling = true;
+            var keepPolling = true;
             var serverSlowRetries = 0;
             function poll() {
-                if (keep_polling) {
+                if (keepPolling) {
                     $.ajax({
                         url: downloadUrl,
                         dataType: 'text',
@@ -358,21 +362,20 @@ hqDefine("fixtures/js/lookup-manage", [
                                 $("#downloading").addClass('hide');
                                 progress.removeClass('hide').html(resp);
                                 if (progress.find(".alert-success").length) {
-                                    keep_polling = false;
+                                    keepPolling = false;
                                 }
                             }
-                            if (keep_polling) {
+                            if (keepPolling) {
                                 setTimeout(poll, 2000);
                             }
                         },
                         error: function (resp) {
-                            if (resp.status === 502 && serverSlowRetries < 5){
+                            if (resp.status === 502 && serverSlowRetries < 5) {
                                 serverSlowRetries += 1;
                                 setTimeout(poll, 2000);
-                            }
-                            else {
+                            } else {
                                 self.downloadError();
-                                keep_polling = false;
+                                keepPolling = false;
                             }
                         },
                     });
@@ -380,7 +383,7 @@ hqDefine("fixtures/js/lookup-manage", [
             }
             $("#fixture-download").on("hide.bs.modal", function () {
                 // stop polling if dialog is closed
-                keep_polling = false;
+                keepPolling = false;
             });
             $("#download-progress").addClass('hide');
             $("#downloading").removeClass('hide');
@@ -388,9 +391,9 @@ hqDefine("fixtures/js/lookup-manage", [
         };
 
         self.downloadError = function () {
-            var error_message = gettext("Sorry, something went wrong with the download. If you see this repeatedly please report an issue.");
+            var errorMessage = gettext("Sorry, something went wrong with the download. If you see this repeatedly please report an issue.");
             $("#fixture-download").modal("hide");
-            $("#FailText").text(error_message);
+            $("#FailText").text(errorMessage);
             $("#editFailure").removeClass('hide');
         };
 
@@ -430,7 +433,7 @@ hqDefine("fixtures/js/lookup-manage", [
         $("#download-progress").addClass('hide');
         $("#download-complete").addClass('hide');
     });
-    $('.alert .close').on("click", function (e) {
+    $('.alert .close').on("click", function () {
         $(this).parent().addClass('hide');
     });
 });
diff --git a/corehq/apps/fixtures/templates/fixtures/manage_tables.html b/corehq/apps/fixtures/templates/fixtures/manage_tables.html
index 00ad06822d08..7444f499eb8d 100644
--- a/corehq/apps/fixtures/templates/fixtures/manage_tables.html
+++ b/corehq/apps/fixtures/templates/fixtures/manage_tables.html
@@ -1,7 +1,8 @@
 {% extends 'fixtures/fixtures_base.html' %}
 {% load hq_shared_tags %}
 {% load i18n %}
-{% requirejs_main "fixtures/js/lookup-manage" %}
+
+{% js_entry_b3 "fixtures/js/lookup-manage" %}
 
 {% block page_title %}
   {% trans 'Manage Tables' %}
diff --git a/corehq/apps/geospatial/const.py b/corehq/apps/geospatial/const.py
index 77ac9ce80061..56a79349f06b 100644
--- a/corehq/apps/geospatial/const.py
+++ b/corehq/apps/geospatial/const.py
@@ -136,3 +136,7 @@
 
 # Case property to identify cases assigned through disbursement on the Case Management Page
 ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY = 'commcare_assigned_via_disbursement'
+ES_INDEX_TASK_HELPER_BASE_KEY = 'geo_cases_index_cases'
+
+DEFAULT_QUERY_LIMIT = 10_000
+DEFAULT_CHUNK_SIZE = 100
diff --git a/corehq/apps/geospatial/es.py b/corehq/apps/geospatial/es.py
index b0d0f01f6e05..38c12ec6aafa 100644
--- a/corehq/apps/geospatial/es.py
+++ b/corehq/apps/geospatial/es.py
@@ -1,15 +1,18 @@
 from math import ceil
 
-from corehq.apps.case_search.const import CASE_PROPERTIES_PATH
-from corehq.apps.es import filters
+from corehq.apps.es import filters, queries, CaseSearchES
 from corehq.apps.es.aggregations import (
     FilterAggregation,
     GeoBoundsAggregation,
     GeohashGridAggregation,
     NestedAggregation,
 )
-from corehq.apps.es.case_search import PROPERTY_GEOPOINT_VALUE, PROPERTY_KEY
-from corehq.apps.geospatial.const import MAX_GEOHASH_DOC_COUNT
+from corehq.apps.es.case_search import (
+    CASE_PROPERTIES_PATH,
+    PROPERTY_GEOPOINT_VALUE,
+    PROPERTY_KEY,
+)
+from corehq.apps.geospatial.const import MAX_GEOHASH_DOC_COUNT, DEFAULT_QUERY_LIMIT
 
 CASE_PROPERTIES_AGG = 'case_properties'
 CASE_PROPERTY_AGG = 'case_property'
@@ -131,3 +134,37 @@ def mid(lower, upper):
     """
     assert lower <= upper
     return ceil(lower + (upper - lower) / 2)
+
+
+def case_query_for_missing_geopoint_val(
+        domain, geo_case_property, case_type=None, offset=0, sort_by=None
+):
+    query = (
+        CaseSearchES()
+        .domain(domain)
+        .filter(_geopoint_value_missing_for_property(geo_case_property))
+        .size(DEFAULT_QUERY_LIMIT)
+    )
+    if case_type:
+        query = query.case_type(case_type)
+    if sort_by:
+        query.sort(sort_by)
+    if offset:
+        query.start(offset)
+    return query
+
+
+def _geopoint_value_missing_for_property(geo_case_property_name):
+    """
+    Query to find docs with missing 'geopoint_value' for the given case property.
+    """
+    return queries.nested(
+        CASE_PROPERTIES_PATH,
+        queries.filtered(
+            queries.match_all(),
+            filters.AND(
+                filters.term(PROPERTY_KEY, geo_case_property_name),
+                filters.missing(PROPERTY_GEOPOINT_VALUE)
+            )
+        )
+    )
diff --git a/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py b/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py
index 2419a88483ae..78b1d8ccf2e5 100644
--- a/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py
+++ b/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py
@@ -2,21 +2,10 @@
 
 from django.core.management.base import BaseCommand
 
-from dimagi.utils.chunked import chunked
-
-from corehq.apps.es import CaseSearchES, case_search_adapter, filters, queries
-from corehq.apps.es.case_search import (
-    CASE_PROPERTIES_PATH,
-    PROPERTY_GEOPOINT_VALUE,
-    PROPERTY_KEY,
-)
-from corehq.apps.es.client import manager
+from corehq.apps.geospatial.const import DEFAULT_QUERY_LIMIT
+from corehq.apps.geospatial.es import case_query_for_missing_geopoint_val
+from corehq.apps.geospatial.management.commands.index_utils import process_batch
 from corehq.apps.geospatial.utils import get_geo_case_property
-from corehq.form_processor.models import CommCareCase
-from corehq.util.log import with_progress_bar
-
-DEFAULT_QUERY_LIMIT = 10_000
-DEFAULT_CHUNK_SIZE = 100
 
 
 class Command(BaseCommand):
@@ -25,64 +14,27 @@ class Command(BaseCommand):
     def add_arguments(self, parser):
         parser.add_argument('domain')
         parser.add_argument('--case_type', required=False)
-        parser.add_argument('--query_limit', required=False)
-        parser.add_argument('--chunk_size', required=False)
 
     def handle(self, *args, **options):
         domain = options['domain']
         case_type = options.get('case_type')
-        query_limit = options.get('query_limit')
-        chunk_size = options.get('chunk_size')
-        index_case_docs(domain, query_limit, chunk_size, case_type)
+        index_case_docs(domain, case_type)
 
 
-def index_case_docs(domain, query_limit=DEFAULT_QUERY_LIMIT, chunk_size=DEFAULT_CHUNK_SIZE, case_type=None):
+def index_case_docs(domain, case_type=None):
     geo_case_property = get_geo_case_property(domain)
-    query = _es_case_query(domain, geo_case_property, case_type)
+    query = case_query_for_missing_geopoint_val(domain, geo_case_property, case_type)
     count = query.count()
     print(f'{count} case(s) to process')
-    batch_count = 1
-    if query_limit:
-        batch_count = math.ceil(count / query_limit)
+    batch_count = math.ceil(count / DEFAULT_QUERY_LIMIT)
     print(f"Cases will be processed in {batch_count} batches")
     for i in range(batch_count):
         print(f'Processing {i+1}/{batch_count}')
-        query = _es_case_query(domain, geo_case_property, case_type, size=query_limit)
-        case_ids = query.get_ids()
-        _index_case_ids(domain, case_ids, chunk_size)
-
-
-def _index_case_ids(domain, case_ids, chunk_size):
-    for case_id_chunk in chunked(with_progress_bar(case_ids), chunk_size):
-        case_chunk = CommCareCase.objects.get_cases(list(case_id_chunk), domain)
-        case_search_adapter.bulk_index(case_chunk)
-    manager.index_refresh(case_search_adapter.index_name)
-
-
-def _es_case_query(domain, geo_case_property, case_type=None, size=None):
-    query = (
-        CaseSearchES()
-        .domain(domain)
-        .filter(_geopoint_value_missing_for_property(geo_case_property))
-    )
-    if case_type:
-        query = query.case_type(case_type)
-    if size:
-        query = query.size(size)
-    return query
-
-
-def _geopoint_value_missing_for_property(geo_case_property_name):
-    """
-    Query to find docs with missing 'geopoint_value' for the given case property.
-    """
-    return queries.nested(
-        CASE_PROPERTIES_PATH,
-        queries.filtered(
-            queries.match_all(),
-            filters.AND(
-                filters.term(PROPERTY_KEY, geo_case_property_name),
-                filters.missing(PROPERTY_GEOPOINT_VALUE)
-            )
+        process_batch(
+            domain,
+            geo_case_property,
+            total_count=count,
+            case_type=case_type,
+            with_progress=True,
+            offset=i * DEFAULT_QUERY_LIMIT,
         )
-    )
diff --git a/corehq/apps/geospatial/management/commands/index_utils.py b/corehq/apps/geospatial/management/commands/index_utils.py
new file mode 100644
index 000000000000..440e3f91e860
--- /dev/null
+++ b/corehq/apps/geospatial/management/commands/index_utils.py
@@ -0,0 +1,33 @@
+from dimagi.utils.chunked import chunked
+
+from corehq.apps.es import case_search_adapter
+from corehq.apps.geospatial.es import case_query_for_missing_geopoint_val
+from corehq.form_processor.models import CommCareCase
+from corehq.util.log import with_progress_bar
+from corehq.apps.geospatial.const import DEFAULT_CHUNK_SIZE, DEFAULT_QUERY_LIMIT
+
+
+def process_batch(
+    domain,
+    geo_case_property,
+    total_count,
+    case_type=None,
+    with_progress=False,
+    offset=0,
+):
+    sort_by = 'opened_on' if total_count > DEFAULT_QUERY_LIMIT else None
+    query = case_query_for_missing_geopoint_val(
+        domain, geo_case_property, case_type, offset=offset, sort_by=sort_by
+    )
+    case_ids = query.get_ids()
+    _index_case_ids(domain, case_ids, with_progress)
+
+
+def _index_case_ids(domain, case_ids, with_progress):
+    if with_progress:
+        ids = with_progress_bar(case_ids)
+    else:
+        ids = case_ids
+    for case_id_chunk in chunked(ids, DEFAULT_CHUNK_SIZE):
+        case_chunk = CommCareCase.objects.get_cases(list(case_id_chunk), domain)
+        case_search_adapter.bulk_index(case_chunk)
diff --git a/corehq/apps/geospatial/reports.py b/corehq/apps/geospatial/reports.py
index 661070ab8e6d..919cf141c5d8 100644
--- a/corehq/apps/geospatial/reports.py
+++ b/corehq/apps/geospatial/reports.py
@@ -25,6 +25,7 @@
 from corehq.util.quickcache import quickcache
 
 from .dispatchers import CaseManagementMapDispatcher
+from corehq.apps.geospatial.const import ES_INDEX_TASK_HELPER_BASE_KEY
 from .es import (
     BUCKET_CASES_AGG,
     CASE_PROPERTIES_AGG,
@@ -38,6 +39,7 @@
     geojson_to_es_geoshape,
     get_geo_case_property,
     validate_geometry,
+    get_celery_task_tracker,
 )
 
 
@@ -59,12 +61,14 @@ class BaseCaseMapReport(ProjectReport, CaseListMixin, XpathCaseSearchFilterMixin
     def template_context(self):
         # Whatever is specified here can be accessed through initial_page_data
         context = super(BaseCaseMapReport, self).template_context
+        celery_task_tracker = get_celery_task_tracker(self.domain, task_slug=ES_INDEX_TASK_HELPER_BASE_KEY)
         context.update({
             'mapbox_access_token': settings.MAPBOX_ACCESS_TOKEN,
             'saved_polygons': [
                 {'id': p.id, 'name': p.name, 'geo_json': p.geo_json}
                 for p in GeoPolygon.objects.filter(domain=self.domain).all()
             ],
+            'task_status': celery_task_tracker.get_status(),
         })
         return context
 
diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index 8892847e8e6e..2b261f96e2d1 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -19,8 +19,6 @@ hqDefine('geospatial/js/models', [
     const SELECTED_FEATURE_ID_QUERY_PARAM = 'selected_feature_id';
     const DEFAULT_CENTER_COORD = [-20.0, -0.0];
     const DISBURSEMENT_LAYER_PREFIX = 'route-';
-    const saveGeoPolygonUrl = initialPageData.reverse('geo_polygons');
-    const reassignCasesUrl = initialPageData.reverse('reassign_cases');
     const unexpectedErrorMessage = gettext(
         "Oops! Something went wrong!" +
         " Please report an issue if the problem persists."
@@ -808,6 +806,7 @@ hqDefine('geospatial/js/models', [
                 if (!validateSavedPolygonName(name)) {
                     return;
                 }
+                const saveGeoPolygonUrl = initialPageData.reverse('geo_polygons');
 
                 if (!clearDisbursementBeforeProceeding()) {
                     return;
@@ -1062,7 +1061,7 @@ hqDefine('geospatial/js/models', [
                 'case_id_to_owner_id': caseIdToOwnerId,
                 'include_related_cases': self.includeRelatedCases(),
             };
-
+            const reassignCasesUrl = initialPageData.reverse('reassign_cases');
             self.assignmentAjaxInProgress(true);
             $.ajax({
                 type: 'post',
diff --git a/corehq/apps/geospatial/tasks.py b/corehq/apps/geospatial/tasks.py
index 69b354aa16da..ef7e6856071f 100644
--- a/corehq/apps/geospatial/tasks.py
+++ b/corehq/apps/geospatial/tasks.py
@@ -1,9 +1,23 @@
+import math
+
+from dimagi.utils.logging import notify_exception
+
 from corehq.apps.celery import task
+from corehq.apps.geospatial.const import (
+    ES_INDEX_TASK_HELPER_BASE_KEY,
+    DEFAULT_QUERY_LIMIT,
+)
+from corehq.apps.geospatial.es import case_query_for_missing_geopoint_val
 from corehq.apps.geospatial.utils import (
-    CeleryTaskTracker,
+    get_celery_task_tracker,
     get_flag_assigned_cases_config,
+    CeleryTaskTracker,
     update_cases_owner,
+    get_geo_case_property,
 )
+from corehq.apps.geospatial.management.commands.index_utils import process_batch
+
+from settings import MAX_GEOSPATIAL_INDEX_DOC_LIMIT
 
 
 @task(queue="background_queue", ignore_result=True)
@@ -14,3 +28,43 @@ def geo_cases_reassignment_update_owners(domain, case_owner_updates_dict, task_k
     finally:
         celery_task_tracker = CeleryTaskTracker(task_key)
         celery_task_tracker.mark_completed()
+
+
+@task(queue='geospatial_queue', ignore_result=True)
+def index_es_docs_with_location_props(domain):
+    celery_task_tracker = get_celery_task_tracker(domain, ES_INDEX_TASK_HELPER_BASE_KEY)
+    geo_case_prop = get_geo_case_property(domain)
+    query = case_query_for_missing_geopoint_val(domain, geo_case_prop)
+    doc_count = query.count()
+    if doc_count > MAX_GEOSPATIAL_INDEX_DOC_LIMIT:
+        celery_task_tracker.mark_as_error(error_slug='TOO_MANY_CASES')
+        return
+
+    celery_task_tracker.mark_requested()
+    batch_count = math.ceil(doc_count / DEFAULT_QUERY_LIMIT)
+    try:
+        for i in range(batch_count):
+            process_batch(
+                domain,
+                geo_case_prop,
+                offset=i * DEFAULT_QUERY_LIMIT,
+                total_count=doc_count
+            )
+            current_batch = i + 1
+            processed_count = min(current_batch * DEFAULT_QUERY_LIMIT, doc_count)
+            celery_task_tracker.update_progress(
+                current=processed_count,
+                total=doc_count
+            )
+    except Exception as e:
+        celery_task_tracker.mark_as_error(error_slug='CELERY')
+        notify_exception(
+            None,
+            'Something went wrong while indexing ES docs with location props.',
+            details={
+                'error': str(e),
+                'domain': domain
+            }
+        )
+    else:
+        celery_task_tracker.mark_completed()
diff --git a/corehq/apps/geospatial/templates/geospatial/case_grouping_map.html b/corehq/apps/geospatial/templates/geospatial/case_grouping_map.html
index 48f25dd95335..5a5da555c658 100644
--- a/corehq/apps/geospatial/templates/geospatial/case_grouping_map.html
+++ b/corehq/apps/geospatial/templates/geospatial/case_grouping_map.html
@@ -4,6 +4,7 @@
 {% load hq_shared_tags %}
 
 {% block reportcontent %}
+{% include 'geospatial/partials/index_alert.html' %}
 <div class="row panel">
   <div class="col col-md-2">
     <span id="lock-groups-controls">
diff --git a/corehq/apps/geospatial/templates/geospatial/case_management.html b/corehq/apps/geospatial/templates/geospatial/case_management.html
index 0a002be55d03..dff21af8fe95 100644
--- a/corehq/apps/geospatial/templates/geospatial/case_management.html
+++ b/corehq/apps/geospatial/templates/geospatial/case_management.html
@@ -2,6 +2,7 @@
 {% load i18n %}
 
 {% block reportcontent %}
+{% include 'geospatial/partials/index_alert.html' %}
 <div class="panel panel-default" id="user-filters-panel">
     <div class="panel-body collapse in" aria-expanded="true">
         <legend>
diff --git a/corehq/apps/geospatial/templates/geospatial/gps_capture_view.html b/corehq/apps/geospatial/templates/geospatial/gps_capture_view.html
index 6ea4437ec0ff..4a92379d5383 100644
--- a/corehq/apps/geospatial/templates/geospatial/gps_capture_view.html
+++ b/corehq/apps/geospatial/templates/geospatial/gps_capture_view.html
@@ -25,6 +25,7 @@
 {% initial_page_data 'case_types_with_gps' case_types_with_gps %}
 {% initial_page_data 'couch_user_username' couch_user_username %}
 
+{% include 'geospatial/partials/index_alert.html' %}
 <ul id="tabs-list" class="nav nav-tabs">
   <li data-bind="click: onclickAction" class="active"><a data-toggle="tab" href="#tabs-cases">{% trans 'Update Case Data' %}</a></li>
   <li data-bind="click: onclickAction"><a data-toggle="tab" href="#tabs-users">{% trans 'Update Mobile Worker Data' %}</a></li>
diff --git a/corehq/apps/geospatial/templates/geospatial/partials/index_alert.html b/corehq/apps/geospatial/templates/geospatial/partials/index_alert.html
new file mode 100644
index 000000000000..629b883fb28e
--- /dev/null
+++ b/corehq/apps/geospatial/templates/geospatial/partials/index_alert.html
@@ -0,0 +1,30 @@
+{% load i18n %}
+
+{% if task_status.status == 'ERROR' %}
+<div class="alert alert-danger">
+  <p>
+    {% if task_status.error_slug == 'TOO_MANY_CASES' %}
+      {% blocktrans %}
+        Existing cases in the domain were not processed to be available in Microplanning reports
+        because there were too many to be processed. New or updated cases will still be available
+        for use for Microplanning. Please reach out to support if you need support with existing cases.
+      {% endblocktrans %}
+    {% elif task_status.error_slug == 'CELERY' %}
+      {% blocktrans %}
+        Oops! Something went wrong while processing existing cases to be available in Microplanning
+        reports. Please reach out to support.
+      {% endblocktrans %}
+    {% endif %}
+  </p>
+</div>
+{% elif task_status.status == 'ACTIVE' %}
+<div class="alert alert-info">
+  <p>
+    {% blocktrans %}
+      Existing cases in the domain are being processed to be available in
+      Microplanning reports. Please be patient.
+    {% endblocktrans %}
+    ({{ task_status.progress}}%)
+  </p>
+</div>
+{% endif %}
diff --git a/corehq/apps/geospatial/templates/geospatial/settings.html b/corehq/apps/geospatial/templates/geospatial/settings.html
index 47a1c348ac61..f5fac67faa85 100644
--- a/corehq/apps/geospatial/templates/geospatial/settings.html
+++ b/corehq/apps/geospatial/templates/geospatial/settings.html
@@ -13,6 +13,7 @@
 {% initial_page_data 'road_network_algorithm_slug' road_network_algorithm_slug %}
 
   <form id="geospatial-config-form" class="form-horizontal disable-on-submit ko-template" method="post">
+    {% include 'geospatial/partials/index_alert.html' %}
     {% crispy form %}
   </form>
 {% endblock %}
diff --git a/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py b/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py
index c5f174e35fb1..77c86de5f707 100644
--- a/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py
+++ b/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py
@@ -4,11 +4,10 @@
 
 from corehq.apps.es import CaseSearchES
 from corehq.apps.es.case_search import case_search_adapter
+from corehq.apps.es.client import manager
 from corehq.apps.es.tests.utils import es_test
-from corehq.apps.geospatial.management.commands.index_geolocation_case_properties import (
-    _es_case_query,
-    index_case_docs,
-)
+from corehq.apps.geospatial.es import case_query_for_missing_geopoint_val
+from corehq.apps.geospatial.management.commands.index_geolocation_case_properties import index_case_docs
 from corehq.apps.geospatial.models import GeoConfig
 
 
@@ -50,13 +49,14 @@ def setUpClass(cls):
         cls.addClassCleanup(cls.geo_config.delete)
 
     def test_has_cases_to_index(self):
-        query = _es_case_query(self.domain, self.gps_prop_name, self.primary_case_type)
+        query = case_query_for_missing_geopoint_val(self.domain, self.gps_prop_name, self.primary_case_type)
         case_count = query.count()
         self.assertEqual(case_count, 2)
 
     def test_cases_correctly_indexed(self):
         index_case_docs(self.domain, case_type=self.secondary_case_type)
-        query = _es_case_query(self.domain, self.gps_prop_name, self.secondary_case_type)
+        manager.index_refresh(case_search_adapter.index_name)
+        query = case_query_for_missing_geopoint_val(self.domain, self.gps_prop_name, self.secondary_case_type)
         case_count = query.count()
         self.assertEqual(case_count, 0)
         doc = (
diff --git a/corehq/apps/geospatial/tests/test_tasks.py b/corehq/apps/geospatial/tests/test_tasks.py
new file mode 100644
index 000000000000..7564f932fcea
--- /dev/null
+++ b/corehq/apps/geospatial/tests/test_tasks.py
@@ -0,0 +1,68 @@
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from casexml.apps.case.mock import CaseFactory
+
+from corehq.apps.es.case_search import case_search_adapter
+from corehq.apps.es.client import manager
+from corehq.apps.es.tests.utils import es_test
+from corehq.apps.geospatial.const import ES_INDEX_TASK_HELPER_BASE_KEY
+from corehq.apps.geospatial.es import case_query_for_missing_geopoint_val
+from corehq.apps.geospatial.models import GeoConfig
+from corehq.apps.geospatial.tasks import index_es_docs_with_location_props
+from corehq.apps.geospatial.utils import get_celery_task_tracker
+
+
+@es_test(requires=[case_search_adapter], setup_class=True)
+class TestIndexESDocsWithLocationProps(TestCase):
+    domain = 'test'
+    gps_prop_name = 'gps-stuff'
+
+    def setUp(self):
+        super().setUp()
+        factory = CaseFactory(self.domain)
+        case_list = [
+            _create_case(factory, self.gps_prop_name, name='foo'),
+            _create_case(factory, self.gps_prop_name, name='bar'),
+        ]
+        case_search_adapter.bulk_index(case_list, refresh=True)
+        self.celery_task_helper = get_celery_task_tracker(self.domain, ES_INDEX_TASK_HELPER_BASE_KEY)
+        geo_config = GeoConfig.objects.create(
+            domain=self.domain,
+            case_location_property_name=self.gps_prop_name,
+        )
+        self.addCleanup(geo_config.delete)
+        self.addCleanup(self.celery_task_helper.mark_completed)
+        self.addCleanup(self.celery_task_helper.clear_progress)
+
+    @patch('corehq.apps.geospatial.tasks.MAX_GEOSPATIAL_INDEX_DOC_LIMIT', 1)
+    def test_max_doc_limit_reached(self):
+        index_es_docs_with_location_props.apply(args=[self.domain])
+        expected_output = {
+            'status': 'ERROR',
+            'progress': 0,
+            'error_slug': 'TOO_MANY_CASES'
+        }
+        self.assertEqual(self.celery_task_helper.get_status(), expected_output)
+
+    def test_index_docs(self):
+        index_es_docs_with_location_props.apply(args=[self.domain])
+        manager.index_refresh(case_search_adapter.index_name)
+
+        doc_count = case_query_for_missing_geopoint_val(self.domain, self.gps_prop_name).count()
+        self.assertEqual(doc_count, 0)
+        expected_output = {
+            'status': None,
+            'progress': 100,
+            'error_slug': None
+        }
+        self.assertEqual(self.celery_task_helper.get_status(), expected_output)
+
+
+def _create_case(factory, gps_prop_name, name):
+    return factory.create_case(
+        case_name=name,
+        case_type='fooey',
+        update={gps_prop_name: '1.1 2.2'}
+    )
diff --git a/corehq/apps/geospatial/tests/test_utils.py b/corehq/apps/geospatial/tests/test_utils.py
index 77592468e29c..3ab33ce45a75 100644
--- a/corehq/apps/geospatial/tests/test_utils.py
+++ b/corehq/apps/geospatial/tests/test_utils.py
@@ -1,6 +1,6 @@
 from uuid import uuid4
 
-from django.test import TestCase
+from django.test import TestCase, SimpleTestCase
 
 from dimagi.utils.couch.cache.cache_core import get_redis_client
 
@@ -19,6 +19,7 @@
     set_case_gps_property,
     set_user_gps_property,
     update_cases_owner,
+    get_celery_task_tracker,
 )
 from corehq.apps.users.models import CommCareUser
 from corehq.form_processor.models import CommCareCase, CommCareCaseIndex
@@ -214,6 +215,8 @@ def test_update_cases_owner_with_flag_assigned_cases(self):
 
 class TestCeleryTaskTracker(TestCase):
     TASK_KEY = 'test-key'
+    PROGRESS_KEY = 'test-key_progress'
+    ERROR_SLUG_KEY = 'test-key_error_slug'
 
     @classmethod
     def setUpClass(cls):
@@ -228,7 +231,7 @@ def tearDown(self):
 
     def test_mark_active(self):
         self.celery_task_tracker.mark_requested()
-        self.assertTrue(self.redis_client.has_key(self.TASK_KEY))
+        self.assertTrue(self.redis_client.get(self.TASK_KEY), 'ACTIVE')
 
     def test_get_active(self):
         self.redis_client.set(self.TASK_KEY, 'ACTIVE')
@@ -239,6 +242,57 @@ def test_mark_inactive(self):
         self.celery_task_tracker.mark_completed()
         self.assertFalse(self.redis_client.has_key(self.TASK_KEY))
 
+    def test_mark_error(self):
+        self.celery_task_tracker.mark_as_error(error_slug='TEST')
+        self.assertEqual(self.redis_client.get(self.TASK_KEY), 'ERROR')
+        self.assertEqual(self.redis_client.get(self.ERROR_SLUG_KEY), 'TEST')
+
+    def test_get_status(self):
+        self.redis_client.set(self.TASK_KEY, 'ERROR')
+        self.redis_client.set(self.ERROR_SLUG_KEY, 'TEST')
+        expected_output = {
+            'status': 'ERROR',
+            'progress': 0,
+            'error_slug': 'TEST'
+        }
+        self.assertEqual(self.celery_task_tracker.get_status(), expected_output)
+
+    def test_set_progress(self):
+        self.assertTrue(self.celery_task_tracker.update_progress(current=1, total=5))
+        self.assertTrue(self.redis_client.has_key(self.PROGRESS_KEY))
+        self.assertEqual(self.redis_client.get(self.PROGRESS_KEY), 20)
+
+    def test_get_progress(self):
+        self.assertEqual(self.celery_task_tracker.get_progress(), 0)
+        self.celery_task_tracker.update_progress(current=1, total=4)
+        self.assertEqual(self.celery_task_tracker.get_progress(), 25)
+
+    def test_clear_progress(self):
+        self.assertFalse(self.celery_task_tracker.clear_progress())
+        self.celery_task_tracker.update_progress(current=1, total=2)
+        self.assertTrue(self.celery_task_tracker.clear_progress())
+        self.assertFalse(self.redis_client.has_key(self.PROGRESS_KEY))
+
+    def test_invalid_progress(self):
+        self.celery_task_tracker.update_progress(current=3, total=0)
+        self.assertEqual(self.celery_task_tracker.get_progress(), 0)
+
+
+class TestGetCeleryTaskTracker(SimpleTestCase):
+    domain = 'foobar'
+    base_key = 'test_me'
+
+    def test_get_celery_task_tracker(self):
+        celery_task_tracker = get_celery_task_tracker(self.domain, self.base_key)
+        self.assertEqual(
+            celery_task_tracker.task_key,
+            'test_me_foobar'
+        )
+        self.assertEqual(
+            celery_task_tracker.progress_key,
+            'test_me_foobar_progress'
+        )
+
 
 class TestGetFlagAssignedCasesConfig(TestCase):
 
diff --git a/corehq/apps/geospatial/utils.py b/corehq/apps/geospatial/utils.py
index 7fbc75805daa..42a20b25ca5d 100644
--- a/corehq/apps/geospatial/utils.py
+++ b/corehq/apps/geospatial/utils.py
@@ -1,5 +1,6 @@
 from dataclasses import asdict, dataclass, field
 
+import math
 import jsonschema
 from jsonobject.exceptions import BadValueError
 
@@ -35,6 +36,11 @@ def get_geo_config(domain):
     return config
 
 
+def get_celery_task_tracker(domain, task_slug):
+    task_key = f'{task_slug}_{domain}'
+    return CeleryTaskTracker(task_key)
+
+
 def _format_coordinates(lat, lon):
     return f"{lat} {lon} 0.0 0.0"
 
@@ -230,15 +236,47 @@ class CeleryTaskTracker(object):
 
     def __init__(self, task_key):
         self.task_key = task_key
+        self.progress_key = f'{task_key}_progress'
+        self.error_slug_key = f'{task_key}_error_slug'
         self._client = get_redis_client()
 
     def mark_requested(self, timeout=ONE_DAY):
         # Timeout here is just a fail safe mechanism in case task is not processed by Celery
         # due to unexpected circumstances
+        self.clear_progress()
+        self._client.delete(self.error_slug_key)
         self._client.set(self.task_key, 'ACTIVE', timeout=timeout)
 
+    def mark_as_error(self, error_slug=None, timeout=ONE_DAY * 14):
+        if error_slug:
+            self._client.set(self.error_slug_key, error_slug, timeout)
+        return self._client.set(self.task_key, 'ERROR', timeout=timeout)
+
     def is_active(self):
-        return self._client.has_key(self.task_key)
+        return self._client.get(self.task_key) == 'ACTIVE'
+
+    def get_status(self):
+        status = self._client.get(self.task_key)
+        return {
+            'status': status,
+            'progress': self.get_progress(),
+            'error_slug': self._client.get(self.error_slug_key) if status == 'ERROR' else None,
+        }
 
     def mark_completed(self):
         return self._client.delete(self.task_key)
+
+    def update_progress(self, current, total, timeout=ONE_DAY):
+        progress_val = 0
+        if total > 0:
+            progress_val = math.ceil(current / total * 100)
+        return self._client.set(self.progress_key, progress_val, timeout)
+
+    def get_progress(self):
+        progress = self._client.get(self.progress_key)
+        if not progress:
+            return 0
+        return progress
+
+    def clear_progress(self):
+        return self._client.delete(self.progress_key)
diff --git a/corehq/apps/geospatial/views.py b/corehq/apps/geospatial/views.py
index c0a642631028..5f400736d61c 100644
--- a/corehq/apps/geospatial/views.py
+++ b/corehq/apps/geospatial/views.py
@@ -47,7 +47,11 @@
 from corehq.form_processor.models import CommCareCase
 from corehq.util.timezones.utils import get_timezone
 
-from .const import GPS_POINT_CASE_PROPERTY, POLYGON_COLLECTION_GEOJSON_SCHEMA
+from .const import (
+    GPS_POINT_CASE_PROPERTY,
+    POLYGON_COLLECTION_GEOJSON_SCHEMA,
+    ES_INDEX_TASK_HELPER_BASE_KEY,
+)
 from .models import GeoConfig, GeoPolygon
 from .utils import (
     CaseOwnerUpdate,
@@ -60,6 +64,7 @@
     set_case_gps_property,
     set_user_gps_property,
     update_cases_owner,
+    get_celery_task_tracker,
 )
 
 
@@ -67,6 +72,16 @@ def geospatial_default(request, *args, **kwargs):
     return HttpResponseRedirect(CaseManagementMap.get_url(*args, **kwargs))
 
 
+class BaseGeospatialView(BaseDomainView):
+
+    @property
+    def main_context(self):
+        context = super().main_context
+        celery_task_tracker = get_celery_task_tracker(self.domain, task_slug=ES_INDEX_TASK_HELPER_BASE_KEY)
+        context['task_status'] = celery_task_tracker.get_status()
+        return context
+
+
 class CaseDisbursementAlgorithm(BaseDomainView):
     urlname = "case_disbursement"
 
@@ -164,7 +179,7 @@ def delete(self, request, *args, **kwargs):
         })
 
 
-class BaseConfigView(BaseDomainView):
+class BaseConfigView(BaseGeospatialView):
     section_name = _("Data")
 
     @method_decorator(toggles.MICROPLANNING.required_decorator())
@@ -242,7 +257,7 @@ def page_context(self):
         return context
 
 
-class GPSCaptureView(BaseDomainView):
+class GPSCaptureView(BaseGeospatialView):
     urlname = 'gps_capture'
     template_name = 'geospatial/gps_capture_view.html'
 
diff --git a/corehq/apps/groups/static/groups/js/all_groups.js b/corehq/apps/groups/static/groups/js/all_groups.js
index 6e1813221973..7b0c01197ad0 100644
--- a/corehq/apps/groups/static/groups/js/all_groups.js
+++ b/corehq/apps/groups/static/groups/js/all_groups.js
@@ -5,6 +5,7 @@ hqDefine("groups/js/all_groups", [
     'es6!hqwebapp/js/bootstrap5_loader',
     // Just importing main.py so the post-link function is accessible, function parameter not needed
     'hqwebapp/js/bootstrap5/main',
+    'commcarehq',
 ], function (
     $,
     googleAnalytics,
diff --git a/corehq/apps/groups/static/groups/js/group_members.js b/corehq/apps/groups/static/groups/js/group_members.js
index d231895909db..8f7bd45c2884 100644
--- a/corehq/apps/groups/static/groups/js/group_members.js
+++ b/corehq/apps/groups/static/groups/js/group_members.js
@@ -9,6 +9,7 @@ hqDefine("groups/js/group_members", [
     "hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-list",
     "hqwebapp/js/select_2_ajax_widget",     // "Group Membership" select2
     "hqwebapp/js/components/select_toggle",            // select toggle for "Edit Setings" popup
+    "commcarehq",
 ], function (
     $,
     _,
diff --git a/corehq/apps/groups/templates/groups/all_groups.html b/corehq/apps/groups/templates/groups/all_groups.html
index 17c669dc89ce..021d84ea19ac 100644
--- a/corehq/apps/groups/templates/groups/all_groups.html
+++ b/corehq/apps/groups/templates/groups/all_groups.html
@@ -1,7 +1,8 @@
 {% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% requirejs_main_b5 "groups/js/all_groups" %}
+
+{% js_entry "groups/js/all_groups" %}
 
 {% block page_title %}
   {% trans "Groups" %}
diff --git a/corehq/apps/groups/templates/groups/group_members.html b/corehq/apps/groups/templates/groups/group_members.html
index 2544ab3d52bc..d9d279001254 100644
--- a/corehq/apps/groups/templates/groups/group_members.html
+++ b/corehq/apps/groups/templates/groups/group_members.html
@@ -11,7 +11,7 @@
   </style>
 {% endblock %}
 
-{% requirejs_main_b5 "groups/js/group_members" %}
+{% js_entry "groups/js/group_members" %}
 
 {% block page_title %}
   {% if request.is_view_only %}
@@ -81,7 +81,7 @@
                   data-html="true"
                   data-content="{% blocktrans %}
                         For all active mobile workers in this group, and for each phone number, this will
-                        initiate an SMS verification workflow. When a user replies to the SMS< their phone
+                        initiate an SMS verification workflow. When a user replies to the SMS, their phone
                         number will be verified.<br><br>If the phone number is already verified or
                         if the phone number is already in use by another contact in the system, nothing
                         will happen. If the phone number is pending verification, the verification SMS
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js b/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
index eae53c88e8c0..b965f0554d7c 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
@@ -1,6 +1,7 @@
 hqDefine("hqmedia/js/bulk_upload", [
     "hqwebapp/js/bulk_upload_file",
     "app_manager/js/download_async_modal",
+    "commcarehq",
 ], function () {
     return 1;
 });
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js b/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
index 1f8360667fc7..cff390c8cf43 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
@@ -3,6 +3,7 @@ hqDefine("hqmedia/js/manage_paths_main", [
     "knockout",
     "hqwebapp/js/assert_properties",
     "hqwebapp/js/components/select_toggle",
+    "commcarehq",
 ], function (
     $,
     ko,
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/references_main.js b/corehq/apps/hqmedia/static/hqmedia/js/references_main.js
index b00f16f4bb29..bc6868c25f2a 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/references_main.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/references_main.js
@@ -1,4 +1,20 @@
-hqDefine("hqmedia/js/references_main", function () {
+hqDefine("hqmedia/js/references_main", [
+    "jquery",
+    "knockout",
+    "underscore",
+    "hqwebapp/js/bootstrap3/alert_user",
+    "hqwebapp/js/initial_page_data",
+    "hqmedia/js/media_reference_models",
+    "app_manager/js/download_async_modal",    // for the 'Download ZIP' button
+    "hqwebapp/js/components/pagination",
+], function (
+    $,
+    ko,
+    _,
+    alertUser,
+    initialPageData,
+    mediaReferenceModels
+) {
     function MultimediaReferenceController() {
         var self = {};
         self.references = ko.observableArray();
@@ -28,7 +44,7 @@ hqDefine("hqmedia/js/references_main", function () {
             self.showPaginationSpinner(true);
             var includeTotal = page === 1;
             $.ajax({
-                url: hqImport("hqwebapp/js/initial_page_data").reverse('hqmedia_references'),
+                url: initialPageData.reverse('hqmedia_references'),
                 data: {
                     json: 1,
                     page: page,
@@ -45,15 +61,15 @@ hqDefine("hqmedia/js/references_main", function () {
                     self.references(_.map(data.references, function (ref) {
                         var objRef = data.object_map[ref.path];
                         if (ref.media_class === "CommCareImage") {
-                            var imageRef = hqImport('hqmedia/js/media_reference_models').ImageReference(ref);
+                            var imageRef = mediaReferenceModels.ImageReference(ref);
                             imageRef.setObjReference(objRef);
                             return imageRef;
                         } else if (ref.media_class === "CommCareAudio") {
-                            var audioRef = hqImport('hqmedia/js/media_reference_models').AudioReference(ref);
+                            var audioRef = mediaReferenceModels.AudioReference(ref);
                             audioRef.setObjReference(objRef);
                             return audioRef;
                         } else if (ref.media_class === "CommCareVideo") {
-                            var videoRef = hqImport('hqmedia/js/media_reference_models').VideoReference(ref);
+                            var videoRef = mediaReferenceModels.VideoReference(ref);
                             videoRef.setObjReference(objRef);
                             return videoRef;
                         }
@@ -69,7 +85,7 @@ hqDefine("hqmedia/js/references_main", function () {
                 },
                 error: function () {
                     self.showPaginationSpinner(false);
-                    hqImport('hqwebapp/js/bootstrap3/alert_user').alert_user(gettext("Error fetching multimedia, " +
+                    alertUser.alert_user(gettext("Error fetching multimedia, " +
                         "please try again or report an issue if the problem persists."), 'danger');
                 },
             });
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js b/corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js
new file mode 100644
index 000000000000..4133a3371839
--- /dev/null
+++ b/corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js
@@ -0,0 +1,6 @@
+hqDefine("hqmedia/js/translations_coverage", [
+    'hqwebapp/js/bootstrap3/widgets',
+    'app_manager/js/widgets',
+], function () {
+    // nothing to do here, this module just groups the above dependencies
+});
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js b/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js
index 1ede359872c4..fe2d6396f120 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js
@@ -1,7 +1,14 @@
-hqDefine("hqmedia/js/uploaders", function () {
-    const assertProperties = hqImport("hqwebapp/js/assert_properties"),
-        initialPageData = hqImport("hqwebapp/js/initial_page_data");
-
+hqDefine("hqmedia/js/uploaders", [
+    "jquery",
+    "underscore",
+    "hqwebapp/js/assert_properties",
+    "hqwebapp/js/initial_page_data",
+], function (
+    $,
+    _,
+    assertProperties,
+    initialPageData
+) {
     const uploader = function (slug, options) {
         assertProperties.assertRequired(options, [
             'uploadURL', 'uploadParams',
diff --git a/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html b/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
index 75c806fb087d..faef62fe58f2 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
@@ -3,11 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
-  {% endcompress js %}
-{% endblock js %}
+{% js_entry_b3 'hqwebapp/js/bootstrap3/widgets' %}
 
 {% block page_content %}
   <p class="lead">{{ current_page.page_name }}</p>
diff --git a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
index d539a7b242ae..b26d3db745f4 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
@@ -1,7 +1,7 @@
 {% extends "hqmedia/uploader_base.html" %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "hqmedia/js/bulk_upload" %}
+{% js_entry_b3 "hqmedia/js/bulk_upload" %}
 
 {% block page_content %}
   {% include "hqmedia/partials/bulk_upload.html" with include_modal=True %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html b/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html
index cf38863387d0..29201ba8de64 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'hqmedia/js/manage_paths_main' %}
+{% js_entry_b3 'hqmedia/js/manage_paths_main' %}
 
 {% block page_content %}
   {% include "hqmedia/partials/manage_paths.html" %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/references.html b/corehq/apps/hqmedia/templates/hqmedia/references.html
index dcab1e209d6b..c68f012ea606 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/references.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/references.html
@@ -2,6 +2,8 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
+{% js_entry_b3 'hqmedia/js/references_main' %}
+
 {% block stylesheets %}{{ block.super }}
   <style type="text/css">
     .media-type-icon,
@@ -11,12 +13,6 @@
   </style>
 {% endblock %}
 
-{% block js %} {{ block.super }}
-  <script src="{% static 'hqmedia/js/media_reference_models.js' %}"></script>
-  <script src="{% static 'hqmedia/js/references_main.js' %}"></script>
-  <script src="{% static 'app_manager/js/download_async_modal.js' %}"></script>
-{% endblock %}
-
 {% block page_content %}
   {% initial_page_data 'uploaders' uploaders_js %}
   {% registerurl 'hqmedia_references' app.domain app.id %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html b/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
index a8b0ac4627e4..ed3f554f7782 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
@@ -3,12 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
-    <script src="{% static 'app_manager/js/widgets.js' %}"></script>
-  {% endcompress js %}
-{% endblock js %}
+{% js_entry_b3 'hqmedia/js/translations_coverage' %}
 
 {% block page_content %}
   {% registerurl "paginate_releases" domain app.get_id %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html b/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html
index b595977d43b0..723dd1db0228 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html
@@ -4,7 +4,3 @@
 {% block page_navigation %}
   {% include 'hqwebapp/partials/bootstrap3/navigation_left_sidebar.html' with sections=navigation_sections %}
 {% endblock page_navigation %}
-
-{% block js %} {{ block.super }}
-  <script src="{% static "hqmedia/js/uploaders.js" %}"></script>
-{% endblock %}
diff --git a/corehq/apps/hqwebapp/decorators.py b/corehq/apps/hqwebapp/decorators.py
index a1b8f47a2096..6fe777e42de4 100644
--- a/corehq/apps/hqwebapp/decorators.py
+++ b/corehq/apps/hqwebapp/decorators.py
@@ -89,20 +89,6 @@ def dispatch(self, request, *args, **kwargs):
     return set_request_flag(view_func, 'use_datatables')
 
 
-def use_typeahead(view_func):
-    """Use this decorator on the dispatch method of a TemplateView subclass
-    to enable the inclusion of the typeahead library at the base template
-    level.
-
-    Example:
-
-    @use_typeahead
-    def dispatch(self, request, *args, **kwargs):
-        return super(MyView, self).dispatch(request, *args, **kwargs)
-    """
-    return set_request_flag(view_func, 'use_typeahead')
-
-
 def use_timepicker(view_func):
     """Use this decorator on the dispatch method of a TemplateView subclass
     to enable the inclusion of the timepicker library at the base template
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js b/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js
index e1f60e605e38..d15abb125209 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js
@@ -73,7 +73,7 @@ function (
         init: function (element) {
             var $element = $(element);
             if (!$element.atwho) {
-                throw new Error("The typeahead binding requires Atwho.js and Caret.js");
+                throw new Error("The autocompleteAtwho binding requires Atwho.js and Caret.js");
             }
 
             init($element, {
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js
deleted file mode 100644
index ffe6b725d028..000000000000
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js
+++ /dev/null
@@ -1,63 +0,0 @@
-hqDefine("hqwebapp/js/bootstrap-multi-typeahead",[
-    "jquery",
-    "bootstrap3-typeahead/bootstrap3-typeahead.min",
-],function ($) {
-    "use strict";
-    // http://stackoverflow.com/a/3561711
-    var regExpEscape = function (s) {
-        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    };
-
-    $.fn.multiTypeahead = function (options) {
-        /**
-         * An extension of the Bootstrap typeahead jQuery plugin that handles
-         * creating a comma-separated list and prevents duplicate values.
-         *
-         * @author mwhite
-         */
-
-        function currentValAndInput(string) {
-        /* split the current value and the current input (the latter to be
-           matched against.) Handles when users manually edit the input such
-           that the number of spaces after a comma is not 1 */
-            var index = string.lastIndexOf(',');
-            if (index === -1) {
-                return ['', ''];
-            } else {
-                index++;
-                while (string.charAt(index) === ' ') {
-                    index++;
-                }
-                return [string.substring(0, index), string.substring(index)];
-            }
-        }
-
-        options = $.extend(options, {
-            matcher: function (item) {
-                var split = currentValAndInput(this.$element.val()),
-                    currentVal = split[0],
-                    currentInput = split[1];
-
-                var pattern = new RegExp("(?:^|,\\s*)" + regExpEscape(item) + "(?:\\s*,?|$)");
-                if (currentVal.match(pattern)) {
-                    return 0;
-                }
-
-                return ~item.toLowerCase().indexOf(currentInput.toLowerCase());
-            },
-            updater: function (item) {
-                var split = currentValAndInput(this.$element.val()),
-                    currentVal = split[0];
-
-                this.$element.focus();
-                return currentVal + item + ', ';
-            },
-        });
-
-        return this.each(function (i, v) {
-            $(v).typeahead(options);
-        });
-    };
-
-
-});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/soil.js b/corehq/apps/hqwebapp/static/hqwebapp/js/soil.js
index 3d24fc526ff8..849397e49026 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/soil.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/soil.js
@@ -2,6 +2,7 @@
 hqDefine("hqwebapp/js/soil", [
     "jquery",
     "hqwebapp/js/initial_page_data",
+    "commcarehq",
 ], function (
     $,
     initialPageData
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/sso_inactivity.js b/corehq/apps/hqwebapp/static/hqwebapp/js/sso_inactivity.js
index d97f5f99484d..97dbaa858996 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/sso_inactivity.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/sso_inactivity.js
@@ -3,7 +3,7 @@
  * Handles communication about the status of SSO login after the inactivity
  * timer has requested a re-login
  */
-hqDefine('hqwebapp/js/sso_inactivity', [], function () {
+hqDefine('hqwebapp/js/sso_inactivity', ['commcarehq'], function () {
     localStorage.setItem('ssoInactivityMessage', JSON.stringify({
         isLoggedIn: true,
     }));
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss
index 1308e41d2049..384127c02c0c 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq.scss
@@ -77,6 +77,7 @@
 @import "commcarehq/form_steps";
 @import "commcarehq/helpbubble";
 @import "commcarehq/hubspot";
+@import "commcarehq/htmx";
 @import "commcarehq/icons";
 @import "commcarehq/inline_edit";
 @import "commcarehq/label";
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_htmx.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_htmx.scss
new file mode 100644
index 000000000000..9ef15af9a3aa
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_htmx.scss
@@ -0,0 +1,72 @@
+@mixin htmx-spinner($width) {
+  position: absolute;
+  height: $width;
+  width: $width;
+  $offset: $width / 2;
+  left: calc(50% - $offset);
+  top: calc(50% - $offset);
+}
+
+form.htmx-request {
+  button[type="submit"] {
+    position: relative;
+    &::before {
+      content: " ";
+      @extend .spinner-border;
+      @extend .spinner-border-sm;
+      @include htmx-spinner(22px);
+    }
+    &.btn-sm::before {
+      @include htmx-spinner(18px);
+    }
+  }
+  .input-group button[type="submit"]::before {
+    vertical-align: -0.28em;
+  }
+}
+
+.htmx-request.page-link {
+  background-color: $blue-300;
+  color: $white;
+  position: relative;
+
+  &::after {
+    content: " ";
+    @extend .spinner-border;
+    @extend .spinner-border-sm;
+    @include htmx-spinner(22px);
+  }
+}
+
+.htmx-request[type="checkbox"] {
+  position: relative;
+
+  &::after {
+    content: " ";
+    color: $blue-400;
+    @extend .spinner-border;
+    @extend .spinner-border-sm;
+    @include htmx-spinner(22px);
+  }
+}
+
+.htmx-request.form-check-input {
+  &::after {
+    @include htmx-spinner(30px);
+  }
+}
+
+button.htmx-request {
+  position: relative;
+  &::before {
+    content: " ";
+    @extend .spinner-border;
+    @extend .spinner-border-sm;
+    @include htmx-spinner(22px);
+    opacity: .5;
+  }
+
+  &.btn-sm::before {
+    @include htmx-spinner(18px);
+  }
+}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/base.html b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
index 9e3628f52ba2..817a1be63eed 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/base.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
@@ -305,6 +305,29 @@
       {% endblock %}
     </div>
 
+    {% if is_demo_visible %}
+      {% if use_bootstrap5 %}
+        {% include "hqwebapp/partials/bootstrap5/get_demo_modals.html" %}
+      {% else %}
+        {% include "hqwebapp/partials/bootstrap3/get_demo_modals.html" %}
+      {% endif %}
+    {% endif %}
+
+    {# Knockout component templates #}
+    {% if use_bootstrap5 %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_pagination.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_inline_edit.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_search_box.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_select_toggle.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_feedback.html' %}
+    {% else %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_pagination.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_inline_edit.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_search_box.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_select_toggle.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_feedback.html' %}
+    {% endif %}
+
     {# javascript below this line #}
 
     {% include "hqwebapp/partials/requirejs.html" with BASE_MAIN=True %}
@@ -392,13 +415,6 @@
       {% endif %}
     {% endif %}
 
-    {% if request.use_typeahead and not use_js_bundler and not use_bootstrap5 %}
-      {% compress js %}
-        <script src="{% static 'bootstrap3-typeahead/bootstrap3-typeahead.min.js' %}"></script>
-        <script src="{% static 'hqwebapp/js/bootstrap-multi-typeahead.js' %}"></script>
-      {% endcompress %}
-    {% endif %}
-
     {% if request.use_timepicker and not use_js_bundler and not use_bootstrap5 %}
       {% compress js %}
         <script src="{% static 'bootstrap-timepicker/js/bootstrap-timepicker.js' %}"></script>
@@ -421,29 +437,6 @@
       {% endif %}
     {% endif %}
 
-    {% if is_demo_visible %}
-      {% if use_bootstrap5 %}
-        {% include "hqwebapp/partials/bootstrap5/get_demo_modals.html" %}
-      {% else %}
-        {% include "hqwebapp/partials/bootstrap3/get_demo_modals.html" %}
-      {% endif %}
-    {% endif %}
-
-    {# Knockout component templates #}
-    {% if use_bootstrap5 %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_pagination.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_inline_edit.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_search_box.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_select_toggle.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_feedback.html' %}
-    {% else %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_pagination.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_inline_edit.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_search_box.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_select_toggle.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_feedback.html' %}
-    {% endif %}
-
     {% if show_overdue_invoice_modal and not use_js_bundler %}
       {% if use_bootstrap5 %}
         <script src="{% static 'hqwebapp/js/bootstrap5/downgrade_modal.js' %}"></script>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_sso_login_success.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_sso_login_success.html
index 17b7975c3d88..a2e22ef90707 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_sso_login_success.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_sso_login_success.html
@@ -5,7 +5,7 @@
 
 {% block title %}{% trans "Thank you for logging in with Single Sign-On!" %}{% endblock %}
 
-{% requirejs_main 'hqwebapp/js/sso_inactivity' %}
+{% js_entry_b3 'hqwebapp/js/sso_inactivity' %}
 
 {% block container_class %}container-fluid{% endblock %}
 
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/soil_status_full.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/soil_status_full.html
index 1f265a31c3fa..0fb80b32eea2 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/soil_status_full.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/soil_status_full.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "hqwebapp/js/soil" %}
+{% js_entry_b3 "hqwebapp/js/soil" %}
 
 {% block page_content %}
   {% initial_page_data 'download_id' download_id %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_sso_login_success.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_sso_login_success.html
index 15e4fe422694..aaf1f7bb1b6a 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_sso_login_success.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_sso_login_success.html
@@ -5,7 +5,7 @@
 
 {% block title %}{% trans "Thank you for logging in with Single Sign-On!" %}{% endblock %}
 
-{% requirejs_main 'hqwebapp/js/sso_inactivity' %}
+{% js_entry 'hqwebapp/js/sso_inactivity' %}
 
 {% block container_class %}container-fluid{% endblock %}
 
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/soil_status_full.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/soil_status_full.html
index 13c961ec4e6f..62eb6d047563 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/soil_status_full.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/soil_status_full.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 "hqwebapp/js/soil" %}
+{% js_entry "hqwebapp/js/soil" %}
 
 {% block page_content %}
   {% initial_page_data 'download_id' download_id %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html b/corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html
new file mode 100644
index 000000000000..c43e1bfac07a
--- /dev/null
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+{% blocktrans %}
+  Encountered error "{{ htmx_error }}" while performing action {{ action }}.
+{% endblocktrans %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/global_navigation_bar.html b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/global_navigation_bar.html
index e3e21c2fef68..7b06d36692ce 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/global_navigation_bar.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/global_navigation_bar.html
@@ -36,7 +36,7 @@
                 <li class="nav-divider divider"></li>
                 <li class="dropdown-header nav-header">{% trans 'Manage Enterprise' %}</li>
                 <li>
-                    <a href="{% url "enterprise_dashboard" domain %}">
+                    <a href="{% url "platform_overview" domain %}">
                         <i class="fa fa-cogs icon-cogs dropdown-icon"></i> {% trans "Enterprise Console" %}
                     </a>
                 </li>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/global_navigation_bar.html b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/global_navigation_bar.html
index be0c909e6307..fb2d16d3b7ed 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/global_navigation_bar.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/global_navigation_bar.html
@@ -41,7 +41,7 @@
               <li><hr class="dropdown-divider"></li>
               <li class="dropdown-header nav-header">{% trans 'Manage Enterprise' %}</li>
               <li>
-                <a href="{% url "enterprise_dashboard" domain %}" class="dropdown-item">
+                <a href="{% url "platform_overview" domain %}" class="dropdown-item">
                   <i class="fa fa-cogs icon-cogs dropdown-icon"></i> {% trans "Enterprise Console" %}
                 </a>
               </li>
diff --git a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
index a0a13848f134..70533be19c8f 100644
--- a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
+++ b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
@@ -29,6 +29,7 @@
 )
 from corehq.apps.hqwebapp.models import Alert
 from corehq.motech.utils import pformat_json
+from corehq.util.soft_assert import soft_assert
 from corehq.util.timezones.conversions import ServerTime
 from corehq.util.timezones.utils import get_timezone
 
@@ -726,15 +727,27 @@ class RequireJSMainNode(template.Node):
     def __init__(self, name, value):
         self.name = name
         self.value = value
+        self.origin = None
 
     def __repr__(self):
         return "<RequireJSMain Node: %r>" % (self.value,)
 
     def render(self, context):
         if self.name not in context and self.value:
+            # Check that there isn't already an entry point from the other bundler tool
+            # If there is, don't add this one, because having both set will cause js errors
+            other_tag = "js_entry" if self.name == "requirejs_main" else "requirejs_main"
+            other_value = None
+            for context_dict in context.dicts:
+                if other_tag in context_dict:
+                    other_value = context_dict.get(other_tag)
+                    msg = f"Discarding {self.value} {self.name} value because {other_value} is using {other_tag}"
+                    soft_assert('jschweers@dimagi.com', notify_admins=False, send_to_ops=False)(False, msg)
             # set name in block parent context
-            context.dicts[-2]['use_js_bundler'] = True
-            context.dicts[-2][self.name] = self.value
+            if not other_value:
+                context.dicts[-2]['use_js_bundler'] = True
+                context.dicts[-2][self.name] = self.value
+
         return ''
 
 
diff --git a/corehq/apps/hqwebapp/templatetags/tests/test_tag.py b/corehq/apps/hqwebapp/templatetags/tests/test_tag.py
index 94495555ccb2..d53b95f8216e 100644
--- a/corehq/apps/hqwebapp/templatetags/tests/test_tag.py
+++ b/corehq/apps/hqwebapp/templatetags/tests/test_tag.py
@@ -240,3 +240,12 @@ def test_js_entry_mismatched_delimiter(self):
                 {% load hq_shared_tags %}
                 {% js_entry 'x" %}
             """)
+
+    def test_requirejs_main_js_entry_conflict(self):
+        msg = "Discarding module/two js_entry value because module/one is using requirejs_main"
+        with self.assertRaisesMessage(AssertionError, msg):
+            self.render("""
+                {% load hq_shared_tags %}
+                {% requirejs_main "module/one" %}
+                {% js_entry "module/two" %}
+            """)
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt
deleted file mode 100644
index ecf3c8875f84..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load crispy_forms_tags %}
- {% load i18n %}
- {% block page_content %}
-   <h1>{% trans "Calendar Fixture Settings" %}</h1>
--  {% crispy form %}
-+  {% crispy form %}  {# todo B5: crispy #}
- {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
deleted file mode 100644
index c8b2229714c2..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
+++ /dev/null
@@ -1,70 +0,0 @@
---- 
-+++ 
-@@ -1,18 +1,18 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load hq_shared_tags %}
- {% load i18n %}
- 
--{% js_entry_b3 'domain/js/bootstrap3/case_search_main' %}
-+{% js_entry 'domain/js/bootstrap5/case_search_main' %}
- 
- {% block page_content %}
--  {% include 'domain/admin/partials/bootstrap3/case_search_templates.html' %}
-+  {% include 'domain/admin/partials/bootstrap5/case_search_templates.html' %}
-   {% initial_page_data 'case_types' case_types %}
-   {% initial_page_data 'values' values %}
-   {% registerurl 'case_search_config' request.domain %}
-   <h1>{% trans "Enable Case Search" %}</h1>
- 
-   <div class="row">
--    <div class="col-sm-6">
-+    <div class="col-md-6">
-       <form id="case-search-config">
-         {% csrf_token %}
-         <div data-bind="saveButton: saveButton"></div>
-@@ -31,7 +31,7 @@
-         </p>
- 
-         <p>
--          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>
-+          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>  {# todo B5: css-checkbox #}
-           <label for="enable">{% trans "Enable Case Search" %}</label>
-         </p>
- 
-@@ -70,7 +70,7 @@
-         <div data-bind="visible: toggleEnabled">
-           <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
-           <p>
--            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>
-+            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>  {# todo B5: css-checkbox #}
-             <label for="sync-web-apps">
-               {% blocktrans %}
-                 Update case search data immediately on web apps form submission.
-@@ -87,7 +87,7 @@
-         <div data-bind="visible: toggleEnabled">
-           <h2>{% trans "Sync Cases On Form Entry" %}</h2>
-           <p>
--            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>
-+            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>  {# todo B5: css-checkbox #}
-             <label for="sync-case-on-form-entry">
-               {% blocktrans %}
-                 Update local case data immediately before entering a web apps form.
-@@ -124,7 +124,7 @@
-             <tbody data-bind="foreach: ignorePatterns">
-             <tr>
-               <td>
--                <select class="form-control" data-bind="options: $root.caseTypes, value: caseType"></select>
-+                <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
-               </td>
-               <td>
-                 <input type="text" class="form-control" data-bind="value: caseProperty" placeholder="e.g. name" />
-@@ -134,7 +134,7 @@
-               </td>
-               <td>
-                 <button type="button"
--                        class="btn btn-danger pull-right"
-+                        class="btn btn-outline-danger float-end"
-                         data-bind="click: function(){$parent.removeIgnorePatterns($data); $parent.change();}">
-                   <i class="fa-regular fa-trash-can"></i>
-                 </button>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
index e12d49307352..9a5ad0d1bd22 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
@@ -7,8 +7,8 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
-+{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+-{% js_entry_b3 'smsbillables/js/rate_calc' %}
++{% js_entry 'smsbillables/js/rate_calc' %}
  
  {% block title %}{% trans "SMS Pricing" %}{% endblock %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt
deleted file mode 100644
index b61f1a5c61fd..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- 
-+++ 
-@@ -1,30 +1,30 @@
- {% load i18n %}
- 
--<div id="property_template" class="hide">
--  <div class="form-group form-inline clearfix">
-+<div id="property_template" class="d-none">
-+  <div class="form-group form-inline clearfix">  {# todo B5: css-form-group, css-form-inline #}
-     <label>{% trans "Case property" %}
-       <input type="text" class="form-control" data-bind="value: property.name" placeholder="e.g. name" />
-     </label>
-     <button type="button"
--            class="btn btn-danger pull-right"
-+            class="btn btn-outline-danger float-end"
-             data-bind="click: function(){$parent.removeProperty($data); $root.change();}">
-       <i class="fa-regular fa-trash-can"></i>
-     </button>
-   </div>
- </div>
- 
--<div id="case_type_template" class="hide">
--  <div class="panel panel-default">
--    <div class="panel-heading clearfix form-inline">
-+<div id="case_type_template" class="d-none">
-+  <div class="card ">  {# todo B5: css-panel #}
-+    <div class="card-header clearfix form-inline">  {# todo B5: css-form-inline #}
-       <strong>{% trans "Case type" %}</strong>
--      <select class="form-control" data-bind="options: $root.caseTypes, value: caseType"></select>
-+      <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
-       <button type="button"
--              class="btn btn-danger pull-right"
-+              class="btn btn-outline-danger float-end"
-               data-bind="click: $root.removeCaseType">
-         <i class="fa-regular fa-trash-can"></i>
-       </button>
-     </div>
--    <div class="panel-body">
-+    <div class="card-body">
-       <div data-bind="template: { name: 'property_template', foreach: properties, as: 'property' }"></div>
-       <button type="button"
-               class="btn btn-primary"
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt
index 47b3f6b62c59..cc6062565a21 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt
@@ -9,14 +9,12 @@
      {% for header, rate_infos in project_limits %}
      <h1>{{ header }}</h1>
      <table class="table table-striped">
-@@ -23,8 +23,8 @@
+@@ -23,7 +23,7 @@
            <td>{{ rate_info.key }}</td>
            <td>
              {{ rate_info.percent_usage }}%
 -            <div class="progress">
--              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>
-+            <div class="progress">  {# todo B5: css-progress #}
-+              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>  {# todo B5: inline-style #}
++            <div class="progress" role="progressbar" aria-label="Percent Usage" aria-valuemin="0" aria-valuemax="100">
+               <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>
              </div>
            </td>
-           <td>{{ rate_info.current_usage }}</td>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt
deleted file mode 100644
index 4409c60d9cae..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- 
-+++ 
-@@ -1,10 +1,10 @@
--{% extends "hqwebapp/bootstrap3/base_section.html" %}
-+{% extends "hqwebapp/bootstrap5/base_section.html" %}
- {% load hq_shared_tags %}
- 
- {% block page_content %}
- 
-   {% initial_page_data 'domain' domain %}
- 
--  {% include "domain/admin/partials/bootstrap3/project_limits_table.html" %}
-+  {% include "domain/admin/partials/bootstrap5/project_limits_table.html" %}
- 
- {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
index 81b11895e924..f29abb5f1703 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
@@ -7,8 +7,8 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
-+{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+-{% js_entry_b3 'smsbillables/js/rate_calc' %}
++{% js_entry 'smsbillables/js/rate_calc' %}
  
  {% block page_content %}
 -  <div class="well">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt
index 7f72069b129a..4893460f33ca 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt
@@ -7,8 +7,8 @@
  {% load hq_shared_tags %}
  {% load i18n %}
  
--{% requirejs_main 'accounting/js/widgets' %}
-+{% requirejs_main_b5 'accounting/js/widgets' %}
+-{% js_entry_b3 'accounting/js/widgets' %}
++{% js_entry 'accounting/js/widgets' %}
  
  {% block plan_breadcrumbs %}{% endblock %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt
index ff00626f7835..6f35896cb25e 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt
@@ -7,8 +7,8 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'domain/js/internal_settings' %}
-+{% requirejs_main_b5 'domain/js/internal_settings' %}
+-{% js_entry_b3 'domain/js/internal_settings' %}
++{% js_entry 'domain/js/internal_settings' %}
  
  {% block stylesheets %}
    {{ block.super }}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
index dbf9733f86e8..1819b0749390 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
@@ -8,7 +8,7 @@
  {% load hq_shared_tags %}
  
 -{% js_entry_b3 'domain/js/bootstrap3/internal_subscription_management' %}
-+{% requirejs_main_b5 'domain/js/bootstrap5/internal_subscription_management' %}
++{% js_entry 'domain/js/bootstrap5/internal_subscription_management' %}
  
  {% block page_content %}
    {% blocktrans %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt
index 5f02d14d4a64..bd6b8372e4d1 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt
@@ -8,8 +8,8 @@
  {% load compress %}
  {% load menu_tags %}
  
--{% requirejs_main 'accounting/js/renew_plan_selection' %}
-+{% requirejs_main_b5 'accounting/js/renew_plan_selection' %}
+-{% js_entry_b3 'accounting/js/renew_plan_selection' %}
++{% js_entry 'accounting/js/renew_plan_selection' %}
  
  {% block plan_breadcrumbs %}{% endblock %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_sso_login_success.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_sso_login_success.html.diff.txt
index d7a137a2d3ff..4ce2f7a93ebb 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_sso_login_success.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_sso_login_success.html.diff.txt
@@ -1,5 +1,14 @@
 --- 
 +++ 
+@@ -5,7 +5,7 @@
+ 
+ {% block title %}{% trans "Thank you for logging in with Single Sign-On!" %}{% endblock %}
+ 
+-{% js_entry_b3 'hqwebapp/js/sso_inactivity' %}
++{% js_entry 'hqwebapp/js/sso_inactivity' %}
+ 
+ {% block container_class %}container-fluid{% endblock %}
+ 
 @@ -15,7 +15,7 @@
      <h1>{% trans "Thank you for logging in with Single Sign-On!" %}</h1>
    </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/global_navigation_bar.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/global_navigation_bar.html.diff.txt
index 4fa8d36f7a94..903075c84570 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/global_navigation_bar.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/global_navigation_bar.html.diff.txt
@@ -37,7 +37,7 @@
 -                <li class="nav-divider divider"></li>
 -                <li class="dropdown-header nav-header">{% trans 'Manage Enterprise' %}</li>
 -                <li>
--                    <a href="{% url "enterprise_dashboard" domain %}">
+-                    <a href="{% url "platform_overview" domain %}">
 -                        <i class="fa fa-cogs icon-cogs dropdown-icon"></i> {% trans "Enterprise Console" %}
 -                    </a>
 -                </li>
@@ -86,7 +86,7 @@
 +              <li><hr class="dropdown-divider"></li>
 +              <li class="dropdown-header nav-header">{% trans 'Manage Enterprise' %}</li>
 +              <li>
-+                <a href="{% url "enterprise_dashboard" domain %}" class="dropdown-item">
++                <a href="{% url "platform_overview" domain %}" class="dropdown-item">
 +                  <i class="fa fa-cogs icon-cogs dropdown-icon"></i> {% trans "Enterprise Console" %}
                  </a>
 -            </li>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/soil_status_full.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/soil_status_full.html.diff.txt
index 61de87ab3915..cd3d2236a7d8 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/soil_status_full.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/soil_status_full.html.diff.txt
@@ -6,8 +6,8 @@
  {% load i18n %}
  {% load hq_shared_tags %}
  
--{% requirejs_main "hqwebapp/js/soil" %}
-+{% requirejs_main_b5 "hqwebapp/js/soil" %}
+-{% js_entry_b3 "hqwebapp/js/soil" %}
++{% js_entry "hqwebapp/js/soil" %}
  
  {% block page_content %}
    {% initial_page_data 'download_id' download_id %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/case_details.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/case_details.js.diff.txt
index 698a873d7350..252c6da317b1 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/case_details.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/case_details.js.diff.txt
@@ -20,8 +20,8 @@
 +    'reports/js/bootstrap5/readable_form',
      'bootstrap',    // needed for $.tab
      'jquery-memoized-ajax/jquery.memoized.ajax.min',
- ], function (
-@@ -92,7 +92,7 @@
+     'commcarehq',
+@@ -93,7 +93,7 @@
                      // form data panel uses sticky tabs when it's its own page
                      // but that behavior would be disruptive here
                      $panel.find(".sticky-tabs").removeClass("sticky-tabs");
@@ -30,7 +30,7 @@
  
                      singleForm.initSingleForm({
                          instance_id: data.xform_id,
-@@ -275,7 +275,7 @@
+@@ -276,7 +276,7 @@
          $propertiesModal.koApplyBindings(modalData);
          $casePropertyNames.click(function () {
              modalData.init($(this).data('property-name'));
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/case_data.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/case_data.html.diff.txt
index 262fde0e8978..57973592078e 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/case_data.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/case_data.html.diff.txt
@@ -10,8 +10,8 @@
    <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">
  {% endblock %}
  
--{% requirejs_main 'reports/js/bootstrap3/case_details' %}
-+{% requirejs_main_b5 'reports/js/bootstrap5/case_details' %}
+-{% js_entry_b3 'reports/js/bootstrap3/case_details' %}
++{% js_entry 'reports/js/bootstrap5/case_details' %}
  
  {% block page_content %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt
index 37c4020bc961..32ff4413ad9b 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/style-imports.commcarehq.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,44 +1,95 @@
+@@ -1,44 +1,96 @@
 -@import "_hq/includes/variables.less";
 -@import "_hq/includes/mixins.less";
  
@@ -123,6 +123,7 @@
 +@import "commcarehq/form_steps";
 +@import "commcarehq/helpbubble";
 +@import "commcarehq/hubspot";
++@import "commcarehq/htmx";
 +@import "commcarehq/icons";
 +@import "commcarehq/inline_edit";
 +@import "commcarehq/label";
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index f6c7e2942559..3238e494f7eb 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -54,7 +54,10 @@
   "domain": {
     "in_progress": true,
     "templates": [
+      "admin/case_search.html",
       "admin/commtrack_settings.html",
+      "admin/partials/case_search_templates.html",
+      "admin/project_limits.html",
       "admin/sms_settings.html"
     ]
   },
diff --git a/corehq/apps/oauth_integrations/__init__.py b/corehq/apps/oauth_integrations/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/oauth_integrations/migrations/0001_initial.py b/corehq/apps/oauth_integrations/migrations/0001_initial.py
deleted file mode 100644
index 2b638c4095a4..000000000000
--- a/corehq/apps/oauth_integrations/migrations/0001_initial.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Generated by Django 2.2.24 on 2022-01-10 13:57
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='GoogleApiToken',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('token', models.CharField(max_length=700)),
-                ('date_created', models.DateField(auto_now_add=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='google_api_tokens', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]
diff --git a/corehq/apps/oauth_integrations/migrations/0002_livegooglesheetschedule.py b/corehq/apps/oauth_integrations/migrations/0002_livegooglesheetschedule.py
deleted file mode 100644
index 078f1b071a12..000000000000
--- a/corehq/apps/oauth_integrations/migrations/0002_livegooglesheetschedule.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 2.2.27 on 2022-02-28 10:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oauth_integrations', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='LiveGoogleSheetSchedule',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('export_config_id', models.CharField(db_index=True, max_length=250)),
-                ('is_active', models.BooleanField(default=True)),
-                ('start_time', models.IntegerField(default=200)),
-                ('google_sheet_id', models.CharField(max_length=250)),
-            ],
-        ),
-    ]
diff --git a/corehq/apps/oauth_integrations/migrations/0003_livegooglesheetrefreshstatus.py b/corehq/apps/oauth_integrations/migrations/0003_livegooglesheetrefreshstatus.py
deleted file mode 100644
index df4e94bb6d33..000000000000
--- a/corehq/apps/oauth_integrations/migrations/0003_livegooglesheetrefreshstatus.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 2.2.27 on 2022-02-28 11:57
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oauth_integrations', '0002_livegooglesheetschedule'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='LiveGoogleSheetRefreshStatus',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('date_start', models.DateTimeField(auto_now_add=True)),
-                ('date_end', models.DateTimeField(blank=True, null=True)),
-                ('refresh_error_reason', models.CharField(choices=[(None, 'No Error'), ('token', 'Invalid Token'), ('timeout', 'Data Timeout'), ('other', 'Other...')], default=None, max_length=7, null=True)),
-                ('refresh_error_note', models.TextField(blank=True, null=True)),
-                ('schedule', models.ForeignKey(on_delete=models.CASCADE, to='oauth_integrations.LiveGoogleSheetSchedule')),
-            ],
-        ),
-    ]
diff --git a/corehq/apps/oauth_integrations/migrations/0004_auto_20220304_1139.py b/corehq/apps/oauth_integrations/migrations/0004_auto_20220304_1139.py
deleted file mode 100644
index 19d83b2b61bc..000000000000
--- a/corehq/apps/oauth_integrations/migrations/0004_auto_20220304_1139.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Generated by Django 2.2.27 on 2022-03-04 11:39
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('oauth_integrations', '0003_livegooglesheetrefreshstatus'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='livegooglesheetrefreshstatus',
-            name='refresh_error_reason',
-            field=models.CharField(choices=[(None, 'No Error'), ('token', 'Invalid Token'), ('timeout', 'Data Timeout'), ('other', 'Other...')], default=None, max_length=16, null=True),
-        ),
-        migrations.AlterField(
-            model_name='livegooglesheetrefreshstatus',
-            name='schedule',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='oauth_integrations.LiveGoogleSheetSchedule'),
-        ),
-    ]
diff --git a/corehq/apps/oauth_integrations/migrations/__init__.py b/corehq/apps/oauth_integrations/migrations/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/oauth_integrations/models.py b/corehq/apps/oauth_integrations/models.py
deleted file mode 100644
index 2262ab9c86cb..000000000000
--- a/corehq/apps/oauth_integrations/models.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from django.db import models
-
-from django.contrib.auth.models import User
-
-
-class GoogleApiToken(models.Model):
-    user = models.ForeignKey(User, related_name='google_api_tokens', on_delete=models.CASCADE)
-    token = models.CharField(max_length=700)
-    date_created = models.DateField(auto_now_add=True)
-
-
-class LiveGoogleSheetSchedule(models.Model):
-    export_config_id = models.CharField(max_length=250, db_index=True)
-    is_active = models.BooleanField(default=True)
-    start_time = models.IntegerField(default=200)
-    google_sheet_id = models.CharField(max_length=250)
-
-
-class LiveGoogleSheetErrorReason():
-    NO_ERROR = None
-    INVALID_TOKEN = 'token'
-    TIMEOUT = 'timeout'
-    OTHER = 'other'
-
-    CHOICES = (
-        (NO_ERROR, "No Error"),
-        (INVALID_TOKEN, "Invalid Token"),
-        (TIMEOUT, "Data Timeout"),
-        (OTHER, "Other..."),
-    )
-
-
-class LiveGoogleSheetRefreshStatus(models.Model):
-    schedule = models.ForeignKey(LiveGoogleSheetSchedule, on_delete=models.CASCADE)
-    date_start = models.DateTimeField(auto_now_add=True)
-    date_end = models.DateTimeField(null=True, blank=True)
-    refresh_error_reason = models.CharField(
-        max_length=16,
-        choices=LiveGoogleSheetErrorReason.CHOICES,
-        null=True,
-        default=LiveGoogleSheetErrorReason.NO_ERROR,
-    )
-    refresh_error_note = models.TextField(null=True, blank=True)
diff --git a/corehq/apps/oauth_integrations/tests/__init__.py b/corehq/apps/oauth_integrations/tests/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/oauth_integrations/tests/test_util.py b/corehq/apps/oauth_integrations/tests/test_util.py
deleted file mode 100644
index f3126aa3af75..000000000000
--- a/corehq/apps/oauth_integrations/tests/test_util.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from datetime import datetime
-
-from django.test import SimpleTestCase, TestCase
-from django.contrib.auth.models import User
-
-from google.oauth2.credentials import Credentials
-
-from corehq.apps.oauth_integrations.models import GoogleApiToken
-from corehq.apps.oauth_integrations.utils import get_token, load_credentials, stringify_credentials
-
-
-class TestUtils(TestCase):
-
-    def setUp(self):
-        super().setUp()
-        self.user = User()
-        self.user.username = 'test@user.com'
-        self.user.save()
-        self.credentials = Credentials(
-            token="token",
-            refresh_token="refresh_token",
-            id_token="id_token",
-            token_uri="token_uri",
-            client_id="client_id",
-            client_secret="client_secret",
-            scopes="scopes",
-            expiry=datetime(2020, 1, 1)
-        )
-
-    def tearDown(self):
-        self.credentials = None
-        self.user.delete()
-        return super().tearDown()
-
-    def test_get_token_with_created_token(self):
-        GoogleApiToken.objects.create(
-            user=self.user,
-            token=stringify_credentials(self.credentials)
-        )
-
-        token = get_token(self.user)
-
-        self.assertIsNotNone(token)
-        self.tearDowntoken()
-
-    def test_get_token_without_token(self):
-        token = get_token(self.user)
-
-        self.assertIsNone(token)
-
-    def tearDowntoken(self):
-        objects = GoogleApiToken.objects.get(user=self.user)
-        objects.delete()
-
-
-class TestCredentialsUtils(SimpleTestCase):
-    def setUp(self):
-        super().setUp()
-        self.credentials = Credentials(
-            token="token",
-            refresh_token="refresh_token",
-            id_token="id_token",
-            token_uri="token_uri",
-            client_id="client_id",
-            client_secret="client_secret",
-            scopes="scopes",
-            expiry=datetime(2020, 1, 1)
-        )
-
-    def tearDown(self):
-        self.credentials = None
-        return super().tearDown()
-
-    def test_stringify_credentials(self):
-        desired_credentials = ('{"token": "token", "refresh_token": "refresh_token", "id_token": "id_token", '
-        '"token_uri": "token_uri", "client_id": "client_id", "client_secret": "client_secret", '
-        '"scopes": "scopes", "expiry": "2020-01-01 00:00:00"}')
-
-        stringified_credentials = stringify_credentials(self.credentials)
-
-        self.assertEqual(desired_credentials, stringified_credentials)
-
-    def test_load_credentials(self):
-        desired_credentials = self.credentials
-
-        stringified_credentials = stringify_credentials(self.credentials)
-        loaded_credentials = load_credentials(stringified_credentials)
-
-        self.assertEqual(loaded_credentials.token, desired_credentials.token)
diff --git a/corehq/apps/oauth_integrations/tests/test_views.py b/corehq/apps/oauth_integrations/tests/test_views.py
deleted file mode 100644
index 25f5121c25b7..000000000000
--- a/corehq/apps/oauth_integrations/tests/test_views.py
+++ /dev/null
@@ -1,146 +0,0 @@
-from datetime import datetime
-
-from unittest.mock import patch
-
-from django.test import TestCase, RequestFactory, override_settings
-from django.contrib.auth.models import User
-
-from google.oauth2.credentials import Credentials
-from corehq.apps.oauth_integrations.utils import get_token, load_credentials, stringify_credentials
-
-from corehq.apps.oauth_integrations.views.google import redirect_oauth_view, call_back_view
-from corehq.apps.domain.shortcuts import create_domain
-from corehq.apps.oauth_integrations.models import GoogleApiToken
-
-
-class TestViews(TestCase):
-
-    def test_redirect_oauth_view_without_credentials(self):
-        self.mocked_get_url.return_value = "googleredirecturl.com"
-        request = self.factory.get('')
-        request.user = self.user
-
-        response = redirect_oauth_view(request, self.domain)
-
-        self.assertEqual(response.url, 'googleredirecturl.com')
-
-    def test_redirect_oauth_view_with_credentials(self):
-        self.setUp_credentials()
-        self.mocked_refresh_credentials.return_value = self.create_new_credentials(token="new_token")
-        self.mocked_get_url.return_value = "googleredirecturl.com"
-        request = self.factory.get('')
-        request.user = self.user
-
-        response = redirect_oauth_view(request, self.domain)
-        stringified_creds = get_token(self.user)
-        creds = load_credentials(stringified_creds.token)
-
-        self.assertEqual(response.url, "placeholder.com")
-        self.assertEqual(creds.token, 'new_token')
-
-    @override_settings(GOOGLE_OATH_CONFIG={
-        "web": {
-            "client_id": "test_id",
-            "project_id": "test_project_id",
-            "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-            "token_uri": "https://oauth2.googleapis.com/token",
-            "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-            "client_secret": "test_client_secret"}
-    })
-    def test_call_back_view_with_token_updates_credentials(self):
-        self.setUp_credentials()
-        self.mocked_get_token.return_value = stringify_credentials(self.create_new_credentials("new_token"))
-        request = self.factory.get('', {'state': 101})
-        request.user = self.user
-
-        call_back_view(request, self.domain)
-
-        stringified_creds = get_token(self.user)
-        creds = load_credentials(stringified_creds.token)
-
-        self.assertEqual(creds.token, "new_token")
-
-    @override_settings(GOOGLE_OATH_CONFIG={
-        "web": {
-            "client_id": "test_id",
-            "project_id": "test_project_id",
-            "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-            "token_uri": "https://oauth2.googleapis.com/token",
-            "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-            "client_secret": "test_client_secret"}
-    })
-    def test_call_back_view_without_token_creates_credentials(self):
-        self.mocked_get_token.return_value = stringify_credentials(self.create_new_credentials("new_token"))
-        request = self.factory.get('', {'state': 101})
-        request.user = self.user
-
-        call_back_view(request, self.domain)
-
-        creds = get_token(self.user)
-
-        self.assertIsNotNone(creds)
-
-    def setUp(self):
-        self.setUp_mocks()
-        self.factory = RequestFactory()
-        self.user = User()
-        self.user.username = 'test@user.com'
-        self.user.save()
-
-        self.domain = create_domain("test_domain")
-
-        self.credentials = Credentials(
-            token="token",
-            refresh_token="refresh_token",
-            id_token="id_token",
-            token_uri="token_uri",
-            client_id="client_id",
-            client_secret="client_secret",
-            scopes="scopes",
-            expiry=datetime(2020, 1, 1)
-        )
-        self.stringified_token = stringify_credentials(self.credentials)
-
-        return super().setUp()
-
-    def tearDown(self):
-        token = get_token(self.user)
-        if token:
-            token.delete()
-        self.user.delete()
-        self.domain.delete()
-
-        return super().tearDown()
-
-    def setUp_mocks(self):
-        get_url_from_google_patcher = patch('corehq.apps.oauth_integrations.views.google.get_url_from_google')
-        refresh_credentials_patcher = patch('corehq.apps.oauth_integrations.views.google.refresh_credentials')
-        get_token_patcher = patch('corehq.apps.oauth_integrations.views.google.get_token_from_google')
-
-        self.mocked_get_url = get_url_from_google_patcher.start()
-        self.mocked_refresh_credentials = refresh_credentials_patcher.start()
-        self.mocked_get_token = get_token_patcher.start()
-
-        self.addCleanup(get_url_from_google_patcher.stop)
-        self.addCleanup(refresh_credentials_patcher.stop)
-        self.addCleanup(get_token_patcher.stop)
-
-    def setUp_credentials(self):
-        return GoogleApiToken.objects.create(
-            user=self.user,
-            token=self.stringified_token
-        )
-
-    def create_new_credentials(self, token="new_token"):
-        credentials = Credentials(
-            token=token,
-            refresh_token="refresh_token",
-            id_token="id_token",
-            token_uri="token_uri",
-            client_id="client_id",
-            client_secret="client_secret",
-            scopes="scopes",
-            expiry=datetime(2020, 1, 1)
-        )
-
-        return credentials
diff --git a/corehq/apps/oauth_integrations/urls.py b/corehq/apps/oauth_integrations/urls.py
deleted file mode 100644
index e97dd60a1987..000000000000
--- a/corehq/apps/oauth_integrations/urls.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.urls import re_path as url
-
-from corehq.apps.oauth_integrations.views.google import (
-    redirect_oauth_view,
-    call_back_view
-)
-
-urlpatterns = [
-    # OAuth redirect views
-    url(r"^google_sheets_oauth/redirect/$",
-        redirect_oauth_view,
-        name="google_sheet_oauth_redirect"),
-    url(r"^google_sheets_oauth/callback/$",
-        call_back_view,
-        name="google_sheet_oauth_callback")
-]
diff --git a/corehq/apps/oauth_integrations/utils.py b/corehq/apps/oauth_integrations/utils.py
deleted file mode 100644
index a0d9c7de4c9f..000000000000
--- a/corehq/apps/oauth_integrations/utils.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import json
-
-from django.conf import settings
-
-from datetime import datetime
-
-from google.oauth2.credentials import Credentials
-
-from corehq.util.couch import get_document_or_404
-
-from corehq.apps.export.esaccessors import get_case_export_base_query
-from corehq.apps.oauth_integrations.models import GoogleApiToken
-
-from googleapiclient.discovery import build
-
-
-def stringify_credentials(credentials):
-    credentials_dict = {
-        'token': credentials.token,
-        'refresh_token': credentials.refresh_token,
-        'id_token': credentials.id_token,
-        'token_uri': credentials.token_uri,
-        'client_id': credentials.client_id,
-        'client_secret': credentials.client_secret,
-        'scopes': credentials.scopes,
-        'expiry': datetime.strftime(credentials.expiry, '%Y-%m-%d %H:%M:%S')
-    }
-    return json.dumps(credentials_dict)
-
-
-def load_credentials(stringified_credentials):
-    credentials_dict = json.loads(stringified_credentials)
-    credentials = Credentials(
-        credentials_dict['token'],
-        refresh_token=credentials_dict['refresh_token'],
-        id_token=credentials_dict['id_token'],
-        token_uri=credentials_dict['token_uri'],
-        client_id=credentials_dict['client_id'],
-        client_secret=credentials_dict['client_secret'],
-        scopes=credentials_dict['scopes'],
-    )
-    return credentials
-
-
-def get_token(user):
-    try:
-        return GoogleApiToken.objects.get(user=user)
-    except GoogleApiToken.DoesNotExist:
-        return None
-
-
-def get_query_results(export_instance, domain, id):
-    export = get_document_or_404(export_instance, domain, id)
-    query = get_case_export_base_query(domain, export.case_type)
-    results = query.run()
-    return results
-
-
-def create_spreadsheet(spreadsheet_data, user):
-    token = GoogleApiToken.objects.get(user=user)
-    credentials = load_credentials(token.token)
-
-    service = build(settings.GOOGLE_SHEETS_API_NAME, settings.GOOGLE_SHEETS_API_VERSION, credentials=credentials)
-    sheets_file = service.spreadsheets().create().execute()
-    spreadsheet_id = sheets_file['spreadsheetId']
-
-    for chunk in spreadsheet_data:
-        value_range_body = {
-            'majorDimension': 'ROWS',
-            'values': chunk
-        }
-        service.spreadsheets().values().append(
-            spreadsheetId=spreadsheet_id,
-            valueInputOption='USER_ENTERED',
-            body=value_range_body,
-            range='A1'
-        ).execute()
-
-    return sheets_file
-
-
-def listify_data(query_results):
-    data = []
-    for row_number, document in enumerate(query_results):
-        row_values = document.get("case_json")
-
-        if(row_number == 0):
-            headers = list(row_values.keys())
-            data.append(headers)
-        data.append(list(row_values.values()))
-
-    return data
diff --git a/corehq/apps/oauth_integrations/views/__init__.py b/corehq/apps/oauth_integrations/views/__init__.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/oauth_integrations/views/google.py b/corehq/apps/oauth_integrations/views/google.py
deleted file mode 100644
index e4f53434f701..000000000000
--- a/corehq/apps/oauth_integrations/views/google.py
+++ /dev/null
@@ -1,100 +0,0 @@
-from django.conf import settings
-from django.contrib import messages
-from django.http import HttpResponseRedirect
-from django.urls import reverse
-from django.utils.translation import gettext as _
-
-from corehq.apps.oauth_integrations.models import GoogleApiToken
-from corehq.apps.oauth_integrations.utils import (
-    stringify_credentials,
-    load_credentials,
-    get_token,
-)
-from corehq.apps.export.exceptions import InvalidLoginException
-
-from google.auth.transport.requests import Request
-from google_auth_oauthlib.flow import Flow
-from google.auth.exceptions import RefreshError
-
-
-def redirect_oauth_view(request, domain):
-    redirect_uri = request.build_absolute_uri(reverse("google_sheet_oauth_callback"))
-    token = get_token(request.user)
-
-    if token is None:
-        return HttpResponseRedirect(get_url_from_google(redirect_uri))
-    else:
-        credentials = load_credentials(token.token)
-        try:
-            token.token = stringify_credentials(refresh_credentials(credentials))
-            token.save()
-        # When we lose access to a user's refresh token, we get this refresh error.
-        # This will simply have them log into google sheets again to give us another refresh token
-        except RefreshError:
-            return HttpResponseRedirect(get_url_from_google(redirect_uri))
-        #replace with google sheet view
-        return HttpResponseRedirect("placeholder.com")
-
-
-def refresh_credentials(credentials, user):
-    return credentials.refresh(Request())
-
-
-def get_url_from_google(redirect_uri):
-    INDEX_URL = 0
-    flow = Flow.from_client_config(
-        settings.GOOGLE_OATH_CONFIG,
-        settings.GOOGLE_OAUTH_SCOPES,
-        redirect_uri=redirect_uri
-    )
-    # Returns a tuple containing (url, state) and we only want the url
-    auth_tuple = flow.authorization_url(prompt='consent')
-    return auth_tuple[INDEX_URL]
-
-
-def call_back_view(request, domain):
-    redirect_uri = request.build_absolute_uri(reverse("google_sheet_oauth_callback"))
-
-    try:
-        check_state(request)
-
-        flow = Flow.from_client_config(
-            settings.GOOGLE_OATH_CONFIG,
-            settings.GOOGLE_OAUTH_SCOPES,
-            redirect_uri=redirect_uri
-        )
-        flow.redirect_uri = redirect_uri
-
-        # Fetch the token and stringify it
-        stringified_token = get_token_from_google(request, flow)
-
-        token = get_token(request.user)
-
-        if not token:
-            GoogleApiToken.objects.create(
-                user=request.user,
-                token=stringified_token
-            )
-        else:
-            token.token = stringified_token
-            token.save()
-
-    except InvalidLoginException:
-        messages.error(request, _("Something went wrong when trying to sign you in to Google. Please try again."))
-
-    #replace with google sheet view
-    return HttpResponseRedirect("placeholder.com")
-
-
-def check_state(request):
-    state = request.GET.get('state', None)
-
-    if not state:
-        raise InvalidLoginException
-
-
-def get_token_from_google(request, flow):
-    authorization_response = request.build_absolute_uri()
-    flow.fetch_token(authorization_response)
-    credentials = flow.credentials
-    return stringify_credentials(credentials)
diff --git a/corehq/apps/receiverwrapper/tests/test_auth.py b/corehq/apps/receiverwrapper/tests/test_auth.py
index 0e02aed674c2..25634f5f3ed0 100644
--- a/corehq/apps/receiverwrapper/tests/test_auth.py
+++ b/corehq/apps/receiverwrapper/tests/test_auth.py
@@ -2,21 +2,26 @@
 import uuid
 from datetime import datetime, timedelta
 from unittest import mock
+from urllib.parse import urlencode
 
 from django.http import HttpResponse
 from django.test import Client, TestCase
 from django.urls import reverse
 
+import django_digest.test
 from oauth2_provider.models import get_access_token_model
-from urllib.parse import urlencode
 
 from couchforms import openrosa_response
 
-import django_digest.test
+from corehq import toggles
 from corehq.apps.app_manager.models import Application
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.receiverwrapper.util import DEMO_SUBMIT_MODE
-from corehq.apps.receiverwrapper.views import post_api, secure_post
+from corehq.apps.receiverwrapper.views import (
+    _verify_access,
+    post_api,
+    secure_post,
+)
 from corehq.apps.users.models import (
     CommCareUser,
     HqPermissions,
@@ -422,3 +427,52 @@ def test_edit_data_required(self):
     def test_access_api_required(self):
         self._create_user(edit_data=True, access_api=False)
         self.assert_api_response(403)
+
+
+@mock.patch('corehq.apps.receiverwrapper.views.is_from_formplayer')
+@mock.patch('corehq.toggles.set_toggle')
+@mock.patch('corehq.apps.receiverwrapper.views.cache.get', mock.MagicMock(return_value=None))
+@mock.patch('corehq.apps.receiverwrapper.views.cache.set', mock.MagicMock)
+class TestHasMobileAccess(TestCase):
+    domain = "test-has-mobile-access"
+
+    @classmethod
+    def setUpClass(cls):
+        cls.domain_obj = create_domain(cls.domain)
+        cls.user_without_permission = cls._create_user(access_mobile_endpoints=False)
+        cls.user_with_permission = cls._create_user(access_mobile_endpoints=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.domain_obj.delete()
+
+    @classmethod
+    def _create_user(cls, access_mobile_endpoints=False):
+        role = UserRole.create(
+            cls.domain, 'api-user', permissions=HqPermissions(access_mobile_endpoints=access_mobile_endpoints)
+        )
+        return WebUser.create(cls.domain, str(uuid.uuid4()), 'p@$$w0rd',
+                              None, None, role_id=role.get_id)
+
+    def _verify_access(self, user):
+        _verify_access(self.domain, user.user_id, mock.MagicMock(couch_user=user))
+
+    def test_formplayer_request_without_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = True
+        self._verify_access(self.user_without_permission)
+        set_toggle.assert_not_called()
+
+    def test_regular_request_without_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = False
+        self._verify_access(self.user_without_permission)
+        set_toggle.assert_called_with('open_submission_endpoint', self.domain, True, toggles.NAMESPACE_DOMAIN)
+
+    def test_formplayer_request_with_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = True
+        self._verify_access(self.user_with_permission)
+        set_toggle.assert_not_called()
+
+    def test_regular_request_with_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = False
+        self._verify_access(self.user_with_permission)
+        set_toggle.assert_not_called()
diff --git a/corehq/apps/receiverwrapper/views.py b/corehq/apps/receiverwrapper/views.py
index df58cd1f8b9e..3e9f41e5a940 100644
--- a/corehq/apps/receiverwrapper/views.py
+++ b/corehq/apps/receiverwrapper/views.py
@@ -79,6 +79,10 @@ def _verify_access(domain, user_id, request):
             cache.set(cache_key, True, CACHE_EXPIRY_7_DAYS_IN_SECS)
             message = f"NoMobileEndpointsAccess: invalid request by {user_id} on {domain}"
             notify_exception(request, message=message)
+            if not toggles.OPEN_SUBMISSION_ENDPOINT.enabled(domain):
+                # Once we're confident this has enabled the flag for all active
+                # usage, we can make domains without the toggle fail hard
+                toggles.OPEN_SUBMISSION_ENDPOINT.set(domain, enabled=True, namespace=toggles.NAMESPACE_DOMAIN)
 
 
 @profile_dump('commcare_receiverwapper_process_form.prof', probability=PROFILE_PROBABILITY, limit=PROFILE_LIMIT)
diff --git a/corehq/apps/registration/static/registration/js/register_new_user.js b/corehq/apps/registration/static/registration/js/register_new_user.js
index dfc8ecb135fb..3607b745c0c4 100644
--- a/corehq/apps/registration/static/registration/js/register_new_user.js
+++ b/corehq/apps/registration/static/registration/js/register_new_user.js
@@ -6,6 +6,7 @@ hqDefine('registration/js/register_new_user', [
     'hqwebapp/js/initial_page_data',
     'analytix/js/kissmetrix',
     'registration/js/login',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/registration/templates/registration/register_new_user.html b/corehq/apps/registration/templates/registration/register_new_user.html
index 8235bfe46489..1ca49652a747 100644
--- a/corehq/apps/registration/templates/registration/register_new_user.html
+++ b/corehq/apps/registration/templates/registration/register_new_user.html
@@ -4,7 +4,7 @@
 {% load compress %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main 'registration/js/register_new_user' %}
+{% js_entry_b3 'registration/js/register_new_user' %}
 
 {% block title %}{% trans "Create an Account" %}{% endblock title %}
 
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/case_details.js b/corehq/apps/reports/static/reports/js/bootstrap3/case_details.js
index 30b4b1fb225b..505c2cf1eae1 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/case_details.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/case_details.js
@@ -14,6 +14,7 @@ hqDefine("reports/js/bootstrap3/case_details", [
     'reports/js/bootstrap3/readable_form',
     'bootstrap',    // needed for $.tab
     'jquery-memoized-ajax/jquery.memoized.ajax.min',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/case_details.js b/corehq/apps/reports/static/reports/js/bootstrap5/case_details.js
index 0bb585df2e1c..11c6f3cc531e 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/case_details.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/case_details.js
@@ -14,6 +14,7 @@ hqDefine("reports/js/bootstrap5/case_details", [
     'reports/js/bootstrap5/readable_form',
     'bootstrap',    // needed for $.tab
     'jquery-memoized-ajax/jquery.memoized.ajax.min',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js b/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js
index 0eb99ee10073..9e8ed1c59e65 100644
--- a/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js
+++ b/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js
@@ -91,7 +91,7 @@ hqDefine("reports/js/filters/case_list_explorer_knockout_bindings", ['jquery', '
         init: function (element) {
             var $element = $(element);
             if (!$element.atwho) {
-                throw new Error("The typeahead binding requires Atwho.js and Caret.js");
+                throw new Error("The explorerColumnsAutocomplete binding requires Atwho.js and Caret.js");
             }
 
             atwho.init($element, {
diff --git a/corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html b/corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
index c3bc69e8db71..e2d14354ce57 100644
--- a/corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
+++ b/corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -8,7 +8,7 @@
   <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">
 {% endblock %}
 
-{% requirejs_main 'reports/js/bootstrap3/case_details' %}
+{% js_entry_b3 'reports/js/bootstrap3/case_details' %}
 
 {% block page_content %}
 
diff --git a/corehq/apps/reports/templates/reports/reportdata/bootstrap5/case_data.html b/corehq/apps/reports/templates/reports/reportdata/bootstrap5/case_data.html
index 698083365a0e..ef0a28780a93 100644
--- a/corehq/apps/reports/templates/reports/reportdata/bootstrap5/case_data.html
+++ b/corehq/apps/reports/templates/reports/reportdata/bootstrap5/case_data.html
@@ -8,7 +8,7 @@
   <link rel="stylesheet" type="text/css" href="{% static "hqwebapp/css/proptable.css" %}">
 {% endblock %}
 
-{% requirejs_main_b5 'reports/js/bootstrap5/case_details' %}
+{% js_entry 'reports/js/bootstrap5/case_details' %}
 
 {% block page_content %}
 
diff --git a/corehq/apps/sms/forms.py b/corehq/apps/sms/forms.py
index 7db5da8d4cb0..6bce5a5747fa 100644
--- a/corehq/apps/sms/forms.py
+++ b/corehq/apps/sms/forms.py
@@ -1296,19 +1296,25 @@ def save(self, commtrack_settings):
 
 
 class ComposeMessageForm(forms.Form):
-
-    recipients = forms.CharField(widget=forms.Textarea(attrs={"class": "vertical-resize"}),
-                                 help_text=gettext_lazy("Type a username, group name or 'send to all'"))
+    recipients = forms.MultipleChoiceField(
+        widget=forms.SelectMultiple(attrs={'class': 'hqwebapp-select2'}),
+    )
     message = forms.CharField(widget=forms.Textarea(attrs={"class": "vertical-resize"}),
     help_text=gettext_lazy('0 characters (160 max)'))
 
     def __init__(self, *args, **kwargs):
         domain = kwargs.pop('domain')
         super(ComposeMessageForm, self).__init__(*args, **kwargs)
+
+        from corehq.apps.sms.views import get_sms_autocomplete_context
+        self.fields['recipients'].choices = [
+            (contact, contact) for contact in get_sms_autocomplete_context(domain)
+        ]
+
         self.helper = HQFormHelper()
         self.helper.form_action = reverse('send_to_recipients', args=[domain])
         self.helper.layout = crispy.Layout(
-            crispy.Field('recipients', rows=2, css_class='sms-typeahead'),
+            crispy.Field('recipients'),
             crispy.Field('message', rows=2),
             hqcrispy.FormActions(
                 twbscrispy.StrictButton(
diff --git a/corehq/apps/sms/static/sms/js/chat_contacts.js b/corehq/apps/sms/static/sms/js/chat_contacts.js
index 5ee8b23e0b9f..288e1df5bb01 100644
--- a/corehq/apps/sms/static/sms/js/chat_contacts.js
+++ b/corehq/apps/sms/static/sms/js/chat_contacts.js
@@ -4,6 +4,7 @@ hqDefine('sms/js/chat_contacts', [
     'underscore',
     'hqwebapp/js/initial_page_data',
     'datatables.bootstrap',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/sms/static/sms/js/compose.js b/corehq/apps/sms/static/sms/js/compose.js
index 1e40798262cc..15b5d3065353 100644
--- a/corehq/apps/sms/static/sms/js/compose.js
+++ b/corehq/apps/sms/static/sms/js/compose.js
@@ -1,10 +1,9 @@
 hqDefine("sms/js/compose",[
     "jquery",
-    "hqwebapp/js/initial_page_data",
-    'jquery-ui/ui/widgets/sortable',
-    "hqwebapp/js/bootstrap-multi-typeahead",
+    "hqwebapp/js/bootstrap3/widgets",
+    "jquery-ui/ui/widgets/sortable",
     "commcarehq",
-], function ($, intialPageData) {
+], function ($) {
     $(function () {
         $("#hint_id_recipients").addClass("alert alert-info");
         $("#hint_id_message").addClass("alert alert-info");
@@ -26,9 +25,5 @@ hqDefine("sms/js/compose",[
             message = message + " (" + maxChar + " max)";
             $charCount.text(message);
         });
-
-        $('.sms-typeahead').multiTypeahead({
-            source: intialPageData.get('sms_contacts'),
-        }).focus();
     });
 });
diff --git a/corehq/apps/sms/static/sms/js/sms_language_main.js b/corehq/apps/sms/static/sms/js/sms_language_main.js
index 5342fd2a82ad..9003d2ef1ac7 100644
--- a/corehq/apps/sms/static/sms/js/sms_language_main.js
+++ b/corehq/apps/sms/static/sms/js/sms_language_main.js
@@ -2,6 +2,7 @@ hqDefine("sms/js/sms_language_main",[
     "langcodes/js/langcodes",
     "hqwebapp/js/bulk_upload_file",
     "sms/js/languages",
+    "commcarehq",
 ],function () {
 
 });
diff --git a/corehq/apps/sms/templates/sms/chat_contacts.html b/corehq/apps/sms/templates/sms/chat_contacts.html
index f993516b6094..e069b02a7df8 100644
--- a/corehq/apps/sms/templates/sms/chat_contacts.html
+++ b/corehq/apps/sms/templates/sms/chat_contacts.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'sms/js/chat_contacts' %}
+{% js_entry_b3 'sms/js/chat_contacts' %}
 
 {% block page_content %}
   {% registerurl "chat_contact_list" domain %}
diff --git a/corehq/apps/sms/templates/sms/compose.html b/corehq/apps/sms/templates/sms/compose.html
index c0455d1a7ef4..38b524a433c9 100644
--- a/corehq/apps/sms/templates/sms/compose.html
+++ b/corehq/apps/sms/templates/sms/compose.html
@@ -6,6 +6,5 @@
 {% js_entry_b3 "sms/js/compose" %}
 
 {% block page_content %}
-  {% initial_page_data 'sms_contacts' sms_contacts %}
   {% crispy form %}
 {% endblock %}
diff --git a/corehq/apps/sms/templates/sms/languages.html b/corehq/apps/sms/templates/sms/languages.html
index 90f31e75ddaf..87363459a217 100644
--- a/corehq/apps/sms/templates/sms/languages.html
+++ b/corehq/apps/sms/templates/sms/languages.html
@@ -6,7 +6,7 @@
   {% trans "SMS Languages" %}
 {% endblock %}
 
-{% requirejs_main 'sms/js/sms_language_main' %}
+{% js_entry_b3 'sms/js/sms_language_main' %}
 
 {% block stylesheets %}{{ block.super }}
   <link rel="stylesheet" href="{% static 'jquery-ui-built-themes/redmond/jquery-ui.min.css' %}"/>
diff --git a/corehq/apps/sms/views.py b/corehq/apps/sms/views.py
index f516c7d9f4c8..69fe22c286f1 100644
--- a/corehq/apps/sms/views.py
+++ b/corehq/apps/sms/views.py
@@ -67,7 +67,6 @@
     use_datatables,
     use_jquery_ui,
     use_timepicker,
-    use_typeahead,
 )
 from corehq.apps.hqwebapp.utils import get_bulk_upload_form
 from corehq.apps.hqwebapp.views import CRUDPaginatedViewMixin
@@ -202,15 +201,10 @@ def page_context(self):
             'timezone_now': datetime.now(tz=tz),
             'form': ComposeMessageForm(domain=self.domain)
         })
-        page_context.update(get_sms_autocomplete_context(self.request, self.domain))
         return page_context
 
-    @use_typeahead
-    def dispatch(self, *args, **kwargs):
-        return super(ComposeMessageView, self).dispatch(*args, **kwargs)
-
 
-def get_sms_autocomplete_context(request, domain):
+def get_sms_autocomplete_context(domain):
     """A helper view for sms autocomplete"""
     phone_users = CouchUser.view("users/phone_users_by_domain",
         startkey=[domain], endkey=[domain, {}], include_docs=True
@@ -225,7 +219,7 @@ def get_sms_autocomplete_context(request, domain):
             continue
         contacts.append(user.username)
         user_id = user._id
-    return {"sms_contacts": contacts}
+    return contacts
 
 
 @login_and_domain_required
@@ -236,14 +230,13 @@ def send_to_recipients(request, domain):
     # Currently the permission to publish an app is just the login_and_domain_required
     # decorator, and this view matches that.
 
-    recipients = request.POST.get('recipients')
+    recipients = request.POST.getlist('recipients')
     message = request.POST.get('message')
     if not recipients:
         messages.error(request, _("You didn't specify any recipients"))
     elif not message:
         messages.error(request, _("You can't send an empty message"))
     else:
-        recipients = [x.strip() for x in recipients.split(',') if x.strip()]
         phone_numbers = []
         # formats: GroupName (group), "Username", +15555555555
         group_names = []
@@ -338,14 +331,9 @@ def wrap_user_by_type(u):
 
         logged_event.completed()
 
-        def comma_reminder():
-            messages.error(request, _("Please remember to separate recipients"
-                " with a comma."))
-
         if empty_groups or failed_numbers or unknown_usernames or no_numbers:
             if empty_groups:
                 messages.error(request, _("The following groups don't exist: ") + (', '.join(empty_groups)))
-                comma_reminder()
             if no_numbers:
                 messages.error(request,
                     _("The following users don't have phone numbers: ") + (', '.join(no_numbers)))
@@ -355,7 +343,6 @@ def comma_reminder():
             if unknown_usernames:
                 messages.error(request,
                     _("Couldn't find the following user(s): ") + (', '.join(unknown_usernames)))
-                comma_reminder()
             if sent:
                 messages.success(request, _("Successfully sent: ") + (', '.join(sent)))
             else:
diff --git a/corehq/apps/smsbillables/static/smsbillables/js/smsbillables.rate_calc.js b/corehq/apps/smsbillables/static/smsbillables/js/rate_calc.js
similarity index 99%
rename from corehq/apps/smsbillables/static/smsbillables/js/smsbillables.rate_calc.js
rename to corehq/apps/smsbillables/static/smsbillables/js/rate_calc.js
index da571320a3ed..e0c8745767a5 100644
--- a/corehq/apps/smsbillables/static/smsbillables/js/smsbillables.rate_calc.js
+++ b/corehq/apps/smsbillables/static/smsbillables/js/rate_calc.js
@@ -1,9 +1,10 @@
-hqDefine("smsbillables/js/smsbillables.rate_calc", [
+hqDefine("smsbillables/js/rate_calc", [
     'jquery',
     'knockout',
     'underscore',
     'hqwebapp/js/select2_handler',
     'hqwebapp/js/bootstrap3/widgets',  // the public sms page uses a .hqwebapp-select2 for country input
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/styleguide/context.py b/corehq/apps/styleguide/context.py
index 7c1b1e3714f7..61ffa82f5bdc 100644
--- a/corehq/apps/styleguide/context.py
+++ b/corehq/apps/styleguide/context.py
@@ -8,6 +8,7 @@
 CrispyFormsDemo = namedtuple('CrispyFormsDemo', 'form code')
 CrispyFormsWithJsDemo = namedtuple('CrispyFormsWithJsDemo', 'form code_python code_js')
 CodeForDisplay = namedtuple('CodeForDisplay', 'code language')
+CodeForDisplayWithPartial = namedtuple('CodeForDisplayWithPartial', 'code language partial')
 ThemeColor = namedtuple('ThemeColor', 'slug hex theme_equivalent')
 
 
diff --git a/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py b/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
index cb30cc10d03e..30de91c6e255 100644
--- a/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+++ b/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
@@ -83,7 +83,7 @@ def __init__(self, *args, **kwargs):
                 twbscrispy.StrictButton(
                     _("Add Filter"),
                     type="submit",
-                    css_class="btn-primary htmx-loading",
+                    css_class="btn btn-primary",
                 ),
                 # The Alpine data model is easily bound to the form
                 # to control hiding/showing the value field:
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
index 8a1a03900dfe..5f2a53ceca0a 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
@@ -54,6 +54,9 @@
       <script src="{% static '@eonasdan/tempus-dominus/dist/js/tempus-dominus.min.js' %}"></script>
     {% endcompress %}
 
+    {% block head %}
+    {% endblock head %}
+
     <script src="{% statici18n LANGUAGE_CODE %}"></script>
   </head>
   <body>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/code_display.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/code_display.html
index 06102e9d54e0..2c405721784a 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/code_display.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/code_display.html
@@ -1,3 +1,8 @@
+{% if content.partial %}
+  <div>
+    {% include content.partial %}
+  </div>
+{% endif %}
 <div class="pb-3">
   {% include 'styleguide/bootstrap5/partials/readable_code_block.html' with content=content.code language=content.language %}
 </div>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_button.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_button.html
new file mode 100644
index 000000000000..12cacb391a10
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_button.html
@@ -0,0 +1,8 @@
+<button
+  class="btn btn-primary" type="button"
+  hx-get="{% url 'styleguide_a_hanging_view' %}"
+  hx-disabled-elt="this"
+  hx-swap="none"  {# example view returns nothing to display #}
+>
+  Click Me
+</button>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_checkbox.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_checkbox.html
new file mode 100644
index 000000000000..268b6e254edb
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_checkbox.html
@@ -0,0 +1,11 @@
+<div class="form-check">
+  <input
+    class="form-check-input" type="checkbox" value="" id="flexCheckDefault"
+    hx-get="{% url 'styleguide_a_hanging_view' %}"
+    hx-disabled-elt="this"
+    hx-swap="none"  {# example view returns nothing to display #}
+  />
+  <label class="form-check-label" for="flexCheckDefault">
+    Try to check me
+  </label>
+</div>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_form.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_form.html
new file mode 100644
index 000000000000..b183526a7107
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_loading_form.html
@@ -0,0 +1,13 @@
+<form
+  hx-get="{% url 'styleguide_a_hanging_view' %}"
+  hx-disabled-elt="find button"
+  hx-swap="none"  {# example view returns nothing to display #}
+>
+  <div class="mb-3">
+    <label for="id_value" class="form-label">Value</label>
+    <input type="text" name="value" class="textinput form-control" id="id_value"/>
+  </div>
+  <button class="btn btn-primary" type="submit">
+    Submit Me!
+  </button>
+</form>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html
index 0c71948a417c..b04ec00e944f 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html
@@ -1,4 +1,9 @@
 {% extends 'styleguide/bootstrap5/base.html' %}
+{% load hq_shared_tags %}
+
+{% block head %}
+  <script src="{% static 'htmx.org/dist/htmx.min.js' %}"></script>
+{% endblock head %}
 
 {% block intro %}
   <h1 class="sg-title mb-0" id="content">HTMX and Alpine</h1>
@@ -31,6 +36,14 @@ <h5 class="my-2 ms-3">On this page</h5>
         </ul>
       </li>
       <li><a href="#debugging">Debugging During Development</a></li>
+      <li>
+        <a href="#loading-indicators">Loading Indicators</a>
+        <ul>
+          <a href="#button-loading">Buttons</a></li>
+          <a href="#checkbox-loading">Checkboxes</a></li>
+          <a href="#form-loading">Forms</a></li>
+        </ul>
+      </li>
     </ul>
   </nav>
 {% endblock toc %}
@@ -241,4 +254,49 @@ <h2 id="debugging" class="pt-4">
     You can check out the <code>HqHtmxDebugMixin</code> directly for additional documentation and usage
     guidance.
   </p>
+
+  <h2 id="loading-indicators" class="pt-4">
+    Loading Indicators
+  </h2>
+  <p>
+    You can use the <code>hx-indicator</code> attribute
+    (<a href="https://htmx.org/attributes/hx-indicator/" target="_blank">see docs here</a>)
+    to mark which element gets the <code>htmx-request</code> class appended to it during a request.
+    We've added custom styling to <code>_htmx.scss</code> to support the common states outlined
+    later in this section.
+  </p>
+  <p>
+    By default, if an element triggers an HTMX request, it will automatically get the <code>htmx-request</code>
+    CSS class applied to it. No extra usage of the <code>hx-indicator</code> attribute is necessary. The
+    example submitting elements below showcase this default behavior <strong>without</strong> the need for
+    specific <code>hx-indicator</code> usage.
+  </p>
+  <p>
+    It's often a great idea to pair button requests with <code>hx-disabled-elt="this"</code>
+    (<a href="https://htmx.org/attributes/hx-disabled-elt/" target="_blank`">see docs for hx-disabled-elt</a>),
+    like the examples below, so that the requesting element or related element is disabled during the request.
+  </p>
+  <h3 id="button-loading" class="pt-4">
+    Buttons
+  </h3>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.loading_button %}
+
+  <h3 id="checkbox-loading" class="pt-4">
+    Checkboxes
+  </h3>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.loading_checkbox %}
+
+  <h3 id="form-loading" class="pt-4">
+    Forms
+  </h3>
+  <p>
+    In the example below, note that the <code>form</code> is the triggering element, so the
+    <code>hx-disabled-elt</code> value is set to <code>find button</code> to disable all button children
+    of that form during an HTMX request. Since <code>form</code> is the submitting element, by default
+    it has the <code>htmx-request</code> class applied. Our styles ensure that
+    <code>button type="submit"</code> elements of a submitting form show the loading indicator during
+    an HTMX request.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.loading_form %}
+
 {% endblock content %}
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
index 6f9c094caf4f..12b978e42aa0 100644
--- a/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
@@ -73,7 +73,7 @@
               x-model="itemValue"
           >
           <button
-              class="btn btn-primary htmx-loading"
+              class="btn btn-primary"
               type="submit"
               @click="isSubmitting = true"
           >
diff --git a/corehq/apps/styleguide/urls.py b/corehq/apps/styleguide/urls.py
index c09538c2ca25..7857cadf0370 100644
--- a/corehq/apps/styleguide/urls.py
+++ b/corehq/apps/styleguide/urls.py
@@ -57,6 +57,8 @@
         name="styleguide_datatables_data"),
     url(r'^b5/data/paginated_table_data$', bootstrap5_data.paginated_table_data,
         name="styleguide_paginated_table_data"),
+    url(r'^b5/data/a_hanging_view$', bootstrap5_data.a_hanging_view,
+        name="styleguide_a_hanging_view"),
     url(r'^b5/example/', include(example_urlpatterns)),
     url(r'^b5/guidelines/$', bootstrap5.styleguide_code_guidelines,
         name="styleguide_code_guidelines_b5"),
diff --git a/corehq/apps/styleguide/views/bootstrap5.py b/corehq/apps/styleguide/views/bootstrap5.py
index 5eda44e41114..341bc17a6e5b 100644
--- a/corehq/apps/styleguide/views/bootstrap5.py
+++ b/corehq/apps/styleguide/views/bootstrap5.py
@@ -14,6 +14,7 @@
     get_js_example_context,
     get_gradient_colors,
     CodeForDisplay,
+    CodeForDisplayWithPartial,
 )
 from corehq.apps.styleguide.examples.bootstrap5.checkbox_form import CheckboxDemoForm
 from corehq.apps.styleguide.examples.bootstrap5.crispy_forms_basic import BasicCrispyExampleForm
@@ -102,6 +103,21 @@ def styleguide_htmx_and_alpine(request):
                 code=get_example_context('styleguide/htmx_todo/item_done.html'),
                 language="Django",
             ),
+            'loading_button': CodeForDisplayWithPartial(
+                code=get_example_context('styleguide/bootstrap5/examples/htmx_loading_button.html'),
+                partial="styleguide/bootstrap5/examples/htmx_loading_button.html",
+                language="Django",
+            ),
+            'loading_checkbox': CodeForDisplayWithPartial(
+                code=get_example_context('styleguide/bootstrap5/examples/htmx_loading_checkbox.html'),
+                partial="styleguide/bootstrap5/examples/htmx_loading_checkbox.html",
+                language="Django",
+            ),
+            'loading_form': CodeForDisplayWithPartial(
+                code=get_example_context('styleguide/bootstrap5/examples/htmx_loading_form.html'),
+                partial="styleguide/bootstrap5/examples/htmx_loading_form.html",
+                language="Django",
+            ),
         }
     })
     return render(request, 'styleguide/bootstrap5/htmx_and_alpine.html', context)
diff --git a/corehq/apps/styleguide/views/bootstrap5_data.py b/corehq/apps/styleguide/views/bootstrap5_data.py
index 2403d3002f07..69f9faee8e82 100644
--- a/corehq/apps/styleguide/views/bootstrap5_data.py
+++ b/corehq/apps/styleguide/views/bootstrap5_data.py
@@ -3,7 +3,7 @@
 from collections import namedtuple
 from gettext import gettext
 
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponse
 from django.shortcuts import render
 
 from corehq.apps.styleguide.utils import get_fake_tabular_data
@@ -111,3 +111,8 @@ def paginated_table_data(request):
         "total": len(fake_data),
         "rows": fake_data[start:end],
     })
+
+
+def a_hanging_view(request):
+    time.sleep(10)
+    return HttpResponse("Done")
diff --git a/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js b/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js
index 748eae578d77..07e115a0b37c 100644
--- a/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js
+++ b/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js
@@ -5,6 +5,7 @@ hqDefine('toggle_ui/js/edit-flag', [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/bootstrap3/main',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko',     // save button
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js b/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
index 4916f1d1f409..bd08471256f1 100644
--- a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
+++ b/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
@@ -5,6 +5,7 @@ hqDefine('toggle_ui/js/flags', [
     'hqwebapp/js/bootstrap3/alert_user',
     'reports/js/bootstrap3/config.dataTables.bootstrap',
     'hqwebapp/js/components/select_toggle',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/toggle_ui/templates/toggle/edit_flag.html b/corehq/apps/toggle_ui/templates/toggle/edit_flag.html
index cc2ea8322c6a..a6dbb5b1bfca 100644
--- a/corehq/apps/toggle_ui/templates/toggle/edit_flag.html
+++ b/corehq/apps/toggle_ui/templates/toggle/edit_flag.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% requirejs_main 'toggle_ui/js/edit-flag' %}
+{% js_entry_b3 'toggle_ui/js/edit-flag' %}
 
 {% block title %}{% trans "Edit Feature Flag: " %}{{ static_toggle.label }}{% endblock %}
 
diff --git a/corehq/apps/toggle_ui/templates/toggle/flags.html b/corehq/apps/toggle_ui/templates/toggle/flags.html
index 16de14949d00..f5b9ac5bfe23 100644
--- a/corehq/apps/toggle_ui/templates/toggle/flags.html
+++ b/corehq/apps/toggle_ui/templates/toggle/flags.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'toggle_ui/js/flags' %}
+{% js_entry_b3 'toggle_ui/js/flags' %}
 
 {% block stylesheets %}{{ block.super }}
   <style>
diff --git a/corehq/apps/userreports/static/userreports/js/ucr_expression.js b/corehq/apps/userreports/static/userreports/js/ucr_expression.js
index f5d49b4f3319..db22411cb913 100644
--- a/corehq/apps/userreports/static/userreports/js/ucr_expression.js
+++ b/corehq/apps/userreports/static/userreports/js/ucr_expression.js
@@ -5,6 +5,7 @@ hqDefine("userreports/js/ucr_expression", [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/base_ace',
     'hqwebapp/js/bootstrap3/alert_user',
+    'commcarehq',
 ], function (
     moment,
     ko,
diff --git a/corehq/apps/userreports/static/userreports/js/ucr_expressions.js b/corehq/apps/userreports/static/userreports/js/ucr_expressions.js
index 2fb0545b7c50..895d408d7cf6 100644
--- a/corehq/apps/userreports/static/userreports/js/ucr_expressions.js
+++ b/corehq/apps/userreports/static/userreports/js/ucr_expressions.js
@@ -3,6 +3,7 @@ hqDefine('userreports/js/ucr_expressions', [
     "hqwebapp/js/initial_page_data",
     "hqwebapp/js/bootstrap3/crud_paginated_list_init",
     'hqwebapp/js/base_ace',
+    'commcarehq',
 ], function () {
     // used to include base_ace on the ucr_statements page
 
diff --git a/corehq/apps/userreports/templates/userreports/ucr_expression.html b/corehq/apps/userreports/templates/userreports/ucr_expression.html
index 85f1b7592943..2407d2d34b0f 100644
--- a/corehq/apps/userreports/templates/userreports/ucr_expression.html
+++ b/corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -13,7 +13,7 @@
   {% endcompress %}
 {% endblock %}
 
-{% requirejs_main "userreports/js/ucr_expression" %}
+{% js_entry_b3 "userreports/js/ucr_expression" %}
 
 {% block page_content %}
 {% initial_page_data "expression" expression %}
diff --git a/corehq/apps/userreports/templates/userreports/ucr_expressions.html b/corehq/apps/userreports/templates/userreports/ucr_expressions.html
index d66ef472a830..2d8af316455f 100644
--- a/corehq/apps/userreports/templates/userreports/ucr_expressions.html
+++ b/corehq/apps/userreports/templates/userreports/ucr_expressions.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "userreports/js/ucr_expressions" %}
+{% js_entry_b3 "userreports/js/ucr_expressions" %}
 
 {% block pagination_templates %}
 <script type="text/html" id="base-ucr-statement-template">
diff --git a/corehq/apps/users/static/users/js/accept_invite.js b/corehq/apps/users/static/users/js/accept_invite.js
index 2bafca654fe5..2bd2137b3bd9 100644
--- a/corehq/apps/users/static/users/js/accept_invite.js
+++ b/corehq/apps/users/static/users/js/accept_invite.js
@@ -2,4 +2,5 @@ hqDefine('users/js/accept_invite', [
     'registration/js/login', // contains password obfuscation & login requirements
     'registration/js/bootstrap3/password',
     'hqwebapp/js/captcha',
+    'commcarehq',
 ], function () {});
diff --git a/corehq/apps/users/templates/users/accept_invite.html b/corehq/apps/users/templates/users/accept_invite.html
index 8ec68d578159..2675a096c6a2 100644
--- a/corehq/apps/users/templates/users/accept_invite.html
+++ b/corehq/apps/users/templates/users/accept_invite.html
@@ -3,7 +3,7 @@
 {% load field_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'users/js/accept_invite' %}
+{% js_entry_b3 'users/js/accept_invite' %}
 
 {% block title %}{% trans "Invitation to join the " %}{{ invite_to }} {{ invite_type }}{% endblock title %}
 
diff --git a/corehq/apps/users/templates/users/commcare_user_confirm_account.html b/corehq/apps/users/templates/users/commcare_user_confirm_account.html
index 5578a32575bf..3ce0a36a9819 100644
--- a/corehq/apps/users/templates/users/commcare_user_confirm_account.html
+++ b/corehq/apps/users/templates/users/commcare_user_confirm_account.html
@@ -3,7 +3,7 @@
 {% load field_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'users/js/accept_invite' %}
+{% js_entry_b3 'users/js/accept_invite' %}
 
 {% block title %}{% blocktrans %}Confirm your account to join the {{ domain_name }} project{% endblocktrans %}{% endblock title %}
 {% block tabs %}{% endblock %}
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
index 28272f118061..e69de29bb2d1 100644
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
+++ b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
@@ -1,31 +0,0 @@
-from .standard import *
-from .case import *
-
-
-def get_element_providers(timing_context, skip_fixtures=False):
-    """
-    Get restore providers which contribute directly to the XML.
-
-    Each provider has a `get_elements(restore_state)` method which
-    returns an iterable. Each item yielded by the returned iterable is
-    either an `cElementTree.Element` object or a UTF-8 encoded string
-    containing one or more XML elements. The string form must be wrapped
-    in an enclosing XML element to construct valid XML.
-    """
-    # note that ordering matters in this list as this is the order that the items
-    # will appear in the XML, and have access to the RestoreState object
-    return [
-        SyncElementProvider(timing_context),
-        RegistrationElementProvider(timing_context),
-        FixtureElementProvider(timing_context, skip_fixtures),
-    ]
-
-def get_async_providers(timing_context, async_task=None):
-    """
-    Get restore providers that return their own fully formed responses
-
-    They can optionally take an async task to update progress
-    """
-    return [
-        CasePayloadProvider(timing_context, async_task),
-    ]
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py
index 58d298235121..e69de29bb2d1 100644
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py
+++ b/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py
@@ -1 +0,0 @@
-from .providers import *
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py
deleted file mode 100644
index 8045ca2f1941..000000000000
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from casexml.apps.phone.data_providers import AsyncDataProvider
-from casexml.apps.phone.data_providers.case.livequery import do_livequery
-
-
-class CasePayloadProvider(AsyncDataProvider):
-    """
-    Async provider responsible for generating the case and stock payloads.
-    """
-
-    def extend_response(self, restore_state, response):
-        do_livequery(
-            self.timing_context,
-            restore_state,
-            response,
-            self.async_task,
-        )
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py
deleted file mode 100644
index 62eff76191a9..000000000000
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from casexml.apps.phone import xml
-from casexml.apps.phone.fixtures import generator
-
-
-class TimedProvider(object):
-    def __init__(self, timing_context):
-        self.timing_context = timing_context
-
-
-class RestoreDataProvider(TimedProvider):
-    """
-    Base class for things that gives data directly to a restore.
-    """
-    def get_elements(self, restore_state):
-        raise NotImplementedError('Need to implement this method')
-
-
-class AsyncDataProvider(TimedProvider):
-    """
-    Base class for things that deal with their own response.
-    """
-    def __init__(self, timing_context, async_task=None):
-        super(AsyncDataProvider, self).__init__(timing_context)
-        self.async_task = async_task
-
-    def extend_response(self, restore_state, response):
-        raise NotImplementedError('Need to implement this method')
-
-
-class SyncElementProvider(RestoreDataProvider):
-    """
-    Gets the initial sync element.
-    """
-
-    def get_elements(self, restore_state):
-        yield xml.get_sync_element(restore_state.current_sync_log._id)
-
-
-class RegistrationElementProvider(RestoreDataProvider):
-    """
-    Gets the registration XML
-    """
-
-    def get_elements(self, restore_state):
-        yield xml.get_registration_element(restore_state.restore_user)
-
-
-class FixtureElementProvider(RestoreDataProvider):
-    """
-    Gets any associated fixtures.
-    """
-
-    def __init__(self, timing_context, skip_fixtures):
-        super().__init__(timing_context)
-        self._skip_fixtures = skip_fixtures
-
-    def get_elements(self, restore_state):
-        # fixture block
-        providers = generator.get_providers(
-            restore_state.restore_user,
-            version=restore_state.version,
-        )
-        for provider in providers:
-            if self._skip_fixtures and not getattr(provider, 'ignore_skip_fixtures_flag', False):
-                continue
-            with self.timing_context('fixture:{}'.format(provider.id)):
-                elements = provider(restore_state)
-                for element in elements:
-                    yield element
diff --git a/corehq/ex-submodules/casexml/apps/phone/fixtures.py b/corehq/ex-submodules/casexml/apps/phone/fixtures.py
index a6f6645f3d74..829b04dce51f 100644
--- a/corehq/ex-submodules/casexml/apps/phone/fixtures.py
+++ b/corehq/ex-submodules/casexml/apps/phone/fixtures.py
@@ -1,10 +1,12 @@
 from abc import ABCMeta, abstractmethod, abstractproperty
 
-from casexml.apps.phone.models import OTARestoreUser
-from casexml.apps.case.xml import V1, V2
 from django.conf import settings
+
+from memoized import memoized
+
+from casexml.apps.case.xml import V1
+from casexml.apps.phone.models import OTARestoreUser
 from dimagi.utils.modules import to_function
-import itertools
 
 
 class FixtureProvider(metaclass=ABCMeta):
@@ -18,11 +20,9 @@ def __call__(self, restore_state):
         raise NotImplementedError
 
 
-class FixtureGenerator(object):
+@memoized
+def _fixture_generators():
     """
-    The generator object, which gets fixtures from your config file that should
-    be included when OTA restoring.
-
     See: https://bitbucket.org/javarosa/javarosa/wiki/externalinstances
 
     To use, add the following to your settings.py
@@ -45,19 +45,19 @@ class FixtureGenerator(object):
 
     The function should return an empty list if there are no fixtures
     """
+    functions = [to_function(func_path, failhard=True) for func_path in settings.FIXTURE_GENERATORS]
+    return [f for f in functions if f]
 
-    def __init__(self):
-        functions = [to_function(func_path, failhard=True) for func_path in settings.FIXTURE_GENERATORS]
-        self._generator_providers = [f for f in functions if f]
-
-    def get_providers(self, user, fixture_id=None, version=V2):
-        if version == V1:
-            return []  # V1 phones will never use or want fixtures
-
-        if not isinstance(user, OTARestoreUser):
-            return []
 
-        return self._generator_providers
+def get_fixture_elements(restore_state, timing_context, skip_fixtures):
+    if restore_state.version == V1:
+        return  # V1 phones will never use or want fixtures
 
+    if not isinstance(restore_state.restore_user, OTARestoreUser):
+        return
 
-generator = FixtureGenerator()
+    for provider in _fixture_generators():
+        if not skip_fixtures or getattr(provider, 'ignore_skip_fixtures_flag', False):
+            with timing_context('fixture:{}'.format(provider.id)):
+                for element in provider(restore_state):
+                    yield element
diff --git a/corehq/ex-submodules/casexml/apps/phone/restore.py b/corehq/ex-submodules/casexml/apps/phone/restore.py
index 8c0609f428af..c0e020af4d59 100644
--- a/corehq/ex-submodules/casexml/apps/phone/restore.py
+++ b/corehq/ex-submodules/casexml/apps/phone/restore.py
@@ -4,7 +4,6 @@
 import tempfile
 import uuid
 from datetime import datetime, timedelta
-from looseversion import LooseVersion
 from io import BytesIO
 from typing import Optional
 from uuid import uuid4
@@ -17,6 +16,7 @@
 
 from celery.exceptions import TimeoutError
 from celery.result import AsyncResult
+from looseversion import LooseVersion
 from memoized import memoized
 
 from casexml.apps.case.xml import V1, check_version
@@ -25,6 +25,7 @@
     get_response_element,
     get_simple_response_xml,
 )
+from dimagi.utils.logging import notify_error
 
 from corehq.apps.app_manager.exceptions import CannotRestoreException
 from corehq.apps.domain.models import Domain
@@ -34,7 +35,6 @@
 from corehq.toggles import EXTENSION_CASES_SYNC_ENABLED
 from corehq.util.metrics import metrics_counter, metrics_histogram
 from corehq.util.timer import TimingContext
-from dimagi.utils.logging import notify_error
 
 from .checksum import CaseStateHash
 from .const import (
@@ -43,13 +43,14 @@
     INITIAL_SYNC_CACHE_THRESHOLD,
     INITIAL_SYNC_CACHE_TIMEOUT,
 )
-from .data_providers import get_async_providers, get_element_providers
+from .data_providers.case.livequery import do_livequery
 from .exceptions import (
     BadStateException,
     InvalidSyncLogException,
     RestoreException,
     SyncLogUserMismatch,
 )
+from .fixtures import get_fixture_elements
 from .models import (
     LOG_FORMAT_LIVEQUERY,
     OTARestoreUser,
@@ -59,7 +60,11 @@
 from .restore_caching import AsyncRestoreTaskIdCache, RestorePayloadPathCache
 from .tasks import ASYNC_RESTORE_SENT, get_async_restore_payload
 from .utils import get_cached_items_with_count
-from .xml import get_progress_element, get_sync_element
+from .xml import (
+    get_progress_element,
+    get_registration_element,
+    get_sync_element,
+)
 
 logger = logging.getLogger('restore')
 
@@ -722,13 +727,18 @@ def _generate_restore_response(self, async_task=None):
         username = self.restore_user.username
         count_items = self.params.include_item_count
         with RestoreContent(username, count_items) as content:
-            for provider in get_element_providers(self.timing_context, skip_fixtures=self.skip_fixtures):
-                with self.timing_context(provider.__class__.__name__):
-                    content.extend(provider.get_elements(self.restore_state))
+            with self.timing_context('SyncElementProvider'):
+                content.append(get_sync_element(self.restore_state.current_sync_log._id))
+
+            with self.timing_context('RegistrationElementProvider'):
+                content.append(get_registration_element(self.restore_state.restore_user))
+
+            with self.timing_context('FixtureElementProvider'):
+                for element in get_fixture_elements(self.restore_state, self.timing_context, self.skip_fixtures):
+                    content.append(element)
 
-            for provider in get_async_providers(self.timing_context, async_task):
-                with self.timing_context(provider.__class__.__name__):
-                    provider.extend_response(self.restore_state, content)
+            with self.timing_context('CasePayloadProvider'):
+                do_livequery(self.timing_context, self.restore_state, content, async_task)
 
             return content.get_fileobj()
 
diff --git a/corehq/ex-submodules/couchexport/models.py b/corehq/ex-submodules/couchexport/models.py
index b290f4f348c3..b071225e4d9c 100644
--- a/corehq/ex-submodules/couchexport/models.py
+++ b/corehq/ex-submodules/couchexport/models.py
@@ -62,18 +62,3 @@ def from_format(cls, format):
         if format not in cls.VALID_FORMATS:
             raise URLError("Unsupported export format: %s!" % format)
         return cls(format, **cls.FORMAT_DICT[format])
-
-
-class IntegrationFormat(object):
-    LIVE_GOOGLE_SHEETS = "live_google_sheets"
-
-    VALID_FORMATS = [
-        LIVE_GOOGLE_SHEETS,
-    ]
-
-    @classmethod
-    def is_integration_format(cls, format):
-        format = format.lower()
-        if format in cls.VALID_FORMATS:
-            return True
-        return False
diff --git a/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html b/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html
index b69d15786bab..f4de2db0e020 100644
--- a/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html
+++ b/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html
@@ -2,17 +2,6 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{# Required to define ACE #}
-{% load compress %}
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'ace-builds/src-min-noconflict/ace.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-json.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-xml.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/ext-searchbox.js' %}"></script>
-  {% endcompress %}
-{% endblock %}
-
 {% js_entry "dhis2/js/dataset_map_json" %}
 
 {% block page_content %}
diff --git a/corehq/motech/openmrs/templates/openmrs/edit_config.html b/corehq/motech/openmrs/templates/openmrs/edit_config.html
index cee7002b49b1..b7aea47a3df7 100644
--- a/corehq/motech/openmrs/templates/openmrs/edit_config.html
+++ b/corehq/motech/openmrs/templates/openmrs/edit_config.html
@@ -3,15 +3,8 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 {% block title %}Edit Config : OpenMRS :: {% endblock %}
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'ace-builds/src-min-noconflict/ace.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-json.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-xml.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/ext-searchbox.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/base_ace.js' %}"></script>
-  {% endcompress %}
-{% endblock %}
+
+{% js_entry 'hqwebapp/js/base_ace' %}
 
 {% block page_content %}
   {% crispy form %}
diff --git a/corehq/motech/repeaters/models.py b/corehq/motech/repeaters/models.py
index 4584219595b2..5b588d42d2b5 100644
--- a/corehq/motech/repeaters/models.py
+++ b/corehq/motech/repeaters/models.py
@@ -1194,6 +1194,9 @@ def fire(self, force_send=False, timing_context=None):
         if force_send or not self.succeeded:
             try:
                 self.repeater.fire_for_record(self, timing_context=timing_context)
+            except OSError as e:
+                self.handle_exception(str(e))
+                raise
             except Exception as e:
                 self.handle_payload_error(str(e), traceback_str=traceback.format_exc())
                 raise
diff --git a/corehq/motech/repeaters/tests/test_models.py b/corehq/motech/repeaters/tests/test_models.py
index b130ff6f5967..5f2b019434c4 100644
--- a/corehq/motech/repeaters/tests/test_models.py
+++ b/corehq/motech/repeaters/tests/test_models.py
@@ -12,7 +12,7 @@
 
 from dateutil.parser import isoparse
 from freezegun import freeze_time
-from nose.tools import assert_in, assert_raises
+from nose.tools import assert_in
 
 from corehq.motech.models import ConnectionSettings
 from corehq.motech.repeater_helpers import RepeaterResponse
@@ -229,38 +229,45 @@ def set_next_attempt_at(repeater, when):
         repeater.save()
 
 
-class ResponseMock:
+class Unknown:
     pass
 
 
 class IsResponseTests(SimpleTestCase):
 
     def test_has_text(self):
-        resp = ResponseMock()
+        resp = Unknown()
         resp.text = '<h1>Hello World</h1>'
         self.assertFalse(is_response(resp))
 
     def test_has_status_code(self):
-        resp = ResponseMock()
+        resp = Unknown()
         resp.status_code = 504
         self.assertFalse(is_response(resp))
 
     def test_has_reason(self):
-        resp = ResponseMock()
+        resp = Unknown()
         resp.reason = 'Gateway Timeout'
         self.assertFalse(is_response(resp))
 
     def test_has_status_code_and_reason(self):
-        resp = ResponseMock()
+        resp = Unknown()
         resp.status_code = 504
         resp.reason = 'Gateway Timeout'
         self.assertTrue(is_response(resp))
 
 
+class ResponseMock:
+    status_code = 0
+    reason = ''
+    text = ''
+    url = ''
+
+
 class FormatResponseTests(SimpleTestCase):
 
     def test_non_response(self):
-        resp = ResponseMock()
+        resp = Unknown()
         self.assertEqual(format_response(resp), '')
 
     def test_no_text(self):
@@ -508,12 +515,6 @@ def test_used_connection_setting_cannot_be_deleted(self):
             ConnectionSettings.all_objects.filter(id=self.conn.id).delete()
 
 
-def test_attempt_forward_now_kwargs():
-    rr = RepeatRecord()
-    with assert_raises(TypeError):
-        rr.attempt_forward_now(True)
-
-
 @patch("corehq.motech.repeaters.tasks.retry_process_repeat_record")
 @patch("corehq.motech.repeaters.tasks.process_repeat_record")
 class TestAttemptForwardNow(RepeaterTestCase):
diff --git a/corehq/motech/repeaters/tests/test_repeater.py b/corehq/motech/repeaters/tests/test_repeater.py
index bead9f544515..23da2263c810 100644
--- a/corehq/motech/repeaters/tests/test_repeater.py
+++ b/corehq/motech/repeaters/tests/test_repeater.py
@@ -130,11 +130,11 @@ def setUpClass(cls):
     def post_xml(cls, xml, domain_name):
         return submit_form_locally(xml, domain_name)
 
-    @classmethod
-    def repeat_records(cls, domain_name):
+    def repeat_records(self, domain=None):
+        domain = domain or self.domain
         # Enqueued repeat records have next_check set 48 hours in the future.
         later = datetime.utcnow() + timedelta(hours=48 + 1)
-        return RepeatRecord.objects.filter(domain=domain_name, next_check__lt=later)
+        return RepeatRecord.objects.filter(domain=domain, next_check__lt=later)
 
 
 class RepeaterTest(BaseRepeaterTest):
@@ -174,9 +174,6 @@ def tearDown(self):
         FormProcessorTestUtils.delete_all_cases_forms_ledgers(self.domain)
         super(RepeaterTest, self).tearDown()
 
-    def repeat_records(self):
-        return super(RepeaterTest, self).repeat_records(self.domain)
-
     # whatever value specified will be doubled since both case and form repeater are active
     def _create_additional_repeat_records(self, count):
         for _ in range(count):
@@ -842,7 +839,7 @@ class NewCaseGenerator(BasePayloadGenerator):
             format_label = 'XML'
 
             def get_payload(self, repeat_record, payload_doc):
-                return self.payload
+                return {}
 
         with self.assertRaises(DuplicateFormatException):
             RegisterGenerator.get_collection(CaseRepeater).add_new_format(NewCaseGenerator)
@@ -853,7 +850,7 @@ class NewCaseGenerator(BasePayloadGenerator):
             format_label = 'XML'
 
             def get_payload(self, repeat_record, payload_doc):
-                return self.payload
+                return {}
 
         with self.assertRaises(DuplicateFormatException):
             RegisterGenerator.get_collection(CaseRepeater).add_new_format(NewCaseGenerator, is_default=True)
diff --git a/corehq/tabs/tabclasses.py b/corehq/tabs/tabclasses.py
index 17787b9015d4..cd4e241c9177 100644
--- a/corehq/tabs/tabclasses.py
+++ b/corehq/tabs/tabclasses.py
@@ -1812,16 +1812,25 @@ def sidebar_items(self):
         enterprise_user_management_views = []
 
         if has_privilege(self._request, privileges.PROJECT_ACCESS):
-            enterprise_views.extend([
+            enterprise_views.append(
                 {
-                    'title': _('Enterprise Dashboard'),
-                    'url': reverse('enterprise_dashboard', args=[self.domain]),
-                },
+                    'title': _('Platform Overview'),
+                    'url': reverse('platform_overview', args=[self.domain]),
+                }
+            )
+            if toggles.ENTERPRISE_DASHBOARD_IMPROVEMENTS.enabled_for_request(self._request):
+                enterprise_views.append(
+                    {
+                        'title': _('Security Center'),
+                        'url': reverse('security_center', args=[self.domain]),
+                    }
+                )
+            enterprise_views.append(
                 {
                     'title': _('Enterprise Settings'),
                     'url': reverse('enterprise_settings', args=[self.domain]),
-                },
-            ])
+                }
+            )
         enterprise_views.append({
             'title': _('Billing Statements'),
             'url': reverse('enterprise_billing_statements',
diff --git a/corehq/tests/pytest_plugins/reusedb.py b/corehq/tests/pytest_plugins/reusedb.py
index bcc632b91fd7..36e260b53f54 100644
--- a/corehq/tests/pytest_plugins/reusedb.py
+++ b/corehq/tests/pytest_plugins/reusedb.py
@@ -15,6 +15,7 @@
 import logging
 import os
 import sys
+import warnings
 from contextlib import ExitStack, contextmanager, nullcontext
 from functools import partial
 from unittest.mock import Mock, patch
@@ -42,6 +43,8 @@
 from ..tools import nottest
 
 log = logging.getLogger(__name__)
+_test_sorting_key = pytest.StashKey()
+_premature_db_did_warn = pytest.StashKey()
 
 REUSE_DB_HELP = """
 To be used in conjunction with the environment variable REUSE_DB=1.
@@ -91,7 +94,6 @@ def pytest_configure(config):
 @pytest.hookimpl(wrapper=True)
 def pytest_collection_modifyitems(session, items):
     """Sort and filter tests, inject database setup"""
-    import pytest_django.plugin as mod
     django_key = None
 
     class items_for_django:
@@ -104,10 +106,10 @@ def skip_django_modifyitems():
         called.append(1)
         return False
 
-    mod.pytest_collection_modifyitems(items_for_django)
+    django_plugin.pytest_collection_modifyitems(items_for_django)
     called = []
     # use patch to skip django-pytest pytest_collection_modifyitems
-    with patch.object(mod, "django_settings_is_configured", skip_django_modifyitems):
+    with patch.object(django_plugin, "django_settings_is_configured", skip_django_modifyitems):
         yield
     assert called, "django_settings_is_configured patch was ineffective. " \
         "HQ-speicific test filtering and sorting may not have happened."
@@ -115,11 +117,21 @@ def skip_django_modifyitems():
         "setup may not be done at the correct point in the test run."
 
 
+@pytest.hookimpl(trylast=True)
+def pytest_runtest_teardown(item):
+    """Check for premature database setup"""
+    if not item.session.stash.get(_premature_db_did_warn, False):
+        sortkey = item.session.stash[_test_sorting_key]
+        if _db_context.is_setup and sortkey(item) == 0:
+            item.session.stash[_premature_db_did_warn] = True  # warn only once
+            warnings.warn(f"non-database test {item.nodeid} triggered database setup")
+
+
 def filter_and_sort(items, key, session):
     def is_db_test(item):
         return bool(new_key(item))
 
-    new_key = reorder(key)
+    new_key = session.stash[_test_sorting_key] = reorder(key)
     if session.config.should_run_database_tests == "only":
         should_run = is_db_test
     elif session.config.should_run_database_tests == "skip":
@@ -195,6 +207,10 @@ class db_blocker:
 
 class DeferredDatabaseContext:
 
+    @property
+    def is_setup(self):
+        return "setup_databases" in self.__dict__
+
     @timelimit(480)
     def setup_databases(self, db_blocker):
         """Setup databases for tests"""
@@ -214,9 +230,9 @@ def teardown(do_teardown):
             with db_blocker.unblock():
                 do_teardown()
 
-        assert "teardown_databases" not in self.__dict__, "already set up"
-        db_blocker = get_request().getfixturevalue("django_db_blocker")
+        assert not self.is_setup, "already set up"
         self.setup_databases = lambda b: None  # do not set up more than once
+        db_blocker = get_request().getfixturevalue("django_db_blocker")
         session = get_request().session
         with ExitStack() as stack:
             try:
@@ -422,7 +438,7 @@ class CouchSpec(object):
 
     def mock_couch(app):
         dbname = dbs.get(app, main_db_url).rsplit("/", 1)[1]
-        return Mock(name=dbname, dbname=dbname, spec_set=CouchSpec)
+        return BlockedMock(name=dbname, dbname=dbname, spec_set=CouchSpec)
 
     # register our dbs with the extension document classes
     main_db_url = settings.COUCH_DATABASE
@@ -443,4 +459,15 @@ def unblock():
     return block, unblock
 
 
+class BlockedMock(Mock):
+    def __getattr__(self, name):
+        try:
+            return super().__getattr__(name)
+        except AttributeError:
+            raise RuntimeError(
+                'Database access not allowed, use the "django_db" mark, or '
+                'the "db" or "transactional_db" fixtures to enable it.'
+            )
+
+
 _db_context = DeferredDatabaseContext()
diff --git a/corehq/tests/test_middleware.py b/corehq/tests/test_middleware.py
index 2f0f78d48bfb..fb0252f5bfca 100644
--- a/corehq/tests/test_middleware.py
+++ b/corehq/tests/test_middleware.py
@@ -176,8 +176,8 @@ class TestLogLongRequestMiddlewareReports(TestCase):
     def setUpClass(cls):
         super().setUpClass()
         cls.domain = Domain(name="long_request", is_active=True)
-        cls.addClassCleanup(cls.domain.delete)
         cls.domain.save()
+        cls.addClassCleanup(cls.domain.delete)
 
         cls.username = 'fingile'
         cls.password = '*******'
diff --git a/corehq/tests/test_reusedb.py b/corehq/tests/test_reusedb.py
index bd63060c7845..56ce4dc27273 100644
--- a/corehq/tests/test_reusedb.py
+++ b/corehq/tests/test_reusedb.py
@@ -13,7 +13,7 @@
 def test_database_blocker():
     assert not settings.DB_ENABLED
 
-    with pytest.raises(AttributeError, match="Mock object has no attribute 'info'"):
+    with pytest.raises(RuntimeError, match=re.compile("^Database access not allowed")):
         CouchModel.get_db().info
 
     with pytest.raises(RuntimeError, match=re.compile("^Database access not allowed")):
diff --git a/corehq/toggles/__init__.py b/corehq/toggles/__init__.py
index fcfa0c0ef4e3..69e94007ac25 100644
--- a/corehq/toggles/__init__.py
+++ b/corehq/toggles/__init__.py
@@ -1705,7 +1705,6 @@ def _commtrackify(domain_name, toggle_is_enabled):
     [NAMESPACE_DOMAIN]
 )
 
-
 DISABLE_MOBILE_ENDPOINTS = StaticToggle(
     'disable_mobile_endpoints',
     'Disable mobile endpoints for form submissions and restores',
@@ -1719,6 +1718,12 @@ def _commtrackify(domain_name, toggle_is_enabled):
     )
 )
 
+OPEN_SUBMISSION_ENDPOINT = StaticToggle(
+    'open_submission_endpoint',
+    'Leave submission endpoint open to let old APIs keep working',
+    TAG_DEPRECATED,
+    [NAMESPACE_DOMAIN],
+)
 
 EMWF_WORKER_ACTIVITY_REPORT = StaticToggle(
     'emwf_worker_activity_report',
@@ -2467,17 +2472,6 @@ def _commtrackify(domain_name, toggle_is_enabled):
     """
 )
 
-GOOGLE_SHEETS_INTEGRATION = StaticToggle(
-    'google-sheet-integration',
-    'Unlock the Google Sheets view in Exports',
-    TAG_SAAS_CONDITIONAL,
-    namespaces=[NAMESPACE_USER],
-    description="""
-    Toggle only when testing the new Google Sheet Integration. The Google Sheet Integration can be found
-    on the Exports page.
-    """
-)
-
 APP_DEPENDENCIES = StaticToggle(
     slug='app-dependencies',
     label='Set Android app dependencies that must be installed before using a CommCare app',
@@ -2607,13 +2601,28 @@ def _handle_attendance_tracking_role(domain, is_enabled):
     save_fn=_handle_attendance_tracking_role,
 )
 
+
+def _handle_geospatial_es_index(domain, is_enabled):
+    from corehq.apps.geospatial.tasks import index_es_docs_with_location_props
+    from corehq.apps.geospatial.utils import get_celery_task_tracker
+    from corehq.apps.geospatial.const import ES_INDEX_TASK_HELPER_BASE_KEY
+
+    if is_enabled:
+        celery_task_tracker = get_celery_task_tracker(domain, ES_INDEX_TASK_HELPER_BASE_KEY)
+        # This check simply enforces that each domain's task is handled in serial.
+        if not celery_task_tracker.is_active():
+            index_es_docs_with_location_props.delay(domain)
+
+
 MICROPLANNING = StaticToggle(
     'microplanning',
     'Allows access to Microplanning GIS functionality',
     TAG_SOLUTIONS_LIMITED,
     namespaces=[NAMESPACE_DOMAIN],
     description='Additional views will be added allowing for visually viewing '
-                'and assigning cases on a map.'
+                'and assigning cases on a map.',
+    save_fn=_handle_geospatial_es_index,
+
 )
 
 COMMCARE_CONNECT = StaticToggle(
diff --git a/corehq/util/htmx_action.py b/corehq/util/htmx_action.py
index d7badd274f82..7d184bc53183 100644
--- a/corehq/util/htmx_action.py
+++ b/corehq/util/htmx_action.py
@@ -49,14 +49,20 @@ def make_edit(request, *args, **kwargs):
     Example docs here: commcarehq.org/styleguide/b5/htmx_alpine/
     See working demo here: commcarehq.org/styleguide/demo/htmx_todo/
     """
-    default_htmx_error_template = "prototype/htmx/partials/htmx_action_error.html"
+    default_htmx_error_template = "hqwebapp/htmx/htmx_action_error.html"
 
-    def get_htmx_error_context(self, **kwargs):
+    def get_htmx_error_context(self, action, htmx_error, **kwargs):
         """
         Use this method to return the context for the HTMX error template.
+
+        :param action: string (the slug for the HTMX action taken)
+        :param htmx_error: HtmxResponseException
         :return: dict
         """
-        return {}
+        return {
+            "action": action,
+            "htmx_error": htmx_error,
+        }
 
     def get_htmx_error_template(self, action, htmx_error):
         """
@@ -117,8 +123,7 @@ def dispatch(self, request, *args, **kwargs):
         try:
             response = handler(request, *args, **kwargs)
         except HtmxResponseException as err:
-            context = self.get_htmx_error_context(**kwargs)
-            context["htmx_error"] = err
+            context = self.get_htmx_error_context(action, err, **kwargs)
             self.template_name = self.get_htmx_error_template(action, err)
             return self.render_to_response(context)
         return response
diff --git a/custom/abt/reports/tests/test_flagspecs.py b/custom/abt/reports/tests/test_flagspecs.py
index ccc529281647..37b9dc82a1bb 100644
--- a/custom/abt/reports/tests/test_flagspecs.py
+++ b/custom/abt/reports/tests/test_flagspecs.py
@@ -12,4 +12,4 @@ def test_yaml_formatting(filename):
         try:
             load(f.read(), Loader=Loader)
         except parser.ParserError:
-            assert False  # nose will tell us which file, and what went wrong.
+            assert False  # the test runner will tell us which file, and what went wrong.
diff --git a/custom/inddex/tests/test_doctests.py b/custom/inddex/tests/test_doctests.py
new file mode 100644
index 000000000000..b899c35376b0
--- /dev/null
+++ b/custom/inddex/tests/test_doctests.py
@@ -0,0 +1,8 @@
+import doctest
+
+import custom.inddex.reports.r4_nutrient_stats
+
+
+def test_doctests():
+    results = doctest.testmod(custom.inddex.reports.r4_nutrient_stats)
+    assert results.failed == 0
diff --git a/custom/inddex/tests/test_master_report.py b/custom/inddex/tests/test_master_report.py
index bff108e389d3..84c6cbcc555a 100644
--- a/custom/inddex/tests/test_master_report.py
+++ b/custom/inddex/tests/test_master_report.py
@@ -1,10 +1,9 @@
 import csv
-import doctest
 import os
 from contextlib import ExitStack
 from datetime import date
 
-from django.test import SimpleTestCase, TestCase
+from django.test import TestCase
 from django.utils.functional import cached_property
 
 from memoized import memoized
@@ -13,7 +12,6 @@
 
 from dimagi.utils.dates import DateSpan
 
-import custom.inddex.reports.r4_nutrient_stats
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.fixtures.models import LookupTable
 from corehq.apps.userreports.util import get_indicator_adapter, get_ucr_datasource_config_by_id
@@ -99,6 +97,15 @@ def with_db(func):
         yield
 
 
+def setup_module():
+    """Make dividedwerun run all tests in this module on the same node
+
+    This could be eliminated if dividedwerun had a way to determine that
+    tests in this module use a fixture (inddex_domain) that uses the
+    database.
+    """
+
+
 @memoized
 def get_food_data(*args, **kwargs):
     # This class takes a while to run.  Memoizing lets me share between tests
@@ -302,10 +309,3 @@ def test_sharing_filtered_food_data(self):
                              filter_selections={'owner_id': ['not-a-user']})
         self.assertEqual([], list(IntakeData(food_data).rows))
         self.assertEqual([], list(DailyIntakeData(food_data).rows))
-
-
-class DocTests(SimpleTestCase):
-
-    def test_doctests(self):
-        results = doctest.testmod(custom.inddex.reports.r4_nutrient_stats)
-        self.assertEqual(results.failed, 0)
diff --git a/migrations.lock b/migrations.lock
index 515762313673..599148d08410 100644
--- a/migrations.lock
+++ b/migrations.lock
@@ -255,6 +255,7 @@ cleanup
  0014_deletedcouchdoc
  0015_deletedcouchdoc_unique_id_and_type
  0016_add_deletedsqldoc
+ 0017_delete_oauth_integrations_models
 cloudcare
  0001_initial
  0002_sqlapplicationaccess
@@ -407,6 +408,7 @@ domain
  0012_operatorcalllimitsettings
  0013_accountconfirmationsettings_squashed_0016_alter_smsaccountconfirmationsettings_project_name (4 squashed migrations)
  0014_appreleasemodesetting
+ 0015_delete_projectlimit
 domain_migration_flags
  0001_initial
  0002_migrate_data_from_tzmigration
@@ -733,11 +735,6 @@ oauth2_provider
  0005_auto_20211222_2352
  0006_alter_application_client_secret
  0007_application_post_logout_redirect_uris
-oauth_integrations
- 0001_initial
- 0002_livegooglesheetschedule
- 0003_livegooglesheetrefreshstatus
- 0004_auto_20220304_1139
 ota
  0001_initial
  0002_alter_db_index
diff --git a/package.json b/package.json
index 6dc0233c947e..73dd05cbaf8d 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
         "bootstrap": "3.4.1",
         "bootstrap-daterangepicker": "3.0.3",
         "bootstrap-timepicker": "0.5.1",
-        "bootstrap3-typeahead": "bassjobsen/Bootstrap-3-Typeahead#~3.1.1",
         "bootstrap5": "npm:bootstrap@5.3.1",
         "calendars": "kbwood/calendars#2.1.2",
         "clipboard": "1.5.15",
@@ -81,9 +80,7 @@
         "select2": "4.1.0-rc.0",
         "signature_pad": "^5.0.4",
         "string-replace-loader": "3.1.0",
-        "topojson": "3.0.2",
         "uglify-js": "3",
-        "ui-select": "npm:ui-select#0.13.2",
         "underscore": "1.13.1",
         "url-polyfill": "1.1.10",
         "webpack": "5.94.0",
diff --git a/requirements/base-requirements.in b/requirements/base-requirements.in
index 3a96beafe987..baf6e21ad785 100644
--- a/requirements/base-requirements.in
+++ b/requirements/base-requirements.in
@@ -49,9 +49,6 @@ ethiopian-date-converter
 eulxml
 firebase-admin  # India Division - used for FCM Push Notifications
 gevent
-google-api-python-client==2.32.0
-google-auth-httplib2==0.1.0
-google-auth-oauthlib==1.2.0
 greenlet
 gunicorn
 haversine  # SolTech - Used in Geospatial features
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index e4ced0010e24..ad6a0aef4aab 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.3.4
     # via aiohttp
-aiohttp==3.10.2
+aiohttp==3.10.11
     # via
     #   aiohttp-retry
     #   twilio
@@ -299,23 +299,16 @@ google-api-core==2.11.0
     #   google-cloud-firestore
     #   google-cloud-storage
 google-api-python-client==2.32.0
-    # via
-    #   -r base-requirements.in
-    #   firebase-admin
+    # via firebase-admin
 google-auth==2.18.1
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
-    #   google-auth-oauthlib
     #   google-cloud-core
     #   google-cloud-storage
 google-auth-httplib2==0.1.0
-    # via
-    #   -r base-requirements.in
-    #   google-api-python-client
-google-auth-oauthlib==1.2.0
-    # via -r base-requirements.in
+    # via google-api-python-client
 google-cloud-core==2.3.2
     # via
     #   google-cloud-firestore
@@ -508,6 +501,8 @@ prompt-toolkit==3.0.36
     # via
     #   click-repl
     #   ipython
+propcache==0.2.0
+    # via yarl
 proto-plus==1.22.2
     # via google-cloud-firestore
 protobuf==4.24.2
@@ -666,9 +661,7 @@ requests==2.32.3
 requests-mock==1.9.3
     # via -r test-requirements.in
 requests-oauthlib==1.3.1
-    # via
-    #   -r base-requirements.in
-    #   google-auth-oauthlib
+    # via -r base-requirements.in
 requests-toolbelt==1.0.0
     # via -r base-requirements.in
 rjsmin==1.2.1
@@ -860,7 +853,7 @@ xmltodict==0.13.0
     # via ddtrace
 yapf==0.31.0
     # via -r dev-requirements.in
-yarl==1.9.4
+yarl==1.17.2
     # via aiohttp
 zipp==3.21.0
     # via importlib-metadata
diff --git a/requirements/docs-requirements.txt b/requirements/docs-requirements.txt
index a17c991d9baa..390f9c1f3c06 100644
--- a/requirements/docs-requirements.txt
+++ b/requirements/docs-requirements.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.3.4
     # via aiohttp
-aiohttp==3.10.2
+aiohttp==3.10.11
     # via
     #   aiohttp-retry
     #   twilio
@@ -258,23 +258,16 @@ google-api-core==2.11.0
     #   google-cloud-firestore
     #   google-cloud-storage
 google-api-python-client==2.32.0
-    # via
-    #   -r base-requirements.in
-    #   firebase-admin
+    # via firebase-admin
 google-auth==2.18.1
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
-    #   google-auth-oauthlib
     #   google-cloud-core
     #   google-cloud-storage
 google-auth-httplib2==0.1.0
-    # via
-    #   -r base-requirements.in
-    #   google-api-python-client
-google-auth-oauthlib==1.2.0
-    # via -r base-requirements.in
+    # via google-api-python-client
 google-cloud-core==2.3.2
     # via
     #   google-cloud-firestore
@@ -431,6 +424,8 @@ prometheus-client==0.14.1
     # via -r base-requirements.in
 prompt-toolkit==3.0.36
     # via click-repl
+propcache==0.2.0
+    # via yarl
 proto-plus==1.22.2
     # via google-cloud-firestore
 protobuf==4.24.2
@@ -557,9 +552,7 @@ requests==2.32.3
     #   transifex-python
     #   twilio
 requests-oauthlib==1.3.1
-    # via
-    #   -r base-requirements.in
-    #   google-auth-oauthlib
+    # via -r base-requirements.in
 requests-toolbelt==1.0.0
     # via -r base-requirements.in
 rjsmin==1.2.1
@@ -717,7 +710,7 @@ xlwt==1.3.0
     # via -r base-requirements.in
 xmltodict==0.13.0
     # via ddtrace
-yarl==1.9.4
+yarl==1.17.2
     # via aiohttp
 zipp==3.21.0
     # via importlib-metadata
diff --git a/requirements/prod-requirements.txt b/requirements/prod-requirements.txt
index c6edc653569c..e67c6d484a17 100644
--- a/requirements/prod-requirements.txt
+++ b/requirements/prod-requirements.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.3.4
     # via aiohttp
-aiohttp==3.10.2
+aiohttp==3.10.11
     # via
     #   aiohttp-retry
     #   twilio
@@ -256,23 +256,16 @@ google-api-core==2.11.0
     #   google-cloud-firestore
     #   google-cloud-storage
 google-api-python-client==2.32.0
-    # via
-    #   -r base-requirements.in
-    #   firebase-admin
+    # via firebase-admin
 google-auth==2.18.1
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
-    #   google-auth-oauthlib
     #   google-cloud-core
     #   google-cloud-storage
 google-auth-httplib2==0.1.0
-    # via
-    #   -r base-requirements.in
-    #   google-api-python-client
-google-auth-oauthlib==1.2.0
-    # via -r base-requirements.in
+    # via google-api-python-client
 google-cloud-core==2.3.2
     # via
     #   google-cloud-firestore
@@ -435,6 +428,8 @@ prompt-toolkit==3.0.36
     # via
     #   click-repl
     #   ipython
+propcache==0.2.0
+    # via yarl
 proto-plus==1.22.2
     # via google-cloud-firestore
 protobuf==4.24.2
@@ -564,9 +559,7 @@ requests==2.32.3
     #   transifex-python
     #   twilio
 requests-oauthlib==1.3.1
-    # via
-    #   -r base-requirements.in
-    #   google-auth-oauthlib
+    # via -r base-requirements.in
 requests-toolbelt==1.0.0
     # via -r base-requirements.in
 rjsmin==1.2.1
@@ -643,7 +636,7 @@ toolz==0.12.1
     # via pyseeyou
 toposort==1.7
     # via -r base-requirements.in
-tornado==6.4.1
+tornado==6.4.2
     # via flower
 traitlets==5.1.1
     # via
@@ -711,7 +704,7 @@ xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
-yarl==1.9.4
+yarl==1.17.2
     # via aiohttp
 zipp==3.21.0
     # via importlib-metadata
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index ddc0827498e0..1a2818605d13 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.3.4
     # via aiohttp
-aiohttp==3.10.2
+aiohttp==3.10.11
     # via
     #   aiohttp-retry
     #   twilio
@@ -245,23 +245,16 @@ google-api-core==2.11.0
     #   google-cloud-firestore
     #   google-cloud-storage
 google-api-python-client==2.32.0
-    # via
-    #   -r base-requirements.in
-    #   firebase-admin
+    # via firebase-admin
 google-auth==2.18.1
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
-    #   google-auth-oauthlib
     #   google-cloud-core
     #   google-cloud-storage
 google-auth-httplib2==0.1.0
-    # via
-    #   -r base-requirements.in
-    #   google-api-python-client
-google-auth-oauthlib==1.2.0
-    # via -r base-requirements.in
+    # via google-api-python-client
 google-cloud-core==2.3.2
     # via
     #   google-cloud-firestore
@@ -405,6 +398,8 @@ prometheus-client==0.14.1
     # via -r base-requirements.in
 prompt-toolkit==3.0.36
     # via click-repl
+propcache==0.2.0
+    # via yarl
 proto-plus==1.22.2
     # via google-cloud-firestore
 protobuf==4.24.2
@@ -527,9 +522,7 @@ requests==2.32.3
     #   transifex-python
     #   twilio
 requests-oauthlib==1.3.1
-    # via
-    #   -r base-requirements.in
-    #   google-auth-oauthlib
+    # via -r base-requirements.in
 requests-toolbelt==1.0.0
     # via -r base-requirements.in
 rjsmin==1.2.1
@@ -662,7 +655,7 @@ xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
-yarl==1.9.4
+yarl==1.17.2
     # via aiohttp
 zipp==3.21.0
     # via importlib-metadata
diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt
index 7e5262eaa2d0..eb0c9b3aaeed 100644
--- a/requirements/test-requirements.txt
+++ b/requirements/test-requirements.txt
@@ -6,7 +6,7 @@
 #
 aiohappyeyeballs==2.3.4
     # via aiohttp
-aiohttp==3.10.2
+aiohttp==3.10.11
     # via
     #   aiohttp-retry
     #   twilio
@@ -262,23 +262,16 @@ google-api-core==2.11.0
     #   google-cloud-firestore
     #   google-cloud-storage
 google-api-python-client==2.32.0
-    # via
-    #   -r base-requirements.in
-    #   firebase-admin
+    # via firebase-admin
 google-auth==2.18.1
     # via
     #   google-api-core
     #   google-api-python-client
     #   google-auth-httplib2
-    #   google-auth-oauthlib
     #   google-cloud-core
     #   google-cloud-storage
 google-auth-httplib2==0.1.0
-    # via
-    #   -r base-requirements.in
-    #   google-api-python-client
-google-auth-oauthlib==1.2.0
-    # via -r base-requirements.in
+    # via google-api-python-client
 google-cloud-core==2.3.2
     # via
     #   google-cloud-firestore
@@ -433,6 +426,8 @@ prometheus-client==0.14.1
     # via -r base-requirements.in
 prompt-toolkit==3.0.36
     # via click-repl
+propcache==0.2.0
+    # via yarl
 proto-plus==1.22.2
     # via google-cloud-firestore
 protobuf==4.24.2
@@ -577,9 +572,7 @@ requests==2.32.3
 requests-mock==1.9.3
     # via -r test-requirements.in
 requests-oauthlib==1.3.1
-    # via
-    #   -r base-requirements.in
-    #   google-auth-oauthlib
+    # via -r base-requirements.in
 requests-toolbelt==1.0.0
     # via -r base-requirements.in
 rjsmin==1.2.1
@@ -730,7 +723,7 @@ xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
-yarl==1.9.4
+yarl==1.17.2
     # via aiohttp
 zipp==3.21.0
     # via importlib-metadata
diff --git a/settings.py b/settings.py
index 503f4b4160d9..c0336440d5ef 100755
--- a/settings.py
+++ b/settings.py
@@ -320,7 +320,6 @@
     'corehq.apps.smsforms',
     'corehq.apps.sso',
     'corehq.apps.ivr',
-    'corehq.apps.oauth_integrations',
     'corehq.messaging.MessagingAppConfig',
     'corehq.messaging.scheduling',
     'corehq.messaging.scheduling.scheduling_partitioned',
@@ -1153,12 +1152,6 @@ def _pkce_required(client_id):
 # used by periodic tasks that delete soft deleted data older than PERMANENT_DELETION_WINDOW days
 PERMANENT_DELETION_WINDOW = 30  # days
 
-# GSheets related work that was dropped, but should be picked up in the near future
-GOOGLE_OATH_CONFIG = {}
-GOOGLE_OAUTH_SCOPES = ['https://www.googleapis.com/auth/spreadsheets']
-GOOGLE_SHEETS_API_NAME = "sheets"
-GOOGLE_SHEETS_API_VERSION = "v4"
-DAYS_KEEP_GSHEET_STATUS = 14
 
 try:
     # try to see if there's an environmental variable set for local_settings
@@ -2103,3 +2096,5 @@ def _pkce_required(client_id):
 
 # NOTE: if you are adding a new setting that you intend to have other environments override,
 # make sure you add it before localsettings are imported (from localsettings import *)
+
+MAX_GEOSPATIAL_INDEX_DOC_LIMIT = 1000000
diff --git a/urls.py b/urls.py
index fc6a60d8f51d..72b538dc1171 100644
--- a/urls.py
+++ b/urls.py
@@ -160,7 +160,6 @@
         r'(?P<user_email>[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,})/(?P<scheduled_report_secret>[\w-]+)/',
         ReportNotificationUnsubscribeView.as_view(), name=ReportNotificationUnsubscribeView.urlname),
     url(r'^phone/list_apps', list_apps, name="list_accessible_apps"),
-    url(r'^oauth/', include('corehq.apps.oauth_integrations.urls')),
 ] + LOCAL_APP_URLS
 
 if settings.ENABLE_PRELOGIN_SITE:
diff --git a/webpack/appPaths.js b/webpack/appPaths.js
index 70b0f98e9df3..e1535b64017a 100644
--- a/webpack/appPaths.js
+++ b/webpack/appPaths.js
@@ -8,6 +8,7 @@ const BUILD_ARTIFACTS_DIR = path.resolve(__dirname, '_build');
 const TEMPLATES_DIR = 'templates';
 const APPS_PATH = path.resolve(__BASE, 'corehq', 'apps');
 const EX_SUBMODULES_PATH = path.resolve(__BASE, 'corehq', 'ex-submodules');
+const SUBMODULES_PATH = path.resolve(__BASE, 'submodules');
 const MESSAGING_PATH = path.resolve(__BASE, 'corehq', 'messaging');
 const MOTECH_PATH = path.resolve(__BASE, 'corehq', 'motech');
 const CUSTOM_PATH = path.resolve(__BASE, 'custom');
@@ -15,8 +16,11 @@ const CUSTOM_PATH = path.resolve(__BASE, 'custom');
 const nonStandardAppPaths = {
     "case": path.resolve(EX_SUBMODULES_PATH, 'casexml', 'apps', 'case'),
     "soil": path.resolve(EX_SUBMODULES_PATH, 'soil'),
+    "langcodes": path.resolve(SUBMODULES_PATH, 'langcodes'),
     "motech": MOTECH_PATH,
     "telerivet": path.resolve(MESSAGING_PATH, 'smsbackends', 'telerivet'),
+    // the path itself is standard, but the app has no templates so getStandardAppPaths filters it out
+    "smsbillables": path.resolve(APPS_PATH, 'smsbillables'),
     // motech apps:
     "dhis2": path.resolve(MOTECH_PATH, 'dhis2'),
     "generic_inbound": path.resolve(MOTECH_PATH, 'generic_inbound'),
diff --git a/webpack/generateDetails.js b/webpack/generateDetails.js
index 0c0d1665735a..828e7e9f4371 100644
--- a/webpack/generateDetails.js
+++ b/webpack/generateDetails.js
@@ -31,6 +31,10 @@ const scanTemplates = function (dir, entryRegex, allAppPaths, details, isProdMod
      *                          being that entry filenames end in `.[contenthash].js`, which is necessary for
      *                          cache busting on production.
      */
+    if (!fs.existsSync(dir)) {      // some apps have javascript but no templates
+        return;
+    }
+
     const files = fs.readdirSync(dir);
 
     files.forEach((file) => {
@@ -120,6 +124,7 @@ if (require.main === module) {
     // these apps, but there are no existing webpack entries from these apps (yet).
     const alwaysIncludeApps = [
         "analytix",
+        "case",
         "hqwebapp",
         "notifications",
         "registration",
diff --git a/webpack/webpack.b3.common.js b/webpack/webpack.b3.common.js
index 0253e96f0b15..3764dc4a6d10 100644
--- a/webpack/webpack.b3.common.js
+++ b/webpack/webpack.b3.common.js
@@ -24,6 +24,8 @@ module.exports = Object.assign({}, commonDefault, {
     resolve: {
         alias: Object.assign({}, commonDefault.resolve.alias, {
             "commcarehq": path.resolve(utils.getStaticPathForApp('hqwebapp', 'js/bootstrap3/'), 'commcarehq'),
+            "datatables": "datatables.net/js/jquery.dataTables.min",
+            "datatables.bootstrap": "datatables-bootstrap3/BS3/assets/js/datatables",
         }),
     },
 
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 301619a33bbb..f6aa74132639 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -8,6 +8,7 @@ const aliases = {
     "commcarehq": path.resolve(utils.getStaticPathForApp('hqwebapp', 'js/bootstrap5/'),
         'commcarehq'),
     "jquery": require.resolve('jquery'),
+    "langcodes/js/langcodes": path.resolve("submodules/langcodes/static/langcodes/js/langcodes"),
 
     // todo after completing requirejs migration,
     //  remove this file and the yarn modernizr post-install step
diff --git a/yarn.lock b/yarn.lock
index da660f1a7981..b6cdcd50ac6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1930,10 +1930,6 @@ bootstrap-timepicker@0.5.1:
   resolved "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.1.tgz#1ee36b4a7c27904c7c96da0988b711c9ee9e99b7"
   integrity sha1-HuNrSnwnkEx8ltoJiLcRye6embc=
 
-bootstrap3-typeahead@bassjobsen/Bootstrap-3-Typeahead#~3.1.1:
-  version "3.1.1"
-  resolved "https://codeload.github.com/bassjobsen/Bootstrap-3-Typeahead/tar.gz/c65c829fe8411f6eadb88415d09c1e85bb4603d0"
-
 "bootstrap5@npm:bootstrap@5.3.1":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.1.tgz#8ca07040ad15d7f75891d1504cf14c5dedfb1cfe"
@@ -2382,11 +2378,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@@ -2397,6 +2388,11 @@ commander@^10.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 common-ancestor-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
@@ -2458,9 +2454,9 @@ cross-fetch@3.1.5:
     node-fetch "2.6.7"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -6572,44 +6568,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-topojson-client@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
-  integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
-  dependencies:
-    commander "2"
-
-topojson-client@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.0.0.tgz#1f99293a77ef42a448d032a81aa982b73f360d2f"
-  integrity sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=
-  dependencies:
-    commander "2"
-
-topojson-server@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/topojson-server/-/topojson-server-3.0.0.tgz#378e78e87c3972a7b5be2c5d604369b6bae69c5e"
-  integrity sha1-N4546Hw5cqe1vixdYENptrrmnF4=
-  dependencies:
-    commander "2"
-
-topojson-simplify@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/topojson-simplify/-/topojson-simplify-3.0.2.tgz#8a2403e639531500fafa0c6594e8b0fadebc2c02"
-  integrity sha512-gyYSVRt4jO/0RJXKZQPzTDQRWV+D/nOfiljNUv0HBXslFLtq3yxRHrl7jbrjdbda5Ytdr7M8BZUI4OxU7tnbRQ==
-  dependencies:
-    commander "2"
-    topojson-client "3"
-
-topojson@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/topojson/-/topojson-3.0.2.tgz#fcb927306c3e0fa76656fa58deed4555d2346fb4"
-  integrity sha512-u3zeuL6WEVL0dmsRn7uHZKc4Ao4gpW3sORUv+N3ezLTvY3JdCuyg0hvpWiIfFw8p/JwVN++SvAsFgcFEeR15rQ==
-  dependencies:
-    topojson-client "3.0.0"
-    topojson-server "3.0.0"
-    topojson-simplify "3.0.2"
-
 tough-cookie@^4.1.3, tough-cookie@~2.5.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
@@ -6720,11 +6678,6 @@ uglify-js@3:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz#e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06"
   integrity sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g==
 
-"ui-select@npm:ui-select#0.13.2":
-  version "0.19.8"
-  resolved "https://registry.yarnpkg.com/ui-select/-/ui-select-0.19.8.tgz#74860848a7fd8bc494d9856d2f62776ea98637c1"
-  integrity sha1-dIYISKf9i8SU2YVtL2J3bqmGN8E=
-
 unbzip2-stream@1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"