diff --git a/.eslintrc.js b/.eslintrc.js
index 835f951d9750..16d950d13d56 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -7,6 +7,7 @@ module.exports = {
     // https://eslint.org/docs/4.0.0/user-guide/configuring#specifying-parser-options
     "parserOptions": {
         "ecmaVersion": 6,
+        "sourceType": "module",
     },
 
     // http://eslint.org/docs/user-guide/configuring#specifying-environments
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 82651df5c040..926ae8247fbf 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -34,18 +34,19 @@
 /corehq/warehouse/ @calellowitz
 /corehq/warnings.py @millerdev
 
-/corehq/apps/accounting/ @dannyroberts @biyeun
+/corehq/apps/accounting/ @dannyroberts @biyeun @nospame
 /corehq/apps/analytics/ @biyeun
 /corehq/apps/app_manager/ @orangejenny
 /corehq/apps/callcenter/ @snopoke
-/corehq/apps/case_search/ @orangejenny @MartinRiese @esoergel @AddisonDunn @stephherbers @Robert-Costello @Jtang-1 @nospame
+/corehq/apps/case_search/ @orangejenny @MartinRiese @esoergel @AddisonDunn @stephherbers @Robert-Costello @Jtang-1
 /corehq/apps/change_feed/ @dannyroberts
 /corehq/apps/cleanup/management/commands/populate_sql_model_from_couch_model.py @millerdev
-/corehq/apps/cloudcare/ @orangejenny @MartinRiese @AddisonDunn @stephherbers @Robert-Costello @Jtang-1 @nospame
+/corehq/apps/cloudcare/ @MartinRiese @AddisonDunn @stephherbers @Robert-Costello @Jtang-1 @nospame
 /corehq/apps/commtrack/ @esoergel
 /corehq/apps/data_dictionary/ @esoergel @orangejenny @zandre-eng
 /corehq/apps/domain/decorators.py @esoergel
 /corehq/apps/domain/auth.py @esoergel
+/corehq/apps/domain/views/accounting.py @nospame
 /corehq/apps/es/ @esoergel @amitphulera
 /corehq/apps/hqcase/ @esoergel
 /corehq/apps/hqwebapp/ @orangejenny @biyeun
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index db6fcdc3c852..fe40d498b91e 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,10 +1,10 @@
 ## Product Description
-<!-- For non-invisible changes, describe user-facing effects. -->
+<!-- Where applicable, describe user-facing effects and include screenshots. -->
 
 ## Technical Summary
 <!--
-    Provide a link to the ticket or document which prompted this change,
-    Describe the rationale and design decisions.
+    Provide a link to any tickets, design documents, and/or technical specifications
+    associated with this change. Describe the rationale and design decisions.
 -->
 
 ## Feature Flag
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1fe9c7707c5b..4a802c4cc8be 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -12,8 +12,8 @@
 name: "CodeQL"
 
 on:
-  push:
-    branches: [ master ]
+#  push:
+#    branches: [ master ]
 #  pull_request:
 #    # The branches below must be a subset of the branches above
 #    branches: [ master ]
@@ -39,7 +39,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d7323fa20e35..796f48577ff7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,6 +10,7 @@ on:
   schedule:
     # see corehq/apps/hqadmin/management/commands/static_analysis.py
     - cron: '47 12 * * *'
+  workflow_dispatch:
 jobs:
   tests:
     runs-on: ubuntu-22.04
diff --git a/.gitignore b/.gitignore
index d3ae1d1011ed..d2beb6af5bae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,3 +85,6 @@ corehq/apps/hqwebapp/static/hqwebapp/js/lib/modernizr.js
 # direnv
 .envrc
 .direnv
+
+# webpack build related
+/webpack/_build/
diff --git a/DEV_FAQ.md b/DEV_FAQ.md
index 04d8b580c1a9..31519c6e9fad 100644
--- a/DEV_FAQ.md
+++ b/DEV_FAQ.md
@@ -38,6 +38,11 @@ Formplayer isn't running properly. See [Formplayer](https://github.com/dimagi/co
 
 It happens, try restarting.
 
+> I'm getting TemplateSyntaxErrors related to Webpack.
+
+Please run `yarn dev`. If this build is failing, and you didn't make any changes to JavaScript files on your branch,
+please raise this as an issue.
+
 ## Generating Sample Data
 
 ### SMS
diff --git a/DEV_SETUP.md b/DEV_SETUP.md
index e6582fe514e9..5bd76c3b3538 100644
--- a/DEV_SETUP.md
+++ b/DEV_SETUP.md
@@ -762,7 +762,23 @@ This can also be used to promote a user created by signing up to a superuser.
 Note that promoting a user to superuser status using this command will also give them the
 ability to assign other users as superuser in the in-app Superuser Management page.
 
-### Step 11: Running CommCare HQ
+### Step 11: Running `yarn dev`
+
+In order to build JavaScript bundles with Webpack, you will need to have `yarn dev`
+running in the background. It will watch any existing Webpack Entry Point, aka modules
+included on a page using the `js_entry` template tag.
+
+When you add a new entry point (`js_entry` tag), please remember to restart `yarn dev` so
+that it can identify the new entry point it needs to watch.
+
+To build Webpack bundles like it's done in production environments, pleas use `yarn build`.
+This command does not have a watch functionality, so it needs to be re-run every time you make
+changes to javascript files bundled by Webpack.
+
+For more information about JavaScript and Static Files, please see the
+[Dimagi JavaScript Guide](https://commcare-hq.readthedocs.io/js-guide/README.html) on Read the Docs.
+
+### Step 12: Running CommCare HQ
 
 Make sure the required services are running (PostgreSQL, Redis, CouchDB, Kafka,
 Elasticsearch).
@@ -794,6 +810,9 @@ yarn install --frozen-lockfile
 ./manage.py fix_less_imports_collectstatic
 ```
 
+See the [Dimagi JavaScript Guide](https://commcare-hq.readthedocs.io/js-guide/README.html) for additional
+useful background and tips.
+
 ## Running Formplayer and submitting data with Web Apps
 
 Formplayer is a Java service that allows us to use applications on the web  instead of on a mobile device.
@@ -1196,54 +1215,3 @@ This script goes through the steps to prepare a report for test coverage of
 JavaScript files _that are touched by tests_, i.e., apps and files with 0% test
 coverage will not be shown. A coverage summary is output to the terminal and a
 detailed html report is generated at ``coverage-js/index.html``.
-
-
-## Sniffer
-
-You can also use sniffer to auto run the Python tests.
-
-When running, sniffer auto-runs the specified tests whenever you save a file.
-
-For example, you are working on the `retire` method of `CommCareUser`. You are
-writing a `RetireUserTestCase`, which you want to run every time you make a
-small change to the `retire` method, or to the `testCase`. Sniffer to the
-rescue!
-
-
-### Sniffer Usage
-
-```sh
-sniffer -x <test.module.path>[:<TestClass>[.<test_name>]]
-```
-
-In our example, we would run
-
-```sh
-sniffer -x corehq.apps.users.tests.retire:RetireUserTestCase`
-```
-
-You can also add the regular `nose` environment variables, like:
-
-```sh
-REUSE_DB=1 sniffer -x <test>
-```
-
-For JavaScript tests, you can add `--js-` before the JavaScript app test name,
-for example:
-
-```sh
-sniffer -x --js-app_manager
-```
-
-You can combine the two to run the JavaScript tests when saving js files, and
-run the Python tests when saving py files as follows:
-
-```sh
-sniffer -x --js-app_manager -x corehq.apps.app_manager:AppManagerViewTest
-```
-
-### Sniffer Installation instructions
-
-<https://github.com/jeffh/sniffer/> (recommended to install `pywatchman` or
-`macfsevents` for this to actually be worthwhile otherwise it takes a long time
-to see the change).
diff --git a/corehq/apps/accounting/decorators.py b/corehq/apps/accounting/decorators.py
index 44fbad9819b1..b7416482b73e 100644
--- a/corehq/apps/accounting/decorators.py
+++ b/corehq/apps/accounting/decorators.py
@@ -1,7 +1,6 @@
-import json
 from functools import wraps
 
-from django.http import HttpResponse
+from django.http import HttpResponse, JsonResponse
 
 from django_prbac.decorators import requires_privilege
 from django_prbac.exceptions import PermissionDenied
@@ -65,7 +64,7 @@ def requires_privilege_plaintext_response(slug,
     """
     A version of the requires_privilege decorator which returns an
     HttpResponse object with HTTP Status Code of 412 by default and
-    content_type of tex/plain if the privilege is not found.
+    content_type of text/plain if the privilege is not found.
     """
     def decorate(fn):
         @wraps(fn)
@@ -114,8 +113,7 @@ def wrapped(request, *args, **kwargs):
             except PermissionDenied:
                 error_message = "You have lost access to this feature."
                 response = get_response(error_message, http_status_code)
-                return HttpResponse(json.dumps(response),
-                                    content_type="application/json", status=401)
+                return JsonResponse(response, status=401)
         return wrapped
     return decorate
 
diff --git a/corehq/apps/accounting/forms.py b/corehq/apps/accounting/forms.py
index 56e7a4224ad1..878eb70b92a0 100644
--- a/corehq/apps/accounting/forms.py
+++ b/corehq/apps/accounting/forms.py
@@ -13,8 +13,8 @@
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.dates import MONTHS
-from django.utils.safestring import mark_safe
 from django.utils.html import format_html, format_html_join
+from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy, gettext_noop
 
@@ -50,10 +50,12 @@
     CustomerBillingRecord,
     CustomerInvoice,
     DefaultProductPlan,
+    DomainUserHistory,
     EntryPoint,
     Feature,
     FeatureRate,
     FeatureType,
+    FormSubmittingMobileWorkerHistory,
     FundingSource,
     Invoice,
     InvoicingPlan,
@@ -68,7 +70,6 @@
     Subscription,
     SubscriptionType,
     WireBillingRecord,
-    DomainUserHistory,
 )
 from corehq.apps.accounting.tasks import send_subscription_reminder_emails
 from corehq.apps.accounting.utils import (
@@ -593,9 +594,12 @@ def __init__(self, subscription, account_id, web_user, *args, **kwargs):
         if is_existing:
             # circular import
             from corehq.apps.accounting.views import (
-                SoftwarePlanVersionView, ManageBillingAccountView
+                ManageBillingAccountView,
+                SoftwarePlanVersionView,
+            )
+            from corehq.apps.domain.views.settings import (
+                DefaultProjectSettingsView,
             )
-            from corehq.apps.domain.views.settings import DefaultProjectSettingsView
             self.fields['account'].initial = subscription.account.id
             account_field = hqcrispy.B3TextField(
                 'account',
@@ -846,7 +850,9 @@ def clean(self):
                     or not account.billingcontactinfo.email_list
                 )
             ):
-                from corehq.apps.accounting.views import ManageBillingAccountView
+                from corehq.apps.accounting.views import (
+                    ManageBillingAccountView,
+                )
                 raise forms.ValidationError(format_html(_(
                     "Please update 'Client Contact Emails' "
                     '<strong><a href={link} target="_blank">here</a></strong> '
@@ -1923,7 +1929,7 @@ def get_instance(self):
         return self.save(commit=False)
 
 
-class EnterprisePlanContactForm(forms.Form):
+class PlanContactForm(forms.Form):
     name = forms.CharField(
         label=gettext_noop("Name")
     )
@@ -1937,105 +1943,34 @@ class EnterprisePlanContactForm(forms.Form):
         widget=forms.Textarea(attrs={"class": "vertical-resize"})
     )
 
-    def __init__(self, domain, web_user, data=None, *args, **kwargs):
-        self.domain = domain
-        self.web_user = web_user
-        super(EnterprisePlanContactForm, self).__init__(data, *args, **kwargs)
-        from corehq.apps.domain.views.accounting import SelectPlanView
-        self.helper = FormHelper()
-        self.helper.label_class = 'col-sm-3 col-md-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-6'
-        self.helper.form_class = "form-horizontal"
-        self.helper.layout = crispy.Layout(
-            'name',
-            'company_name',
-            'message',
-            hqcrispy.FormActions(
-                hqcrispy.LinkButton(
-                    _("Select different plan"),
-                    reverse(SelectPlanView.urlname, args=[self.domain]),
-                    css_class="btn btn-default"
-                ),
-                StrictButton(
-                    _("Request Quote"),
-                    type="submit",
-                    css_class="btn-primary",
-                ),
-            )
-        )
-
-    def send_message(self):
-        subject = "[Enterprise Plan Request] %s" % self.domain
-        context = {
-            'name': self.cleaned_data['name'],
-            'company': self.cleaned_data['company_name'],
-            'message': self.cleaned_data['message'],
-            'domain': self.domain,
-            'email': self.web_user.email
-        }
-        html_content = render_to_string('accounting/email/sales_request.html', context)
-        text_content = """
-        Email: %(email)s
-        Name: %(name)s
-        Company: %(company)s
-        Domain: %(domain)s
-        Message:
-        %(message)s
-        """ % context
-        send_html_email_async.delay(subject, settings.BILLING_EMAIL,
-                                    html_content, text_content,
-                                    email_from=settings.DEFAULT_FROM_EMAIL)
-
+    def __init__(self, domain, web_user, back_button=('Back', None), data=None, *args, **kwargs):
+        super().__init__(data, *args, **kwargs)
 
-class AnnualPlanContactForm(forms.Form):
-    name = forms.CharField(
-        label=gettext_noop("Name")
-    )
-    company_name = forms.CharField(
-        required=False,
-        label=gettext_noop("Company / Organization")
-    )
-    message = forms.CharField(
-        required=False,
-        label=gettext_noop("Message"),
-        widget=forms.Textarea(attrs={"class": "vertical-resize"})
-    )
-
-    def __init__(self, domain, web_user, on_annual_plan, data=None, *args, **kwargs):
         self.domain = domain
         self.web_user = web_user
-        super(AnnualPlanContactForm, self).__init__(data, *args, **kwargs)
-        from corehq.apps.domain.views.accounting import SelectPlanView, DomainSubscriptionView
         self.helper = FormHelper()
         self.helper.label_class = 'col-sm-3 col-md-2'
         self.helper.field_class = 'col-sm-9 col-md-8 col-lg-6'
         self.helper.form_class = "form-horizontal"
-        if on_annual_plan:
-            back_button_text = "Back to my Subscription"
-            urlname = DomainSubscriptionView.urlname
-        else:
-            back_button_text = "Select different plan"
-            urlname = SelectPlanView.urlname
         self.helper.layout = crispy.Layout(
             'name',
             'company_name',
             'message',
             hqcrispy.FormActions(
                 hqcrispy.LinkButton(
-                    _(back_button_text),
-                    reverse(urlname, args=[self.domain]),
+                    *back_button,
                     css_class="btn btn-default"
                 ),
                 StrictButton(
-                    _("Submit"),
+                    _("Submit Request"),
                     type="submit",
                     css_class="btn-primary",
                 ),
             )
         )
 
-    def send_message(self):
-        subject = "[Annual Plan Request] %s" % self.domain
+    def send_message(self, request_type):
+        subject = f"[{request_type}] {self.domain}"
         context = {
             'name': self.cleaned_data['name'],
             'company': self.cleaned_data['company_name'],
@@ -2061,12 +1996,17 @@ class TriggerInvoiceForm(forms.Form):
     month = forms.ChoiceField(label="Statement Period Month")
     year = forms.ChoiceField(label="Statement Period Year")
     domain = forms.CharField(label="Project Space", widget=forms.Select(choices=[]))
-    num_users = forms.IntegerField(
-        label="Number of Users",
+    num_mobile_workers = forms.IntegerField(
+        label="Number of Mobile Workers",
         required=False,
-        help_text="This is part of accounting tests and overwrites the "
-                  "DomainUserHistory recorded for this month. Please leave "
-                  "this blank to use what is already in the system."
+        help_text="This will overwrite the DomainUserHistory recorded for this month. "
+                  "Please leave this blank to use what is already in the system."
+    )
+    num_form_submitting_workers = forms.IntegerField(
+        label="Number of Form-Submitting Mobile Workers",
+        required=False,
+        help_text="This will overwrite the FormSubmittingMobileWorkerHistory recorded for this month. "
+                  "Please leave this blank to use what is already in the system."
     )
 
     def __init__(self, *args, **kwargs):
@@ -2097,13 +2037,24 @@ def __init__(self, *args, **kwargs):
                 placeholder="Search for Project"
             )
         ]
+        self.helper.layout = crispy.Layout(
+            crispy.Fieldset(*details)
+        )
+
         if self.show_testing_options:
-            details.append(crispy.Field('num_users', css_class='input_large'))
+            testing_options = [
+                'Testing Options',
+                crispy.Field('num_mobile_workers', css_class='input_large'),
+                crispy.Field('num_form_submitting_workers', css_class='input_large'),
+            ]
+            self.helper.layout.append(
+                crispy.Fieldset(*testing_options)
+            )
         else:
-            del self.fields['num_users']
+            del self.fields['num_mobile_workers']
+            del self.fields['num_form_submitting_workers']
 
-        self.helper.layout = crispy.Layout(
-            crispy.Fieldset(*details),
+        self.helper.layout.append(
             hqcrispy.FormActions(
                 StrictButton(
                     "Trigger Invoice",
@@ -2122,20 +2073,18 @@ def trigger_invoice(self):
 
         self.clean_previous_invoices(invoice_start, invoice_end, domain_obj.name)
 
-        if self.show_testing_options and self.cleaned_data['num_users']:
-            num_users = int(self.cleaned_data['num_users'])
-            existing_histories = DomainUserHistory.objects.filter(
-                domain=domain_obj.name,
-                record_date__gte=invoice_start,
-                record_date__lte=invoice_end,
-            )
-            if existing_histories.exists():
-                existing_histories.all().delete()
-            DomainUserHistory.objects.create(
-                domain=domain_obj.name,
-                record_date=invoice_end,
-                num_users=num_users
-            )
+        if self.show_testing_options:
+            if self.cleaned_data['num_mobile_workers']:
+                num_users = int(self.cleaned_data['num_mobile_workers'])
+                self._overwrite_user_history(
+                    DomainUserHistory, domain_obj.name, num_users, invoice_start, invoice_end
+                )
+            if self.cleaned_data['num_form_submitting_workers']:
+                num_users = int(self.cleaned_data['num_form_submitting_workers'])
+                self._overwrite_user_history(
+                    FormSubmittingMobileWorkerHistory,
+                    domain_obj.name, num_users, invoice_start, invoice_end
+                )
 
         invoice_factory = DomainInvoiceFactory(
             invoice_start, invoice_end, domain_obj, recipients=[settings.ACCOUNTS_EMAIL]
@@ -2163,6 +2112,21 @@ def clean_previous_invoices(invoice_start, invoice_end, domain_name):
                 )
             )
 
+    @staticmethod
+    def _overwrite_user_history(history_cls, domain, num_users, invoice_start, invoice_end):
+        existing_histories = history_cls.objects.filter(
+            domain=domain,
+            record_date__gte=invoice_start,
+            record_date__lte=invoice_end,
+        )
+        if existing_histories.exists():
+            existing_histories.all().delete()
+        history_cls.objects.create(
+            domain=domain,
+            record_date=invoice_end,
+            num_users=num_users
+        )
+
     def clean(self):
         today = datetime.date.today()
         year = int(self.cleaned_data['year'])
diff --git a/corehq/apps/accounting/invoicing.py b/corehq/apps/accounting/invoicing.py
index b07e1e843f7c..d45a50beed8f 100644
--- a/corehq/apps/accounting/invoicing.py
+++ b/corehq/apps/accounting/invoicing.py
@@ -32,6 +32,7 @@
     DomainUserHistory,
     EntryPoint,
     FeatureType,
+    FormSubmittingMobileWorkerHistory,
     Invoice,
     InvoicingPlan,
     LineItem,
@@ -554,6 +555,7 @@ def get_factory_by_feature_type(cls, feature_type):
         try:
             return {
                 FeatureType.SMS: SmsLineItemFactory,
+                FeatureType.FORM_SUBMITTING_MOBILE_WORKER: FormSubmittingMobileWorkerLineItemFactory,
                 FeatureType.USER: UserLineItemFactory,
                 FeatureType.WEB_USER: WebUserLineItemFactory,
             }[feature_type]
@@ -745,20 +747,24 @@ def quantity(self):
         dates = self.all_month_ends_in_invoice()
         excess_users = 0
         for date in dates:
-            total_users = 0
-            for domain in self.subscribed_domains:
-                try:
-                    history = DomainUserHistory.objects.get(domain=domain, record_date=date)
-                    total_users += history.num_users
-                except DomainUserHistory.DoesNotExist:
-                    if not deleted_domain_exists(domain):
-                        # this checks to see if the domain still exists
-                        # before raising an error. If it was deleted the
-                        # loop will continue
-                        raise
+            total_users = self.total_users_for_date(date)
             excess_users += max(total_users - self.rate.monthly_limit, 0)
         return excess_users
 
+    def total_users_for_date(self, date):
+        total_users = 0
+        for domain in self.subscribed_domains:
+            try:
+                history = DomainUserHistory.objects.get(domain=domain, record_date=date)
+                total_users += history.num_users
+            except DomainUserHistory.DoesNotExist:
+                if not deleted_domain_exists(domain):
+                    # this checks to see if the domain still exists
+                    # before raising an error. If it was deleted the
+                    # loop will continue
+                    raise
+        return total_users
+
     def all_month_ends_in_invoice(self):
         _, month_end = get_first_last_days(self.invoice.date_end.year, self.invoice.date_end.month)
         dates = []
@@ -777,41 +783,43 @@ def _unit_description_by_user_type(self, user_type):
                 )
             )
         if self.quantity > 0:
-            return ngettext(
-                "Per-{user} fee exceeding limit of {monthly_limit} {user} "
-                "with plan above.{prorated_notice}",
-                "Per-{user} fee exceeding limit of {monthly_limit} {user}s "
-                "with plan above.{prorated_notice}",
-                self.rate.monthly_limit
-            ).format(
-                monthly_limit=self.rate.monthly_limit,
-                prorated_notice=prorated_notice,
-                user=user_type
-            )
+            return _("Fee for each {user} exceeding the plan limit of {monthly_limit}.").format(
+                user=_(user_type), monthly_limit=self.rate.monthly_limit
+            ) + prorated_notice
 
     @property
     def unit_description(self):
         return self._unit_description_by_user_type("mobile user")
 
 
-class WebUserLineItemFactory(UserLineItemFactory):
+class FormSubmittingMobileWorkerLineItemFactory(UserLineItemFactory):
 
-    @property
-    @memoized
-    def quantity(self):
-        # Iterate through all months in the invoice date range to aggregate total users into one line item
-        dates = self.all_month_ends_in_invoice()
-        excess_users = 0
-        for date in dates:
-            total_users = 0
+    def total_users_for_date(self, date):
+        total_users = 0
+        for domain in self.subscribed_domains:
             try:
-                history = BillingAccountWebUserHistory.objects.get(
-                    billing_account=self.subscription.account, record_date=date)
+                history = FormSubmittingMobileWorkerHistory.objects.get(domain=domain, record_date=date)
                 total_users += history.num_users
-            except BillingAccountWebUserHistory.DoesNotExist:
-                raise
-            excess_users += max(total_users - self.rate.monthly_limit, 0)
-        return excess_users
+            except FormSubmittingMobileWorkerHistory.DoesNotExist:
+                if not deleted_domain_exists(domain):
+                    raise
+        return total_users
+
+    @property
+    def unit_description(self):
+        return super()._unit_description_by_user_type("form-submitting mobile worker")
+
+
+class WebUserLineItemFactory(UserLineItemFactory):
+
+    def total_users_for_date(self, date):
+        try:
+            history = BillingAccountWebUserHistory.objects.get(
+                billing_account=self.subscription.account, record_date=date)
+            total_users = history.num_users
+        except BillingAccountWebUserHistory.DoesNotExist:
+            raise
+        return total_users
 
     @property
     def unit_description(self):
diff --git a/corehq/apps/accounting/models.py b/corehq/apps/accounting/models.py
index 19a374b028fa..c93739521c22 100644
--- a/corehq/apps/accounting/models.py
+++ b/corehq/apps/accounting/models.py
@@ -532,7 +532,8 @@ def get_domains(self):
                     'subscriber__domain', flat=True))
 
     def has_enterprise_admin(self, email):
-        return self.is_customer_billing_account and email in self.enterprise_admin_emails
+        lower_emails = [e.lower() for e in self.enterprise_admin_emails]
+        return self.is_customer_billing_account and email.lower() in lower_emails
 
     def update_autopay_user(self, new_user, domain):
         if self.auto_pay_enabled and new_user != self.auto_pay_user:
@@ -828,7 +829,7 @@ class SoftwarePlan(models.Model):
     class Meta(object):
         app_label = 'accounting'
 
-    @quickcache(vary_on=['self.pk'], timeout=10)
+    @quickcache(vary_on=['self.pk'], timeout=10, skip_arg=lambda *a, **k: settings.UNIT_TESTING)
     def get_version(self):
         try:
             return self.softwareplanversion_set.filter(is_active=True).latest('date_created')
@@ -3991,9 +3992,9 @@ class FormSubmittingMobileWorkerHistory(DomainUserHistoryBase):
     The number of mobile workers in a domain who have submitted one or more
     forms in the month preceeding the record_date. Ex: a record_date of
     2024-07-09 includes all dates from 2024-06-09 to 2024-07-08, inclusive.
-    TODO: Create by task calculate_form_submitting_mobile_workers_in_all_domains
-    on the first of every month. Will be used to bill clients for the
-    appropriate number of form-submitting mobile workers.
+    Created by task calculate_form_submitting_mobile_workers_in_all_domains
+    on the first of every month. Used to bill clients for the appropriate
+    number of form-submitting mobile workers.
     """
     pass
 
diff --git a/corehq/apps/accounting/tasks.py b/corehq/apps/accounting/tasks.py
index 4b219e2da3b3..29c75ef4c091 100644
--- a/corehq/apps/accounting/tasks.py
+++ b/corehq/apps/accounting/tasks.py
@@ -5,7 +5,7 @@
 from datetime import date
 
 from django.conf import settings
-from django.db import transaction
+from django.db import IntegrityError, transaction
 from django.db.models import F, Q
 from django.http import HttpRequest, QueryDict
 from django.template.loader import render_to_string
@@ -44,6 +44,7 @@
     Currency,
     DomainUserHistory,
     FeatureType,
+    FormSubmittingMobileWorkerHistory,
     InvoicingPlan,
     Subscription,
     SubscriptionAdjustment,
@@ -61,6 +62,7 @@
     get_context_to_send_purchase_receipt,
 )
 from corehq.apps.accounting.utils import (
+    count_form_submitting_mobile_workers,
     get_change_status,
     log_accounting_error,
     log_accounting_info,
@@ -810,6 +812,27 @@ def calculate_users_in_all_domains(today=None):
     auto_deactivate_mobile_workers.delay()
 
 
+@periodic_task(run_every=crontab(hour=1, minute=0, day_of_month='1'), acks_late=True)
+def calculate_form_submitting_mobile_workers_in_all_domains(today=None):
+    today = today or datetime.date.today()
+    date_start = today - relativedelta(months=1)
+    for domain in Domain.get_all_names():
+        num_workers = count_form_submitting_mobile_workers(domain, date_start, today)
+        record_date = today - relativedelta(days=1)
+        try:
+            FormSubmittingMobileWorkerHistory.objects.create(
+                domain=domain,
+                num_users=num_workers,
+                record_date=record_date
+            )
+        except IntegrityError as e:
+            log_accounting_error(
+                f"""Something went wrong while creating FormSubmittingMobileWorkerHistory
+                  for domain {domain}: {e}""",
+                show_stack_trace=True,
+            )
+
+
 @periodic_task(run_every=crontab(hour=1, minute=0, day_of_month='1'), acks_late=True)
 def calculate_web_users_in_all_billing_accounts(today=None):
     today = today or datetime.date.today()
diff --git a/corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html b/corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
index ff87fb41aede..dd7219c56004 100644
--- a/corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
+++ b/corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
@@ -104,18 +104,5 @@ <h4>
 {% endif %}
 
 {% if downgrade_messages and not is_same_edition %}
-  <hr />
-  <h4 class="text-center">
-    {% trans 'Note: Selecting this plan will result in the following changes to your project.' %}
-  </h4>
-  {% for message in downgrade_messages %}
-    <div class="alert alert-warning alert-downgrade">
-      {{ message.message }}
-      <ul>
-        {% for detail in message.details %}
-          <li>{{ detail }}</li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endfor %}
+  {% include 'accounting/partials/downgrade_messages.html' with messages=downgrade_messages only %}
 {% endif %}
diff --git a/corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html b/corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
new file mode 100644
index 000000000000..cd97e0791914
--- /dev/null
+++ b/corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
@@ -0,0 +1,16 @@
+{% load i18n %}
+
+<hr />
+<h4 class="text-center">
+  {% trans 'Note: Selecting this plan will result in the following changes to your project.' %}
+</h4>
+{% for message in messages %}
+  <div class="alert alert-warning alert-downgrade">
+    {{ message.message }}
+    <ul>
+      {% for detail in message.details %}
+        <li>{{ detail }}</li>
+      {% endfor %}
+    </ul>
+  </div>
+{% endfor %}
diff --git a/corehq/apps/accounting/templates/accounting/partials/renew_plan_selection.html b/corehq/apps/accounting/templates/accounting/partials/renew_plan_selection.html
index 44160fc124ca..1bbdd522b9ba 100644
--- a/corehq/apps/accounting/templates/accounting/partials/renew_plan_selection.html
+++ b/corehq/apps/accounting/templates/accounting/partials/renew_plan_selection.html
@@ -41,3 +41,7 @@ <h4>
     </div>
   </div>
 </div>
+
+{% if downgrade_messages %}
+  {% include 'accounting/partials/downgrade_messages.html' with messages=downgrade_messages only %}
+{% endif %}
diff --git a/corehq/apps/accounting/tests/generator.py b/corehq/apps/accounting/tests/generator.py
index 9de9200ed608..ccd3c911ef21 100644
--- a/corehq/apps/accounting/tests/generator.py
+++ b/corehq/apps/accounting/tests/generator.py
@@ -22,7 +22,13 @@
     BillingContactInfo,
     Currency,
     DefaultProductPlan,
+    Feature,
+    FeatureType,
+    SoftwarePlan,
     SoftwarePlanEdition,
+    SoftwarePlanVersion,
+    SoftwareProductRate,
+    Role,
     Subscriber,
     Subscription,
     SubscriptionType,
@@ -112,6 +118,38 @@ def subscribable_plan_version(edition=SoftwarePlanEdition.STANDARD):
     return DefaultProductPlan.get_default_plan_version(edition)
 
 
+@unit_testing_only
+def default_feature_rates(edition=SoftwarePlanEdition.STANDARD):
+    feature_rates = []
+    for feature_type in FeatureType.EDITIONED_FEATURES:
+        feature = Feature.objects.get(
+            feature_type=feature_type,
+            name=f"{feature_type} {edition}"
+        )
+        feature_rates.append(feature.get_rate(default_instance=True))
+    return feature_rates
+
+
+@unit_testing_only
+def custom_plan_version(name='Custom software plan', edition=SoftwarePlanEdition.STANDARD,
+                        role_slug='standard_plan_v0', feature_rates=None):
+    plan = SoftwarePlan.objects.create(name=name, edition=edition)
+    product_rate = SoftwareProductRate.objects.create(name=name)
+    role = Role.objects.get(slug=role_slug)
+    plan_version = SoftwarePlanVersion.objects.create(
+        plan=plan,
+        product_rate=product_rate,
+        role=role
+    )
+    if feature_rates is None:
+        feature_rates = default_feature_rates(edition)
+    for feature_rate in feature_rates:
+        feature_rate.save()
+        plan_version.feature_rates.add(feature_rate)
+    plan_version.save()
+    return plan_version
+
+
 @unit_testing_only
 def generate_domain_subscription(account, domain, date_start, date_end,
                                  plan_version=None, service_type=SubscriptionType.NOT_SET,
diff --git a/corehq/apps/accounting/tests/test_forms.py b/corehq/apps/accounting/tests/test_forms.py
index a0ec2841b5b4..db0131eaf98b 100644
--- a/corehq/apps/accounting/tests/test_forms.py
+++ b/corehq/apps/accounting/tests/test_forms.py
@@ -1,17 +1,27 @@
 import datetime
 import random
+from unittest.mock import patch
 
 from django.core.exceptions import ValidationError
+from django.test import TestCase
 
 from dateutil.relativedelta import relativedelta
 
-from corehq.apps.accounting.forms import AdjustBalanceForm, SubscriptionForm
+from corehq.apps.accounting.exceptions import InvoiceError
+from corehq.apps.accounting.forms import (
+    AdjustBalanceForm,
+    PlanContactForm,
+    SubscriptionForm,
+    TriggerInvoiceForm,
+)
 from corehq.apps.accounting.models import (
     BillingAccount,
     CreditAdjustmentReason,
     CreditLine,
     CustomerInvoice,
     DefaultProductPlan,
+    DomainUserHistory,
+    FormSubmittingMobileWorkerHistory,
     Invoice,
     SoftwarePlanEdition,
     Subscription,
@@ -25,6 +35,7 @@
 from corehq.apps.accounting.tests.test_invoicing import BaseInvoiceTestCase
 from corehq.apps.domain.models import Domain
 from corehq.apps.users.models import WebUser
+from corehq.util.dates import get_first_last_days
 
 
 class TestAdjustBalanceForm(BaseInvoiceTestCase):
@@ -311,3 +322,118 @@ def test_customer_plan_not_added_to_regular_account(self):
         }
 
         self.assertRaises(ValidationError, lambda: subscription_form.clean_active_accounts())
+
+
+class TestTriggerInvoiceForm(BaseInvoiceTestCase):
+
+    def setUp(self):
+        super().setUp()
+        statement_period = self.subscription.date_start + relativedelta(months=1)
+        self.statement_start, self.statement_end = get_first_last_days(
+            statement_period.year, statement_period.month
+        )
+        calculate_users_in_all_domains(self.statement_end + datetime.timedelta(days=1))
+
+    def init_form(self, form_data, show_testing_options=False):
+        self.form = TriggerInvoiceForm(
+            data=form_data,
+            show_testing_options=show_testing_options
+        )
+
+    def form_data(self, **kwargs):
+        form_data = {
+            'month': str(self.statement_start.month),
+            'year': str(self.statement_start.year),
+            'domain': self.domain.name,
+        }
+        form_data.update({k: str(v) for k, v in kwargs.items()})
+        return form_data
+
+    def test_trigger_invoice(self):
+        self.init_form(self.form_data())
+        self.form.full_clean()
+        self.form.trigger_invoice()
+
+        invoice = self.subscription.invoice_set.latest('date_created')
+        self.assertEqual(invoice.date_start, self.statement_start)
+        self.assertEqual(invoice.date_end, self.statement_end)
+
+    def test_clean_previous_invoices(self):
+        prev_invoice = Invoice.objects.create(
+            date_start=self.statement_start,
+            date_end=self.statement_end,
+            subscription=self.subscription
+        )
+        self.init_form(self.form_data())
+        self.form.full_clean()
+
+        with self.assertRaises(InvoiceError) as e:
+            self.form.clean_previous_invoices(self.statement_start, self.statement_end, self.domain.name)
+        self.assertIn(prev_invoice.invoice_number, str(e.exception))
+
+    def test_show_testing_options(self):
+        self.init_form(self.form_data(), show_testing_options=False)
+        self.assertNotIn('num_mobile_workers', self.form.fields)
+        self.assertNotIn('num_form_submitting_workers', self.form.fields)
+
+        self.init_form(self.form_data(), show_testing_options=True)
+        self.assertIn('num_mobile_workers', self.form.fields)
+        self.assertIn('num_form_submitting_workers', self.form.fields)
+
+    def test_num_mobile_workers(self):
+        num_users = 10
+        self.init_form(
+            self.form_data(num_mobile_workers=num_users),
+            show_testing_options=True
+        )
+        self.form.full_clean()
+        self.form.trigger_invoice()
+
+        user_history = DomainUserHistory.objects.get(
+            domain=self.domain.name, record_date=self.statement_end
+        )
+        self.assertEqual(user_history.num_users, num_users)
+
+    def test_num_form_submitting_mobile_workers(self):
+        num_users = 5
+        self.init_form(
+            self.form_data(num_form_submitting_workers=num_users),
+            show_testing_options=True
+        )
+        self.form.full_clean()
+        self.form.trigger_invoice()
+
+        user_history = FormSubmittingMobileWorkerHistory.objects.get(
+            domain=self.domain.name, record_date=self.statement_end
+        )
+        self.assertEqual(user_history.num_users, num_users)
+
+
+class TestPlanContactForm(TestCase):
+    def setUp(self):
+        super().setUp()
+        self.domain = generator.arbitrary_domain()
+        self.addCleanup(self.domain.delete)
+        self.web_user = generator.arbitrary_user(self.domain.name, is_webuser=True)
+
+    @patch('corehq.apps.accounting.forms.send_html_email_async')
+    def test_send_message(self, mock_send):
+        data = {
+            'name': 'Nelson Muntz',
+            'company_name': 'Springfield Elementary',
+            'message': 'Haw haw.'
+        }
+        form = PlanContactForm(self.domain.name, self.web_user, data=data)
+        form.full_clean()
+
+        request_type = 'Testy McTestFace'
+        form.send_message(request_type)
+        mock_send.delay.assert_called_once()
+
+        args = mock_send.delay.call_args[0]
+        subject = args[0]
+        text_content = args[3]
+
+        expected_subject = f'[{request_type}] {self.domain.name}'
+        self.assertEqual(subject, expected_subject)
+        self.assertTrue(all(value in text_content for value in data.values()))
diff --git a/corehq/apps/accounting/tests/test_invoicing.py b/corehq/apps/accounting/tests/test_invoicing.py
index 5603e1b167ce..83fd1f1162d1 100644
--- a/corehq/apps/accounting/tests/test_invoicing.py
+++ b/corehq/apps/accounting/tests/test_invoicing.py
@@ -15,7 +15,11 @@
     BillingAccount,
     BillingRecord,
     DefaultProductPlan,
+    DomainUserHistory,
+    Feature,
+    FeatureRate,
     FeatureType,
+    FormSubmittingMobileWorkerHistory,
     Invoice,
     SoftwarePlanEdition,
     Subscriber,
@@ -59,17 +63,17 @@ def setUpClass(cls):
         cls.domain = generator.arbitrary_domain()
 
         cls.subscription_length = 15  # months
-        subscription_start_date = datetime.date(2016, 2, 23)
+        cls.subscription_start_date = datetime.date(2016, 2, 23)
         cls.subscription_is_active = False
         if cls.is_testing_web_user_feature:
             # make sure the subscription is still active when we count web users
             cls.subscription_is_active = True
-        subscription_end_date = add_months_to_date(subscription_start_date, cls.subscription_length)
+        cls.subscription_end_date = add_months_to_date(cls.subscription_start_date, cls.subscription_length)
         cls.subscription = generator.generate_domain_subscription(
             cls.account,
             cls.domain,
-            date_start=subscription_start_date,
-            date_end=subscription_end_date,
+            date_start=cls.subscription_start_date,
+            date_end=cls.subscription_end_date,
             is_active=cls.subscription_is_active
         )
 
@@ -450,6 +454,82 @@ def test_community_over_limit(self):
         self.assertEqual(user_line_item.total, num_to_charge * self.user_rate.per_excess_fee)
 
 
+class TestFormSubmittingMobileWorkerLineItem(BaseInvoiceTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.feature_rate = FeatureRate.objects.create(
+            feature=Feature.objects.get(name=FeatureType.FORM_SUBMITTING_MOBILE_WORKER),
+            monthly_limit=10,
+            per_excess_fee=Decimal('3.00')
+        )
+        plan_feature_rates = generator.default_feature_rates() + [cls.feature_rate]
+        plan_version = generator.custom_plan_version(feature_rates=plan_feature_rates)
+        cls.subscription = generator.generate_domain_subscription(
+            cls.account,
+            cls.domain,
+            date_start=cls.subscription_start_date,
+            date_end=cls.subscription_end_date,
+            is_active=cls.subscription_is_active,
+            plan_version=plan_version
+        )
+
+    def setup_invoice(self, num_form_submitting_workers):
+        generator.arbitrary_commcare_users_for_domain(self.domain.name, num_form_submitting_workers)
+
+        invoice_date = utils.months_from_date(self.subscription.date_start, 2)
+        record_date = invoice_date - datetime.timedelta(days=1)
+        self._create_worker_history(DomainUserHistory, record_date)
+        self._create_worker_history(FormSubmittingMobileWorkerHistory,
+                                    record_date, num_workers=num_form_submitting_workers)
+
+        tasks.generate_invoices_based_on_date(invoice_date)
+        return self.subscription.invoice_set.latest('date_created')
+
+    def _create_worker_history(self, history_cls, record_date, num_workers=0):
+        history_cls.objects.create(
+            domain=self.domain,
+            record_date=record_date,
+            num_users=num_workers
+        )
+
+    def test_under_limit(self):
+        """
+        When usage is not chargeable, the Form-Submitting Mobile Worker line item produced:
+        - base_cost and unit_cost match FeatureRate defined on this test class
+        - quantity is 0, because there were no excess users
+        - unit_description is None, because its line item will not appear on invoice
+        """
+        num_form_submitting_workers = self.feature_rate.monthly_limit
+        invoice = self.setup_invoice(num_form_submitting_workers)
+        worker_line_item = invoice.lineitem_set.get_feature_by_type(
+            FeatureType.FORM_SUBMITTING_MOBILE_WORKER).get()
+
+        self.assertIsNone(worker_line_item.unit_description)
+        self.assertEqual(worker_line_item.base_cost, self.feature_rate.monthly_fee)
+        self.assertEqual(worker_line_item.unit_cost, self.feature_rate.per_excess_fee)
+        self.assertEqual(worker_line_item.quantity, 0)
+
+    def test_over_limit(self):
+        """
+        When usage is chargeable, the Form-Submitting Mobile Worker line item produced:
+        - base_cost and unit_cost match the FeatureRate defined on this test class
+        - quantity is the number of workers in excess of the FeatureRate's monthly_limit
+        - unit_description includes 'form-submitting mobile worker'
+        """
+        num_excess = 3
+        num_form_submitting_workers = self.feature_rate.monthly_limit + num_excess
+        invoice = self.setup_invoice(num_form_submitting_workers)
+        worker_line_item = invoice.lineitem_set.get_feature_by_type(
+            FeatureType.FORM_SUBMITTING_MOBILE_WORKER).get()
+
+        self.assertIn('form-submitting mobile worker', worker_line_item.unit_description)
+        self.assertEqual(worker_line_item.quantity, num_excess)
+        self.assertEqual(worker_line_item.base_cost, self.feature_rate.monthly_fee)
+        self.assertEqual(worker_line_item.unit_cost, self.feature_rate.per_excess_fee)
+
+
 class TestWebUserLineItem(BaseInvoiceTestCase):
 
     is_using_test_plans = True
diff --git a/corehq/apps/accounting/tests/test_models.py b/corehq/apps/accounting/tests/test_models.py
index 63e18f19f187..4f7e5ae9d679 100644
--- a/corehq/apps/accounting/tests/test_models.py
+++ b/corehq/apps/accounting/tests/test_models.py
@@ -3,6 +3,7 @@
 
 from django.core import mail
 from django.db import models
+from django.test import SimpleTestCase
 
 from unittest import mock
 
@@ -343,3 +344,9 @@ def test_unset_autopay(self, fake_customer):
         self.assertEqual(self.fake_card.metadata, {"auto_pay_{}".format(self.billing_account.id): 'False'})
         self.assertIsNone(self.billing_account.auto_pay_user)
         self.assertFalse(self.billing_account.auto_pay_enabled)
+
+
+class SimpleBillingAccountTest(SimpleTestCase):
+    def test_has_enterprise_admin_does_case_insensitive_match(self):
+        account = BillingAccount(is_customer_billing_account=True, enterprise_admin_emails=['TEST@dimagi.com'])
+        self.assertTrue(account.has_enterprise_admin('test@DIMAGI.com'))
diff --git a/corehq/apps/accounting/tests/test_tasks.py b/corehq/apps/accounting/tests/test_tasks.py
new file mode 100644
index 000000000000..6d6515e58d1e
--- /dev/null
+++ b/corehq/apps/accounting/tests/test_tasks.py
@@ -0,0 +1,56 @@
+import datetime
+
+from corehq.apps.accounting import tasks
+from corehq.apps.accounting.models import FormSubmittingMobileWorkerHistory
+from corehq.apps.accounting.tests import generator
+from corehq.apps.accounting.tests.test_invoicing import BaseInvoiceTestCase
+from corehq.apps.domain.tests.test_utils import delete_all_domains
+from corehq.apps.es.forms import form_adapter
+from corehq.apps.es.tests.utils import es_test
+from corehq.apps.users.dbaccessors import delete_all_users
+from corehq.form_processor.utils.xform import TestFormMetadata
+from corehq.util.test_utils import make_es_ready_form
+
+
+@es_test(requires=[form_adapter], setup_class=True)
+class TestCalculateFormSubmittingMobileWorkers(BaseInvoiceTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        num_workers = 5
+        generator.arbitrary_commcare_users_for_domain(cls.domain.name, num_workers)
+
+        cls.num_form_submitting_workers = 3
+        cls.one_day_ago = datetime.date.today() - datetime.timedelta(days=1)
+        one_week_ago_dt = datetime.datetime.combine(
+            cls.one_day_ago - datetime.timedelta(days=6), datetime.time()
+        )
+        for user in cls.domain.all_users()[:cls.num_form_submitting_workers]:
+            cls._submit_form(user, one_week_ago_dt)
+
+    @classmethod
+    def _submit_form(cls, user, received_on):
+        form_pair = make_es_ready_form(
+            TestFormMetadata(
+                domain=cls.domain.name,
+                user_id=user.user_id,
+                received_on=received_on
+            )
+        )
+        form_adapter.index(form_pair.json_form, refresh=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        delete_all_users()
+        delete_all_domains()
+        return super().tearDownClass()
+
+    def test_calculate_form_submitting_mobile_workers_in_all_domains(self):
+        tasks.calculate_form_submitting_mobile_workers_in_all_domains()
+        self.assertEqual(FormSubmittingMobileWorkerHistory.objects.count(), 1)
+
+        worker_history = FormSubmittingMobileWorkerHistory.objects.first()
+        self.assertEqual(worker_history.domain, self.domain.name)
+        self.assertEqual(worker_history.num_users, self.num_form_submitting_workers)
+        self.assertEqual(worker_history.record_date, self.one_day_ago)
diff --git a/corehq/apps/accounting/usage.py b/corehq/apps/accounting/usage.py
index 91efe735f020..f9779368f0af 100644
--- a/corehq/apps/accounting/usage.py
+++ b/corehq/apps/accounting/usage.py
@@ -2,6 +2,7 @@
 import datetime
 
 from corehq.apps.accounting.models import FeatureType
+from corehq.apps.accounting.utils import count_form_submitting_mobile_workers
 from corehq.apps.smsbillables.models import SmsBillable
 from corehq.apps.users.models import CommCareUser, WebUser
 
@@ -20,13 +21,19 @@ def __init__(self, feature_rate, domain_name,
         self.end_date = end_date or datetime.date(
             today.year, today.month, last_day)
 
+    @property
+    def usage_fns(self):
+        return {
+            FeatureType.USER: self._get_user_usage,
+            FeatureType.SMS: self._get_sms_usage,
+            FeatureType.WEB_USER: self._get_web_user_usage,
+            FeatureType.FORM_SUBMITTING_MOBILE_WORKER: self._get_form_submitting_mobile_worker_user_usage,
+        }
+
     def get_usage(self):
         try:
-            return {
-                FeatureType.USER: self._get_user_usage(),
-                FeatureType.SMS: self._get_sms_usage(),
-                FeatureType.WEB_USER: self._get_web_user_usage(),
-            }[self.feature_rate.feature.feature_type]
+            usage_fn = self.usage_fns[self.feature_rate.feature.feature_type]
+            return usage_fn()
         except KeyError:
             pass
 
@@ -44,3 +51,6 @@ def _get_sms_usage(self):
     def _get_web_user_usage(self):
         web_user_in_account = set(WebUser.ids_by_domain(self.domain))
         return len(web_user_in_account)
+
+    def _get_form_submitting_mobile_worker_user_usage(self):
+        return count_form_submitting_mobile_workers(self.domain, self.start_date, self.end_date)
diff --git a/corehq/apps/accounting/user_text.py b/corehq/apps/accounting/user_text.py
index 9b622084fb05..e3bcee05cc96 100644
--- a/corehq/apps/accounting/user_text.py
+++ b/corehq/apps/accounting/user_text.py
@@ -54,17 +54,14 @@
     FeatureType.SMS: _("SMS Messages"),
     FeatureType.USER: _("Mobile Workers"),
     FeatureType.WEB_USER: _("Web Users"),
+    FeatureType.FORM_SUBMITTING_MOBILE_WORKER: _("Form-Submitting Mobile Workers"),
 }
 
 
 def get_feature_name(feature_type):
     if feature_type not in [f[0] for f in FeatureType.CHOICES]:
         raise ValueError("Unsupported Feature")
-    return {
-        FeatureType.USER: _("Mobile Users"),
-        FeatureType.SMS: _("SMS"),
-        FeatureType.WEB_USER: _("Web Users")
-    }[feature_type]
+    return FEATURE_TYPE_TO_NAME[feature_type]
 
 
 def get_feature_recurring_interval(feature_type):
diff --git a/corehq/apps/accounting/utils/__init__.py b/corehq/apps/accounting/utils/__init__.py
index 91e4d64a8afa..9c7b7ddbd51b 100644
--- a/corehq/apps/accounting/utils/__init__.py
+++ b/corehq/apps/accounting/utils/__init__.py
@@ -18,6 +18,7 @@
     ProductPlanNotFoundError,
 )
 from corehq.apps.domain.models import Domain
+from corehq.apps.es.forms import FormES
 from corehq.toggles import domain_has_privilege_from_toggle
 from corehq.util.quickcache import quickcache
 from corehq.util.view_utils import absolute_reverse
@@ -470,3 +471,20 @@ def get_paused_plan_context(request, domain):
         'change_plan_url': reverse(SelectPlanView.urlname, args=[domain]),
         'can_edit_billing_info': request.couch_user.is_domain_admin(domain),
     }
+
+
+def count_form_submitting_mobile_workers(domain, start, end):
+    """
+    Returns the count of mobile workers who have submitted a form in the time specified.
+    """
+    form_counts_by_worker = (
+        FormES(for_export=True)
+        .domain(domain)
+        .submitted(gte=start, lt=end)
+        .user_type('mobile')
+        .user_aggregation()
+        .size(0)
+        .run()
+        .aggregations.user.normalized_buckets
+    )
+    return len(form_counts_by_worker)
diff --git a/corehq/apps/aggregate_ucrs/tests/test_aggregation.py b/corehq/apps/aggregate_ucrs/tests/test_aggregation.py
index 862bf8300f9d..d3ed8ebef06c 100644
--- a/corehq/apps/aggregate_ucrs/tests/test_aggregation.py
+++ b/corehq/apps/aggregate_ucrs/tests/test_aggregation.py
@@ -104,10 +104,17 @@ def setUpClass(cls):
         # the closed case causes there to be some data with an end_column
         cls.closed_case_id = cls._create_closed_case()
 
+        def cleanup_datasource(data_source, adapter):
+            data_source.get_db().delete_doc(data_source.get_id)
+            adapter.drop_table()
+
         # populate the UCRs with the data we just created
         cls.form_adapter = get_indicator_adapter(cls.form_data_source)
+        cls.addClassCleanup(cleanup_datasource, cls.form_data_source, cls.form_adapter)
         cls.case_adapter = get_indicator_adapter(cls.case_data_source)
+        cls.addClassCleanup(cleanup_datasource, cls.case_data_source, cls.case_adapter)
         cls.parent_case_adapter = get_indicator_adapter(cls.parent_case_data_source)
+        cls.addClassCleanup(cleanup_datasource, cls.parent_case_data_source, cls.parent_case_adapter)
 
         cls.form_adapter.rebuild_table()
         cls.case_adapter.rebuild_table()
diff --git a/corehq/apps/analytics/README.md b/corehq/apps/analytics/README.md
index 48215479bd80..05fa1a2aa6cd 100644
--- a/corehq/apps/analytics/README.md
+++ b/corehq/apps/analytics/README.md
@@ -96,17 +96,13 @@ When troubleshooting in Hubspot's portal, it's often useful to create lists base
 
 This is the live chat feature available for new users. There's a [drift.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/drift.js) HQ module, though it doesn't do much. No server component.
 
-### Fullstory
-
-Generally available in areas of interest to the product and growth teams: signup, app builder, report builder. We include their script but there's no other interaction with their code - no events, etc. Not much related code; there's a [fullstory.html](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/templates/analytics/fullstory.html) template to include their script but no HQ JavaScript module and no server component.
-
 ### Facebook Pixel
 
 Their script is included in [signup](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/registration/templates/registration/register_new_user.html), but we don't do any event tracking or other interaction with it. Very little related code, just the script inclusion.
 
 ### Google Tag Manager (GTM)
 
-Its script is available in the [gtm.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/gtm.js) which loads the GTM tracking script and sends the desired user properties to GTM.
+Its script is available in the [gtx.js](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/analytics/static/analytix/js/gtx.js) which loads the GTM tracking script and sends the desired user properties to GTM.
 Any tracking of events should be configured at the GTM console end in tandem with the desired analytics tooling. The goal is to track specific features in HQ and also disable them when there is no need via the GTM console itself.
 Any `id` attribute added to html element for tracking through console should be prefixed with `gtm-` to indicate that this element is likely being tracked in GTM.
 This should potentially avoid accidental removal of id attribute from these elements. (Similar approach may be followed for any tooling in case of tracking of elements through console.)
diff --git a/corehq/apps/analytics/static/analytix/js/gtm.js b/corehq/apps/analytics/static/analytix/js/gtx.js
similarity index 94%
rename from corehq/apps/analytics/static/analytix/js/gtm.js
rename to corehq/apps/analytics/static/analytix/js/gtx.js
index 3973795a1903..343a9ffdcdb7 100644
--- a/corehq/apps/analytics/static/analytix/js/gtm.js
+++ b/corehq/apps/analytics/static/analytix/js/gtx.js
@@ -1,8 +1,9 @@
 "use strict";
 /**
- *  Handles communication with the google tag manager API. 
+ *  Handles communication with the google tag manager API.
+ *  gtx is the filename because some ad blockers blocks 'gtm.js'*
  */
-hqDefine('analytix/js/gtm', [
+hqDefine('analytix/js/gtx', [
     'jquery',
     'underscore',
     'analytix/js/initial',
diff --git a/corehq/apps/analytics/templates/analytics/analytics_js.html b/corehq/apps/analytics/templates/analytics/analytics_js.html
index d1112245b847..284a48d358c8 100644
--- a/corehq/apps/analytics/templates/analytics/analytics_js.html
+++ b/corehq/apps/analytics/templates/analytics/analytics_js.html
@@ -12,5 +12,6 @@
   <script src="{% static 'analytix/js/hubspot.js' %}"></script>
   <script src="{% static 'analytix/js/drift.js' %}"></script>
   <script src="{% static 'analytix/js/appcues.js' %}"></script>
-  <script src="{% static 'analytix/js/gtm.js' %}"></script>
+  {# gtx is the filename because some adblockers blocks 'gtm.js' #}
+  <script src="{% static 'analytix/js/gtx.js' %}"></script>
 {% endcompress %}
diff --git a/corehq/apps/analytics/templates/analytics/fullstory.html b/corehq/apps/analytics/templates/analytics/fullstory.html
deleted file mode 100644
index e9c802c80751..000000000000
--- a/corehq/apps/analytics/templates/analytics/fullstory.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% if ANALYTICS_IDS.FULLSTORY_ID and not request.project.restrict_superusers %}
-  {# This is fine as an inline script; it's independent of all HQ code and all third-party libraries #}
-  <script>
-    window['_fs_debug'] = false;
-    window['_fs_host'] = 'www.fullstory.com';
-    window['_fs_org'] = '{{ ANALYTICS_IDS.FULLSTORY_ID }}';
-    (function(m,n,e,t,l,o,g,y){
-      g=m[e]=function(a,b){g.q?g.q.push([a,b]):g._api(a,b);};g.q=[];
-      o=n.createElement(t);o.async=1;o.src='https://'+_fs_host+'/s/fs.js';
-      y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
-      g.identify=function(i,v){g(l,{uid:i});if(v)g(l,v)};g.setUserVars=function(v){FS(l,v)};
-      g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;FS(o,v)};
-      g.clearUserCookie=function(d,i){d=n.domain;while(1){n.cookie='fs_uid=;domain='+d+
-        ';path=/;expires='+new Date(0);i=d.indexOf('.');if(i<0)break;d=d.slice(i+1)}}
-    })(window,document,'FS','script','user');
-    FS.identify('{{ request.couch_user.username }}',{'displayName': '{{ request.couch_user.username }}'});
-  </script>
-{% endif %}
diff --git a/corehq/apps/api/object_fetch_api.py b/corehq/apps/api/object_fetch_api.py
index d30344b0815a..391aeccbb5cd 100644
--- a/corehq/apps/api/object_fetch_api.py
+++ b/corehq/apps/api/object_fetch_api.py
@@ -122,7 +122,7 @@ def get(self, request, domain, case_id=None, attachment_id=None):
         if attachment_meta is not None:
             mime_type = attachment_meta['content_type']
         else:
-            mime_type = "plain/text"
+            mime_type = "text/plain"
 
         return StreamingHttpResponse(streaming_content=FileWrapper(attachment_stream),
                                      content_type=mime_type)
diff --git a/corehq/apps/api/resources/auth.py b/corehq/apps/api/resources/auth.py
index 4d3ee4088b2e..e18d1092a2f7 100644
--- a/corehq/apps/api/resources/auth.py
+++ b/corehq/apps/api/resources/auth.py
@@ -1,8 +1,7 @@
-import json
 from functools import wraps
 
 from django.core.exceptions import PermissionDenied
-from django.http import Http404, HttpResponse, HttpResponseForbidden
+from django.http import Http404, HttpResponseForbidden, JsonResponse
 
 from attrs import define, field
 from tastypie.authentication import Authentication
@@ -28,11 +27,9 @@ def _inner(req, *args, **kwargs):
             return view_func(req, *args, **kwargs)
         except Http404 as e:
             if str(e):
-                return HttpResponse(json.dumps({"error": str(e)}),
-                                content_type="application/json",
-                                status=404)
-            return HttpResponse(json.dumps({"error": "not authorized"}),
-                                content_type="application/json",
+                return JsonResponse({"error": str(e)},
+                                    status=404)
+            return JsonResponse({"error": "not authorized"},
                                 status=401)
     return _inner
 
@@ -192,7 +189,7 @@ def _get_auth_decorator(self, request):
 class DomainAdminAuthentication(LoginAndDomainAuthentication):
 
     def is_authenticated(self, request, **kwargs):
-        permission_check = lambda couch_user, domain: couch_user.is_domain_admin(domain)
+        permission_check = lambda couch_user, domain: couch_user.is_domain_admin(domain)  # noqa: E731
         wrappers = [
             require_permission_raw(permission_check, login_decorator=self._get_auth_decorator(request)),
             wrap_4xx_errors_for_apis,
diff --git a/corehq/apps/api/resources/v0_5.py b/corehq/apps/api/resources/v0_5.py
index 04596a18f61a..5a3f5a52ccb9 100644
--- a/corehq/apps/api/resources/v0_5.py
+++ b/corehq/apps/api/resources/v0_5.py
@@ -230,6 +230,8 @@ def detail_uri_kwargs(self, bundle_or_obj):
 
 
 class CommCareUserResource(v0_1.CommCareUserResource):
+    primary_location = fields.CharField()
+    locations = fields.ListField()
 
     class Meta(v0_1.CommCareUserResource.Meta):
         detail_allowed_methods = ['get', 'put', 'delete']
@@ -320,10 +322,22 @@ def obj_delete(self, bundle, **kwargs):
                         deleted_via=USER_CHANGE_VIA_API)
         return ImmediateHttpResponse(response=http.HttpAccepted())
 
+    def dehydrate_primary_location(self, bundle):
+        return bundle.obj.get_location_id(bundle.obj.domain)
+
+    def dehydrate_locations(self, bundle):
+        return bundle.obj.get_location_ids(bundle.obj.domain)
+
     @classmethod
     def _update(cls, bundle, user_change_logger=None):
         errors = []
-        for key, value in bundle.data.items():
+
+        location_object = {'primary_location': bundle.data.pop('primary_location', None),
+                           'locations': bundle.data.pop('locations', None)}
+
+        items_to_update = list(bundle.data.items()) + [('location', location_object)]
+
+        for key, value in items_to_update:
             try:
                 update(bundle.obj, key, value, user_change_logger)
             except UpdateUserException as e:
diff --git a/corehq/apps/api/tests/test_ucr_resources.py b/corehq/apps/api/tests/test_ucr_resources.py
index a7e732451dab..36657c383c87 100644
--- a/corehq/apps/api/tests/test_ucr_resources.py
+++ b/corehq/apps/api/tests/test_ucr_resources.py
@@ -27,6 +27,7 @@
     ReportConfiguration,
 )
 from corehq.apps.userreports.tasks import rebuild_indicators
+from corehq.apps.userreports.tests.utils import cleanup_ucr
 from corehq.apps.users.models import Document, WebUser
 from corehq.form_processor.models import CommCareCase
 from corehq.util.test_utils import flag_enabled
@@ -439,8 +440,8 @@ def setUpClass(cls):
             table_id=uuid.uuid4().hex,
         )
         cls.data_source.save()
-        cls.addClassCleanup(cls.data_source.delete)
         rebuild_indicators(cls.data_source._id)
+        cls.addClassCleanup(cleanup_ucr, cls.data_source)
         cls.client = Client()
 
     def test_forbidden_when_feature_flag_not_enabled(self):
diff --git a/corehq/apps/api/tests/user_resources.py b/corehq/apps/api/tests/test_user_resources.py
similarity index 91%
rename from corehq/apps/api/tests/user_resources.py
rename to corehq/apps/api/tests/test_user_resources.py
index 643343dad9ce..fffe39e8a127 100644
--- a/corehq/apps/api/tests/user_resources.py
+++ b/corehq/apps/api/tests/test_user_resources.py
@@ -19,6 +19,7 @@
 from corehq.apps.es.tests.utils import es_test
 from corehq.apps.es.users import user_adapter
 from corehq.apps.groups.models import Group
+from corehq.apps.locations.models import LocationType, SQLLocation
 from corehq.apps.users.analytics import update_analytics_indexes
 from corehq.apps.users.audit.change_messages import UserChangeMessage
 from corehq.apps.users.model_log import UserModelAction
@@ -70,6 +71,11 @@ def setUpClass(cls):
             definition=cls.definition,
         )
         cls.profile.save()
+        cls.loc_type = LocationType.objects.create(domain=cls.domain.name, name='loc_type')
+        cls.loc1 = SQLLocation.objects.create(
+            location_id='loc1', location_type=cls.loc_type, domain=cls.domain.name)
+        cls.loc2 = SQLLocation.objects.create(
+            location_id='loc2', location_type=cls.loc_type, domain=cls.domain.name)
 
     @classmethod
     def tearDownClass(cls):
@@ -81,6 +87,8 @@ def test_get_list(self):
         commcare_user = CommCareUser.create(domain=self.domain.name, username='fake_user', password='*****',
                                             created_by=None, created_via=None)
         self.addCleanup(commcare_user.delete, self.domain.name, deleted_by=None)
+        commcare_user.set_location(self.loc1)
+        commcare_user.set_location(self.loc2)
         backend_id = commcare_user.get_id
         update_analytics_indexes()
 
@@ -100,8 +108,13 @@ def test_get_list(self):
             'last_name': '',
             'phone_numbers': [],
             'resource_uri': '/a/qwerty/api/v0.5/user/{}/'.format(backend_id),
-            'user_data': {'commcare_project': 'qwerty', PROFILE_SLUG: '', 'imaginary': ''},
-            'username': 'fake_user'
+            'user_data': {'commcare_project': 'qwerty', PROFILE_SLUG: '', 'imaginary': '',
+                          'commcare_location_id': self.loc2.location_id,
+                          'commcare_primary_case_sharing_id': self.loc2.location_id,
+                          'commcare_location_ids': f'{self.loc1.location_id} {self.loc2.location_id}'},
+            'username': 'fake_user',
+            'primary_location': self.loc2.location_id,
+            'locations': [self.loc1.location_id, self.loc2.location_id]
         })
 
     @flaky
@@ -109,6 +122,8 @@ def test_get_single(self):
         commcare_user = CommCareUser.create(domain=self.domain.name, username='fake_user', password='*****',
                                             created_by=None, created_via=None)
         self.addCleanup(commcare_user.delete, self.domain.name, deleted_by=None)
+        commcare_user.set_location(self.loc1)
+        commcare_user.set_location(self.loc2)
         backend_id = commcare_user._id
 
         response = self._assert_auth_get_resource(self.single_endpoint(backend_id))
@@ -126,8 +141,15 @@ def test_get_single(self):
             'last_name': '',
             'phone_numbers': [],
             'resource_uri': '/a/qwerty/api/v0.5/user/{}/'.format(backend_id),
-            'user_data': {'commcare_project': 'qwerty', PROFILE_SLUG: '', 'imaginary': ''},
+            'user_data': {'commcare_project': 'qwerty',
+                          PROFILE_SLUG: '',
+                          'imaginary': '',
+                          'commcare_location_id': self.loc2.location_id,
+                          'commcare_primary_case_sharing_id': self.loc2.location_id,
+                          'commcare_location_ids': f'{self.loc1.location_id} {self.loc2.location_id}'},
             'username': 'fake_user',
+            'primary_location': self.loc2.location_id,
+            'locations': [self.loc1.location_id, self.loc2.location_id]
         })
 
     def test_create(self):
@@ -153,7 +175,10 @@ def test_create(self):
             ],
             "user_data": {
                 "chw_id": "13/43/DFA"
-            }
+            },
+            'locations': [self.loc1.location_id, self.loc2.location_id],
+            'primary_location': self.loc1.location_id
+
         }
         response = self._assert_auth_post_resource(self.list_endpoint,
                                                    json.dumps(user_json),
@@ -171,6 +196,9 @@ def test_create(self):
         self.assertEqual(user_back.get_group_ids()[0], group._id)
         self.assertEqual(user_back.get_user_data(self.domain.name)["chw_id"], "13/43/DFA")
         self.assertEqual(user_back.default_phone_number, "50253311399")
+        self.assertEqual(user_back.get_location_ids(self.domain.name),
+                         [self.loc1.location_id, self.loc2.location_id])
+        self.assertEqual(user_back.get_location_id(self.domain.name), self.loc1.location_id)
 
     @flag_enabled('COMMCARE_CONNECT')
     def test_create_connect_user_no_password(self):
@@ -266,7 +294,9 @@ def test_update(self):
                 PROFILE_SLUG: self.profile.id,
                 "chw_id": "13/43/DFA"
             },
-            "password": "qwerty1234"
+            "password": "qwerty1234",
+            'locations': [self.loc1.location_id, self.loc2.location_id],
+            'primary_location': self.loc1.location_id
         }
 
         backend_id = user._id
@@ -288,6 +318,9 @@ def test_update(self):
         self.assertEqual(user_data.profile_id, self.profile.id)
         self.assertEqual(user_data["imaginary"], "yes")
         self.assertEqual(modified.default_phone_number, "50253311399")
+        self.assertEqual(modified.get_location_ids(self.domain.name),
+                         [self.loc1.location_id, self.loc2.location_id])
+        self.assertEqual(modified.get_location_id(self.domain.name), self.loc1.location_id)
 
         # test user history audit
         user_history = UserHistory.objects.get(action=UserModelAction.UPDATE.value,
@@ -300,6 +333,8 @@ def test_update(self):
                 'last_name': 'last',
                 'first_name': 'test',
                 'user_data': {'chw_id': '13/43/DFA'},
+                'location_id': 'loc1',
+                'assigned_location_ids': ['loc1', 'loc2']
             }
         )
         self.assertTrue("50253311398" in
diff --git a/corehq/apps/api/tests/test_user_updates.py b/corehq/apps/api/tests/test_user_updates.py
index 955618af93e0..609321384d47 100644
--- a/corehq/apps/api/tests/test_user_updates.py
+++ b/corehq/apps/api/tests/test_user_updates.py
@@ -11,9 +11,11 @@
 )
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.groups.models import Group
+from corehq.apps.locations.models import LocationType, SQLLocation
 from corehq.apps.user_importer.helpers import UserChangeLogger
 from corehq.apps.users.audit.change_messages import (
     GROUPS_FIELD,
+    LOCATION_FIELD,
     PASSWORD_FIELD,
     ROLE_FIELD,
 )
@@ -31,6 +33,11 @@ def setUpClass(cls):
         cls.domain = 'test-domain'
         cls.domain_obj = create_domain(cls.domain)
         cls.addClassCleanup(cls.domain_obj.delete)
+        cls.loc_type = LocationType.objects.create(domain=cls.domain, name='loc_type')
+        cls.loc1 = SQLLocation.objects.create(
+            location_id='loc1', location_type=cls.loc_type, domain=cls.domain)
+        cls.loc2 = SQLLocation.objects.create(
+            location_id='loc2', location_type=cls.loc_type, domain=cls.domain)
 
     def setUp(self) -> None:
         super().setUp()
@@ -135,6 +142,10 @@ def test_update_groups_fails(self):
         with self.assertRaises(ValidationError):
             update(self.user, 'groups', [group._id])
 
+    def test_update_groups_with_fake_group_id_raises_exception(self):
+        with self.assertRaises(ValidationError):
+            update(self.user, 'groups', ["fake_id"])
+
     def test_update_unknown_field_raises_exception(self):
         with self.assertRaises(UpdateUserException) as cm:
             update(self.user, 'username', 'new-username')
@@ -190,6 +201,48 @@ def _setup_profile(self):
         profile.save()
         return profile.id
 
+    def test_update_locations_raises_if_primary_location_not_in_location_list(self):
+        with self.assertRaises(UpdateUserException) as e:
+            update(self.user, 'location',
+                   {'primary_location': self.loc2.location_id, 'locations': [self.loc1.location_id]})
+
+        self.assertEqual(str(e.exception), 'Primary location must be included in the list of locations.')
+
+    def test_update_locations_raises_if_any_location_does_not_exist(self):
+        with self.assertRaises(UpdateUserException) as e:
+            update(self.user, 'location',
+                   {'primary_location': 'fake_loc', 'locations': [self.loc1.location_id, 'fake_loc']})
+        self.assertEqual(str(e.exception), "Could not find location ids: fake_loc.")
+
+    def test_update_locations_raises_if_primary_location_not_provided(self):
+        with self.assertRaises(UpdateUserException) as e:
+            update(self.user, 'location', {'locations': [self.loc1.location_id]})
+        self.assertEqual(str(e.exception), 'Both primary_location and locations must be provided together.')
+
+    def test_update_locations_raises_if_locations_not_provided(self):
+        with self.assertRaises(UpdateUserException) as e:
+            update(self.user, 'location', {'primary_location': self.loc1.location_id})
+        self.assertEqual(str(e.exception), 'Both primary_location and locations must be provided together.')
+
+    def test_update_locations_do_nothing_if_nothing_provided(self):
+        self.user.set_location(self.loc1)
+        update(self.user, 'location', {'primary_location': None, 'locations': None})
+        self.assertEqual(self.user.get_location_ids(self.domain), [self.loc1.location_id])
+        self.assertEqual(self.user.get_location_id(self.domain), self.loc1.location_id)
+
+    def test_update_locations_removes_locations_if_empty_string_provided(self):
+        self.user.set_location(self.loc1)
+        update(self.user, 'location', {'primary_location': '', 'locations': []})
+        self.assertEqual(self.user.get_location_ids(self.domain), [])
+        self.assertEqual(self.user.get_location_id(self.domain), None)
+
+    def test_update_locations_succeeds(self):
+        update(self.user, 'location',
+               {'primary_location': self.loc1.location_id,
+                'locations': [self.loc1.location_id, self.loc2.location_id]})
+        self.assertEqual(self.user.get_location_ids(self.domain), [self.loc1.location_id, self.loc2.location_id])
+        self.assertEqual(self.user.get_location_id(self.domain), self.loc1.location_id)
+
 
 class TestUpdateUserMethodsLogChanges(TestCase):
 
@@ -199,6 +252,11 @@ def setUpClass(cls):
         cls.domain = 'test-domain'
         cls.domain_obj = create_domain(cls.domain)
         cls.addClassCleanup(cls.domain_obj.delete)
+        cls.loc_type = LocationType.objects.create(domain=cls.domain, name='loc_type')
+        cls.loc1 = SQLLocation.objects.create(
+            location_id='loc1', location_type=cls.loc_type, domain=cls.domain)
+        cls.loc2 = SQLLocation.objects.create(
+            location_id='loc2', location_type=cls.loc_type, domain=cls.domain)
 
     def setUp(self) -> None:
         super().setUp()
@@ -332,3 +390,25 @@ def test_update_user_role_does_not_logs_change(self):
         update(self.user, 'role', 'edit-data', user_change_logger=self.user_change_logger)
 
         self.assertNotIn(ROLE_FIELD, self.user_change_logger.change_messages.keys())
+
+    def test_update_location_logs_change(self):
+        update(self.user, 'location',
+               {'primary_location': self.loc1.location_id,
+                'locations': [self.loc1.location_id, self.loc2.location_id]},
+               user_change_logger=self.user_change_logger)
+        self.assertIn(LOCATION_FIELD, self.user_change_logger.change_messages.keys())
+
+    def test_update_location_without_include_location_fields_does_not_log_change(self):
+        update(self.user, 'location',
+               {'primary_location': None, 'locations': None},
+               user_change_logger=self.user_change_logger)
+        self.assertNotIn(LOCATION_FIELD, self.user_change_logger.change_messages.keys())
+
+    def test_update_location_with_current_locations_does_not_log_change(self):
+        self.user.set_location(self.loc2)
+        self.user.set_location(self.loc1)
+        update(self.user, 'location',
+               {'primary_location': self.loc1.location_id,
+                'locations': [self.loc1.location_id, self.loc2.location_id]},
+               user_change_logger=self.user_change_logger)
+        self.assertNotIn(LOCATION_FIELD, self.user_change_logger.change_messages.keys())
diff --git a/corehq/apps/api/user_updates.py b/corehq/apps/api/user_updates.py
index 433fc6106f93..a823c80a4e52 100644
--- a/corehq/apps/api/user_updates.py
+++ b/corehq/apps/api/user_updates.py
@@ -1,5 +1,6 @@
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext as _
+from corehq.apps.locations.models import SQLLocation
 
 from dimagi.utils.couch.bulk import get_docs
 
@@ -35,6 +36,7 @@ def update(user, field, value, user_change_logger=None):
         'phone_numbers': _update_phone_numbers,
         'user_data': _update_user_data,
         'role': _update_user_role,
+        'location': _update_location,
     }.get(field)
 
     if not update_fn:
@@ -165,3 +167,69 @@ def _log_phone_number_change(new_phone_numbers, old_phone_numbers, user_change_l
 
     if change_messages:
         user_change_logger.add_change_message({'phone_numbers': change_messages})
+
+
+def _update_location(user, location_object, user_change_logger):
+    primary_location_id = location_object.get('primary_location')
+    location_ids = location_object.get('locations')
+
+    if primary_location_id is None and location_ids is None:
+        return
+
+    current_primary_location_id = user.get_location_id(user.domain)
+    current_locations = user.get_location_ids(user.domain)
+
+    if not primary_location_id and not location_ids:
+        _remove_all_locations(user, user_change_logger)
+    else:
+        if _validate_locations(primary_location_id, location_ids):
+            locations = _verify_location_ids(location_ids, user.domain)
+            if primary_location_id != current_primary_location_id:
+                _update_primary_location(user, primary_location_id, user_change_logger)
+            if set(current_locations) != set(location_ids):
+                _update_assigned_locations(user, locations, location_ids, user_change_logger)
+
+
+def _validate_locations(primary_location_id, location_ids):
+    if not primary_location_id and not location_ids:
+        return False
+    if not primary_location_id or not location_ids:
+        raise UpdateUserException(_('Both primary_location and locations must be provided together.'))
+    if primary_location_id not in location_ids:
+        raise UpdateUserException(_('Primary location must be included in the list of locations.'))
+    return True
+
+
+def _remove_all_locations(user, user_change_logger):
+    user.unset_location(commit=False)
+    user.reset_locations([], commit=False)
+    if user_change_logger:
+        user_change_logger.add_changes({'location_id': None})
+        user_change_logger.add_info(UserChangeMessage.primary_location_removed())
+        user_change_logger.add_changes({'assigned_location_ids': []})
+        user_change_logger.add_info(UserChangeMessage.assigned_locations_info([]))
+
+
+def _update_primary_location(user, primary_location_id, user_change_logger):
+    primary_location = SQLLocation.active_objects.get(location_id=primary_location_id)
+    user.set_location(primary_location, commit=False)
+    if user_change_logger:
+        user_change_logger.add_changes({'location_id': primary_location_id})
+        user_change_logger.add_info(UserChangeMessage.primary_location_info(primary_location))
+
+
+def _verify_location_ids(location_ids, domain):
+    locations = SQLLocation.active_objects.filter(location_id__in=location_ids, domain=domain)
+    real_ids = [loc.location_id for loc in locations]
+
+    if missing_ids := set(location_ids) - set(real_ids):
+        raise UpdateUserException(f"Could not find location ids: {', '.join(missing_ids)}.")
+
+    return locations
+
+
+def _update_assigned_locations(user, locations, location_ids, user_change_logger):
+    user.reset_locations(location_ids, commit=False)
+    if user_change_logger:
+        user_change_logger.add_changes({'assigned_location_ids': location_ids})
+        user_change_logger.add_info(UserChangeMessage.assigned_locations_info(locations))
diff --git a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
index c07d5b0e9527..1671727b9013 100644
--- a/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
+++ b/corehq/apps/app_execution/static/app_execution/js/workflow_logs.js
@@ -5,7 +5,7 @@ hqDefine("app_execution/js/workflow_logs", [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/tempus_dominus',
     'app_execution/js/workflow_charts',
-    'hqwebapp/js/bootstrap5/components.ko',
+    'hqwebapp/js/components/pagination',
 ], function ($, ko, initialPageData, hqTempusDominus) {
     let logsModel = function () {
         let self = {};
diff --git a/corehq/apps/app_manager/app_strings.py b/corehq/apps/app_manager/app_strings.py
index b3c0b30179b1..5683ad36d14b 100644
--- a/corehq/apps/app_manager/app_strings.py
+++ b/corehq/apps/app_manager/app_strings.py
@@ -22,6 +22,13 @@
 from corehq.util.translation import localize
 
 
+# If the language name is not showing up properly in the language menu, you can
+# define those languages here, mapped to their two-letter language codes.
+CUSTOM_LANGUAGE_NAMES = {
+    'km': "ខ្មែរ",
+}
+
+
 def non_empty_only(dct):
     return {key: value for key, value in dct.items() if value}
 
@@ -60,8 +67,16 @@ def _create_custom_app_strings(app, lang, for_default=False, build_profile_id=No
             name = langcodes.get_name(lc) or lc
             if not name:
                 continue
-            with localize(convert_to_two_letter_code(lc)):
-                name = gettext(name)
+            letter_code = convert_to_two_letter_code(lc)
+
+            if letter_code in CUSTOM_LANGUAGE_NAMES.keys():
+                # These are languages not installed on our machines, so localize does not understand them.
+                # Though we don't want to install these langauges, we still want to support projects
+                # who want to see the name written properly.
+                name = CUSTOM_LANGUAGE_NAMES[letter_code]
+            else:
+                with localize(letter_code):
+                    name = gettext(name)
             yield lc, name
 
     yield id_strings.current_language(), lang
diff --git a/corehq/apps/app_manager/const.py b/corehq/apps/app_manager/const.py
index 172fbc6978d2..4784b2cf45d0 100644
--- a/corehq/apps/app_manager/const.py
+++ b/corehq/apps/app_manager/const.py
@@ -97,3 +97,9 @@
 CALCULATED_SORT_FIELD_RX = r'^_cc_calculated_(\d+)$'
 
 CASE_LIST_FILTER_LOCATIONS_FIXTURE = 'Locations Fixture'
+
+MOBILE_UCR_V1_FIXTURE_IDENTIFIER = 'src="jr://fixture/commcare:reports'
+MOBILE_UCR_V1_FIXTURE_PATTERN = r'<.*src="jr://fixture/commcare:reports.*>'
+MOBILE_UCR_V1_REFERENCES_PATTERN = r"<.*instance\('reports'\)/reports/.*>"
+MOBILE_UCR_V1_ALL_REFERENCES = f"{MOBILE_UCR_V1_FIXTURE_PATTERN}|{MOBILE_UCR_V1_REFERENCES_PATTERN}"
+MOBILE_UCR_V1_CASE_LIST_REFERENCES_PATTERN = r"instance\('commcare:reports'\)/reports/report\[@id='.*'\]/rows/row"
diff --git a/corehq/apps/app_manager/decorators.py b/corehq/apps/app_manager/decorators.py
index fd6d2a731fd6..c4d53265a5a8 100644
--- a/corehq/apps/app_manager/decorators.py
+++ b/corehq/apps/app_manager/decorators.py
@@ -114,7 +114,8 @@ def _safe_cached_download(request, *args, **kwargs):
             if not username:
                 content_response = dict(error="app.update.not.allowed.user.logged_out",
                                         default_response=_("Please log in to the app to check for an update."))
-                return HttpResponse(status=406, content=json.dumps(content_response))
+                return HttpResponse(status=406, content=json.dumps(content_response),
+                                    content_type='application/json')
         if latest and not target:
             latest_enabled_build = _get_latest_enabled_build(domain, username, app_id, request.GET.get('profile'),
                                                              location_flag_enabled)
diff --git a/corehq/apps/app_manager/fields.py b/corehq/apps/app_manager/fields.py
index 889a26a4f376..557876f07b09 100644
--- a/corehq/apps/app_manager/fields.py
+++ b/corehq/apps/app_manager/fields.py
@@ -15,9 +15,10 @@
 
 from corehq.apps.app_manager.analytics import get_exports_by_application
 from corehq.apps.app_manager.dbaccessors import get_app, get_apps_in_domain
+from corehq.apps.export.const import ALL_CASE_TYPE_EXPORT
+from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.registry.models import DataRegistry
 from corehq.apps.registry.utils import get_data_registry_dropdown_options
-from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.reports.analytics.esaccessors import get_case_types_for_domain
 from corehq.apps.userreports.app_manager.data_source_meta import (
     DATA_SOURCE_TYPE_CASE,
@@ -26,7 +27,6 @@
 )
 from corehq.apps.userreports.dbaccessors import get_datasources_for_domain
 from corehq.toggles import AGGREGATE_UCRS
-from corehq.apps.export.const import ALL_CASE_TYPE_EXPORT
 
 DataSource = collections.namedtuple('DataSource', ['application', 'source_type', 'source', 'registry_slug'])
 RMIDataChoice = collections.namedtuple('RMIDataChoice', ['id', 'text', 'data'])
@@ -285,8 +285,10 @@ class ApplicationDataRMIHelper(object):
     APP_TYPE_NONE = 'no_app'
     APP_TYPE_UNKNOWN = 'unknown'
 
-    def __init__(self, domain, user, as_dict=True):
+    def __init__(self, domain, project, user, as_dict=True):
         self.domain = domain
+        self.domain_object = project
+
         self.user = user
         self.as_dict = as_dict
         self.form_labels = AppFormRMIPlaceholder(
@@ -420,14 +422,16 @@ def _sort_key_form(form):
     def _all_forms(self):
         forms = []
         unknown_forms = []
-        for f in get_exports_by_form(self.domain):
+
+        for f in get_exports_by_form(self.domain, use_es=self.domain_object.exports_use_elasticsearch):
             form = f['value']
             if form.get('app_deleted') and not form.get('submissions'):
                 continue
             if 'app' in form:
                 form['has_app'] = True
                 forms.append(form)
-            else:
+            elif not self.domain_object.exports_use_elasticsearch:
+                # If the elasticsearch toggle is on, we don't care about forms without apps
                 app_id = f['key'][1] or ''
                 form['app'] = {
                     'id': app_id
diff --git a/corehq/apps/app_manager/models.py b/corehq/apps/app_manager/models.py
index c1d195048934..fb927c3f0014 100644
--- a/corehq/apps/app_manager/models.py
+++ b/corehq/apps/app_manager/models.py
@@ -4179,7 +4179,7 @@ def assert_app_v2(self):
     has_submissions = BooleanProperty(default=False)
 
     mobile_ucr_restore_version = StringProperty(
-        default=const.MOBILE_UCR_VERSION_1, choices=const.MOBILE_UCR_VERSIONS, required=False
+        default=const.MOBILE_UCR_VERSION_2, choices=const.MOBILE_UCR_VERSIONS, required=False
     )
     location_fixture_restore = StringProperty(
         default=const.DEFAULT_LOCATION_FIXTURE_OPTION, choices=const.LOCATION_FIXTURE_OPTIONS,
diff --git a/corehq/apps/app_manager/static/app_manager/js/download_async_modal.js b/corehq/apps/app_manager/static/app_manager/js/download_async_modal.js
index 5c9fa5947e8c..22df1b1fb255 100644
--- a/corehq/apps/app_manager/static/app_manager/js/download_async_modal.js
+++ b/corehq/apps/app_manager/static/app_manager/js/download_async_modal.js
@@ -1,4 +1,10 @@
-hqDefine('app_manager/js/download_async_modal', function () {
+hqDefine('app_manager/js/download_async_modal', [
+    'jquery',
+    'underscore',
+], function (
+    $,
+    _
+) {
     var asyncDownloader = function ($el) {
         "use strict";
         var self = {};
@@ -7,9 +13,9 @@ hqDefine('app_manager/js/download_async_modal', function () {
                              "If you see this repeatedly please report an issue.");
 
         self.$el = $el;
-        self.el_id = $el.attr("id");
-        self.$download_progress = self.$el.find("#" + self.el_id + "-download-progress");
-        self.$downloading = self.$el.find("#" + self.el_id + "-downloading");
+        self.elId = $el.attr("id");
+        self.$download_progress = self.$el.find("#" + self.elId + "-download-progress");
+        self.$downloading = self.$el.find("#" + self.elId + "-downloading");
 
         self.init = function () {
             self.download_in_progress = false;
@@ -40,29 +46,29 @@ hqDefine('app_manager/js/download_async_modal', function () {
             }
         };
 
-        self.updateProgress = function (progress_response) {
-            if (progress_response.trim().length) {
+        self.updateProgress = function (progressResponse) {
+            if (progressResponse.trim().length) {
                 self.$downloading.addClass("hide");
-                self.$download_progress.html(progress_response).removeClass("hide");
+                self.$download_progress.html(progressResponse).removeClass("hide");
             }
         };
 
-        self.isDone = function (progress_response) {
-            var ready_id = 'ready_' + self.download_poll_id,
-                error_id = 'error_' + self.download_poll_id;
-            return progress_response &&
-                progress_response.trim().length &&
-                _.any([ready_id, error_id], function (el_id) {
-                    return progress_response.indexOf(el_id) >= 0;
+        self.isDone = function (progressResponse) {
+            var readyId = 'ready_' + self.download_poll_id,
+                errorId = 'error_' + self.download_poll_id;
+            return progressResponse &&
+                progressResponse.trim().length &&
+                _.any([readyId, errorId], function (elId) {
+                    return progressResponse.indexOf(elId) >= 0;
                 });
         };
 
-        self.generateDownload = function (download_url, params) {
+        self.generateDownload = function (downloadUrl, params) {
             // prevent multiple calls
             if (!self.download_in_progress) {
                 self.download_in_progress = true;
                 $.ajax({
-                    url: download_url,
+                    url: downloadUrl,
                     type: "GET",
                     data: params,
                     dataType: "json",
diff --git a/corehq/apps/app_manager/static/app_manager/js/settings/commcare_settings.js b/corehq/apps/app_manager/static/app_manager/js/settings/commcare_settings.js
index b2096b295ac0..7171259f8030 100644
--- a/corehq/apps/app_manager/static/app_manager/js/settings/commcare_settings.js
+++ b/corehq/apps/app_manager/static/app_manager/js/settings/commcare_settings.js
@@ -522,13 +522,3 @@ hqDefine('app_manager/js/settings/commcare_settings', function () {
         CommcareSettings: CommcareSettings,
     };
 });
-
-ko.bindingHandlers.passwordSetter = {
-    init: function (element, valueAccessor) {
-        var observableValue = valueAccessor();
-        $(element).password_setter();
-        $(element).on('textchange change', function () {
-            observableValue($(element).val());
-        });
-    },
-};
diff --git a/corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js b/corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
deleted file mode 100644
index dc7489c4699e..000000000000
--- a/corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* jQuery extension for password reset widget. Only used by app settings. */
-
-$.fn.password_setter = function () {
-    var that = this,
-        randID = Math.floor(Math.random() * 1000),
-        password1ID = 'password-' + randID + '-1',
-        password2ID = 'password-' + randID + '-2',
-        $popupLink = $('<a/>').text(gettext("Reset")).attr({
-            href: '#password-setter',
-            'data-toggle': 'modal',
-        }),
-        $modal = $("#password-setter"),
-        $passwordRow = $modal.find(".password"),
-        $passwordInput = $passwordRow.find("input"),
-        $repeatRow = $modal.find(".repeat-password"),
-        $repeatInput = $repeatRow.find("input"),
-        $errorMismatch = $modal.find(".password-mismatch"),
-        $errorEmpty = $modal.find(".password-empty");
-
-    that.hide();
-    that.after($popupLink);
-    $popupLink.click(function () {
-        $passwordRow.find("input").focus();
-    });
-
-    $passwordRow.find("label").attr("for", password1ID);
-    $passwordInput.attr("id", password1ID);
-    $repeatRow.find("label").attr("for", password2ID);
-    $repeatInput.find("input").attr("id", password2ID);
-
-    $modal.find("button.save").click(function () {
-        $errorMismatch.addClass("hide");
-        $errorEmpty.addClass("hide");
-        if ($passwordInput.val() !== $repeatInput.val()) {
-            $errorMismatch.removeClass("hide");
-        } else if (!$passwordInput.val()) {
-            $errorEmpty.removeClass("hide");
-        } else {
-            $modal.modal('hide');
-            that.val($passwordInput.val()).trigger('textchange');
-        }
-    });
-};
diff --git a/corehq/apps/app_manager/static/app_manager/js/summary/case_summary.js b/corehq/apps/app_manager/static/app_manager/js/summary/case_summary.js
index 08e58ce564eb..83e440e9beff 100644
--- a/corehq/apps/app_manager/static/app_manager/js/summary/case_summary.js
+++ b/corehq/apps/app_manager/static/app_manager/js/summary/case_summary.js
@@ -7,7 +7,7 @@ hqDefine('app_manager/js/summary/case_summary',[
     'app_manager/js/summary/models',
     'app_manager/js/menu',  // enable lang switcher and "Updates to publish" banner
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // popover
-    'hqwebapp/js/bootstrap3/components.ko',    // search box
+    'hqwebapp/js/components/search_box',
 ], function ($, _, ko, initialPageData, assertProperties, models) {
 
     var caseTypeModel = function (caseType) {
diff --git a/corehq/apps/app_manager/static/app_manager/js/summary/form_diff.js b/corehq/apps/app_manager/static/app_manager/js/summary/form_diff.js
index a482d826b3de..186beac6c6ab 100644
--- a/corehq/apps/app_manager/static/app_manager/js/summary/form_diff.js
+++ b/corehq/apps/app_manager/static/app_manager/js/summary/form_diff.js
@@ -10,7 +10,7 @@ hqDefine('app_manager/js/summary/form_diff',[
     'hqwebapp/js/layout',
     'app_manager/js/menu',  // enable lang switcher and "Updates to publish" banner
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // popover
-    'hqwebapp/js/bootstrap3/components.ko',    // search box
+    'hqwebapp/js/components/search_box',
 ], function ($, _, ko, initialPageData, assertProperties, models, formModels, utils, layout) {
 
     $(function () {
diff --git a/corehq/apps/app_manager/static/app_manager/js/summary/form_summary.js b/corehq/apps/app_manager/static/app_manager/js/summary/form_summary.js
index d54e242a9b96..6dfadbacbcc9 100644
--- a/corehq/apps/app_manager/static/app_manager/js/summary/form_summary.js
+++ b/corehq/apps/app_manager/static/app_manager/js/summary/form_summary.js
@@ -9,7 +9,7 @@ hqDefine('app_manager/js/summary/form_summary',[
     'app_manager/js/summary/utils',
     'app_manager/js/menu',  // enable lang switcher and "Updates to publish" banner
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // popover
-    'hqwebapp/js/bootstrap3/components.ko',    // search box
+    'hqwebapp/js/components/search_box',
 ], function ($, _, ko, initialPageData, assertProperties, models, formModels, utils) {
     $(function () {
         var lang = initialPageData.get('lang'),
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/README.md b/corehq/apps/app_manager/static/app_manager/js/vellum/README.md
index a15c93dc2b99..4bf32d4ce7b8 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/README.md
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/README.md
@@ -83,7 +83,7 @@ If not present, bundled versions will be loaded.  -->
 ```
 
 See
-[here](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/app_manager/templates/app_manager/v1/form_designer.html)
+[here](https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/app_manager/static/app_manager/js/forms/form_designer.js)
 and `tests/main.js` for example options usage.
 
 Vellum targets modern browsers.  IE8 and earlier are not supported.
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/manifest.txt b/corehq/apps/app_manager/static/app_manager/js/vellum/manifest.txt
index 2ce6363d9f47..2cf1be72d0b6 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/manifest.txt
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/manifest.txt
@@ -87,8 +87,8 @@
 ├─ brace-expansion@1.1.11
 │  ├─ balanced-match@^1.0.0
 │  └─ concat-map@0.0.1
-├─ braces@3.0.2
-│  └─ fill-range@^7.0.1
+├─ braces@3.0.3
+│  └─ fill-range@^7.1.1
 ├─ browser-stdout@1.3.1
 ├─ buffer-crc32@0.2.13
 ├─ buffer@5.7.1
@@ -230,7 +230,7 @@
 │  └─ websocket-driver@>=0.5.1
 ├─ fd-slicer@1.1.0
 │  └─ pend@~1.2.0
-├─ fill-range@7.0.1
+├─ fill-range@7.1.1
 │  └─ to-regex-range@^5.0.1
 ├─ finalhandler@1.1.2
 │  ├─ debug@2.6.9
@@ -259,7 +259,7 @@
 │  └─ parse-filepath@^1.0.1
 ├─ flagged-respawn@1.0.1
 ├─ flat@5.0.2
-├─ follow-redirects@1.15.5
+├─ follow-redirects@1.15.6
 ├─ for-in@1.0.2
 ├─ for-own@1.0.0
 │  └─ for-in@^1.0.1
@@ -571,7 +571,6 @@
 │  └─ uc.micro@^1.0.5
 ├─ mdn-data@2.0.14
 ├─ mdurl@1.0.1
-├─ MediaUploader@0.0.0
 ├─ micromatch@4.0.4
 │  ├─ braces@^3.0.1
 │  ├─ picomatch@^2.2.3
@@ -793,7 +792,7 @@
 │  ├─ requirejs@2.3.3
 │  ├─ requirejs@2.3.3
 │  └─ underscore@^1.8.3
-├─ requirejs@2.3.6
+├─ requirejs@2.3.7
 ├─ requires-port@1.0.0
 ├─ resolve-dir@1.0.1
 │  ├─ expand-tilde@^2.0.0
@@ -978,7 +977,7 @@
 │  ├─ string-width@^4.1.0
 │  └─ strip-ansi@^6.0.0
 ├─ wrappy@1.0.2
-├─ ws@5.2.3
+├─ ws@5.2.4
 │  └─ async-limiter@~1.0.0
 ├─ XMLWriter@1.1.0
 ├─ xpath@0.0.8
@@ -1006,4 +1005,4 @@
 │  ├─ buffer-crc32@~0.2.3
 │  └─ fd-slicer@~1.1.0
 └─ yocto-queue@0.1.0
-Done in 0.29s.
+Done in 0.12s.
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/src/local-deps.js b/corehq/apps/app_manager/static/app_manager/js/vellum/src/local-deps.js
index c7bfadcc3461..e5f6bf3e8135 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/src/local-deps.js
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/src/local-deps.js
@@ -16,4 +16,4 @@ n=r.y+s[0]<a?-s[0]:r.y-s[2]>l.height-n.height-a?l.height-n.height+s[2]:r.y,d=Mat
 var s=!0===o[a](t);i=r==CKEDITOR.VALIDATE_AND?i&&s:i||s}return!!i||n}},regex:function(e,t){return this.functions(function(t){return e.test(t)},t)},notEmpty:function(e){return this.functions(function(e){return 0<e.replace(RegExp("^[\\u0020\\u00a0\\u1680\\u202f\\u205f\\u3000\\u2000-\\u200a\\s]+|[\\u0020\\u00a0\\u1680\\u202f\\u205f\\u3000\\u2000-\\u200a\\s]+$","g"),"").length},e)},integer:function(t){return this.regex(e,t)},number:function(e){return this.regex(t,e)},cssLength:function(e){return this.functions(function(e){return i.test(CKEDITOR.tools.trim(e))},e)},htmlLength:function(e){return this.functions(function(e){return n.test(CKEDITOR.tools.trim(e))},e)},inlineStyle:function(e){return this.functions(function(e){return e=CKEDITOR.tools.trim(e).split(";"),""===e[e.length-1]&&e.pop(),CKEDITOR.tools.array.every(e,function(e){return r.test(CKEDITOR.tools.trim(e))})},e)},equals:function(e,t){return this.functions(function(t){return t==e},t)},notEqual:function(e,t){return this.functions(function(t){return t!=e},t)}},CKEDITOR.on("instanceDestroyed",function(e){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var t;t=CKEDITOR.dialog._.currentTop;)t.hide();for(var n in x)x[n].remove();x={}}e=e.editor._.storedDialogs;for(var i in e)e[i].destroy()})}(),CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(e,t,n){var i=null,r=CKEDITOR.dialog._.dialogDefinitions[e];if(null===CKEDITOR.dialog._.currentTop&&p(this),"function"==typeof r)r=this._.storedDialogs||(this._.storedDialogs={}),i=r[e]||(r[e]=new CKEDITOR.dialog(this,e)),i.setModel(n),t&&t.call(i,i),i.show();else{if("failed"==r)throw m(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+e+'" failed when loading definition.');"string"==typeof r&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(r),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[e]&&(CKEDITOR.dialog._.dialogDefinitions[e]="failed"),this.openDialog(e,t,n)},this,0,1)}return CKEDITOR.skin.loadPart("dialog"),i&&i.once("hide",function(){i.setModel(null)},null,null,999),i}}),CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(e){b||(CKEDITOR.document.appendStyleSheet(this.path+"styles/dialog.css"),b=!0),e.on("doubleclick",function(t){t.data.dialog&&e.openDialog(t.data.dialog)},null,null,999)}})}(),function(){function e(e,t){CKEDITOR.tools.extend(this,t,{editor:e,id:"cke-"+CKEDITOR.tools.getUniqueId(),area:e._.notificationArea}),t.type||(this.type="info"),this.element=this._createElement(),e.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(this.element)}function t(e){var t=this;this.editor=e,this.notifications=[],this.element=this._createElement(),this._uiBuffer=CKEDITOR.tools.eventsBuffer(10,this._layout,this),this._changeBuffer=CKEDITOR.tools.eventsBuffer(500,this._layout,this),e.on("destroy",function(){t._removeListeners(),t.element.remove()})}CKEDITOR.plugins.add("notification",{init:function(e){function n(e){var t=new CKEDITOR.dom.element("div");t.setStyles({position:"fixed","margin-left":"-9999px"}),t.setAttributes({"aria-live":"assertive","aria-atomic":"true"}),t.setText(e),CKEDITOR.document.getBody().append(t),setTimeout(function(){t.remove()},100)}e._.notificationArea=new t(e),e.showNotification=function(t,n,i){var r,o;return"progress"==n?r=i:o=i,t=new CKEDITOR.plugins.notification(e,{message:t,type:n,progress:r,duration:o}),t.show(),t},e.on("key",function(t){if(27==t.data.keyCode){var i=e._.notificationArea.notifications;i.length&&(n(e.lang.notification.closed),i[i.length-1].hide(),t.cancel())}})}}),e.prototype={show:function(){!1!==this.editor.fire("notificationShow",{notification:this})&&(this.area.add(this),this._hideAfterTimeout())},update:function(e){var t=!0;!1===this.editor.fire("notificationUpdate",{notification:this,options:e})&&(t=!1);var n=this.element,i=n.findOne(".cke_notification_message"),r=n.findOne(".cke_notification_progress"),o=e.type;n.removeAttribute("role"),e.progress&&"progress"!=this.type&&(o="progress"),o&&(n.removeClass(this._getClass()),n.removeAttribute("aria-label"),this.type=o,n.addClass(this._getClass()),n.setAttribute("aria-label",this.type),"progress"!=this.type||r?"progress"!=this.type&&r&&r.remove():(r=this._createProgressElement(),r.insertBefore(i))),void 0!==e.message&&(this.message=e.message,i.setHtml(this.message)),void 0!==e.progress&&(this.progress=e.progress,r&&r.setStyle("width",this._getPercentageProgress())),t&&e.important&&(n.setAttribute("role","alert"),this.isVisible()||this.area.add(this)),this.duration=e.duration,this._hideAfterTimeout()},hide:function(){!1!==this.editor.fire("notificationHide",{notification:this})&&this.area.remove(this)},isVisible:function(){return 0<=CKEDITOR.tools.indexOf(this.area.notifications,this)},_createElement:function(){var e,t,n=this,i=this.editor.lang.common.close;return e=new CKEDITOR.dom.element("div"),e.addClass("cke_notification"),e.addClass(this._getClass()),e.setAttributes({id:this.id,role:"alert","aria-label":this.type}),"progress"==this.type&&e.append(this._createProgressElement()),t=new CKEDITOR.dom.element("p"),t.addClass("cke_notification_message"),t.setHtml(this.message),e.append(t),t=CKEDITOR.dom.element.createFromHtml('<a class="cke_notification_close" href="javascript:void(0)" title="'+i+'" role="button" tabindex="-1"><span class="cke_label">X</span></a>'),e.append(t),t.on("click",function(){n.editor.focus(),n.hide()}),e},_getClass:function(){return"progress"==this.type?"cke_notification_info":"cke_notification_"+this.type},_createProgressElement:function(){var e=new CKEDITOR.dom.element("span");return e.addClass("cke_notification_progress"),e.setStyle("width",this._getPercentageProgress()),e},_getPercentageProgress:function(){return Math.round(100*(this.progress||0))+"%"},_hideAfterTimeout:function(){var e,t=this;this._hideTimeoutId&&clearTimeout(this._hideTimeoutId),"number"==typeof this.duration?e=this.duration:"info"!=this.type&&"success"!=this.type||(e="number"==typeof this.editor.config.notification_duration?this.editor.config.notification_duration:5e3),e&&(t._hideTimeoutId=setTimeout(function(){t.hide()},e))}},t.prototype={add:function(e){this.notifications.push(e),this.element.append(e.element),1==this.element.getChildCount()&&(CKEDITOR.document.getBody().append(this.element),this._attachListeners()),this._layout()},remove:function(e){var t=CKEDITOR.tools.indexOf(this.notifications,e);0>t||(this.notifications.splice(t,1),e.element.remove(),this.element.getChildCount()||(this._removeListeners(),this.element.remove()))},_createElement:function(){var e=this.editor,t=e.config,n=new CKEDITOR.dom.element("div");return n.addClass("cke_notifications_area"),n.setAttribute("id","cke_notifications_area_"+e.name),n.setStyle("z-index",t.baseFloatZIndex-2),n},_attachListeners:function(){var e=CKEDITOR.document.getWindow(),t=this.editor;e.on("scroll",this._uiBuffer.input),e.on("resize",this._uiBuffer.input),t.on("change",this._changeBuffer.input),t.on("floatingSpaceLayout",this._layout,this,null,20),t.on("blur",this._layout,this,null,20)},_removeListeners:function(){var e=CKEDITOR.document.getWindow(),t=this.editor;e.removeListener("scroll",this._uiBuffer.input),e.removeListener("resize",this._uiBuffer.input),t.removeListener("change",this._changeBuffer.input),t.removeListener("floatingSpaceLayout",this._layout),t.removeListener("blur",this._layout)},_layout:function(){function e(){r.setStyle("left",p(m+a.width-d-c))}var t,n,i,r=this.element,o=this.editor,a=o.ui.contentsElement.getClientRect(),s=o.ui.contentsElement.getDocumentPosition(),l=r.getClientRect(),d=this._notificationWidth,c=this._notificationMargin;i=CKEDITOR.document.getWindow();var h=i.getScrollPosition(),u=i.getViewPaneSize(),f=CKEDITOR.document.getBody(),g=f.getDocumentPosition(),p=CKEDITOR.tools.cssLength;d&&c||(i=this.element.getChild(0),d=this._notificationWidth=i.getClientRect().width,c=this._notificationMargin=parseInt(i.getComputedStyle("margin-left"),10)+parseInt(i.getComputedStyle("margin-right"),10)),o.toolbar&&(t=o.ui.space(o.config.toolbarLocation),n=t.getClientRect()),t&&t.isVisible()&&n.bottom>a.top&&n.bottom<a.bottom-l.height?r.setStyles({position:"fixed",top:p(n.bottom)}):0<a.top?r.setStyles({position:"absolute",top:p(s.y)}):s.y+a.height-l.height>h.y?r.setStyles({position:"fixed",top:0}):r.setStyles({position:"absolute",top:p(s.y+a.height-l.height)});var m="fixed"==r.getStyle("position")?a.left:"static"!=f.getComputedStyle("position")?s.x-g.x:s.x;a.width<d+c?s.x+d+c>h.x+u.width?e():r.setStyle("left",p(m)):s.x+d+c>h.x+u.width?r.setStyle("left",p(m)):s.x+a.width/2+d/2+c>h.x+u.width?r.setStyle("left",p(m-s.x+h.x+u.width-d-c)):0>a.left+a.width-d-c?e():0>a.left+a.width/2-d/2?r.setStyle("left",p(m-s.x+h.x)):r.setStyle("left",p(m+a.width/2-d/2-c/2))}},CKEDITOR.plugins.notification=e}(),function(){var e='<a id="{id}" class="cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href=\"javascript:void('{titleJs}')\"")+' title="{title}" tabindex="-1" hidefocus="true" role="button" aria-labelledby="{id}_label" aria-describedby="{id}_description" aria-haspopup="{hasArrow}" aria-disabled="{ariaDisabled}"{hasArrowAriaHtml}{toggleAriaHtml}';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(e+=' onkeypress="return false;"'),CKEDITOR.env.gecko&&(e+=' onblur="this.style.cssText = this.style.cssText;"');var t="";CKEDITOR.env.ie&&(t='return false;" onmouseup="CKEDITOR.tools.getMouseButton(event)==CKEDITOR.MOUSE_BUTTON_LEFT&&');var e=e+' onkeydown="return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus="return CKEDITOR.tools.callFunction({focusFn},event);" onclick="'+t+'CKEDITOR.tools.callFunction({clickFn},this);return false;"><span class="cke_button_icon cke_button__{iconName}_icon" style="{style}">&nbsp;</span><span id="{id}_label" class="cke_button_label cke_button__{name}_label" aria-hidden="false">{label}</span><span id="{id}_description" class="cke_button_label" aria-hidden="false">{ariaShortcutSpace}{ariaShortcut}</span>{arrowHtml}</a>',n=CKEDITOR.addTemplate("buttonArrow",'<span class="cke_button_arrow">'+(CKEDITOR.env.hc?"&#9660;":"")+"</span>"),i=CKEDITOR.addTemplate("button",e);CKEDITOR.plugins.add("button",{beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}}),CKEDITOR.UI_BUTTON="button",CKEDITOR.ui.button=function(e){CKEDITOR.tools.extend(this,e,{isToggle:e.isToggle||!1,title:e.label,click:e.click||function(t){t.execCommand(e.command)}}),this._={}},CKEDITOR.ui.button.handler={create:function(e){return new CKEDITOR.ui.button(e)}},CKEDITOR.ui.button.prototype={render:function(e,t){function r(){var t=e.mode;t&&(t=this.modes[t]?void 0!==l[t]?l[t]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,t=e.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:t,this.setState(t),this.refresh&&this.refresh())}var o,a,s,l=null,d=CKEDITOR.env,c=this._.id=CKEDITOR.tools.getNextId(),h="",u=this.command;this._.editor=e;var f={id:c,button:this,editor:e,focus:function(){CKEDITOR.document.getById(c).focus()},execute:function(){this.button.click(e)},attach:function(e){this.button.attach(e)}},g=CKEDITOR.tools.addFunction(function(e){if(f.onkey)return e=new CKEDITOR.dom.event(e),!1!==f.onkey(f,e.getKeystroke())}),p=CKEDITOR.tools.addFunction(function(e){var t;return f.onfocus&&(t=!1!==f.onfocus(f,new CKEDITOR.dom.event(e))),t}),m=0;f.clickFn=o=CKEDITOR.tools.addFunction(function(){m&&(e.unlockSelection(1),m=0),f.execute(),d.iOS&&e.focus()}),this.modes?(l={},e.on("beforeModeUnload",function(){e.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(l[e.mode]=this._.state)},this),e.on("activeFilterChange",r,this),e.on("mode",r,this),!this.readOnly&&e.on("readOnly",r,this)):u&&(u=e.getCommand(u))&&(u.on("state",function(){this.setState(u.state)},this),h+=u.state==CKEDITOR.TRISTATE_ON?"on":u.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");var E;this.directional&&e.on("contentDirChanged",function(t){var n=CKEDITOR.document.getById(this._.id),i=n.getFirst();t=t.data,t!=e.lang.dir?n.addClass("cke_"+t):n.removeClass("cke_ltr").removeClass("cke_rtl"),i.setAttribute("style",CKEDITOR.skin.getIconStyle(E,"rtl"==t,this.icon,this.iconOffset))},this),u?(a=e.getCommandKeystroke(u))&&(s=CKEDITOR.tools.keystrokeToString(e.lang.common.keyboard,a)):h+="off",a=this.name||this.command;var _=null,T=this.icon;return E=a,this.icon&&!/\./.test(this.icon)?(E=this.icon,T=null):(this.icon&&(_=this.icon),CKEDITOR.env.hidpi&&this.iconHiDpi&&(_=this.iconHiDpi)),_?(CKEDITOR.skin.addIcon(_,_),T=null):_=E,h={id:c,name:a,iconName:E,label:this.label,cls:(this.hasArrow?"cke_button_expandable ":"")+(this.className||""),state:h,ariaDisabled:"disabled"==h?"true":"false",title:this.title+(s?" ("+s.display+")":""),ariaShortcutSpace:s?"&nbsp;":"",ariaShortcut:s?e.lang.common.keyboardShortcut+" "+s.aria:"",titleJs:d.gecko&&!d.hc?"":(this.title||"").replace("'",""),hasArrow:"string"==typeof this.hasArrow&&this.hasArrow||(this.hasArrow?"true":"false"),keydownFn:g,focusFn:p,clickFn:o,style:CKEDITOR.skin.getIconStyle(_,"rtl"==e.lang.dir,T,this.iconOffset),arrowHtml:this.hasArrow?n.output():"",hasArrowAriaHtml:this.hasArrow?' aria-expanded="false"':"",toggleAriaHtml:this.isToggle?'aria-pressed="false"':""},i.output(h,t),this.onRender&&this.onRender(),f},setState:function(e){if(this._.state==e)return!1;this._.state=e;var t=CKEDITOR.document.getById(this._.id);return!!t&&(t.setState(e,"cke_button"),t.setAttribute("aria-disabled",e==CKEDITOR.TRISTATE_DISABLED),this.isToggle&&!this.hasArrow&&t.setAttribute("aria-pressed",e===CKEDITOR.TRISTATE_ON),!0)},getState:function(){return this._.state},toFeature:function(e){if(this._.feature)return this._.feature;var t=this;return this.allowedContent||this.requiredContent||!this.command||(t=e.getCommand(this.command)||t),this._.feature=t}},CKEDITOR.ui.prototype.addButton=function(e,t){this.add(e,CKEDITOR.UI_BUTTON,t)}}(),function(){function e(e){function n(){var t,n,i,r={};for(t in e.ui.items)n=e.ui.items[t],i=n.toolbar||"others",i=i.split(","),n=i[0],i=parseInt(i[1]||-1,10),r[n]||(r[n]=[]),r[n].push({name:t,order:i});for(n in r)r[n]=r[n].sort(function(e,t){return e.order==t.order?0:0>t.order?-1:0>e.order?1:e.order<t.order?-1:1});return r}function i(t,n){if(n.length){t.items?t.items.push(e.ui.create("-")):t.items=[];for(var i;i=n.shift();)i="string"==typeof i?i:i.name,r&&-1!=CKEDITOR.tools.indexOf(r,i)||(i=e.ui.create(i))&&e.addFeature(i)&&t.items.push(i)}}var r=function(e){return e&&"string"==typeof e?e.split(","):e}(e.config.removeButtons),o=e.config.toolbar;return"string"==typeof o&&(o=e.config["toolbar_"+o]),e.toolbar=o?function(e){var t,n,r,o=[];for(t=0;t<e.length;++t)n=e[t],r={},"/"==n?o.push(n):CKEDITOR.tools.isArray(n)?(i(r,CKEDITOR.tools.clone(n)),o.push(r)):n.items&&(i(r,CKEDITOR.tools.clone(n.items)),r.name=n.name,o.push(r));return o}(o):function(){for(var r=n(),o=CKEDITOR.tools.clone(e.config.toolbarGroups)||t(e),a=0;a<o.length;a++){var s=o[a];if("/"!=s){"string"==typeof s&&(s=o[a]={name:s});var l,d=s.groups;if(d)for(var c=0;c<d.length;c++)l=d[c],(l=r[l])&&i(s,l);(l=r[s.name])&&i(s,l)}}return o}()}function t(e){return e._.toolbarGroups||(e._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list","indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},{name:"about"}])}var n=function(){this.toolbars=[]};n.prototype.focus=function(){for(var e,t=0;e=this.toolbars[t++];)for(var n,i=0;n=e.items[i++];)if(n.focus)return void n.focus()};var i={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(e){e.toolbox&&(CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){e.toolbox.focus()},100):e.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(t){var r,o=function(e,n){var i,a="rtl"==t.lang.dir,s=t.config.toolbarGroupCycling,l=a?37:39,a=a?39:37,s=void 0===s||s;switch(n){case 9:case CKEDITOR.SHIFT+9:for(;!i||!i.items.length;)if(i=9==n?(i?i.next:e.toolbar.next)||t.toolbox.toolbars[0]:(i?i.previous:e.toolbar.previous)||t.toolbox.toolbars[t.toolbox.toolbars.length-1],i.items.length)for(e=i.items[r?i.items.length-1:0];e&&!e.focus;)(e=r?e.previous:e.next)||(i=0);return e&&e.focus(),!1;case l:i=e;do{!(i=i.next)&&s&&(i=e.toolbar.items[0])}while(i&&!i.focus);return i?i.focus():o(e,9),!1;case 40:return e.button&&e.button.hasArrow?e.execute():o(e,40==n?l:a),!1;case a:case 38:i=e;do{!(i=i.previous)&&s&&(i=e.toolbar.items[e.toolbar.items.length-1])}while(i&&!i.focus);return i?i.focus():(r=1,o(e,CKEDITOR.SHIFT+9),r=0),!1;case 27:return t.focus(),!1;case 13:case 32:return e.execute(),!1;case CKEDITOR.ALT+122:return t.execCommand("elementsPathFocus"),!1}return!0};t.on("uiSpace",function(i){if(i.data.space==t.config.toolbarLocation){i.removeListener(),t.toolbox=new n;var r,a,s=CKEDITOR.tools.getNextId(),l=['<span id="',s,'" class="cke_voice_label">',t.lang.toolbar.toolbars,"</span>",'<span id="'+t.ui.spaceId("toolbox")+'" class="cke_toolbox" role="group" aria-labelledby="',s,'" onmousedown="return false;">'],s=!1!==t.config.toolbarStartupExpanded;t.config.toolbarCanCollapse&&t.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&l.push('<span class="cke_toolbox_main"'+(s?">":' style="display:none">'));for(var d=t.toolbox.toolbars,c=e(t),h=c.length,u=0;u<h;u++){var f,g,p,m=0,E=c[u],_="/"!==E&&("/"===c[u+1]||u==h-1);if(E)if(r&&(l.push("</span>"),a=r=0),"/"===E)l.push('<span class="cke_toolbar_break"></span>');else{p=E.items||E;for(var T=0;T<p.length;T++){var C,v=p[T];if(v){var O=function(e){e=e.render(t,l),I=m.items.push(e)-1,0<I&&(e.previous=m.items[I-1],e.previous.next=e),e.toolbar=m,e.onkey=o};if(v.type==CKEDITOR.UI_SEPARATOR)a=r&&v;else{if(C=!1!==v.canGroup,!m){f=CKEDITOR.tools.getNextId(),m={id:f,items:[]},g=E.name&&(t.lang.toolbar.toolbarGroups[E.name]||E.name),l.push('<span id="',f,'" class="cke_toolbar'+(_?' cke_toolbar_last"':'"'),g?' aria-labelledby="'+f+'_label"':"",' role="toolbar">'),g&&l.push('<span id="',f,'_label" class="cke_voice_label">',g,"</span>"),l.push('<span class="cke_toolbar_start"></span>');var I=d.push(m)-1;0<I&&(m.previous=d[I-1],m.previous.next=m)}C?r||(l.push('<span class="cke_toolgroup" role="presentation">'),r=1):r&&(l.push("</span>"),r=0),a&&(O(a),a=0),O(v)}}}r&&(l.push("</span>"),a=r=0),m&&l.push('<span class="cke_toolbar_end"></span></span>')}}if(t.config.toolbarCanCollapse&&l.push("</span>"),t.config.toolbarCanCollapse&&t.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var D=CKEDITOR.tools.addFunction(function(){t.execCommand("toolbarCollapse")});t.on("destroy",function(){CKEDITOR.tools.removeFunction(D)}),t.addCommand("toolbarCollapse",{readOnly:1,exec:function(e){var t=e.ui.space("toolbar_collapser"),n=t.getPrevious(),i=e.ui.space("contents"),r=n.getParent(),o=parseInt(i.$.style.height,10),a=r.$.offsetHeight,s=t.hasClass("cke_toolbox_collapser_min");s?(n.show(),t.removeClass("cke_toolbox_collapser_min"),t.setAttribute("title",e.lang.toolbar.toolbarCollapse)):(n.hide(),t.addClass("cke_toolbox_collapser_min"),t.setAttribute("title",e.lang.toolbar.toolbarExpand)),t.getFirst().setText(s?"\u25b2":"\u25c0"),i.setStyle("height",o-(r.$.offsetHeight-a)+"px"),e.fire("resize",{outerHeight:e.container.$.offsetHeight,contentsHeight:i.$.offsetHeight,outerWidth:e.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}}),t.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse"),l.push('<a title="'+(s?t.lang.toolbar.toolbarCollapse:t.lang.toolbar.toolbarExpand)+'" id="'+t.ui.spaceId("toolbar_collapser")+'" tabIndex="-1" class="cke_toolbox_collapser'),s||l.push(" cke_toolbox_collapser_min"),l.push('" onclick="CKEDITOR.tools.callFunction('+D+')">','<span class="cke_arrow">&#9650;</span>',"</a>")}l.push("</span>"),i.data.html+=l.join("")}}),t.on("destroy",function(){if(this.toolbox){var e,t,n,i,r=0;for(e=this.toolbox.toolbars;r<e.length;r++)for(n=e[r].items,t=0;t<n.length;t++)i=n[t],i.clickFn&&CKEDITOR.tools.removeFunction(i.clickFn),i.keyDownFn&&CKEDITOR.tools.removeFunction(i.keyDownFn)}}),t.on("uiReady",function(){var e=t.ui.space("toolbox");e&&t.focusManager.add(e,1)}),t.addCommand("toolbarFocus",i),t.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus"),t.ui.add("-",CKEDITOR.UI_SEPARATOR,{}),t.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(e,t){return t.push('<span class="cke_toolbar_separator" role="separator"></span>'),{}}}}})}}),CKEDITOR.ui.prototype.addToolbarGroup=function(e,n,i){var r=t(this.editor),o=0===n,a={name:e};if(i){if(i=CKEDITOR.tools.search(r,function(e){return e.name==i}))return!i.groups&&(i.groups=[]),n&&0<=(n=CKEDITOR.tools.indexOf(i.groups,n))?void i.groups.splice(n+1,0,e):void(o?i.groups.splice(0,0,e):i.groups.push(e));n=null}n&&(n=CKEDITOR.tools.indexOf(r,function(e){return e.name==n})),o?r.splice(0,0,e):"number"==typeof n?r.splice(n+1,0,a):r.push(e)}}(),CKEDITOR.UI_SEPARATOR="separator",CKEDITOR.config.toolbarLocation="top",function(){function e(e,t,n){return t.type||(t.type="auto"),!(n&&!1===e.fire("beforePaste",t)||!t.dataValue&&t.dataTransfer.isEmpty())&&(t.dataValue||(t.dataValue=""),CKEDITOR.env.gecko&&"drop"==t.method&&e.toolbox&&e.once("afterPaste",function(){e.toolbox.focus(),e.focus()}),e.fire("paste",t))}function t(t){function n(){var e=t.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var n=function(e){t.getSelection().isCollapsed()||(t.readOnly&&"cut"==e.name||p.initPasteDataTransfer(e,t),e.data.preventDefault())};e.on("copy",n),e.on("cut",n),e.on("cut",function(){t.readOnly||t.extractSelectedHtml()},null,null,999)}e.on(p.mainPasteEvent,function(e){"beforepaste"==p.mainPasteEvent&&m||u(e)}),"beforepaste"==p.mainPasteEvent&&(e.on("paste",function(e){E||(o(),e.data.preventDefault(),u(e),s("paste"))}),e.on("contextmenu",a,null,null,0),e.on("beforepaste",function(e){!e.data||e.data.$.ctrlKey||e.data.$.shiftKey||a()},null,null,0)),e.on("beforecut",function(){!m&&l()});var i;e.attachListener(CKEDITOR.env.ie?e:t.document.getDocumentElement(),"mouseup",function(){i=setTimeout(f,0)}),t.on("destroy",function(){clearTimeout(i)}),e.on("keyup",f)}function i(e){return{type:e,canUndo:"cut"==e,startDisabled:!0,fakeKeystroke:"cut"==e?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&l();var e,n=this.type;if(CKEDITOR.env.ie)e=s(n);else try{e=t.document.$.execCommand(n,!1,null)}catch(t){e=!1}return e||t.showNotification(t.lang.clipboard[this.type+"Error"]),e}}}function r(){return{canUndo:!1,async:!0,fakeKeystroke:CKEDITOR.CTRL+86,exec:function(t,n){function i(n,i){i=void 0===i||i,n?(n.method="paste",n.dataTransfer||(n.dataTransfer=p.initPasteDataTransfer()),e(t,n,i)):o&&!t._.forcePasteDialog&&t.showNotification(l,"info",t.config.clipboard_notificationDuration),t._.forcePasteDialog=!1,t.fire("afterCommandExec",{name:"paste",command:r,returnValue:!!n})}n=void 0!==n&&null!==n?n:{};var r=this,o=void 0===n.notification||n.notification,a=n.type,s=CKEDITOR.tools.keystrokeToString(t.lang.common.keyboard,t.getCommandKeystroke(this)),l="string"==typeof o?o:t.lang.clipboard.pasteNotification.replace(/%1/,'<kbd aria-label="'+s.aria+'">'+s.display+"</kbd>"),s="string"==typeof n?n:n.dataValue;a&&!0!==t.config.forcePasteAsPlainText&&"allow-word"!==t.config.forcePasteAsPlainText?t._.nextPasteType=a:delete t._.nextPasteType,"string"==typeof s?i({dataValue:s}):t.getClipboardData(i)}}}function o(){E=1,setTimeout(function(){E=0},100)}function a(){m=1,setTimeout(function(){m=0},10)}function s(e){var n=t.document,i=n.getBody(),r=!1,o=function(){r=!0};return i.on(e,o),7<CKEDITOR.env.version?n.$.execCommand(e):n.$.selection.createRange().execCommand(e),i.removeListener(e,o),r}function l(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var e,n,i,r=t.getSelection();r.getType()==CKEDITOR.SELECTION_ELEMENT&&(e=r.getSelectedElement())&&(n=r.getRanges()[0],i=t.document.createText(""),i.insertBefore(e),n.setStartBefore(i),n.setEndAfter(e),r.selectRanges([n]),setTimeout(function(){e.getParent()&&(i.remove(),r.selectElement(e))},0))}}function d(e,n){var i,r=t.document,o=t.editable(),a=function(e){e.cancel()};if(!r.getById("cke_pastebin")){var s=t.getSelection(),l=s.createBookmarks();CKEDITOR.env.ie&&s.root.fire("selectionchange");var d=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!o.is("body")||CKEDITOR.env.ie?"div":"body",r);d.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var c=0,r=r.getWindow();CKEDITOR.env.webkit?(o.append(d),d.addClass("cke_editable"),o.is("body")||(c="static"!=o.getComputedStyle("position")?o:CKEDITOR.dom.element.get(o.$.offsetParent),c=c.getDocumentPosition().y)):o.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(d),d.setStyles({position:"absolute",top:r.getScrollPosition().y-c+10+"px",width:"1px",height:Math.max(1,r.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0}),CKEDITOR.env.safari&&d.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text")),(c=d.getParent().isReadOnly())?(d.setOpacity(0),d.setAttribute("contenteditable",!0)):d.setStyle("ltr"==t.config.contentsLangDirection?"left":"right","-10000px"),t.on("selectionChange",a,null,null,0),(CKEDITOR.env.webkit||CKEDITOR.env.gecko)&&(i=o.once("blur",a,null,null,-100)),c&&d.focus(),c=new CKEDITOR.dom.range(d),c.selectNodeContents(d);var h=c.select();CKEDITOR.env.ie&&(i=o.once("blur",function(){t.lockSelection(h)}));var u=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=u),i&&i.removeListener(),CKEDITOR.env.ie&&o.focus(),s.selectBookmarks(l),d.remove();var e;CKEDITOR.env.webkit&&(e=d.getFirst())&&e.is&&e.hasClass("Apple-style-span")&&(d=e),t.removeListener("selectionChange",a),n(d.getHtml())},0)}}function c(){if("paste"==p.mainPasteEvent)return t.fire("beforePaste",{type:"auto",method:"paste"}),!1;t.focus(),o();var e=t.focusManager;return e.lock(),t.editable().fire(p.mainPasteEvent)&&!s("paste")?(e.unlock(),!1):(e.unlock(),!0)}function h(e){if("wysiwyg"==t.mode)switch(e.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:e=t.editable(),o(),"paste"==p.mainPasteEvent&&e.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:t.fire("saveSnapshot"),setTimeout(function(){t.fire("saveSnapshot")},50)}}function u(n){var i={type:"auto",method:"paste",dataTransfer:p.initPasteDataTransfer(n)};i.dataTransfer.cacheData();var r=!1!==t.fire("beforePaste",i);r&&p.canClipboardApiBeTrusted(i.dataTransfer,t)?(n.data.preventDefault(),setTimeout(function(){e(t,i)},0)):d(n,function(n){i.dataValue=n.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/gi,""),r&&e(t,i)})}function f(){if("wysiwyg"==t.mode){var e=g("paste");t.getCommand("cut").setState(g("cut")),t.getCommand("copy").setState(g("copy")),t.getCommand("paste").setState(e),t.fire("pasteState",e)}}function g(e){var n=t.getSelection(),n=n&&n.getRanges()[0];return(t.readOnly||n&&n.checkReadOnly())&&e in{paste:1,cut:1}?CKEDITOR.TRISTATE_DISABLED:"paste"==e?CKEDITOR.TRISTATE_OFF:(e=t.getSelection(),n=e.getRanges(),e.getType()==CKEDITOR.SELECTION_NONE||1==n.length&&n[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF)}var p=CKEDITOR.plugins.clipboard,m=0,E=0;!function(){if(t.on("key",h),t.on("contentDom",n),t.on("selectionChange",f),t.contextMenu){t.contextMenu.addListener(function(){return{cut:g("cut"),copy:g("copy"),paste:g("paste")}});var e=null;t.on("menuShow",function(){e&&(e.removeListener(),e=null);var n=t.contextMenu.findItemByCommandName("paste");n&&n.element&&(e=n.element.on("touchend",function(){t._.forcePasteDialog=!0}))})}t.ui.addButton&&t.once("instanceReady",function(){t._.pasteButtons&&CKEDITOR.tools.array.forEach(t._.pasteButtons,function(e){(e=t.ui.get(e))&&(e=CKEDITOR.document.getById(e._.id))&&e.on("touchend",function(){t._.forcePasteDialog=!0})})})}(),function(){function e(e,n,i,r,o){var a=t.lang.clipboard[n];t.addCommand(n,i),t.ui.addButton&&t.ui.addButton(e,{label:a,command:n,toolbar:"clipboard,"+r}),t.addMenuItems&&t.addMenuItem(n,{label:a,command:n,group:"clipboard",order:o})}e("Cut","cut",i("cut"),10,1),e("Copy","copy",i("copy"),20,4),e("Paste","paste",r(),30,8),t._.pasteButtons||(t._.pasteButtons=[]),t._.pasteButtons.push("Paste")}(),t.getClipboardData=function(e,n){function i(e){e.removeListener(),e.cancel(),n(e.data)}function r(e){e.removeListener(),e.cancel(),n({type:a,dataValue:e.data.dataValue,dataTransfer:e.data.dataTransfer,method:"paste"})}var o=!1,a="auto";n||(n=e,e=null),t.on("beforePaste",function(e){e.removeListener(),o=!0,a=e.data.type},null,null,1e3),t.on("paste",i,null,null,0),!1===c()&&(t.removeListener("paste",i),t._.forcePasteDialog&&o&&t.fire("pasteDialog")?(t.on("pasteDialogCommit",r),t.on("dialogHide",function(e){e.removeListener(),e.data.removeListener("pasteDialogCommit",r),e.data._.committed||n(null)})):n(null))}}function n(e){if(CKEDITOR.env.webkit){if(!e.match(/^[^<]*$/g)&&!e.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!e.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!e.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else{if(!CKEDITOR.env.gecko)return"html";if(!e.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}return"htmlifiedtext"}function i(e,t){function n(e){return CKEDITOR.tools.repeat("</p><p>",~~(e/2))+(1==e%2?"<br>":"")}return t=t.replace(/(?!\u3000)\s+/g," ").replace(/> +</g,"><").replace(/<br ?\/>/gi,"<br>"),t=t.replace(/<\/?[A-Z]+>/g,function(e){return e.toLowerCase()}),t.match(/^[^<]$/)?t:(CKEDITOR.env.webkit&&-1<t.indexOf("<div>")&&(t=t.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"<br>").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"<div></div>"),t.match(/<div>(<br>|)<\/div>/)&&(t="<p>"+t.replace(/(<div>(<br>|)<\/div>)+/g,function(e){return n(e.split("</div><div>").length+1)})+"</p>"),t=t.replace(/<\/div><div>/g,"<br>"),t=t.replace(/<\/?div>/g,"")),CKEDITOR.env.gecko&&e.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(t=t.replace(/^<br><br>$/,"<br>")),-1<t.indexOf("<br><br>")&&(t="<p>"+t.replace(/(<br>){2,}/g,function(e){return n(e.length/4)})+"</p>")),a(e,t))}function r(e){function t(){var e,t={};for(e in CKEDITOR.dtd)"$"!=e.charAt(0)&&"div"!=e&&"span"!=e&&(t[e]=1);return t}var n={};return{get:function(i){return"plain-text"==i?n.plainText||(n.plainText=new CKEDITOR.filter(e,"br")):"semantic-content"==i?((i=n.semanticContent)||(i=new CKEDITOR.filter(e,{}),i.allow({$1:{elements:t(),attributes:!0,styles:!1,classes:!1}}),i=n.semanticContent=i),i):i?new CKEDITOR.filter(e,i):null}}}function o(e,t,n){t=CKEDITOR.htmlParser.fragment.fromHtml(t);var i=new CKEDITOR.htmlParser.basicWriter;return n.applyTo(t,!0,!1,e.activeEnterMode),t.writeHtml(i),i.getHtml()}function a(e,t){return e.enterMode==CKEDITOR.ENTER_BR?t=t.replace(/(<\/p><p>)+/g,function(e){return CKEDITOR.tools.repeat("<br>",e.length/7*2)}).replace(/<\/?p>/g,""):e.enterMode==CKEDITOR.ENTER_DIV&&(t=t.replace(/<(\/)?p>/g,"<$1div>")),t}function s(e){e.data.preventDefault(),e.data.$.dataTransfer.dropEffect="none"}function l(t){var n=CKEDITOR.plugins.clipboard;t.on("contentDom",function(){function i(n,i,r){i.select(),e(t,{dataTransfer:r,method:"drop"},1),r.sourceEditor.fire("saveSnapshot"),r.sourceEditor.editable().extractHtmlFromRange(n),r.sourceEditor.getSelection().selectRanges([n]),r.sourceEditor.fire("saveSnapshot")}function r(i,r){i.select(),e(t,{dataTransfer:r,method:"drop"},1),n.resetDragDataTransfer()}function o(e,n,i){var r={$:e.data.$,target:e.data.getTarget()};n&&(r.dragRange=n),i&&(r.dropRange=i),!1===t.fire(e.name,r)&&e.data.preventDefault()}function a(e){return e.type!=CKEDITOR.NODE_ELEMENT&&(e=e.getParent()),e.getChildCount()}var s=t.editable(),l=CKEDITOR.plugins.clipboard.getDropTarget(t),d=t.ui.space("top"),c=t.ui.space("bottom");n.preventDefaultDropOnElement(d),n.preventDefaultDropOnElement(c),s.attachListener(l,"dragstart",o),
 s.attachListener(t,"dragstart",n.resetDragDataTransfer,n,null,1),s.attachListener(t,"dragstart",function(e){n.initDragDataTransfer(e,t)},null,null,2),s.attachListener(t,"dragstart",function(){var e=n.dragRange=t.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(n.dragStartContainerChildCount=e?a(e.startContainer):null,n.dragEndContainerChildCount=e?a(e.endContainer):null)},null,null,100),s.attachListener(l,"dragend",o),s.attachListener(t,"dragend",n.initDragDataTransfer,n,null,1),s.attachListener(t,"dragend",n.resetDragDataTransfer,n,null,100),s.attachListener(l,"dragover",function(e){if(CKEDITOR.env.edge)e.data.preventDefault();else{var t=e.data.getTarget();t&&t.is&&t.is("html")?e.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&e.data.$.dataTransfer.types.contains("Files")&&e.data.preventDefault()}}),s.attachListener(l,"drop",function(e){if(!e.data.$.defaultPrevented&&(e.data.preventDefault(),!t.readOnly)){var i=e.data.getTarget();if(!i.isReadOnly()||i.type==CKEDITOR.NODE_ELEMENT&&i.is("html")){var i=n.getRangeAtDropPosition(e,t),r=n.dragRange;i&&o(e,r,i)}}},null,null,9999),s.attachListener(t,"drop",n.initDragDataTransfer,n,null,1),s.attachListener(t,"drop",function(e){if(e=e.data){var o=e.dropRange,a=e.dragRange,s=e.dataTransfer;s.getTransferType(t)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){n.internalDrop(a,o,s,t)},0):s.getTransferType(t)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?i(a,o,s):r(o,s)}},null,null,9999)})}var d;CKEDITOR.plugins.add("clipboard",{requires:"dialog,notification,toolbar",_supportedFileMatchers:[],init:function(e){function a(t){return!!e.config.clipboard_handleImages&&-1!==CKEDITOR.tools.indexOf(["image/png","image/jpeg","image/gif"],t.type)}function s(t){return CKEDITOR.tools.array.some(e.plugins.clipboard._supportedFileMatchers,function(e){return e(t)})}function d(t){t.length&&(t=CKEDITOR.tools.array.unique(t),t=CKEDITOR.tools.array.filter(t,function(e){return!!CKEDITOR.tools.trim(e)}),t=c(t.join(", ")),e.showNotification(t,"info",e.config.clipboard_notificationDuration))}function c(t){return t?e.lang.clipboard.fileFormatNotSupportedNotification.replace(/\${formats\}/g,"<em>"+t+"</em>"):e.lang.clipboard.fileWithoutFormatNotSupportedNotification}function h(e,t){return!(CKEDITOR.env.ie&&e.data.fileTransferCancel||!(CKEDITOR.env.ie||t&&g!==t.id))&&(t.isFileTransfer()&&1===t.getFilesCount())}var u,f=r(e);e.config.forcePasteAsPlainText?u="plain-text":e.config.pasteFilter?u=e.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in e.config||(u="semantic-content"),e.pasteFilter=f.get(u),t(e),l(e),CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));var g,p=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||CKEDITOR.plugins.clipboard.isFileApiSupported;CKEDITOR.plugins.clipboard.addFileMatcher(e,a),e.on("paste",function(e){if(p){var t=e.data;if(e=t.dataTransfer,!t.dataValue){for(var t=[],n=0;n<e.getFilesCount();n++){var i=e.getFile(n);s(i)||t.push(i.type)}d(t)}}},null,null,1),e.on("paste",function(t){if(p&&e.config.clipboard_handleImages){var n=t.data,i=n.dataTransfer;if(!n.dataValue&&h(t,i)&&(i=i.getFile(0),a(i))){var r=new FileReader;r.addEventListener("load",function(){t.data.dataValue='<img src="'+r.result+'" />',e.fire("paste",t.data)},!1),r.addEventListener("abort",function(){CKEDITOR.env.ie&&(t.data.fileTransferCancel=!0),e.fire("paste",t.data)},!1),r.addEventListener("error",function(){CKEDITOR.env.ie&&(t.data.fileTransferCancel=!0),e.fire("paste",t.data)},!1),r.readAsDataURL(i),g=n.dataTransfer.id,t.stop()}}},null,null,1),e.on("paste",function(t){if(t.data.dataTransfer||(t.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer),!t.data.dataValue){var n=t.data.dataTransfer,i=n.getData("text/html");i?(t.data.dataValue=i,t.data.type="html"):(i=n.getData("text/plain"))&&(t.data.dataValue=e.editable().transformPlainTextToHtml(i),t.data.type="text")}},null,null,1),e.on("paste",function(e){var t=e.data.dataValue,n=CKEDITOR.dtd.$block;if(-1<t.indexOf("Apple-")&&(t=t.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=e.data.type&&(t=t.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(e,t){return t.replace(/\t/g,"&nbsp;&nbsp; &nbsp;")})),-1<t.indexOf('<br class="Apple-interchange-newline">')&&(e.data.startsWithEOL=1,e.data.preSniffing="html",t=t.replace(/<br class="Apple-interchange-newline">/,"")),t=t.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1")),t.match(/^<[^<]+cke_(editable|contents)/i)){var i,r,o=new CKEDITOR.dom.element("div");for(o.setHtml(t);1==o.getChildCount()&&(i=o.getFirst())&&i.type==CKEDITOR.NODE_ELEMENT&&(i.hasClass("cke_editable")||i.hasClass("cke_contents"));)o=r=i;r&&(t=r.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?t=t.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(t,i){return i.toLowerCase()in n?(e.data.preSniffing="html","<"+i):t}):CKEDITOR.env.webkit?t=t.replace(/<\/(\w+)><div><br><\/div>$/,function(t,i){return i in n?(e.data.endsWithEOL=1,"</"+i+">"):t}):CKEDITOR.env.gecko&&(t=t.replace(/(\s)<br>$/,"$1")),e.data.dataValue=t},null,null,3),e.on("paste",function(t){t=t.data;var r,a=e._.nextPasteType||t.type,s=t.dataValue,l=e.config.clipboard_defaultContentType||"html",d=t.dataTransfer.getTransferType(e)==CKEDITOR.DATA_TRANSFER_EXTERNAL,c=!0===e.config.forcePasteAsPlainText;r="html"==a||"html"==t.preSniffing?"html":n(s),delete e._.nextPasteType,"htmlifiedtext"==r&&(s=i(e.config,s)),"text"==a&&"html"==r?s=o(e,s,f.get("plain-text")):(d&&e.pasteFilter&&!t.dontFilter||c)&&(s=o(e,s,e.pasteFilter)),t.startsWithEOL&&(s='<br data-cke-eol="1">'+s),t.endsWithEOL&&(s+='<br data-cke-eol="1">'),"auto"==a&&(a="html"==r||"html"==l?"html":"text"),t.type=a,t.dataValue=s,delete t.preSniffing,delete t.startsWithEOL,delete t.endsWithEOL},null,null,6),e.on("paste",function(t){t=t.data,t.dataValue&&(e.insertHtml(t.dataValue,t.type,t.range),setTimeout(function(){e.fire("afterPaste")},0))},null,null,1e3),e.on("pasteDialog",function(t){setTimeout(function(){e.openDialog("paste",t.data)},0)})}}),CKEDITOR.plugins.clipboard={addFileMatcher:function(e,t){e.plugins.clipboard._supportedFileMatchers.push(t)},isCustomCopyCutSupported:!(CKEDITOR.env.ie&&16>CKEDITOR.env.version||CKEDITOR.env.iOS&&605>CKEDITOR.env.version),isCustomDataTypesSupported:!CKEDITOR.env.ie||16<=CKEDITOR.env.version,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",addPasteButton:function(e,t,n){e.ui.addButton&&(e.ui.addButton(t,n),e._.pasteButtons||(e._.pasteButtons=[]),e._.pasteButtons.push(t))},canClipboardApiBeTrusted:function(e,t){return!!(e.getTransferType(t)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!e.isEmpty()||CKEDITOR.env.gecko&&(e.getData("text/html")||e.getFilesCount())||CKEDITOR.env.safari&&603<=CKEDITOR.env.version&&!CKEDITOR.env.iOS||CKEDITOR.env.iOS&&605<=CKEDITOR.env.version||CKEDITOR.env.edge&&16<=CKEDITOR.env.version)},getDropTarget:function(e){var t=e.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||t.isInline()?t:e.document},fixSplitNodesAfterDrop:function(e,t,n,i){function r(e,n,i){var r=e;if(r.type==CKEDITOR.NODE_TEXT&&(r=e.getParent()),r.equals(n)&&i!=n.getChildCount())return e=t.startContainer.getChild(t.startOffset-1),n=t.startContainer.getChild(t.startOffset),e&&e.type==CKEDITOR.NODE_TEXT&&n&&n.type==CKEDITOR.NODE_TEXT&&(i=e.getLength(),e.setText(e.getText()+n.getText()),n.remove(),t.setStart(e,i),t.collapse(!0)),!0}var o=t.startContainer;"number"==typeof i&&"number"==typeof n&&o.type==CKEDITOR.NODE_ELEMENT&&(r(e.startContainer,o,n)||r(e.endContainer,o,i))},isDropRangeAffectedByDragRange:function(e,t){var n=t.startContainer,i=t.endOffset;return!!(e.endContainer.equals(n)&&e.endOffset<=i||e.startContainer.getParent().equals(n)&&e.startContainer.getIndex()<i||e.endContainer.getParent().equals(n)&&e.endContainer.getIndex()<i)},internalDrop:function(t,n,i,r){var o,a,s=CKEDITOR.plugins.clipboard,l=r.editable();r.fire("saveSnapshot"),r.fire("lockSnapshot",{dontUpdate:1}),CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(t,n,s.dragStartContainerChildCount,s.dragEndContainerChildCount),(a=this.isDropRangeAffectedByDragRange(t,n))||(o=t.createBookmark(!1)),s=n.clone().createBookmark(!1),a&&(o=t.createBookmark(!1)),t=o.startNode,n=o.endNode,a=s.startNode,n&&t.getPosition(a)&CKEDITOR.POSITION_PRECEDING&&n.getPosition(a)&CKEDITOR.POSITION_FOLLOWING&&a.insertBefore(t),t=r.createRange(),t.moveToBookmark(o),l.extractHtmlFromRange(t,1),n=r.createRange(),s.startNode.getCommonAncestor(l)||(s=r.getSelection().createBookmarks()[0]),n.moveToBookmark(s),e(r,{dataTransfer:i,method:"drop",range:n},1),r.fire("unlockSnapshot")},getRangeAtDropPosition:function(e,t){var n=e.data.$,i=n.clientX,r=n.clientY,o=t.getSelection(!0).getRanges()[0],a=t.createRange();if(e.data.testRange)return e.data.testRange;if(document.caretRangeFromPoint&&t.document.$.caretRangeFromPoint(i,r))n=t.document.$.caretRangeFromPoint(i,r),a.setStart(CKEDITOR.dom.node(n.startContainer),n.startOffset),a.collapse(!0);else if(n.rangeParent)a.setStart(CKEDITOR.dom.node(n.rangeParent),n.rangeOffset),a.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&o&&t.editable().hasFocus)return o;if(!document.body.createTextRange)return null;t.focus(),n=t.document.getBody().$.createTextRange();try{for(var s=!1,l=0;20>l&&!s;l++){if(!s)try{n.moveToPoint(i,r-l),s=!0}catch(e){}if(!s)try{n.moveToPoint(i,r+l),s=!0}catch(e){}}if(s){var d="cke-temp-"+(new Date).getTime();n.pasteHTML('<span id="'+d+'">\u200b</span>');var c=t.document.getById(d);a.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START),c.remove()}else{var h,u=t.document.$.elementFromPoint(i,r),f=new CKEDITOR.dom.element(u);if(f.equals(t.editable())||"html"==f.getName())return o&&o.startContainer&&!o.startContainer.equals(t.editable())?o:null;h=f.getClientRect(),i<h.left?a.setStartAt(f,CKEDITOR.POSITION_AFTER_START):a.setStartAt(f,CKEDITOR.POSITION_BEFORE_END),a.collapse(!0)}}catch(e){return null}}return a},initDragDataTransfer:function(e,t){var n=e.data.$?e.data.$.dataTransfer:null,i=new this.dataTransfer(n,t);"dragstart"===e.name&&i.storeId(),n?this.dragData&&i.id==this.dragData.id?i=this.dragData:this.dragData=i:this.dragData?i=this.dragData:this.dragData=i,e.data.dataTransfer=i},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(e,t){if(this.isCustomCopyCutSupported){if(e&&e.data&&e.data.$){var n=e.data.$.clipboardData,i=new this.dataTransfer(n,t);return"copy"!==e.name&&"cut"!==e.name||i.storeId(),this.copyCutData&&i.id==this.copyCutData.id?(i=this.copyCutData,i.$=n):this.copyCutData=i,i}return new this.dataTransfer(null,t)}return new this.dataTransfer(CKEDITOR.env.edge&&e&&e.data.$&&e.data.$.clipboardData||null,t)},preventDefaultDropOnElement:function(e){e&&e.on("dragover",s)}},d=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text",CKEDITOR.plugins.clipboard.dataTransfer=function(e,t){e&&(this.$=e),this._={metaRegExp:/^<meta.*?>/i,fragmentRegExp:/\s*\x3c!--StartFragment--\x3e|\x3c!--EndFragment--\x3e\s*/g,types:[],data:{},files:[],nativeHtmlCache:"",normalizeType:function(e){return e=e.toLowerCase(),"text"==e||"text/plain"==e?"Text":"url"==e?"URL":"files"===e?"Files":e}},this._.fallbackDataTransfer=new CKEDITOR.plugins.clipboard.fallbackDataTransfer(this),this.id=this.getData(d),this.id||(this.id="Text"==d?"":"cke-"+CKEDITOR.tools.getUniqueId()),t&&(this.sourceEditor=t,this.setData("text/html",t.getSelectedHtml(1)),"Text"==d||this.getData("text/plain")||this.setData("text/plain",t.getSelection().getSelectedText()))},CKEDITOR.DATA_TRANSFER_INTERNAL=1,CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2,CKEDITOR.DATA_TRANSFER_EXTERNAL=3,CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(e,t){e=this._.normalizeType(e);var n="text/html"==e&&t?this._.nativeHtmlCache:this._.data[e];if(void 0===n||null===n||""===n){if(this._.fallbackDataTransfer.isRequired())n=this._.fallbackDataTransfer.getData(e,t);else try{n=this.$.getData(e)||""}catch(e){n=""}"text/html"!=e||t||(n=this._stripHtml(n))}if("Text"==e&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==n.substring(0,7)&&(n=""),"string"==typeof n)var i=n.indexOf("</html>"),n=-1!==i?n.substring(0,i+7):n;return n},setData:function(e,t){if(e=this._.normalizeType(e),"text/html"==e?(this._.data[e]=this._stripHtml(t),this._.nativeHtmlCache=t):this._.data[e]=t,CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==e||"Text"==e)if("Text"==d&&"Text"==e&&(this.id=t),this._.fallbackDataTransfer.isRequired())this._.fallbackDataTransfer.setData(e,t);else try{this.$.setData(e,t)}catch(e){}},storeId:function(){"Text"!==d&&this.setData(d,this.id)},getTransferType:function(e){return this.sourceEditor?this.sourceEditor==e?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function e(e){e=r._.normalizeType(e);var t=r.getData(e);"text/html"==e&&(r._.nativeHtmlCache=r.getData(e,!0),t=r._stripHtml(t)),t&&(r._.data[e]=t),r._.types.push(e)}if(this.$){var t,n,i,r=this;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(t=0;t<this.$.types.length;t++)e(this.$.types[t])}else e("Text"),e("URL");if(n=this._getImageFromClipboard(),(i=this.$&&this.$.files||null)||n){if(this._.files=[],i&&i.length)for(t=0;t<i.length;t++)this._.files.push(i[t]);0===this._.files.length&&n&&this._.files.push(n)}}},getFilesCount:function(){if(this._.files.length)return this._.files.length;var e=this.$&&this.$.files||null;return e&&e.length?e.length:this._getImageFromClipboard()?1:0},getFile:function(e){if(this._.files.length)return this._.files[e];var t=this.$&&this.$.files||null;return t&&t.length?t[e]:0===e?this._getImageFromClipboard():void 0},isFileTransfer:function(){var e=this.getTypes(),e=CKEDITOR.tools.array.filter(e,function(e){return"application/x-moz-file"!==e});return 1===e.length&&"files"===e[0].toLowerCase()},isEmpty:function(){var e,t={};if(this.getFilesCount())return!1;if(CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(this._.data),function(e){t[e]=1}),this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var n=0;n<this.$.types.length;n++)t[this.$.types[n]]=1}else t.Text=1,t.URL=1;"Text"!=d&&(t[d]=0);for(e in t)if(t[e]&&""!==this.getData(e))return!1;return!0},getTypes:function(){return 0<this._.types.length?this._.types:this.$&&this.$.types?[].slice.call(this.$.types):[]},_getImageFromClipboard:function(){var e;try{if(this.$&&this.$.items&&this.$.items[0]&&(e=this.$.items[0].getAsFile())&&e.type)return e}catch(e){}},_stripHtml:function(e){return e&&e.length&&(e=function(e){var t,n,i=new CKEDITOR.htmlParser;return i.onTagOpen=function(e){"body"===e&&(t=i._.htmlPartsRegex.lastIndex)},i.onTagClose=function(e){"body"===e&&(n=i._.htmlPartsRegex.lastIndex)},i.parse(e),"number"!=typeof t||"number"!=typeof n?e:e.substring(t,n).replace(/<\/body\s*>$/gi,"")}(e),e=e.replace(this._.metaRegExp,""),e=e.replace(this._.fragmentRegExp,"")),e}},CKEDITOR.plugins.clipboard.fallbackDataTransfer=function(e){this._dataTransfer=e,this._customDataFallbackType="text/html"},CKEDITOR.plugins.clipboard.fallbackDataTransfer._isCustomMimeTypeSupported=null,CKEDITOR.plugins.clipboard.fallbackDataTransfer._customTypes=[],CKEDITOR.plugins.clipboard.fallbackDataTransfer.prototype={isRequired:function(){var e=CKEDITOR.plugins.clipboard.fallbackDataTransfer,t=this._dataTransfer.$;if(null===e._isCustomMimeTypeSupported){if(!t)return!1;if(e._isCustomMimeTypeSupported=!1,CKEDITOR.env.edge&&17<=CKEDITOR.env.version)return!0;try{t.setData("cke/mimetypetest","cke test value"),e._isCustomMimeTypeSupported="cke test value"===t.getData("cke/mimetypetest"),t.clearData("cke/mimetypetest")}catch(e){}}return!e._isCustomMimeTypeSupported},getData:function(e,t){var n=this._getData(this._customDataFallbackType,!0);if(t)return n;var n=this._extractDataComment(n),i=null,i=e===this._customDataFallbackType?n.content:n.data&&n.data[e]?n.data[e]:this._getData(e,!0);return null!==i?i:""},setData:function(e,t){var n=e===this._customDataFallbackType;n&&(t=this._applyDataComment(t,this._getFallbackTypeData()));var i=t,r=this._dataTransfer.$;try{r.setData(e,i),n&&(this._dataTransfer._.nativeHtmlCache=i)}catch(t){if(this._isUnsupportedMimeTypeError(t)){n=CKEDITOR.plugins.clipboard.fallbackDataTransfer,-1===CKEDITOR.tools.indexOf(n._customTypes,e)&&n._customTypes.push(e);var n=this._getFallbackTypeContent(),o=this._getFallbackTypeData();o[e]=i;try{i=this._applyDataComment(n,o),r.setData(this._customDataFallbackType,i),this._dataTransfer._.nativeHtmlCache=i}catch(e){i=""}}}return i},_getData:function(e,t){var n=this._dataTransfer._.data;if(!t&&n[e])return n[e];try{return this._dataTransfer.$.getData(e)}catch(e){return null}},_getFallbackTypeContent:function(){var e=this._dataTransfer._.data[this._customDataFallbackType];return e||(e=this._extractDataComment(this._getData(this._customDataFallbackType,!0)).content),e},_getFallbackTypeData:function(){var e=CKEDITOR.plugins.clipboard.fallbackDataTransfer._customTypes,t=this._extractDataComment(this._getData(this._customDataFallbackType,!0)).data||{},n=this._dataTransfer._.data;return CKEDITOR.tools.array.forEach(e,function(e){void 0!==n[e]?t[e]=n[e]:void 0!==t[e]&&(t[e]=t[e])},this),t},_isUnsupportedMimeTypeError:function(e){return e.message&&-1!==e.message.search(/element not found/gi)},_extractDataComment:function(e){var t={data:null,content:e||""};if(e&&16<e.length){var n;(n=/\x3c!--cke-data:(.*?)--\x3e/g.exec(e))&&n[1]&&(t.data=JSON.parse(decodeURIComponent(n[1])),t.content=e.replace(n[0],""))}return t},_applyDataComment:function(e,t){var n="";return t&&CKEDITOR.tools.object.keys(t).length&&(n="\x3c!--cke-data:"+encodeURIComponent(JSON.stringify(t))+"--\x3e"),n+(e&&e.length?e:"")}}}(),CKEDITOR.config.clipboard_notificationDuration=1e4,CKEDITOR.config.clipboard_handleImages=!0,function(){function e(e){return!e||!(20<e.length)&&(!(e=e.replace(/[\n|\t]*/g,"").toLowerCase())||"<br>"==e||"<p>&nbsp;<br></p>"==e||"<p><br></p>"==e||"<div><br></div>"==e||"<p>&nbsp;</p>"==e||"&nbsp;"==e||" "==e||"&nbsp;<br>"==e||" <br>"==e)}function t(t){var n=t.editor;if(!n.readOnly){var i=n.editable(),r=t.listenerData;if(i){if("wysiwyg"==n.mode){if(CKEDITOR.dialog._.currentTop||!i)return;e(i.getHtml())&&(i.setHtml(r),i.addClass("placeholder"))}"source"==n.mode&&(o?"mode"==t.name&&i.setAttribute("placeholder",r):e(i.getValue())&&(i.setValue(r),i.addClass("placeholder")))}}}function n(e){e=e.editor;var t=e.editable();if(t){if("wysiwyg"==e.mode){if(!t.hasClass("placeholder"))return;if(t.removeClass("placeholder"),CKEDITOR.dtd[t.getName()].p){var n="";e.enterMode===CKEDITOR.ENTER_P?n="<p><br/></p>":e.enterMode===CKEDITOR.ENTER_DIV?n="<div><br/></div>":(n="<br/>",(CKEDITOR.env.gecko||CKEDITOR.env.ie)&&(n=" ")),t.setHtml(n),n=new CKEDITOR.dom.range(e.document),n.moveToElementEditablePosition(t.getFirst(),!0),e.getSelection().selectRanges([n])}else t.setHtml(" ")}"source"==e.mode&&t.hasClass("placeholder")&&(t.removeClass("placeholder"),t.setValue(""))}}function i(e){e.editor.readOnly?n(e):t(e)}function r(e){return e?e.getAttribute("lang")||r(e.getParent()):null}var o="placeholder"in document.createElement("textarea");CKEDITOR.plugins.add("confighelper",{getPlaceholderCss:function(){return".placeholder{ color: #999; }"},onLoad:function(){CKEDITOR.addCss(this.getPlaceholderCss())},init:function(a){function s(e){if(a==e.editor){var t=e.data.name;e=e.data.definition;var n,i,r,o,s;if("tableProperties"==t&&(t="table"),"removeDialogFields"in a._||!a.config.removeDialogFields||(a._.removeDialogFields=c(a.config.removeDialogFields)),a._.removeDialogFields&&(n=a._.removeDialogFields[t]))for(r in n)if(o=n[r],s=e.getContents(r))for(i=0;i<o.length;i++)s.remove(o[i]);if("hideDialogFields"in a._||!a.config.hideDialogFields||(a._.hideDialogFields=c(a.config.hideDialogFields)),a._.hideDialogFields&&(n=a._.hideDialogFields[t]))for(r in n)if(o=n[r],s=e.getContents(r))for(i=0;i<o.length;i++)s.get(o[i]).hidden=!0;if(a.config.dialogFieldsDefaultValues&&(n=a.config.dialogFieldsDefaultValues[t]))for(r in n)if(o=n[r],s=e.getContents(r))for(var l in o)(t=s.get(l))&&(t.default=o[l])}}a.on("mode",function(e){e.editor.focusManager.hasFocus=!1});var l=a.element.getAttribute("placeholder")||a.config.placeholder;if(l){var d=CKEDITOR.document.getHead().append("style");d.setAttribute("type","text/css"),CKEDITOR.env.ie&&11>CKEDITOR.env.version?d.$.styleSheet.cssText="textarea.placeholder { color: #999; font-style: italic; }":d.$.innerHTML="textarea.placeholder { color: #999; font-style: italic; }",a.on("getData",function(e){var t=a.editable();t&&t.hasClass("placeholder")&&(e.data.dataValue="")}),a.on("setData",function(n){if(!(CKEDITOR.dialog._.currentTop||"source"==a.mode&&o)){var i=a.editable();i&&(e(n.data.dataValue)?t(n):i.hasClass("placeholder")&&i.removeClass("placeholder"))}}),a.on("blur",t,null,l),a.on("mode",t,null,l),a.on("contentDom",t,null,l),a.on("focus",n),a.on("key",n),a.on("beforeModeUnload",n),a.on("readOnly",i,null,l)}if((l=a.config.contentsLanguage||r(a.element))&&a.plugins.scayt&&!a.config.scayt_sLang){try{localStorage&&localStorage.removeItem("scayt_0_lang")}catch(e){}a.config.scayt_sLang={en:"en_US","en-us":"en_US","en-gb":"en_GB","pt-br":"pt_BR",da:"da_DK","da-dk":"da_DK","nl-nl":"nl_NL","en-ca":"en_CA","fi-fi":"fi_FI",fr:"fr_FR","fr-fr":"fr_FR","fr-ca":"fr_CA",de:"de_DE","de-de":"de_DE","el-gr":"el_GR",it:"it_IT","it-it":"it_IT","nb-no":"nb_NO",pt:"pt_PT","pt-pt":"pt_PT",es:"es_ES","es-es":"es_ES","sv-se":"sv_SE"}[l.toLowerCase()]}var c=function(e){if("object"==typeof e)return e;e=e.split(";");var t,n={};for(t=0;t<e.length;t++){var i=e[t].split(":");if(3==i.length){var r=i[0],o=i[1],i=i[2];n[r]||(n[r]={}),n[r][o]||(n[r][o]=[]),n[r][o].push(i)}}return n};CKEDITOR.on("dialogDefinition",s),a.once("beforeDestroy",function(){CKEDITOR.removeListener("dialogDefinition",s)})}})}(),function(){function e(e,t){var n={},i=[],r={nbsp:"\xa0",shy:"\xad",gt:">",lt:"<",amp:"&",apos:"'",quot:'"'};if(e=e.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(e,o){var a=t?"&"+o+";":r[o];return n[a]=t?r[o]:"&"+o+";",i.push(a),""}),e=e.replace(/,$/,""),!t&&e){e=e.split(",");var o,a=document.createElement("div");for(a.innerHTML="&"+e.join(";&")+";",o=a.innerHTML,a=null,a=0;a<o.length;a++){var s=o.charAt(a);n[s]="&"+e[a]+";",i.push(s)}}return n.regex=i.join(t?"|":""),n}CKEDITOR.plugins.add("entities",{afterInit:function(t){function n(e){return l[e]}function i(e){return"force"!=r.entities_processNumerical&&a[e]?a[e]:"&#"+(CKEDITOR.env.ie?e.charCodeAt(0):e.codePointAt(0))+";"}var r=t.config;if(t=(t=t.dataProcessor)&&t.htmlFilter){var o=[];!1!==r.basicEntities&&o.push("nbsp,gt,lt,amp"),r.entities&&(o.length&&o.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),r.entities_latin&&o.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),r.entities_greek&&o.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),r.entities_additional&&o.push(r.entities_additional));var a=e(o.join(",")),s=a.regex?"["+a.regex+"]":"a^";delete a.regex,r.entities&&r.entities_processNumerical&&(s="[^ -~]|"+s);var s=new RegExp(s,CKEDITOR.env.ie?"g":"gu"),l=e("nbsp,gt,lt,amp,shy",!0),d=new RegExp(l.regex,"g");t.addRules({text:function(e){return e.replace(d,n).replace(s,i)}},{applyToAll:!0,excludeNestedEditable:!0})}}})}(),CKEDITOR.config.basicEntities=!0,CKEDITOR.config.entities=!0,CKEDITOR.config.entities_latin=!0,CKEDITOR.config.entities_greek=!0,CKEDITOR.config.entities_additional="#39",function(){function e(e,t){return CKEDITOR.tools.array.reduce(t,function(e,t){return t(e)},e)}var t=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+CKEDITOR.SHIFT+90],n={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(e){function n(e){o.enabled&&!1!==e.data.command.canUndo&&o.save()}function r(){o.enabled=!e.readOnly&&"wysiwyg"==e.mode,o.onChange()}var o=e.undoManager=new i(e),s=o.editingHandler=new a(o),l=e.addCommand("undo",{exec:function(){o.undo()&&(e.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),d=e.addCommand("redo",{exec:function(){o.redo()&&(e.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,canUndo:!1});e.setKeystroke([[t[0],"undo"],[t[1],"redo"],[t[2],"redo"]]),o.onChange=function(){l.setState(o.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),d.setState(o.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)},e.on("beforeCommandExec",n),e.on("afterCommandExec",n),e.on("saveSnapshot",function(e){o.save(e.data&&e.data.contentOnly)}),e.on("contentDom",s.attachListeners,s),e.on("instanceReady",function(){e.fire("saveSnapshot")}),e.on("beforeModeUnload",function(){"wysiwyg"==e.mode&&o.save(!0)}),e.on("mode",r),e.on("readOnly",r),e.ui.addButton&&(e.ui.addButton("Undo",{label:e.lang.undo.undo,command:"undo",toolbar:"undo,10"}),e.ui.addButton("Redo",{label:e.lang.undo.redo,command:"redo",toolbar:"undo,20"})),e.resetUndo=function(){o.reset(),e.fire("saveSnapshot")},e.on("updateSnapshot",function(){o.currentImage&&o.update()}),e.on("lockSnapshot",function(e){e=e.data,o.lock(e&&e.dontUpdate,e&&e.forceUpdate)}),e.on("unlockSnapshot",o.unlock,o)}}),CKEDITOR.plugins.undo={};var i=CKEDITOR.plugins.undo.UndoManager=function(e){this.strokesRecorded=[0,0],this.locked=null,this.previousKeyGroup=-1,this.limit=e.config.undoStackSize||20,this.strokesLimit=25,this._filterRules=[],this.editor=e,this.reset(),CKEDITOR.env.ie&&this.addFilterRule(function(e){return e.replace(/\s+data-cke-expando=".*?"/g,"")})};i.prototype={type:function(e,t){var n=i.getKeyGroup(e),r=this.strokesRecorded[n]+1;t=t||r>=this.strokesLimit,this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange()),t?(r=0,this.editor.fire("saveSnapshot")):this.editor.fire("change"),this.strokesRecorded[n]=r,this.previousKeyGroup=n},keyGroupChanged:function(e){return i.getKeyGroup(e)!=this.previousKeyGroup},reset:function(){this.snapshots=[],this.index=-1,this.currentImage=null,this.hasRedo=this.hasUndo=!1,this.locked=null,this.resetType()},resetType:function(){this.strokesRecorded=[0,0],this.typing=!1,this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0),this.hasRedo=!!this.getNextImage(!1),this.resetType(),this.onChange()},save:function(e,t,n){var i=this.editor;if(this.locked||"ready"!=i.status||"wysiwyg"!=i.mode)return!1;var o=i.editable();if(!o||"ready"!=o.status)return!1;if(o=this.snapshots,t||(t=new r(i)),!1===t.contents)return!1;if(this.currentImage)if(t.equalsContent(this.currentImage)){if(e||t.equalsSelection(this.currentImage))return!1}else!1!==n&&i.fire("change");return o.splice(this.index+1,o.length-this.index-1),o.length==this.limit&&o.shift(),this.index=o.push(t)-1,this.currentImage=t,!1!==n&&this.refreshState(),!0},restoreImage:function(e){var t,n=this.editor;e.bookmarks&&(n.focus(),t=n.getSelection()),this.locked={level:999},this.editor.loadSnapshot(e.contents),e.bookmarks?t.selectBookmarks(e.bookmarks):CKEDITOR.env.ie&&(t=this.editor.document.getBody().$.createTextRange(),t.collapse(!0),t.select()),this.locked=null,this.index=e.index,this.currentImage=this.snapshots[this.index],this.update(),this.refreshState(),n.fire("change")},getNextImage:function(e){var t,n=this.snapshots,i=this.currentImage;if(i)if(e){for(t=this.index-1;0<=t;t--)if(e=n[t],!i.equalsContent(e))return e.index=t,e}else for(t=this.index+1;t<n.length;t++)if(e=n[t],!i.equalsContent(e))return e.index=t,e;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);var e=this.getNextImage(!0);if(e)return this.restoreImage(e),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var e=this.getNextImage(!1);if(e)return this.restoreImage(e),!0}return!1},update:function(e){if(!this.locked){e||(e=new r(this.editor));for(var t=this.index,n=this.snapshots;0<t&&this.currentImage.equalsContent(n[t-1]);)--t;n.splice(t,this.index-t+1,e),this.index=t,this.currentImage=e}},updateSelection:function(e){if(!this.snapshots.length)return!1;var t=this.snapshots,n=t[t.length-1];return!(!n.equalsContent(e)||n.equalsSelection(e))&&(this.currentImage=t[t.length-1]=e,!0)},lock:function(e,t){if(this.locked)this.locked.level++;else if(e)this.locked={level:1};else{var n=null;if(t)n=!0;else{var i=new r(this.editor,!0);this.currentImage&&this.currentImage.equalsContent(i)&&(n=i)}this.locked={update:n,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var e=this.locked.update;if(this.locked=null,!0===e)this.update();else if(e){var t=new r(this.editor,!0);e.equalsContent(t)||this.update()}}},addFilterRule:function(e){this._filterRules.push(e)}},i.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1},i.keyGroups={PRINTABLE:0,FUNCTIONAL:1},i.isNavigationKey=function(e){return!!i.navigationKeyCodes[e]},i.getKeyGroup=function(e){var t=i.keyGroups;return n[e]?t.FUNCTIONAL:t.PRINTABLE},i.getOppositeKeyGroup=function(e){var t=i.keyGroups;return e==t.FUNCTIONAL?t.PRINTABLE:t.FUNCTIONAL},i.ieFunctionalKeysBug=function(e){return CKEDITOR.env.ie&&i.getKeyGroup(e)==i.keyGroups.FUNCTIONAL};var r=CKEDITOR.plugins.undo.Image=function(t,n){this.editor=t,t.fire("beforeUndoImage");var i=t.getSnapshot();i&&(this.contents=e(i,t.undoManager._filterRules)),n||(this.bookmarks=(i=i&&t.getSelection())&&i.createBookmarks2(!0)),t.fire("afterUndoImage")},o=/\b(?:href|src|name)="[^"]*?"/gi;r.prototype={equalsContent:function(e){var t=this.contents;return e=e.contents,CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(t=t.replace(o,""),e=e.replace(o,"")),t==e},equalsSelection:function(e){var t=this.bookmarks;if(e=e.bookmarks,t||e){if(!t||!e||t.length!=e.length)return!1;for(var n=0;n<t.length;n++){var i=t[n],r=e[n];if(i.startOffset!=r.startOffset||i.endOffset!=r.endOffset||!CKEDITOR.tools.arrayCompare(i.start,r.start)||!CKEDITOR.tools.arrayCompare(i.end,r.end))return!1}}return!0}};var a=CKEDITOR.plugins.undo.NativeEditingHandler=function(e){this.undoManager=e,this.ignoreInputEvent=!1,this.keyEventsStack=new s,this.lastKeydownImage=null};a.prototype={onKeydown:function(e){var n=e.data.getKey();229!==n&&(-1<CKEDITOR.tools.indexOf(t,e.data.getKeystroke())?e.data.preventDefault():(this.keyEventsStack.cleanUp(e),e=this.undoManager,this.keyEventsStack.getLast(n)||this.keyEventsStack.push(n),this.lastKeydownImage=new r(e.editor),(i.isNavigationKey(n)||this.undoManager.keyGroupChanged(n))&&(e.strokesRecorded[0]||e.strokesRecorded[1])&&(e.save(!1,this.lastKeydownImage,!1),e.resetType())))},onInput:function(){
 if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var e=this.keyEventsStack.getLast();e||(e=this.keyEventsStack.push(0)),this.keyEventsStack.increment(e.keyCode),this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(e.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(e){var t=this.undoManager;e=e.data.getKey();var n=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(e),i.ieFunctionalKeysBug(e)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new r(t.editor,!0))||(0<n?t.type(e):i.isNavigationKey(e)&&this.onNavigationKey(!0))},onNavigationKey:function(e){var t=this.undoManager;!e&&t.save(!0,null,!1)||t.updateSelection(new r(t.editor)),t.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},activateInputEventListener:function(){this.ignoreInputEvent=!1},attachListeners:function(){var e=this.undoManager.editor,t=e.editable(),n=this;t.attachListener(t,"keydown",function(e){n.onKeydown(e),i.ieFunctionalKeysBug(e.data.getKey())&&n.onInput()},null,null,999),t.attachListener(t,CKEDITOR.env.ie?"keypress":"input",n.onInput,n,null,999),t.attachListener(t,"keyup",n.onKeyup,n,null,999),t.attachListener(t,"paste",n.ignoreInputEventListener,n,null,999),t.attachListener(t,"drop",n.ignoreInputEventListener,n,null,999),e.on("afterPaste",n.activateInputEventListener,n,null,999),t.attachListener(t.isInline()?t:e.document.getDocumentElement(),"click",function(){n.onNavigationKey()},null,null,999),t.attachListener(this.undoManager.editor,"blur",function(){n.keyEventsStack.remove(9)},null,null,999)}};var s=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};s.prototype={push:function(e){return e=this.stack.push({keyCode:e,inputs:0}),this.stack[e-1]},getLastIndex:function(e){if("number"!=typeof e)return this.stack.length-1;for(var t=this.stack.length;t--;)if(this.stack[t].keyCode==e)return t;return-1},getLast:function(e){return e=this.getLastIndex(e),-1!=e?this.stack[e]:null},increment:function(e){this.getLast(e).inputs++},remove:function(e){-1!=(e=this.getLastIndex(e))&&this.stack.splice(e,1)},resetInputs:function(e){if("number"==typeof e)this.getLast(e).inputs=0;else for(e=this.stack.length;e--;)this.stack[e].inputs=0},getTotalInputs:function(){for(var e=this.stack.length,t=0;e--;)t+=this.stack[e].inputs;return t},cleanUp:function(e){e=e.data.$,e.ctrlKey||e.metaKey||this.remove(17),e.shiftKey||this.remove(16),e.altKey||this.remove(18)}}}(),function(){function e(e,t){CKEDITOR.tools.extend(this,{editor:e,editable:e.editable(),doc:e.document,win:e.window},t,!0),this.inline=this.editable.isInline(),this.inline||(this.frame=this.win.getFrame()),this.target=this[this.inline?"editable":"doc"]}function t(e,t){CKEDITOR.tools.extend(this,t,{editor:e},!0)}function n(e,t){var n=e.editable();CKEDITOR.tools.extend(this,{editor:e,editable:n,inline:n.isInline(),doc:e.document,win:e.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},t,!0),this.hidden={},this.visible={},this.inline||(this.frame=this.win.getFrame()),this.queryViewport();var i=CKEDITOR.tools.bind(this.queryViewport,this),a=CKEDITOR.tools.bind(this.hideVisible,this),s=CKEDITOR.tools.bind(this.removeAll,this);n.attachListener(this.winTop,"resize",i),n.attachListener(this.winTop,"scroll",i),n.attachListener(this.winTop,"resize",a),n.attachListener(this.win,"scroll",a),n.attachListener(this.inline?n:this.frame,"mouseout",function(e){var t=e.data.$.clientX;e=e.data.$.clientY,this.queryViewport(),(t<=this.rect.left||t>=this.rect.right||e<=this.rect.top||e>=this.rect.bottom)&&this.hideVisible(),(0>=t||t>=this.winTopPane.width||0>=e||e>=this.winTopPane.height)&&this.hideVisible()},this),n.attachListener(e,"resize",i),n.attachListener(e,"mode",s),e.on("destroy",s),this.lineTpl=new CKEDITOR.template('<div data-cke-lineutils-line="1" class="cke_reset_all" style="{lineStyle}"><span style="{tipLeftStyle}">&nbsp;</span><span style="{tipRightStyle}">&nbsp;</span></div>').output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},o,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},r,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},r,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function i(e){var t;return(t=e&&e.type==CKEDITOR.NODE_ELEMENT)&&(t=!(a[e.getComputedStyle("float")]||a[e.getAttribute("align")])),t&&!s[e.getComputedStyle("position")]}CKEDITOR.plugins.add("lineutils"),CKEDITOR.LINEUTILS_BEFORE=1,CKEDITOR.LINEUTILS_AFTER=2,CKEDITOR.LINEUTILS_INSIDE=4,e.prototype={start:function(e){var t,n,i,r,o=this,a=this.editor,s=this.doc,l=CKEDITOR.tools.eventsBuffer(50,function(){a.readOnly||"wysiwyg"!=a.mode||(o.relations={},(n=s.$.elementFromPoint(i,r))&&n.nodeType&&(t=new CKEDITOR.dom.element(n),o.traverseSearch(t),isNaN(i+r)||o.pixelSearch(t,i,r),e&&e(o.relations,i,r)))});this.listener=this.editable.attachListener(this.target,"mousemove",function(e){i=e.data.$.clientX,r=e.data.$.clientY,l.input()}),this.editable.attachListener(this.inline?this.editable:this.frame,"mouseout",function(){l.reset()})},stop:function(){this.listener&&this.listener.removeListener()},getRange:function(){var e={};return e[CKEDITOR.LINEUTILS_BEFORE]=CKEDITOR.POSITION_BEFORE_START,e[CKEDITOR.LINEUTILS_AFTER]=CKEDITOR.POSITION_AFTER_END,e[CKEDITOR.LINEUTILS_INSIDE]=CKEDITOR.POSITION_AFTER_START,function(t){var n=this.editor.createRange();return n.moveToPosition(this.relations[t.uid].element,e[t.type]),n}}(),store:function(){function e(e,t,n){var i=e.getUniqueId();i in n?n[i].type|=t:n[i]={element:e,type:t}}return function(t,n){var r;n&CKEDITOR.LINEUTILS_AFTER&&i(r=t.getNext())&&r.isVisible()&&(e(r,CKEDITOR.LINEUTILS_BEFORE,this.relations),n^=CKEDITOR.LINEUTILS_AFTER),n&CKEDITOR.LINEUTILS_INSIDE&&i(r=t.getFirst())&&r.isVisible()&&(e(r,CKEDITOR.LINEUTILS_BEFORE,this.relations),n^=CKEDITOR.LINEUTILS_INSIDE),e(t,n,this.relations)}}(),traverseSearch:function(e){var t,n,r;do{if(!((r=e.$["data-cke-expando"])&&r in this.relations)){if(e.equals(this.editable))break;if(i(e))for(t in this.lookups)(n=this.lookups[t](e))&&this.store(e,n)}}while((!e||e.type!=CKEDITOR.NODE_ELEMENT||"true"!=e.getAttribute("contenteditable"))&&(e=e.getParent()))},pixelSearch:function(){function e(e,n,r,o,a){for(var s,l=0;a(r)&&(r+=o,25!=++l);)if(s=this.doc.$.elementFromPoint(n,r))if(s==e)l=0;else if(t(e,s)&&(l=0,i(s=new CKEDITOR.dom.element(s))))return s}var t=CKEDITOR.env.ie||CKEDITOR.env.webkit?function(e,t){return e.contains(t)}:function(e,t){return!!(16&e.compareDocumentPosition(t))};return function(t,n,r){var o=this.win.getViewPaneSize().height,a=e.call(this,t.$,n,r,-1,function(e){return 0<e});if(n=e.call(this,t.$,n,r,1,function(e){return e<o}),a)for(this.traverseSearch(a);!a.getParent().equals(t);)a=a.getParent();if(n)for(this.traverseSearch(n);!n.getParent().equals(t);)n=n.getParent();for(;(a||n)&&(a&&(a=a.getNext(i)),a&&!a.equals(n))&&(this.traverseSearch(a),n&&(n=n.getPrevious(i)),n&&!n.equals(a));)this.traverseSearch(n)}}(),greedySearch:function(){this.relations={};for(var e,t,n,r=this.editable.getElementsByTag("*"),o=0;e=r.getItem(o++);)if(!e.equals(this.editable)&&e.type==CKEDITOR.NODE_ELEMENT&&(e.hasAttribute("contenteditable")||!e.isReadOnly())&&i(e)&&e.isVisible())for(n in this.lookups)(t=this.lookups[n](e))&&this.store(e,t);return this.relations}},t.prototype={locate:function(){function e(e,t){var n=e.element[t===CKEDITOR.LINEUTILS_BEFORE?"getPrevious":"getNext"]();return n&&i(n)?(e.siblingRect=n.getClientRect(),t==CKEDITOR.LINEUTILS_BEFORE?(e.siblingRect.bottom+e.elementRect.top)/2:(e.elementRect.bottom+e.siblingRect.top)/2):t==CKEDITOR.LINEUTILS_BEFORE?e.elementRect.top:e.elementRect.bottom}return function(t){var n;this.locations={};for(var i in t)n=t[i],n.elementRect=n.element.getClientRect(),n.type&CKEDITOR.LINEUTILS_BEFORE&&this.store(i,CKEDITOR.LINEUTILS_BEFORE,e(n,CKEDITOR.LINEUTILS_BEFORE)),n.type&CKEDITOR.LINEUTILS_AFTER&&this.store(i,CKEDITOR.LINEUTILS_AFTER,e(n,CKEDITOR.LINEUTILS_AFTER)),n.type&CKEDITOR.LINEUTILS_INSIDE&&this.store(i,CKEDITOR.LINEUTILS_INSIDE,(n.elementRect.top+n.elementRect.bottom)/2);return this.locations}}(),sort:function(){var e,t,n,i;return function(r,o){e=this.locations,t=[];for(var a in e)for(var s in e[a])if(n=Math.abs(r-e[a][s]),t.length){for(i=0;i<t.length;i++)if(n<t[i].dist){t.splice(i,0,{uid:+a,type:s,dist:n});break}i==t.length&&t.push({uid:+a,type:s,dist:n})}else t.push({uid:+a,type:s,dist:n});return void 0!==o?t.slice(0,o):t}}(),store:function(e,t,n){this.locations[e]||(this.locations[e]={}),this.locations[e][t]=n}};var r={display:"block",width:"0px",height:"0px","border-color":"transparent","border-style":"solid",position:"absolute",top:"-6px"},o={height:"0px","border-top":"1px dashed red",position:"absolute","z-index":9999};n.prototype={removeAll:function(){for(var e in this.hidden)this.hidden[e].remove(),delete this.hidden[e];for(e in this.visible)this.visible[e].remove(),delete this.visible[e]},hideLine:function(e){var t=e.getUniqueId();e.hide(),this.hidden[t]=e,delete this.visible[t]},showLine:function(e){var t=e.getUniqueId();e.show(),this.visible[t]=e,delete this.hidden[t]},hideVisible:function(){for(var e in this.visible)this.hideLine(this.visible[e])},placeLine:function(e,t){var n,i,r;if(n=this.getStyle(e.uid,e.type)){for(r in this.visible)if(this.visible[r].getCustomData("hash")!==this.hash){i=this.visible[r];break}if(!i)for(r in this.hidden)if(this.hidden[r].getCustomData("hash")!==this.hash){this.showLine(i=this.hidden[r]);break}i||this.showLine(i=this.addLine()),i.setCustomData("hash",this.hash),this.visible[i.getUniqueId()]=i,i.setStyles(n),t&&t(i)}},getStyle:function(e,t){var n=this.relations[e],i=this.locations[e][t],r={};if(r.width=n.siblingRect?Math.max(n.siblingRect.width,n.elementRect.width):n.elementRect.width,r.top=this.inline?i+this.winTopScroll.y-this.rect.relativeY:this.rect.top+this.winTopScroll.y+i,r.top-this.winTopScroll.y<this.rect.top||r.top-this.winTopScroll.y>this.rect.bottom)return!1;this.inline?r.left=n.elementRect.left-this.rect.relativeX:(0<n.elementRect.left?r.left=this.rect.left+n.elementRect.left:(r.width+=n.elementRect.left,r.left=this.rect.left),0<(n=r.left+r.width-(this.rect.left+this.winPane.width))&&(r.width-=n)),r.left+=this.winTopScroll.x;for(var o in r)r[o]=CKEDITOR.tools.cssLength(r[o]);return r},addLine:function(){var e=CKEDITOR.dom.element.createFromHtml(this.lineTpl);return e.appendTo(this.container),e},prepare:function(e,t){this.relations=e,this.locations=t,this.hash=Math.random()},cleanup:function(){var e,t;for(t in this.visible)e=this.visible[t],e.getCustomData("hash")!==this.hash&&this.hideLine(e)},queryViewport:function(){this.winPane=this.win.getViewPaneSize(),this.winTopScroll=this.winTop.getScrollPosition(),this.winTopPane=this.winTop.getViewPaneSize(),this.rect=this.getClientRect(this.inline?this.editable:this.frame)},getClientRect:function(e){e=e.getClientRect();var t=this.container.getDocumentPosition(),n=this.container.getComputedStyle("position");return e.relativeX=e.relativeY=0,"static"!=n&&(e.relativeY=t.y,e.relativeX=t.x,e.top-=e.relativeY,e.bottom-=e.relativeY,e.left-=e.relativeX,e.right-=e.relativeX),e}};var a={left:1,right:1,center:1},s={absolute:1,fixed:1};CKEDITOR.plugins.lineutils={finder:e,locator:t,liner:n}}(),function(){function e(e){return e.getName&&!e.hasAttribute("data-cke-temp")}CKEDITOR.plugins.add("widgetselection",{init:function(e){if(CKEDITOR.env.webkit){var t=CKEDITOR.plugins.widgetselection;e.on("contentDom",function(e){e=e.editor;var n=e.editable();n.attachListener(n,"keydown",function(e){e.data.getKeystroke()==CKEDITOR.CTRL+65&&CKEDITOR.tools.setTimeout(function(){t.addFillers(n)||t.removeFillers(n)},0)},null,null,-1),e.on("selectionCheck",function(e){t.removeFillers(e.editor.editable())}),e.on("paste",function(e){e.data.dataValue=t.cleanPasteData(e.data.dataValue)}),"selectall"in e.plugins&&t.addSelectAllIntegration(e)})}}}),CKEDITOR.plugins.widgetselection={startFiller:null,endFiller:null,fillerAttribute:"data-cke-filler-webkit",fillerContent:"&nbsp;",fillerTagName:"div",addFillers:function(t){var n=t.editor;if(!this.isWholeContentSelected(t)&&0<t.getChildCount()){var i=t.getFirst(e),r=t.getLast(e);if(i&&i.type==CKEDITOR.NODE_ELEMENT&&!i.isEditable()&&(this.startFiller=this.createFiller(),t.append(this.startFiller,1)),r&&r.type==CKEDITOR.NODE_ELEMENT&&!r.isEditable()&&(this.endFiller=this.createFiller(!0),t.append(this.endFiller,0)),this.hasFiller(t))return n=n.createRange(),n.selectNodeContents(t),n.select(),!0}return!1},removeFillers:function(e){if(this.hasFiller(e)&&!this.isWholeContentSelected(e)){var t=e.findOne(this.fillerTagName+"["+this.fillerAttribute+"=start]"),n=e.findOne(this.fillerTagName+"["+this.fillerAttribute+"=end]");this.startFiller&&t&&this.startFiller.equals(t)?this.removeFiller(this.startFiller,e):this.startFiller=t,this.endFiller&&n&&this.endFiller.equals(n)?this.removeFiller(this.endFiller,e):this.endFiller=n}},cleanPasteData:function(e){return e&&e.length&&(e=e.replace(this.createFillerRegex(),"").replace(this.createFillerRegex(!0),"")),e},isWholeContentSelected:function(e){var t=e.editor.getSelection().getRanges()[0];return!(!t||t&&t.collapsed)&&(t=t.clone(),t.enlarge(CKEDITOR.ENLARGE_ELEMENT),!!(t&&e&&t.startContainer&&t.endContainer&&0===t.startOffset&&t.endOffset===e.getChildCount()&&t.startContainer.equals(e)&&t.endContainer.equals(e)))},hasFiller:function(e){return 0<e.find(this.fillerTagName+"["+this.fillerAttribute+"]").count()},createFiller:function(e){var t=new CKEDITOR.dom.element(this.fillerTagName);return t.setHtml(this.fillerContent),t.setAttribute(this.fillerAttribute,e?"end":"start"),t.setAttribute("data-cke-temp",1),t.setStyles({display:"block",width:0,height:0,padding:0,border:0,margin:0,position:"absolute",top:0,left:"-9999px",opacity:0,overflow:"hidden"}),t},removeFiller:function(e,t){if(e){var n,i,r=t.editor,o=t.editor.getSelection().getRanges()[0].startPath(),a=r.createRange();o.contains(e)&&(n=e.getHtml(),i=!0),o="start"==e.getAttribute(this.fillerAttribute),e.remove(),n&&0<n.length&&n!=this.fillerContent?(t.insertHtmlIntoRange(n,r.getSelection().getRanges()[0]),a.setStartAt(t.getChild(t.getChildCount()-1),CKEDITOR.POSITION_BEFORE_END),r.getSelection().selectRanges([a])):i&&(o?a.setStartAt(t.getFirst().getNext(),CKEDITOR.POSITION_AFTER_START):a.setEndAt(t.getLast().getPrevious(),CKEDITOR.POSITION_BEFORE_END),t.editor.getSelection().selectRanges([a]))}},createFillerRegex:function(e){var t=this.createFiller(e).getOuterHtml().replace(/style="[^"]*"/gi,'style="[^"]*"').replace(/>[^<]*</gi,">[^<]*<");return new RegExp((e?"":"^")+t+(e?"$":""))},addSelectAllIntegration:function(e){var t=this;e.editable().attachListener(e,"beforeCommandExec",function(n){var i=e.editable();"selectAll"==n.data.name&&i&&t.addFillers(i)},null,null,9999)}}}(),function(){function e(e){this.editor=e,this.registered={},this.instances={},this.selected=[],this.widgetHoldingFocusedEditable=this.focused=null,this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}},R(this),D(this),this.on("checkWidgets",a),this.editor.on("contentDomInvalidated",this.checkWidgets,this),I(this),C(this),v(this),T(this),O(this)}function t(e,n,i,r,o){var a=e.editor;CKEDITOR.tools.extend(this,r,{editor:a,id:n,inline:"span"==i.getParent().getName(),element:i,data:CKEDITOR.tools.extend({},"function"==typeof r.defaults?r.defaults():r.defaults),dataReady:!1,inited:!1,ready:!1,edit:t.prototype.edit,focusedEditable:null,definition:r,repository:e,draggable:!1!==r.draggable,_:{downcastFn:r.downcast&&"string"==typeof r.downcast?r.downcasts[r.downcast]:r.downcast}},!0),e.fire("instanceCreated",this),P(this,r),this.init&&this.init(),this.inited=!0,(e=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(e))),o&&this.setData(o),this.data.classes||this.setData("classes",this.getClasses()),this.dataReady=!0,W(this),this.fire("data",this.data),this.isInited()&&a.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function n(e,t,n){CKEDITOR.dom.element.call(this,t.$),this.editor=e,this._={},t=this.filter=n.filter,CKEDITOR.dtd[this.getName()].p?(this.enterMode=t?t.getAllowedEnterMode(e.enterMode):e.enterMode,this.shiftEnterMode=t?t.getAllowedEnterMode(e.shiftEnterMode,!0):e.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function i(e,t){e.addCommand(t.name,{exec:function(e,n){function i(){e.widgets.finalizeCreation(s)}var r=e.widgets.focused;if(r&&r.name==t.name)r.edit();else if(t.insert)t.insert({editor:e,commandData:n});else if(t.template){var o,r="function"==typeof t.defaults?t.defaults():t.defaults,r=CKEDITOR.tools.object.merge(r||{},n&&n.startupData||{}),r=CKEDITOR.dom.element.createFromHtml(t.template.output(r),e.document),a=e.widgets.wrapElement(r,t.name),s=new CKEDITOR.dom.documentFragment(a.getDocument());s.append(a),(o=e.widgets.initOn(r,t,n&&n.startupData))?(r=o.once("edit",function(t){t.data.dialog?o.once("dialog",function(t){t=t.data;var n,r;n=t.once("ok",i,null,null,20),r=t.once("cancel",function(t){t.data&&!1===t.data.hide||e.widgets.destroy(o,!0)}),t.once("hide",function(){n.removeListener(),r.removeListener()})}):i()},null,null,999),o.edit(),r.removeListener()):i()}},allowedContent:t.allowedContent,requiredContent:t.requiredContent,contentForms:t.contentForms,contentTransformations:t.contentTransformations})}function r(e,t){function n(e,n){var i,r,o=t.upcast.split(",");for(r=0;r<o.length;r++)if((i=o[r])===e.name)return t.upcasts[i].call(this,e,n);return!1}function i(t,n,i){var r=CKEDITOR.tools.getIndex(e._.upcasts,function(e){return e[2]>i});0>r&&(r=e._.upcasts.length),e._.upcasts.splice(r,0,[CKEDITOR.tools.bind(t,n),n.name,i])}var r=t.upcast,o=t.upcastPriority||10;r&&("string"==typeof r?i(n,t,o):i(r,t,o))}function o(e,t){if(e.focused=null,t.isInited()){var n=t.editor.checkDirty();e.fire("widgetBlurred",{widget:t}),t.setFocused(!1),!n&&t.editor.resetDirty()}}function a(e){if(e=e.data,"wysiwyg"==this.editor.mode){var n,i,r,o,a=this.editor.editable(),s=this.instances;if(a){for(n in s)s[n].isReady()&&!a.contains(s[n].wrapper)&&this.destroy(s[n],!0);if(e&&e.initOnlyNew)s=this.initOnAll();else{var l=a.find(".cke_widget_wrapper"),s=[];for(n=0,i=l.count();n<i;n++){if(r=l.getItem(n),o=!this.getByElement(r,!0)){e:{o=p;for(var d=r;d=d.getParent();)if(o(d)){o=!0;break e}o=!1}o=!o}o&&a.contains(r)&&(r.addClass("cke_widget_new"),s.push(this.initOn(r.getFirst(t.isDomWidgetElement))))}}e&&e.focusInited&&1==s.length&&s[0].focus()}}}function s(e){if(void 0!==e.attributes&&e.attributes["data-widget"]){var t=l(e),n=d(e),i=!1;t&&t.value&&t.value.match(/^\s/g)&&(t.parent.attributes["data-cke-white-space-first"]=1,t.value=t.value.replace(/^\s/g,"&nbsp;"),i=!0),n&&n.value&&n.value.match(/\s$/g)&&(n.parent.attributes["data-cke-white-space-last"]=1,n.value=n.value.replace(/\s$/g,"&nbsp;"),i=!0),i&&(e.attributes["data-cke-widget-white-space"]=1)}}function l(e){return e.find(function(e){return 3===e.type},!0).shift()}function d(e){return e.find(function(e){return 3===e.type},!0).pop()}function c(e,t,n){if(!n.allowedContent&&!n.disallowedContent)return null;var i=this._.filters[e];return i||(this._.filters[e]=i={}),e=i[t],e||(e=n.allowedContent?new CKEDITOR.filter(n.allowedContent):this.editor.filter.clone(),i[t]=e,n.disallowedContent&&e.disallow(n.disallowedContent)),e}function h(e){var n=[],i=e._.upcasts,r=e._.upcastCallbacks;return{toBeWrapped:n,iterator:function(e){var o,a,s,l,d;if("data-cke-widget-wrapper"in e.attributes)return(e=e.getFirst(t.isParserWidgetElement))&&n.push([e]),!1;if("data-widget"in e.attributes)return n.push([e]),!1;if(d=i.length){if(e.attributes["data-cke-widget-upcasted"])return!1;for(l=0,o=r.length;l<o;++l)if(!1===r[l](e))return;for(l=0;l<d;++l)if(o=i[l],s={},a=o[0](e,s))return a instanceof CKEDITOR.htmlParser.element&&(e=a),e.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(s)),e.attributes["data-cke-widget-upcasted"]=1,n.push([e,o[1]]),!1}}}}function u(e,t){return{tabindex:-1,contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off",class:"cke_widget_wrapper cke_widget_new cke_widget_"+(e?"inline":"block")+(t?" cke_widget_"+t:"")}}function f(e,t,n){if(e.type==CKEDITOR.NODE_ELEMENT){var i=CKEDITOR.dtd[e.name];if(i&&!i[n.name]){var i=e.split(t),r=e.parent;return t=i.getIndex(),e.children.length||(--t,e.remove()),i.children.length||i.remove(),f(r,t,n)}}e.add(n,t)}function g(e,t){return"boolean"==typeof e.inline?e.inline:!!CKEDITOR.dtd.$inline[t]}function p(e){return e.hasAttribute("data-cke-temp")}function m(e,t,n,i){var r=e.editor;r.fire("lockSnapshot"),n?(i=n.data("cke-widget-editable"),i=t.editables[i],e.widgetHoldingFocusedEditable=t,t.focusedEditable=i,n.addClass("cke_widget_editable_focused"),i.filter&&r.setActiveFilter(i.filter),r.setActiveEnterMode(i.enterMode,i.shiftEnterMode)):(i||t.focusedEditable.removeClass("cke_widget_editable_focused"),t.focusedEditable=null,e.widgetHoldingFocusedEditable=null,r.setActiveFilter(null),r.setActiveEnterMode(null,null)),r.fire("unlockSnapshot")}function E(e){e.contextMenu&&e.contextMenu.addListener(function(t){if(t=e.widgets.getByElement(t,!0))return t.fire("contextMenu",{})})}function _(e,t){return CKEDITOR.tools.trim(t)}function T(e){var n=e.editor,i=CKEDITOR.plugins.lineutils;n.on("dragstart",function(i){var r=i.data.target;t.isDomDragHandler(r)&&(r=e.getByElement(r),i.data.dataTransfer.setData("cke/widget-id",r.id),n.focus(),r.focus())}),n.on("drop",function(t){var i=t.data.dataTransfer,r=i.getData("cke/widget-id"),o=i.getTransferType(n),i=n.createRange(),a=function(e){return e=e.getBoundaryNodes().startNode,e.type!==CKEDITOR.NODE_ELEMENT&&(e=e.getParent()),n.widgets.getByElement(e)}(t.data.dropRange);""!==r&&o===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?t.cancel():o==CKEDITOR.DATA_TRANSFER_INTERNAL&&(""===r&&0<n.widgets.selected.length?t.data.dataTransfer.setData("text/html",L(n)):(r=e.instances[r])&&(!function(e,t){return!(!e||!t)&&(e.wrapper.equals(t.wrapper)||e.wrapper.contains(t.wrapper))}(r,a)?(i.setStartBefore(r.wrapper),i.setEndAfter(r.wrapper),t.data.dragRange=i,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,t.data.dataTransfer.setData("text/html",r.getClipboardHtml()),n.widgets.destroy(r,!0)):t.cancel()))}),n.on("contentDom",function(){var r=n.editable();CKEDITOR.tools.extend(e,{finder:new i.finder(n,{lookups:{default:function(n){if(!n.is(CKEDITOR.dtd.$listItem)&&n.is(CKEDITOR.dtd.$block)&&!t.isDomNestedEditable(n)&&!e._.draggedWidget.wrapper.contains(n)){var i=t.getNestedEditable(r,n);if(i){if(n=e._.draggedWidget,e.getByElement(i)==n)return;if(i=CKEDITOR.filter.instances[i.data("cke-filter")],n=n.requiredContent,i&&n&&!i.check(n))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new i.locator(n),liner:new i.liner(n,{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function C(e){var n=e.editor;n.on("contentDom",function(){var i,r,o=n.editable(),a=o.isInline()?o:n.document;o.attachListener(a,"mousedown",function(o){var a=o.data.getTarget();i=a instanceof CKEDITOR.dom.element?e.getByElement(a):null,r=0,i&&(i.inline&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")?(r=1,e.focused!=i&&n.getSelection().removeAllRanges()):t.getNestedEditable(i.wrapper,a)?i=null:(o.data.preventDefault(),CKEDITOR.env.ie||i.focus()))}),o.attachListener(a,"mouseup",function(){r&&i&&i.wrapper&&(r=0,i.focus())}),CKEDITOR.env.ie&&o.attachListener(a,"mouseup",function(){setTimeout(function(){i&&i.wrapper&&o.contains(i.wrapper)&&(i.focus(),i=null)})})}),n.on("doubleclick",function(n){var i=e.getByElement(n.data.element);if(i&&!t.getNestedEditable(i.wrapper,n.data.element))return i.fire("doubleclick",{element:n.data.element})},null,null,1)}function v(e){e.editor.on("key",function(t){var n,i=e.focused,r=e.widgetHoldingFocusedEditable;return i?n=i.fire("key",{keyCode:t.data.keyCode}):r&&(i=t.data.keyCode,t=r.focusedEditable,i==CKEDITOR.CTRL+65?(i=t.getBogus(),r=r.editor.createRange(),r.selectNodeContents(t),i&&r.setEndAt(i,CKEDITOR.POSITION_BEFORE_START),r.select(),n=!1):8==i||46==i?(n=r.editor.getSelection().getRanges(),r=n[0],n=!(1==n.length&&r.collapsed&&r.checkBoundaryOfElement(t,CKEDITOR[8==i?"START":"END"]))):n=void 0),n},null,null,1)}function O(e){function t(t){1>e.selected.length||N(n,"cut"===t.name)}var n=e.editor;n.on("contentDom",function(){var e=n.editable();e.attachListener(e,"copy",t),e.attachListener(e,"cut",t)})}function I(e){function n(){var e=a.getSelection();if(e&&(e=e.getRanges()[0])&&!e.collapsed){var t=i(e.startContainer),n=i(e.endContainer);!t&&n?(e.setEndBefore(n.wrapper),e.select()):t&&!n&&(e.setStartAfter(t.wrapper),e.select())}}function i(e){return e?e.type==CKEDITOR.NODE_TEXT?i(e.getParent()):a.widgets.getByElement(e):null}function r(){e.fire("checkSelection")}var a=e.editor;a.on("selectionCheck",r),a.on("contentDom",function(){a.editable().attachListener(a,"key",function(){setTimeout(r,10)})}),CKEDITOR.env.ie||e.on("checkSelection",n),e.on("checkSelection",e.checkSelection,e),a.on("selectionChange",function(n){var i=(n=t.getNestedEditable(a.editable(),n.data.selection.getStartElement()))&&e.getByElement(n),r=e.widgetHoldingFocusedEditable;r?r===i&&r.focusedEditable.equals(n)||(m(e,r,null),i&&n&&m(e,i,n)):i&&n&&m(e,i,n)}),a.on("dataReady",function(){b(e).commit()}),a.on("blur",function(){var t;(t=e.focused)&&o(e,t),(t=e.widgetHoldingFocusedEditable)&&m(e,t,null)})}function D(e){var n=e.editor,i={};n.on("toDataFormat",function(n){var r=CKEDITOR.tools.getNextNumber(),o=[];n.data.downcastingSessionId=r,i[r]=o,n.data.dataValue.forEach(function(n){var i,r=n.attributes;if("data-cke-widget-white-space"in r){i=l(n);var a=d(n);i.parent.attributes["data-cke-white-space-first"]&&(i.value=i.value.replace(/^&nbsp;/g," ")),a.parent.attributes["data-cke-white-space-last"]&&(a.value=a.value.replace(/&nbsp;$/g," "))}if("data-cke-widget-id"in r)(r=e.instances[r["data-cke-widget-id"]])&&(i=n.getFirst(t.isParserWidgetElement),o.push({wrapper:n,element:i,widget:r,editables:{}}),i&&"1"!=i.attributes["data-cke-widget-keep-attr"]&&delete i.attributes["data-widget"]);else if("data-cke-widget-editable"in r)return 0<o.length&&(o[o.length-1].editables[r["data-cke-widget-editable"]]=n),!1},CKEDITOR.NODE_ELEMENT,!0)},null,null,8),n.on("toDataFormat",function(e){if(e.data.downcastingSessionId)for(var t,n,r,o,a,s,l=i[e.data.downcastingSessionId];t=l.shift();){n=t.widget,r=t.element,o=n._.downcastFn&&n._.downcastFn.call(n,r),e.data.widgetsCopy&&n.getClipboardHtml&&(o=CKEDITOR.htmlParser.fragment.fromHtml(n.getClipboardHtml()),o=o.children[0]);for(s in t.editables)a=t.editables[s],delete a.attributes.contenteditable,a.setHtml(n.editables[s].getData());o||(o=r),o?t.wrapper.replaceWith(o):t.wrapper.remove()}},null,null,13),n.on("contentDomUnload",function(){e.destroyAll(!0)})}function R(e){var n,i,r=e.editor;r.on("toHtml",function(i){var r,o=h(e);for(i.data.dataValue.forEach(o.iterator,CKEDITOR.NODE_ELEMENT,!0);r=o.toBeWrapped.pop();){var a=r[0],s=a.parent;s.type==CKEDITOR.NODE_ELEMENT&&s.attributes["data-cke-widget-wrapper"]&&s.replaceWith(a),e.wrapElement(r[0],r[1])}n=i.data.protectedWhitespaces?3==i.data.dataValue.children.length&&t.isParserWidgetWrapper(i.data.dataValue.children[1]):1==i.data.dataValue.children.length&&t.isParserWidgetWrapper(i.data.dataValue.children[0])},null,null,8),r.on("dataReady",function(){if(i)for(var n,o,a=r.editable().find(".cke_widget_wrapper"),s=0,l=a.count();s<l;++s)n=a.getItem(s),o=n.getFirst(t.isDomWidgetElement),o.type==CKEDITOR.NODE_ELEMENT&&o.data("widget")?(o.replace(n),e.wrapElement(o)):n.remove();i=0,e.destroyAll(!0),e.initOnAll()}),r.on("loadSnapshot",function(t){/data-cke-widget/.test(t.data)&&(i=1),e.destroyAll(!0)},null,null,9),r.on("paste",function(e){e=e.data,e.dataValue=e.dataValue.replace(X,_),e.range&&(e=t.getNestedEditable(r.editable(),e.range.startContainer))&&(e=CKEDITOR.filter.instances[e.data("cke-filter")])&&r.setActiveFilter(e)}),r.on("afterInsertHtml",function(t){t.data.intoRange?e.checkWidgets({initOnlyNew:!0}):(r.fire("lockSnapshot"),e.checkWidgets({initOnlyNew:!0,focusInited:n}),r.fire("unlockSnapshot"))})}function b(e){var t=e.selected,n=[],i=t.slice(0),r=null;return{select:function(e){return 0>CKEDITOR.tools.indexOf(t,e)&&n.push(e),e=CKEDITOR.tools.indexOf(i,e),0<=e&&i.splice(e,1),this},focus:function(e){return r=e,this},commit:function(){var a,s,l=e.focused!==r;for(e.editor.fire("lockSnapshot"),l&&(a=e.focused)&&o(e,a);a=i.pop();)t.splice(CKEDITOR.tools.indexOf(t,a),1),a.isInited()&&(s=a.editor.checkDirty(),a.setSelected(!1),!s&&a.editor.resetDirty());for(l&&r&&(s=e.editor.checkDirty(),e.focused=r,e.fire("widgetFocused",{widget:r}),r.setFocused(!0),!s&&e.editor.resetDirty());a=n.pop();)t.push(a),a.setSelected(!0);e.editor.fire("unlockSnapshot")}}}function y(e){e&&e.addFilterRule(function(e){return e.replace(/\s*cke_widget_selected/g,"").replace(/\s*cke_widget_focused/g,"")})}function K(e,t,n){var i=0;t=x(t);var r,o=e.data.classes||{};if(t){for(o=CKEDITOR.tools.clone(o);r=t.pop();)n?o[r]||(i=o[r]=1):o[r]&&(delete o[r],i=1);i&&e.setData("classes",o)}}function k(e){e.cancel()}function w(e,t){var n=function(e){return e==CKEDITOR.ENTER_BR?"br":e==CKEDITOR.ENTER_DIV?"div":"p"}(e.editor.config.enterMode),i=new CKEDITOR.dom.element(n);"br"!==n&&i.appendBogus(),"after"===t?i.insertAfter(e.wrapper):i.insertBefore(e.wrapper),function(t){var n=e.editor.createRange();n.setStart(t,0),e.editor.getSelection().selectRanges([n])}(i)}function N(e,t){var n,i,r,o=e.widgets.focused;J.hasCopyBin(e)||(i=new J(e,{beforeDestroy:function(){!t&&o&&o.focus(),r&&e.getSelection().selectBookmarks(r),n&&CKEDITOR.plugins.widgetselection.addFillers(e.editable())},afterDestroy:function(){t&&!e.readOnly&&(o?e.widgets.del(o):e.extractSelectedHtml(),e.fire("saveSnapshot"))}}),o||(n=CKEDITOR.env.webkit&&CKEDITOR.plugins.widgetselection.isWholeContentSelected(e.editable()),r=e.getSelection().createBookmarks(!0)),i.handle(L(e)))}function x(e){return(e=(e=e.getDefinition().attributes)&&e.class)?e.split(/\s+/):null}function S(){var e=CKEDITOR.document.getActive(),t=this.editor,n=t.editable();(n.isInline()?n:t.document.getWindow().getFrame()).equals(e)&&t.focusManager.focus(n)}function A(){CKEDITOR.env.gecko&&this.editor.unlockSelection(),CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function L(e){var t=e.getSelectedHtml(!0);return e.widgets.focused?e.widgets.focused.getClipboardHtml():(e.once("toDataFormat",function(e){e.data.widgetsCopy=!0},null,null,-1),e.dataProcessor.toDataFormat(t))}function P(e,n){var i=e.editor.config.widget_keystrokeInsertLineBefore,r=e.editor.config.widget_keystrokeInsertLineAfter;F(e),j(e),B(e),$(e),q(e),V(e),z(e),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&e.wrapper.on("dragstart",function(n){var i=n.data.getTarget();t.getNestedEditable(e,i)||e.inline&&t.isDomDragHandler(i)||n.data.preventDefault()}),e.wrapper.removeClass("cke_widget_new"),e.element.addClass("cke_widget_element"),e.on("key",function(t){if((t=t.data.keyCode)==i)w(e,"before"),e.editor.fire("saveSnapshot");else if(t==r)w(e,"after"),e.editor.fire("saveSnapshot");else if(13==t)e.edit();else{if(t==CKEDITOR.CTRL+67||t==CKEDITOR.CTRL+88)return void N(e.editor,t==CKEDITOR.CTRL+88);if(t in Y||CKEDITOR.CTRL&t||CKEDITOR.ALT&t)return}return!1},null,null,999),e.on("doubleclick",function(t){e.edit()&&t.cancel()}),n.data&&e.on("data",n.data),n.edit&&e.on("edit",n.edit)}function F(e){(e.wrapper=e.element.getParent()).setAttribute("data-cke-widget-id",e.id)}function j(e,t){if(e.partSelectors||(e.partSelectors=e.parts),e.parts){
-var n,i,r={};for(i in e.partSelectors)t||!e.parts[i]||"string"==typeof e.parts[i]?(n=e.wrapper.findOne(e.partSelectors[i]),r[i]=n):r[i]=e.parts[i];e.parts=r}}function B(e){var t,n,i=e.editables;if(e.editables={},e.editables)for(t in i)n=i[t],e.initEditable(t,"string"==typeof n?{selector:n}:n)}function $(e){if(!0===e.mask)M(e);else if(e.mask){var t,n,i=new CKEDITOR.tools.buffers.throttle(250,H,e),r=CKEDITOR.env.gecko?300:0;if(e.on("focus",function(){i.input(),t=e.editor.on("change",i.input),n=e.on("blur",function(){t.removeListener(),n.removeListener()})}),e.editor.on("instanceReady",function(){setTimeout(function(){i.input()},r)}),e.editor.on("mode",function(){setTimeout(function(){i.input()},r)}),CKEDITOR.env.gecko){var o=e.element.find("img");CKEDITOR.tools.array.forEach(o.toArray(),function(e){e.on("load",function(){i.input()})})}for(var a in e.editables)e.editables[a].on("focus",function(){e.editor.on("change",i.input),n&&n.removeListener()}),e.editables[a].on("blur",function(){e.editor.removeListener("change",i.input)});i.input()}}function M(e){var t=e.wrapper.findOne(".cke_widget_mask");t||(t=new CKEDITOR.dom.element("img",e.editor.document),t.setAttributes({src:CKEDITOR.tools.transparentImageData,class:"cke_reset cke_widget_mask"}),e.wrapper.append(t)),e.mask=t}function H(){if(this.wrapper){this.maskPart=this.maskPart||this.mask;var e,t=this.parts[this.maskPart];if(t&&"string"!=typeof t){e=this.wrapper.findOne(".cke_widget_partial_mask"),e||(e=new CKEDITOR.dom.element("img",this.editor.document),e.setAttributes({src:CKEDITOR.tools.transparentImageData,class:"cke_reset cke_widget_partial_mask"}),this.wrapper.append(e)),this.mask=e;var n=e.$,i=t.$,r=!(n.offsetTop==i.offsetTop&&n.offsetLeft==i.offsetLeft);(n.offsetWidth!=i.offsetWidth||n.offsetHeight!=i.offsetHeight||r)&&(n=t.getParent(),i=CKEDITOR.plugins.widget.isDomWidget(n),e.setStyles({top:t.$.offsetTop+(i?0:n.$.offsetTop)+"px",left:t.$.offsetLeft+(i?0:n.$.offsetLeft)+"px",width:t.$.offsetWidth+"px",height:t.$.offsetHeight+"px"}))}}}function q(e){if(e.draggable){var n,i=e.editor,r=e.wrapper.getLast(t.isDomDragHandlerContainer);r?n=r.findOne("img"):(r=new CKEDITOR.dom.element("span",i.document),r.setAttributes({class:"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+i.plugins.widget.path+"images/handle.png);display:none;"}),n=new CKEDITOR.dom.element("img",i.document),n.setAttributes({class:"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,width:15,title:i.lang.widget.move,height:15,role:"presentation"}),e.inline&&n.setAttribute("draggable","true"),r.append(n),e.wrapper.append(r)),e.wrapper.on("dragover",function(e){e.data.preventDefault()}),e.wrapper.on("mouseenter",e.updateDragHandlerPosition,e),setTimeout(function(){e.on("data",e.updateDragHandlerPosition,e)},50),!e.inline&&(n.on("mousedown",U,e),CKEDITOR.env.ie&&9>CKEDITOR.env.version)&&n.on("dragstart",function(e){e.data.preventDefault(!0)}),e.dragHandlerContainer=r}}function U(e){function t(){var t;for(u.reset();t=d.pop();)t.removeListener();var n=c;t=e.sender;var i=this.repository.finder,r=this.repository.liner,o=this.editor,a=this.editor.editable();CKEDITOR.tools.isEmpty(r.visible)||(n=i.getRange(n[0]),this.focus(),o.fire("drop",{dropRange:n,target:n.startContainer})),a.removeClass("cke_widget_dragging"),r.hideVisible(),o.fire("dragend",{target:t})}if(CKEDITOR.tools.getMouseButton(e)===CKEDITOR.MOUSE_BUTTON_LEFT){var n,i,r=this.repository.finder,o=this.repository.locator,a=this.repository.liner,s=this.editor,l=s.editable(),d=[],c=[];this.repository._.draggedWidget=this;var h=r.greedySearch(),u=CKEDITOR.tools.eventsBuffer(50,function(){n=o.locate(h),c=o.sort(i,1),c.length&&(a.prepare(h,n),a.placeLine(c[0]),a.cleanup())});l.addClass("cke_widget_dragging"),d.push(l.on("mousemove",function(e){i=e.data.$.clientY,u.input()})),s.fire("dragstart",{target:e.sender}),d.push(s.document.once("mouseup",t,this)),l.isInline()||d.push(CKEDITOR.document.once("mouseup",t,this))}}function V(e){var t=null;e.on("data",function(){var e,n=this.data.classes;if(t!=n){for(e in t)n&&n[e]||this.removeClass(e);for(e in n)this.addClass(e);t=n}})}function z(e){e.on("data",function(){if(e.wrapper){var t=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());e.wrapper.setAttribute("role","region"),e.wrapper.setAttribute("aria-label",t)}},null,null,9999)}function W(e){e.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(e.data)))}function G(){function e(){}function n(e,t,n){return!(!n||!this.checkElement(e))&&((e=n.widgets.getByElement(e,!0))&&e.checkStyleActive(this))}function i(e){var t,n=e.widget;r[n]||(r[n]={});for(var i=0,o=e.group.length;i<o;i++)t=e.group[i],r[n][t]||(r[n][t]=[]),t=r[n][t],function(e,t,n){for(var i=e.length,r=0;r<i;){if(t.call(n,e[r],r,e))return e[r];r++}}(t,function(e){function t(e,n){var i=CKEDITOR.tools.object.keys(e),r=CKEDITOR.tools.object.keys(n);if(i.length!==r.length)return!1;for(var o in e)if(("object"!=typeof e[o]||"object"!=typeof n[o]||!t(e[o],n[o]))&&e[o]!==n[o])return!1;return!0}return function(n){return t(e.getDefinition(),n.getDefinition())}}(e))||t.push(e)}var r={};CKEDITOR.style.addCustomHandler({type:"widget",setup:function(e){this.widget=e.widget,(this.group="string"==typeof e.group?[e.group]:e.group)&&i(this)},apply:function(e){var t;e instanceof CKEDITOR.editor&&this.checkApplicable(e.elementPath(),e)&&(t=e.widgets.focused,this.group&&this.removeStylesFromSameGroup(e),t.applyStyle(this))},remove:function(e){e instanceof CKEDITOR.editor&&this.checkApplicable(e.elementPath(),e)&&e.widgets.focused.removeStyle(this)},removeStylesFromSameGroup:function(e){var t,n,i=!1;if(!(e instanceof CKEDITOR.editor))return!1;if(n=e.elementPath(),this.checkApplicable(n,e))for(var o=0,a=this.group.length;o<a;o++){t=r[this.widget][this.group[o]];for(var s=0;s<t.length;s++)t[s]!==this&&t[s].checkActive(n,e)&&(e.widgets.focused.removeStyle(t[s]),i=!0)}return i},checkActive:function(e,t){return this.checkElementMatch(e.lastElement,0,t)},checkApplicable:function(e,t){return t instanceof CKEDITOR.editor&&this.checkElement(e.lastElement)},checkElementMatch:n,checkElementRemovable:n,checkElement:function(e){return!!t.isDomWidgetWrapper(e)&&((e=e.getFirst(t.isDomWidgetElement))&&e.data("widget")==this.widget)},buildPreview:function(e){return e||this._.definition.name},toAllowedContentRules:function(e){if(!e)return null;e=e.widgets.registered[this.widget];var t,n={};return e?e.styleableElements?(t=this.getClassesArray())?(n[e.styleableElements]={classes:t,propertiesOnly:!0},n):null:e.styleToAllowedContentRules?e.styleToAllowedContentRules(this):null:null},getClassesArray:function(){var e=this._.definition.attributes&&this._.definition.attributes.class;return e?CKEDITOR.tools.trim(e).split(/\s+/):null},applyToRange:e,removeFromRange:e,applyToObject:e})}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard,widgetselection",onLoad:function(){void 0!==CKEDITOR.document.$.querySelectorAll&&(CKEDITOR.addCss('.cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover>.cke_widget_element{outline:2px solid #ffd25c;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid #ffd25c}.cke_widget_wrapper.cke_widget_focused>.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #47a4f5}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:block;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover>.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}.cke_editable[contenteditable="false"] .cke_widget_drag_handler_container{display:none;}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_widget_partial_mask{position:absolute;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}'),G())},beforeInit:function(t){void 0!==CKEDITOR.document.$.querySelectorAll&&(t.widgets=new e(t))},afterInit:function(e){if(void 0!==CKEDITOR.document.$.querySelectorAll){var t,n,i,r=e.widgets.registered;for(n in r)t=r[n],(i=t.button)&&e.ui.addButton&&e.ui.addButton(CKEDITOR.tools.capitalize(t.name,!0),{label:i,command:t.name,toolbar:"insert,10"});E(e),y(e.undoManager)}}}),e.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(e,t){var n=this.editor;if(t=CKEDITOR.tools.prototypedCopy(t),t.name=e,t._=t._||{},n.fire("widgetDefinition",t),t.template&&(t.template=new CKEDITOR.template(t.template)),i(n,t),r(this,t),this.registered[e]=t,t.dialog&&n.plugins.dialog)var o=CKEDITOR.on("dialogDefinition",function(e){e=e.data.definition;var i=e.dialog;e.getMode||i.getName()!==t.dialog||(e.getMode=function(){var e=i.getModel(n);return e&&e instanceof CKEDITOR.plugins.widget&&e.ready?CKEDITOR.dialog.EDITING_MODE:CKEDITOR.dialog.CREATION_MODE}),o.removeListener()});return t},addUpcastCallback:function(e){this._.upcastCallbacks.push(e)},checkSelection:function(){if(this.editor.getSelection()){var e,n=this.editor.getSelection(),i=n.getSelectedElement(),r=b(this);if(i&&(e=this.getByElement(i,!0)))return r.focus(e).select(e).commit();if(!(n=n.getRanges()[0])||n.collapsed)return r.commit();for(n=new CKEDITOR.dom.walker(n),n.evaluator=t.isDomWidgetWrapper;i=n.next();)r.select(this.getByElement(i));r.commit()}},checkWidgets:function(e){this.fire("checkWidgets",CKEDITOR.tools.copy(e||{}))},del:function(e){if(this.focused===e){var t,n=e.editor,i=n.createRange();(t=i.moveToClosestEditablePosition(e.wrapper,!0))||(t=i.moveToClosestEditablePosition(e.wrapper,!1)),t&&n.getSelection().selectRanges([i])}e.wrapper.remove(),this.destroy(e,!0)},destroy:function(e,t){this.widgetHoldingFocusedEditable===e&&m(this,e,null,t),e.destroy(t),delete this.instances[e.id],this.fire("instanceDestroyed",e)},destroyAll:function(e,t){var n,i,r=this.instances;if(t&&!e){i=t.find(".cke_widget_wrapper");for(var r=i.count(),o=0;o<r;++o)(n=this.getByElement(i.getItem(o),!0))&&this.destroy(n)}else for(i in r)n=r[i],this.destroy(n,e)},finalizeCreation:function(e){(e=e.getFirst())&&t.isDomWidgetWrapper(e)&&(this.editor.insertElement(e),e=this.getByElement(e),e.ready=!0,e.fire("ready"),e.focus())},getByElement:function(){function e(e){return e.is(t)&&e.data("cke-widget-id")}var t={div:1,span:1};return function(t,n){if(!t)return null;var i=e(t);if(!n&&!i){var r=this.editor.editable();do{t=t.getParent()}while(t&&!t.equals(r)&&!(i=e(t)))}return this.instances[i]||null}}(),initOn:function(e,n,i){if(n?"string"==typeof n&&(n=this.registered[n]):n=this.registered[e.data("widget")],!n)return null;var r=this.wrapElement(e,n.name);return r?r.hasClass("cke_widget_new")?(e=new t(this,this._.nextId++,e,n,i),e.isInited()?this.instances[e.id]=e:null):this.getByElement(e):null},initOnAll:function(e){e=(e||this.editor.editable()).find(".cke_widget_new");for(var n,i=[],r=e.count();r--;)(n=this.initOn(e.getItem(r).getFirst(t.isDomWidgetElement)))&&i.push(n);return i},onWidget:function(e){var t=Array.prototype.slice.call(arguments);t.shift();for(var n in this.instances){var i=this.instances[n];i.name==e&&i.on.apply(i,t)}this.on("instanceCreated",function(n){n=n.data,n.name==e&&n.on.apply(n,t)})},parseElementClasses:function(e){if(!e)return null;e=CKEDITOR.tools.trim(e).split(/\s+/);for(var t,n={},i=0;t=e.pop();)-1==t.indexOf("cke_")&&(n[t]=i=1);return i?n:null},wrapElement:function(e,t){var n,i,r=null;if(e instanceof CKEDITOR.dom.element){if(t=t||e.data("widget"),!(n=this.registered[t]))return null;if((r=e.getParent())&&r.type==CKEDITOR.NODE_ELEMENT&&r.data("cke-widget-wrapper"))return r;e.hasAttribute("data-cke-widget-keep-attr")||e.data("cke-widget-keep-attr",e.data("widget")?1:0),e.data("widget",t),(i=g(n,e.getName()))&&s(e),r=new CKEDITOR.dom.element(i?"span":"div",e.getDocument()),r.setAttributes(u(i,t)),r.data("cke-display-name",n.pathName?n.pathName:e.getName()),e.getParent(!0)&&r.replace(e),e.appendTo(r)}else if(e instanceof CKEDITOR.htmlParser.element){if(t=t||e.attributes["data-widget"],!(n=this.registered[t]))return null;if((r=e.parent)&&r.type==CKEDITOR.NODE_ELEMENT&&r.attributes["data-cke-widget-wrapper"])return r;"data-cke-widget-keep-attr"in e.attributes||(e.attributes["data-cke-widget-keep-attr"]=e.attributes["data-widget"]?1:0),t&&(e.attributes["data-widget"]=t),(i=g(n,e.name))&&s(e),r=new CKEDITOR.htmlParser.element(i?"span":"div",u(i,t)),r.attributes["data-cke-display-name"]=n.pathName?n.pathName:e.name,n=e.parent;var o;n&&(o=e.getIndex(),e.remove()),r.add(e),n&&f(n,o,r)}return r},_tests_createEditableFilter:c},CKEDITOR.event.implementOn(e.prototype),t.prototype={addClass:function(e){this.element.addClass(e),this.wrapper.addClass(t.WRAPPER_CLASS_PREFIX+e)},applyStyle:function(e){K(this,e,1)},checkStyleActive:function(e){e=x(e);var t;if(!e)return!1;for(;t=e.pop();)if(!this.hasClass(t))return!1;return!0},destroy:function(e){if(this.fire("destroy"),this.editables)for(var t in this.editables)this.destroyEditable(t,e);e||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper)),this.wrapper=null},destroyEditable:function(e,t){var n=this.editables[e],i=!0;if(n.removeListener("focus",A),n.removeListener("blur",S),this.editor.focusManager.remove(n),n.filter){for(var r in this.repository.instances){var o=this.repository.instances[r];o.editables&&(o=o.editables[e])&&o!==n&&n.filter===o.filter&&(i=!1)}i&&(n.filter.destroy(),(i=this.repository._.filters[this.name])&&delete i[e])}t||(this.repository.destroyAll(!1,n),n.removeClass("cke_widget_editable"),n.removeClass("cke_widget_editable_focused"),n.removeAttributes(["contenteditable","data-cke-widget-editable","data-cke-enter-mode"])),delete this.editables[e]},edit:function(){var e={dialog:this.dialog},t=this;return!(!1===this.fire("edit",e)||!e.dialog)&&(this.editor.openDialog(e.dialog,function(e){var n,i;!1!==t.fire("dialog",e)&&(n=e.on("show",function(){e.setupContent(t)}),i=e.on("ok",function(){var n,i=t.on("data",function(e){n=1,e.cancel()},null,null,0);t.editor.fire("saveSnapshot"),e.commitContent(t),i.removeListener(),n&&(t.fire("data",t.data),t.editor.fire("saveSnapshot"))}),e.once("hide",function(){n.removeListener(),i.removeListener()}))},t),!0)},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},getClipboardHtml:function(){var e=this.editor.createRange();return e.setStartBefore(this.wrapper),e.setEndAfter(this.wrapper),this.editor.editable().getHtmlFromRange(e).getHtml()},hasClass:function(e){return this.element.hasClass(e)},initEditable:function(e,t){var i=this._findOneNotNested(t.selector);return!(!i||!i.is(CKEDITOR.dtd.$editable))&&(i=new n(this.editor,i,{filter:c.call(this.repository,this.name,e,t)}),this.editables[e]=i,i.setAttributes({contenteditable:"true","data-cke-widget-editable":e,"data-cke-enter-mode":i.enterMode}),i.filter&&i.data("cke-filter",i.filter.id),i.addClass("cke_widget_editable"),i.removeClass("cke_widget_editable_focused"),t.pathName&&i.data("cke-display-name",t.pathName),this.editor.focusManager.add(i),i.on("focus",A,this),CKEDITOR.env.ie&&i.on("blur",S,this),i._.initialSetData=!0,i.setData(i.getHtml()),!0)},_findOneNotNested:function(e){e=this.wrapper.find(e);for(var n,i,r=0;r<e.count();r++)if(n=e.getItem(r),i=n.getAscendant(t.isDomWidgetWrapper),this.wrapper.equals(i))return n;return null},isInited:function(){return!(!this.wrapper||!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var e=this.editor.getSelection();if(e){var t=this.editor.checkDirty();e.fake(this.wrapper),!t&&this.editor.resetDirty()}this.editor.focus()},refreshMask:function(){$(this)},refreshParts:function(e){j(this,void 0===e||e)},removeClass:function(e){this.element.removeClass(e),this.wrapper.removeClass(t.WRAPPER_CLASS_PREFIX+e)},removeStyle:function(e){K(this,e,0)},setData:function(e,t){var n=this.data,i=0;if("string"==typeof e)n[e]!==t&&(n[e]=t,i=1);else{var r=e;for(e in r)n[e]!==r[e]&&(i=1,n[e]=r[e])}return i&&this.dataReady&&(W(this),this.fire("data",n)),this},setFocused:function(e){return this.wrapper[e?"addClass":"removeClass"]("cke_widget_focused"),this.fire(e?"focus":"blur"),this},setSelected:function(e){return this.wrapper[e?"addClass":"removeClass"]("cke_widget_selected"),this.fire(e?"select":"deselect"),this},updateDragHandlerPosition:function(){var e=this.editor,t=this.element.$,n=this._.dragHandlerOffset,t={x:t.offsetLeft,y:t.offsetTop-15};n&&t.x==n.x&&t.y==n.y||(n=e.checkDirty(),e.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:t.y+"px",left:t.x+"px"}),this.dragHandlerContainer.removeStyle("display"),e.fire("unlockSnapshot"),!n&&e.resetDirty(),this._.dragHandlerOffset=t)}},CKEDITOR.event.implementOn(t.prototype),t.getNestedEditable=function(e,n){return!n||n.equals(e)?null:t.isDomNestedEditable(n)?n:t.getNestedEditable(e,n.getParent())},t.isDomDragHandler=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-cke-widget-drag-handler")},t.isDomDragHandlerContainer=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasClass("cke_widget_drag_handler_container")},t.isDomNestedEditable=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-cke-widget-editable")},t.isDomWidgetElement=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-widget")},t.isDomWidgetWrapper=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-cke-widget-wrapper")},t.isDomWidget=function(e){return!!e&&(this.isDomWidgetWrapper(e)||this.isDomWidgetElement(e))},t.isParserWidgetElement=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&!!e.attributes["data-widget"]},t.isParserWidgetWrapper=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&!!e.attributes["data-cke-widget-wrapper"]},t.WRAPPER_CLASS_PREFIX="cke_widget_wrapper_",n.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),{setData:function(e){this._.initialSetData||this.editor.widgets.destroyAll(!1,this),this._.initialSetData=!1,e=this.editor.dataProcessor.unprotectRealComments(e),e=this.editor.dataProcessor.unprotectSource(e),e=this.editor.dataProcessor.toHtml(e,{context:this.getName(),filter:this.filter,enterMode:this.enterMode}),this.setHtml(e),this.editor.widgets.initOnAll(this)},getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var X=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,Y={37:1,38:1,39:1,40:1,8:1,46:1};Y[CKEDITOR.SHIFT+121]=1;var J=CKEDITOR.tools.createClass({$:function(e,t){this._.createCopyBin(e,t),this._.createListeners(t)},_:{createCopyBin:function(e){var t=e.document,n=CKEDITOR.env.edge&&16<=CKEDITOR.env.version,i=!e.blockless&&!CKEDITOR.env.ie||n?"div":"span",n=t.createElement(i),t=t.createElement(i);t.setAttributes({id:"cke_copybin","data-cke-temp":"1"}),n.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"}),n.setStyle("ltr"==e.config.contentsLangDirection?"left":"right","-5000px"),this.editor=e,this.copyBin=n,this.container=t},createListeners:function(e){e&&(e.beforeDestroy&&(this.beforeDestroy=e.beforeDestroy),e.afterDestroy&&(this.afterDestroy=e.afterDestroy))}},proto:{handle:function(e){var t,n,i,r=this.copyBin,o=this.editor,a=this.container,s=CKEDITOR.env.ie&&9>CKEDITOR.env.version,l=o.document.getDocumentElement().$,d=o.createRange(),c=this,h=CKEDITOR.env.mac&&CKEDITOR.env.webkit,u=h?100:0,f=window.requestAnimationFrame&&!h?requestAnimationFrame:setTimeout;return r.setHtml('<span data-cke-copybin-start="1">\u200b</span>'+e+'<span data-cke-copybin-end="1">\u200b</span>'),o.fire("lockSnapshot"),a.append(r),o.editable().append(a),t=o.on("selectionChange",k,null,null,0),n=o.widgets.on("checkSelection",k,null,null,0),s&&(i=l.scrollTop),d.selectNodeContents(r),d.select(),s&&(l.scrollTop=i),new CKEDITOR.tools.promise(function(e){f(function(){c.beforeDestroy&&c.beforeDestroy(),a.remove(),t.removeListener(),n.removeListener(),o.fire("unlockSnapshot"),c.afterDestroy&&c.afterDestroy(),e()},u)})}},statics:{hasCopyBin:function(e){return!!J.getCopyBin(e)},getCopyBin:function(e){return e.document.getById("cke_copybin")}}});CKEDITOR.plugins.widget=t,t.repository=e,t.nestedEditable=n}(),CKEDITOR.config.widget_keystrokeInsertLineBefore=CKEDITOR.SHIFT+CKEDITOR.ALT+13,CKEDITOR.config.widget_keystrokeInsertLineAfter=CKEDITOR.SHIFT+13,CKEDITOR.config.plugins="dialogui,dialog,notification,button,toolbar,clipboard,confighelper,entities,undo,lineutils,widgetselection,widget",CKEDITOR.config.skin="minimalist",function(){var e=function(e,t){var n=CKEDITOR.getUrl("plugins/"+t);e=e.split(",");for(var i=0;i<e.length;i++)CKEDITOR.skin.icons[e[i]]={path:n,offset:-e[++i],bgsize:e[++i]}};CKEDITOR.env.hidpi?e("about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,bidiltr,168,,bidirtl,192,,blockquote,216,,copy-rtl,240,,copy,264,,cut-rtl,288,,cut,312,,paste-rtl,336,,paste,360,,codesnippet,384,,bgcolor,408,,textcolor,432,,copyformatting,456,,creatediv,480,,docprops-rtl,504,,docprops,528,,easyimagealigncenter,552,,easyimagealignleft,576,,easyimagealignright,600,,easyimagealt,624,,easyimagefull,648,,easyimageside,672,,easyimageupload,696,,embed,720,,embedsemantic,744,,emojipanel,768,,find-rtl,792,,find,816,,replace,840,,button,864,,checkbox,888,,form,912,,hiddenfield,936,,imagebutton,960,,radio,984,,select-rtl,1008,,select,1032,,textarea-rtl,1056,,textarea,1080,,textfield-rtl,1104,,textfield,1128,,horizontalrule,1152,,iframe,1176,,image,1200,,indent-rtl,1224,,indent,1248,,outdent-rtl,1272,,outdent,1296,,justifyblock,1320,,justifycenter,1344,,justifyleft,1368,,justifyright,1392,,language,1416,,anchor-rtl,1440,,anchor,1464,,link,1488,,unlink,1512,,bulletedlist-rtl,1536,,bulletedlist,1560,,numberedlist-rtl,1584,,numberedlist,1608,,mathjax,1632,,maximize,1656,,newpage-rtl,1680,,newpage,1704,,pagebreak-rtl,1728,,pagebreak,1752,,pastefromword-rtl,1776,,pastefromword,1800,,pastetext-rtl,1824,,pastetext,1848,,placeholder,1872,,preview-rtl,1896,,preview,1920,,print,1944,,removeformat,1968,,save,1992,,selectall,2016,,showblocks-rtl,2040,,showblocks,2064,,smiley,2088,,source-rtl,2112,,source,2136,,sourcedialog-rtl,2160,,sourcedialog,2184,,specialchar,2208,,table,2232,,templates-rtl,2256,,templates,2280,,uicolor,2304,,redo-rtl,2328,,redo,2352,,undo-rtl,2376,,undo,2400,,simplebox,4848,auto","icons_hidpi.png"):e("about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,bidiltr,168,auto,bidirtl,192,auto,blockquote,216,auto,copy-rtl,240,auto,copy,264,auto,cut-rtl,288,auto,cut,312,auto,paste-rtl,336,auto,paste,360,auto,codesnippet,384,auto,bgcolor,408,auto,textcolor,432,auto,copyformatting,456,auto,creatediv,480,auto,docprops-rtl,504,auto,docprops,528,auto,easyimagealigncenter,552,auto,easyimagealignleft,576,auto,easyimagealignright,600,auto,easyimagealt,624,auto,easyimagefull,648,auto,easyimageside,672,auto,easyimageupload,696,auto,embed,720,auto,embedsemantic,744,auto,emojipanel,768,auto,find-rtl,792,auto,find,816,auto,replace,840,auto,button,864,auto,checkbox,888,auto,form,912,auto,hiddenfield,936,auto,imagebutton,960,auto,radio,984,auto,select-rtl,1008,auto,select,1032,auto,textarea-rtl,1056,auto,textarea,1080,auto,textfield-rtl,1104,auto,textfield,1128,auto,horizontalrule,1152,auto,iframe,1176,auto,image,1200,auto,indent-rtl,1224,auto,indent,1248,auto,outdent-rtl,1272,auto,outdent,1296,auto,justifyblock,1320,auto,justifycenter,1344,auto,justifyleft,1368,auto,justifyright,1392,auto,language,1416,auto,anchor-rtl,1440,auto,anchor,1464,auto,link,1488,auto,unlink,1512,auto,bulletedlist-rtl,1536,auto,bulletedlist,1560,auto,numberedlist-rtl,1584,auto,numberedlist,1608,auto,mathjax,1632,auto,maximize,1656,auto,newpage-rtl,1680,auto,newpage,1704,auto,pagebreak-rtl,1728,auto,pagebreak,1752,auto,pastefromword-rtl,1776,auto,pastefromword,1800,auto,pastetext-rtl,1824,auto,pastetext,1848,auto,placeholder,1872,auto,preview-rtl,1896,auto,preview,1920,auto,print,1944,auto,removeformat,1968,auto,save,1992,auto,selectall,2016,auto,showblocks-rtl,2040,auto,showblocks,2064,auto,smiley,2088,auto,source-rtl,2112,auto,source,2136,auto,sourcedialog-rtl,2160,auto,sourcedialog,2184,auto,specialchar,2208,auto,table,2232,auto,templates-rtl,2256,auto,templates,2280,auto,uicolor,2304,auto,redo-rtl,2328,auto,redo,2352,auto,undo-rtl,2376,auto,undo,2400,auto,simplebox,2424,auto","icons.png")}(),CKEDITOR.lang.languages={en:1})}(),define("ckeditor",function(e){return function(){return e.CKEDITOR}}(this)),function(e){if(void 0===e)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal=void 0===CKEDITOR.config.jqueryOverrideVal||CKEDITOR.config.jqueryOverrideVal,e.extend(e.fn,{ckeditorGet:function(){var e=this.eq(0).data("ckeditorInstance");if(!e)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return e},ckeditor:function(t,n){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if("function"!=typeof t){var i=n;n=t,t=i}var r=[];n=n||{},this.each(function(){var i=e(this),o=i.data("ckeditorInstance"),a=i.data("_ckeditorInstanceLock"),s=this,l=new e.Deferred;r.push(l.promise()),o&&!a?(t&&t.apply(o,[this]),l.resolve()):a?o.once("instanceReady",function(){setTimeout(function e(){o.element?(o.element.$==s&&t&&t.apply(o,[s]),l.resolve()):setTimeout(e,100)},0)},null,null,9999):((n.autoUpdateElement||void 0===n.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)&&(n.autoUpdateElementJquery=!0),n.autoUpdateElement=!1,i.data("_ckeditorInstanceLock",!0),o=e(this).is("textarea")?CKEDITOR.replace(s,n):CKEDITOR.inline(s,n),i.data("ckeditorInstance",o),o.on("instanceReady",function(n){var r=n.editor;setTimeout(function o(){if(r.element){if(n.removeListener(),r.on("dataReady",function(){i.trigger("dataReady.ckeditor",[r])}),r.on("setData",function(e){i.trigger("setData.ckeditor",[r,e.data])}),r.on("getData",function(e){i.trigger("getData.ckeditor",[r,e.data])},999),r.on("destroy",function(){i.trigger("destroy.ckeditor",[r])}),r.on("save",function(){return e(s.form).trigger("submit"),!1},null,null,20),r.config.autoUpdateElementJquery&&i.is("textarea")&&e(s.form).length){var a=function(){i.ckeditor(function(){r.updateElement()})};e(s.form).on("submit",a),e(s.form).on("form-pre-serialize",a),i.on("destroy.ckeditor",function(){e(s.form).off("submit",a),e(s.form).off("form-pre-serialize",a)})}r.on("destroy",function(){i.removeData("ckeditorInstance")}),i.removeData("_ckeditorInstanceLock"),i.trigger("instanceReady.ckeditor",[r]),t&&t.apply(r,[s]),l.resolve()}else setTimeout(o,100)},0)},null,null,9999))});var o=new e.Deferred;return this.promise=o.promise(),e.when.apply(this,r).then(function(){o.resolve()}),this.editor=this.eq(0).data("ckeditorInstance"),this}}),CKEDITOR.config.jqueryOverrideVal&&(e.fn.val=CKEDITOR.tools.override(e.fn.val,function(t){return function(n){if(arguments.length){var i=this,r=[],o=this.each(function(){var i=e(this),o=i.data("ckeditorInstance");if(i.is("textarea")&&o){var a=new e.Deferred;return o.setData(n,function(){a.resolve()}),r.push(a.promise()),!0}return t.call(i,n)});if(r.length){var a=new e.Deferred;return e.when.apply(this,r).done(function(){a.resolveWith(i)}),a.promise()}return o}var o=e(this).eq(0),s=o.data("ckeditorInstance");return o.is("textarea")&&s?s.getData():t.call(o)}}))}(window.jQuery),define("ckeditor-jquery",["jquery","ckeditor"],function(e){return function(){return e.$.fn.ckeditor}}(this)),define("css/css!../node_modules/codemirror/lib/codemirror",[],function(){}),define("css/css!yui-combo",[],function(){}),define("css/css!../node_modules/at.js/dist/css/jquery.atwho",[],function(){}),define("local-deps",function(){});
\ No newline at end of file
+var n,i,r={};for(i in e.partSelectors)t||!e.parts[i]||"string"==typeof e.parts[i]?(n=e.wrapper.findOne(e.partSelectors[i]),r[i]=n):r[i]=e.parts[i];e.parts=r}}function B(e){var t,n,i=e.editables;if(e.editables={},e.editables)for(t in i)n=i[t],e.initEditable(t,"string"==typeof n?{selector:n}:n)}function $(e){if(!0===e.mask)M(e);else if(e.mask){var t,n,i=new CKEDITOR.tools.buffers.throttle(250,H,e),r=CKEDITOR.env.gecko?300:0;if(e.on("focus",function(){i.input(),t=e.editor.on("change",i.input),n=e.on("blur",function(){t.removeListener(),n.removeListener()})}),e.editor.on("instanceReady",function(){setTimeout(function(){i.input()},r)}),e.editor.on("mode",function(){setTimeout(function(){i.input()},r)}),CKEDITOR.env.gecko){var o=e.element.find("img");CKEDITOR.tools.array.forEach(o.toArray(),function(e){e.on("load",function(){i.input()})})}for(var a in e.editables)e.editables[a].on("focus",function(){e.editor.on("change",i.input),n&&n.removeListener()}),e.editables[a].on("blur",function(){e.editor.removeListener("change",i.input)});i.input()}}function M(e){var t=e.wrapper.findOne(".cke_widget_mask");t||(t=new CKEDITOR.dom.element("img",e.editor.document),t.setAttributes({src:CKEDITOR.tools.transparentImageData,class:"cke_reset cke_widget_mask"}),e.wrapper.append(t)),e.mask=t}function H(){if(this.wrapper){this.maskPart=this.maskPart||this.mask;var e,t=this.parts[this.maskPart];if(t&&"string"!=typeof t){e=this.wrapper.findOne(".cke_widget_partial_mask"),e||(e=new CKEDITOR.dom.element("img",this.editor.document),e.setAttributes({src:CKEDITOR.tools.transparentImageData,class:"cke_reset cke_widget_partial_mask"}),this.wrapper.append(e)),this.mask=e;var n=e.$,i=t.$,r=!(n.offsetTop==i.offsetTop&&n.offsetLeft==i.offsetLeft);(n.offsetWidth!=i.offsetWidth||n.offsetHeight!=i.offsetHeight||r)&&(n=t.getParent(),i=CKEDITOR.plugins.widget.isDomWidget(n),e.setStyles({top:t.$.offsetTop+(i?0:n.$.offsetTop)+"px",left:t.$.offsetLeft+(i?0:n.$.offsetLeft)+"px",width:t.$.offsetWidth+"px",height:t.$.offsetHeight+"px"}))}}}function q(e){if(e.draggable){var n,i=e.editor,r=e.wrapper.getLast(t.isDomDragHandlerContainer);r?n=r.findOne("img"):(r=new CKEDITOR.dom.element("span",i.document),r.setAttributes({class:"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+i.plugins.widget.path+"images/handle.png);display:none;"}),n=new CKEDITOR.dom.element("img",i.document),n.setAttributes({class:"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,width:15,title:i.lang.widget.move,height:15,role:"presentation"}),e.inline&&n.setAttribute("draggable","true"),r.append(n),e.wrapper.append(r)),e.wrapper.on("dragover",function(e){e.data.preventDefault()}),e.wrapper.on("mouseenter",e.updateDragHandlerPosition,e),setTimeout(function(){e.on("data",e.updateDragHandlerPosition,e)},50),!e.inline&&(n.on("mousedown",U,e),CKEDITOR.env.ie&&9>CKEDITOR.env.version)&&n.on("dragstart",function(e){e.data.preventDefault(!0)}),e.dragHandlerContainer=r}}function U(e){function t(){var t;for(u.reset();t=d.pop();)t.removeListener();var n=c;t=e.sender;var i=this.repository.finder,r=this.repository.liner,o=this.editor,a=this.editor.editable();CKEDITOR.tools.isEmpty(r.visible)||(n=i.getRange(n[0]),this.focus(),o.fire("drop",{dropRange:n,target:n.startContainer})),a.removeClass("cke_widget_dragging"),r.hideVisible(),o.fire("dragend",{target:t})}if(CKEDITOR.tools.getMouseButton(e)===CKEDITOR.MOUSE_BUTTON_LEFT){var n,i,r=this.repository.finder,o=this.repository.locator,a=this.repository.liner,s=this.editor,l=s.editable(),d=[],c=[];this.repository._.draggedWidget=this;var h=r.greedySearch(),u=CKEDITOR.tools.eventsBuffer(50,function(){n=o.locate(h),c=o.sort(i,1),c.length&&(a.prepare(h,n),a.placeLine(c[0]),a.cleanup())});l.addClass("cke_widget_dragging"),d.push(l.on("mousemove",function(e){i=e.data.$.clientY,u.input()})),s.fire("dragstart",{target:e.sender}),d.push(s.document.once("mouseup",t,this)),l.isInline()||d.push(CKEDITOR.document.once("mouseup",t,this))}}function V(e){var t=null;e.on("data",function(){var e,n=this.data.classes;if(t!=n){for(e in t)n&&n[e]||this.removeClass(e);for(e in n)this.addClass(e);t=n}})}function z(e){e.on("data",function(){if(e.wrapper){var t=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());e.wrapper.setAttribute("role","region"),e.wrapper.setAttribute("aria-label",t)}},null,null,9999)}function W(e){e.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(e.data)))}function G(){function e(){}function n(e,t,n){return!(!n||!this.checkElement(e))&&((e=n.widgets.getByElement(e,!0))&&e.checkStyleActive(this))}function i(e){var t,n=e.widget;r[n]||(r[n]={});for(var i=0,o=e.group.length;i<o;i++)t=e.group[i],r[n][t]||(r[n][t]=[]),t=r[n][t],function(e,t,n){for(var i=e.length,r=0;r<i;){if(t.call(n,e[r],r,e))return e[r];r++}}(t,function(e){function t(e,n){var i=CKEDITOR.tools.object.keys(e),r=CKEDITOR.tools.object.keys(n);if(i.length!==r.length)return!1;for(var o in e)if(("object"!=typeof e[o]||"object"!=typeof n[o]||!t(e[o],n[o]))&&e[o]!==n[o])return!1;return!0}return function(n){return t(e.getDefinition(),n.getDefinition())}}(e))||t.push(e)}var r={};CKEDITOR.style.addCustomHandler({type:"widget",setup:function(e){this.widget=e.widget,(this.group="string"==typeof e.group?[e.group]:e.group)&&i(this)},apply:function(e){var t;e instanceof CKEDITOR.editor&&this.checkApplicable(e.elementPath(),e)&&(t=e.widgets.focused,this.group&&this.removeStylesFromSameGroup(e),t.applyStyle(this))},remove:function(e){e instanceof CKEDITOR.editor&&this.checkApplicable(e.elementPath(),e)&&e.widgets.focused.removeStyle(this)},removeStylesFromSameGroup:function(e){var t,n,i=!1;if(!(e instanceof CKEDITOR.editor))return!1;if(n=e.elementPath(),this.checkApplicable(n,e))for(var o=0,a=this.group.length;o<a;o++){t=r[this.widget][this.group[o]];for(var s=0;s<t.length;s++)t[s]!==this&&t[s].checkActive(n,e)&&(e.widgets.focused.removeStyle(t[s]),i=!0)}return i},checkActive:function(e,t){return this.checkElementMatch(e.lastElement,0,t)},checkApplicable:function(e,t){return t instanceof CKEDITOR.editor&&this.checkElement(e.lastElement)},checkElementMatch:n,checkElementRemovable:n,checkElement:function(e){return!!t.isDomWidgetWrapper(e)&&((e=e.getFirst(t.isDomWidgetElement))&&e.data("widget")==this.widget)},buildPreview:function(e){return e||this._.definition.name},toAllowedContentRules:function(e){if(!e)return null;e=e.widgets.registered[this.widget];var t,n={};return e?e.styleableElements?(t=this.getClassesArray())?(n[e.styleableElements]={classes:t,propertiesOnly:!0},n):null:e.styleToAllowedContentRules?e.styleToAllowedContentRules(this):null:null},getClassesArray:function(){var e=this._.definition.attributes&&this._.definition.attributes.class;return e?CKEDITOR.tools.trim(e).split(/\s+/):null},applyToRange:e,removeFromRange:e,applyToObject:e})}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard,widgetselection",onLoad:function(){void 0!==CKEDITOR.document.$.querySelectorAll&&(CKEDITOR.addCss('.cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover>.cke_widget_element{outline:2px solid #ffd25c;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid #ffd25c}.cke_widget_wrapper.cke_widget_focused>.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #47a4f5}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:block;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover>.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}.cke_editable[contenteditable="false"] .cke_widget_drag_handler_container{display:none;}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_widget_partial_mask{position:absolute;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}'),G())},beforeInit:function(t){void 0!==CKEDITOR.document.$.querySelectorAll&&(t.widgets=new e(t))},afterInit:function(e){if(void 0!==CKEDITOR.document.$.querySelectorAll){var t,n,i,r=e.widgets.registered;for(n in r)t=r[n],(i=t.button)&&e.ui.addButton&&e.ui.addButton(CKEDITOR.tools.capitalize(t.name,!0),{label:i,command:t.name,toolbar:"insert,10"});E(e),y(e.undoManager)}}}),e.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(e,t){var n=this.editor;if(t=CKEDITOR.tools.prototypedCopy(t),t.name=e,t._=t._||{},n.fire("widgetDefinition",t),t.template&&(t.template=new CKEDITOR.template(t.template)),i(n,t),r(this,t),this.registered[e]=t,t.dialog&&n.plugins.dialog)var o=CKEDITOR.on("dialogDefinition",function(e){e=e.data.definition;var i=e.dialog;e.getMode||i.getName()!==t.dialog||(e.getMode=function(){var e=i.getModel(n);return e&&e instanceof CKEDITOR.plugins.widget&&e.ready?CKEDITOR.dialog.EDITING_MODE:CKEDITOR.dialog.CREATION_MODE}),o.removeListener()});return t},addUpcastCallback:function(e){this._.upcastCallbacks.push(e)},checkSelection:function(){if(this.editor.getSelection()){var e,n=this.editor.getSelection(),i=n.getSelectedElement(),r=b(this);if(i&&(e=this.getByElement(i,!0)))return r.focus(e).select(e).commit();if(!(n=n.getRanges()[0])||n.collapsed)return r.commit();for(n=new CKEDITOR.dom.walker(n),n.evaluator=t.isDomWidgetWrapper;i=n.next();)r.select(this.getByElement(i));r.commit()}},checkWidgets:function(e){this.fire("checkWidgets",CKEDITOR.tools.copy(e||{}))},del:function(e){if(this.focused===e){var t,n=e.editor,i=n.createRange();(t=i.moveToClosestEditablePosition(e.wrapper,!0))||(t=i.moveToClosestEditablePosition(e.wrapper,!1)),t&&n.getSelection().selectRanges([i])}e.wrapper.remove(),this.destroy(e,!0)},destroy:function(e,t){this.widgetHoldingFocusedEditable===e&&m(this,e,null,t),e.destroy(t),delete this.instances[e.id],this.fire("instanceDestroyed",e)},destroyAll:function(e,t){var n,i,r=this.instances;if(t&&!e){i=t.find(".cke_widget_wrapper");for(var r=i.count(),o=0;o<r;++o)(n=this.getByElement(i.getItem(o),!0))&&this.destroy(n)}else for(i in r)n=r[i],this.destroy(n,e)},finalizeCreation:function(e){(e=e.getFirst())&&t.isDomWidgetWrapper(e)&&(this.editor.insertElement(e),e=this.getByElement(e),e.ready=!0,e.fire("ready"),e.focus())},getByElement:function(){function e(e){return e.is(t)&&e.data("cke-widget-id")}var t={div:1,span:1};return function(t,n){if(!t)return null;var i=e(t);if(!n&&!i){var r=this.editor.editable();do{t=t.getParent()}while(t&&!t.equals(r)&&!(i=e(t)))}return this.instances[i]||null}}(),initOn:function(e,n,i){if(n?"string"==typeof n&&(n=this.registered[n]):n=this.registered[e.data("widget")],!n)return null;var r=this.wrapElement(e,n.name);return r?r.hasClass("cke_widget_new")?(e=new t(this,this._.nextId++,e,n,i),e.isInited()?this.instances[e.id]=e:null):this.getByElement(e):null},initOnAll:function(e){e=(e||this.editor.editable()).find(".cke_widget_new");for(var n,i=[],r=e.count();r--;)(n=this.initOn(e.getItem(r).getFirst(t.isDomWidgetElement)))&&i.push(n);return i},onWidget:function(e){var t=Array.prototype.slice.call(arguments);t.shift();for(var n in this.instances){var i=this.instances[n];i.name==e&&i.on.apply(i,t)}this.on("instanceCreated",function(n){n=n.data,n.name==e&&n.on.apply(n,t)})},parseElementClasses:function(e){if(!e)return null;e=CKEDITOR.tools.trim(e).split(/\s+/);for(var t,n={},i=0;t=e.pop();)-1==t.indexOf("cke_")&&(n[t]=i=1);return i?n:null},wrapElement:function(e,t){var n,i,r=null;if(e instanceof CKEDITOR.dom.element){if(t=t||e.data("widget"),!(n=this.registered[t]))return null;if((r=e.getParent())&&r.type==CKEDITOR.NODE_ELEMENT&&r.data("cke-widget-wrapper"))return r;e.hasAttribute("data-cke-widget-keep-attr")||e.data("cke-widget-keep-attr",e.data("widget")?1:0),e.data("widget",t),(i=g(n,e.getName()))&&s(e),r=new CKEDITOR.dom.element(i?"span":"div",e.getDocument()),r.setAttributes(u(i,t)),r.data("cke-display-name",n.pathName?n.pathName:e.getName()),e.getParent(!0)&&r.replace(e),e.appendTo(r)}else if(e instanceof CKEDITOR.htmlParser.element){if(t=t||e.attributes["data-widget"],!(n=this.registered[t]))return null;if((r=e.parent)&&r.type==CKEDITOR.NODE_ELEMENT&&r.attributes["data-cke-widget-wrapper"])return r;"data-cke-widget-keep-attr"in e.attributes||(e.attributes["data-cke-widget-keep-attr"]=e.attributes["data-widget"]?1:0),t&&(e.attributes["data-widget"]=t),(i=g(n,e.name))&&s(e),r=new CKEDITOR.htmlParser.element(i?"span":"div",u(i,t)),r.attributes["data-cke-display-name"]=n.pathName?n.pathName:e.name,n=e.parent;var o;n&&(o=e.getIndex(),e.remove()),r.add(e),n&&f(n,o,r)}return r},_tests_createEditableFilter:c},CKEDITOR.event.implementOn(e.prototype),t.prototype={addClass:function(e){this.element.addClass(e),this.wrapper.addClass(t.WRAPPER_CLASS_PREFIX+e)},applyStyle:function(e){K(this,e,1)},checkStyleActive:function(e){e=x(e);var t;if(!e)return!1;for(;t=e.pop();)if(!this.hasClass(t))return!1;return!0},destroy:function(e){if(this.fire("destroy"),this.editables)for(var t in this.editables)this.destroyEditable(t,e);e||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper)),this.wrapper=null},destroyEditable:function(e,t){var n=this.editables[e],i=!0;if(n.removeListener("focus",A),n.removeListener("blur",S),this.editor.focusManager.remove(n),n.filter){for(var r in this.repository.instances){var o=this.repository.instances[r];o.editables&&(o=o.editables[e])&&o!==n&&n.filter===o.filter&&(i=!1)}i&&(n.filter.destroy(),(i=this.repository._.filters[this.name])&&delete i[e])}t||(this.repository.destroyAll(!1,n),n.removeClass("cke_widget_editable"),n.removeClass("cke_widget_editable_focused"),n.removeAttributes(["contenteditable","data-cke-widget-editable","data-cke-enter-mode"])),delete this.editables[e]},edit:function(){var e={dialog:this.dialog},t=this;return!(!1===this.fire("edit",e)||!e.dialog)&&(this.editor.openDialog(e.dialog,function(e){var n,i;!1!==t.fire("dialog",e)&&(n=e.on("show",function(){e.setupContent(t)}),i=e.on("ok",function(){var n,i=t.on("data",function(e){n=1,e.cancel()},null,null,0);t.editor.fire("saveSnapshot"),e.commitContent(t),i.removeListener(),n&&(t.fire("data",t.data),t.editor.fire("saveSnapshot"))}),e.once("hide",function(){n.removeListener(),i.removeListener()}))},t),!0)},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},getClipboardHtml:function(){var e=this.editor.createRange();return e.setStartBefore(this.wrapper),e.setEndAfter(this.wrapper),this.editor.editable().getHtmlFromRange(e).getHtml()},hasClass:function(e){return this.element.hasClass(e)},initEditable:function(e,t){var i=this._findOneNotNested(t.selector);return!(!i||!i.is(CKEDITOR.dtd.$editable))&&(i=new n(this.editor,i,{filter:c.call(this.repository,this.name,e,t)}),this.editables[e]=i,i.setAttributes({contenteditable:"true","data-cke-widget-editable":e,"data-cke-enter-mode":i.enterMode}),i.filter&&i.data("cke-filter",i.filter.id),i.addClass("cke_widget_editable"),i.removeClass("cke_widget_editable_focused"),t.pathName&&i.data("cke-display-name",t.pathName),this.editor.focusManager.add(i),i.on("focus",A,this),CKEDITOR.env.ie&&i.on("blur",S,this),i._.initialSetData=!0,i.setData(i.getHtml()),!0)},_findOneNotNested:function(e){e=this.wrapper.find(e);for(var n,i,r=0;r<e.count();r++)if(n=e.getItem(r),i=n.getAscendant(t.isDomWidgetWrapper),this.wrapper.equals(i))return n;return null},isInited:function(){return!(!this.wrapper||!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var e=this.editor.getSelection();if(e){var t=this.editor.checkDirty();e.fake(this.wrapper),!t&&this.editor.resetDirty()}this.editor.focus()},refreshMask:function(){$(this)},refreshParts:function(e){j(this,void 0===e||e)},removeClass:function(e){this.element.removeClass(e),this.wrapper.removeClass(t.WRAPPER_CLASS_PREFIX+e)},removeStyle:function(e){K(this,e,0)},setData:function(e,t){var n=this.data,i=0;if("string"==typeof e)n[e]!==t&&(n[e]=t,i=1);else{var r=e;for(e in r)n[e]!==r[e]&&(i=1,n[e]=r[e])}return i&&this.dataReady&&(W(this),this.fire("data",n)),this},setFocused:function(e){return this.wrapper[e?"addClass":"removeClass"]("cke_widget_focused"),this.fire(e?"focus":"blur"),this},setSelected:function(e){return this.wrapper[e?"addClass":"removeClass"]("cke_widget_selected"),this.fire(e?"select":"deselect"),this},updateDragHandlerPosition:function(){var e=this.editor,t=this.element.$,n=this._.dragHandlerOffset,t={x:t.offsetLeft,y:t.offsetTop-15};n&&t.x==n.x&&t.y==n.y||(n=e.checkDirty(),e.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:t.y+"px",left:t.x+"px"}),this.dragHandlerContainer.removeStyle("display"),e.fire("unlockSnapshot"),!n&&e.resetDirty(),this._.dragHandlerOffset=t)}},CKEDITOR.event.implementOn(t.prototype),t.getNestedEditable=function(e,n){return!n||n.equals(e)?null:t.isDomNestedEditable(n)?n:t.getNestedEditable(e,n.getParent())},t.isDomDragHandler=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-cke-widget-drag-handler")},t.isDomDragHandlerContainer=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasClass("cke_widget_drag_handler_container")},t.isDomNestedEditable=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-cke-widget-editable")},t.isDomWidgetElement=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-widget")},t.isDomWidgetWrapper=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&e.hasAttribute("data-cke-widget-wrapper")},t.isDomWidget=function(e){return!!e&&(this.isDomWidgetWrapper(e)||this.isDomWidgetElement(e))},t.isParserWidgetElement=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&!!e.attributes["data-widget"]},t.isParserWidgetWrapper=function(e){return e.type==CKEDITOR.NODE_ELEMENT&&!!e.attributes["data-cke-widget-wrapper"]},t.WRAPPER_CLASS_PREFIX="cke_widget_wrapper_",n.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),{setData:function(e){this._.initialSetData||this.editor.widgets.destroyAll(!1,this),this._.initialSetData=!1,e=this.editor.dataProcessor.unprotectRealComments(e),e=this.editor.dataProcessor.unprotectSource(e),e=this.editor.dataProcessor.toHtml(e,{context:this.getName(),filter:this.filter,enterMode:this.enterMode}),this.setHtml(e),this.editor.widgets.initOnAll(this)},getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var X=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,Y={37:1,38:1,39:1,40:1,8:1,46:1};Y[CKEDITOR.SHIFT+121]=1;var J=CKEDITOR.tools.createClass({$:function(e,t){this._.createCopyBin(e,t),this._.createListeners(t)},_:{createCopyBin:function(e){var t=e.document,n=CKEDITOR.env.edge&&16<=CKEDITOR.env.version,i=!e.blockless&&!CKEDITOR.env.ie||n?"div":"span",n=t.createElement(i),t=t.createElement(i);t.setAttributes({id:"cke_copybin","data-cke-temp":"1"}),n.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"}),n.setStyle("ltr"==e.config.contentsLangDirection?"left":"right","-5000px"),this.editor=e,this.copyBin=n,this.container=t},createListeners:function(e){e&&(e.beforeDestroy&&(this.beforeDestroy=e.beforeDestroy),e.afterDestroy&&(this.afterDestroy=e.afterDestroy))}},proto:{handle:function(e){var t,n,i,r=this.copyBin,o=this.editor,a=this.container,s=CKEDITOR.env.ie&&9>CKEDITOR.env.version,l=o.document.getDocumentElement().$,d=o.createRange(),c=this,h=CKEDITOR.env.mac&&CKEDITOR.env.webkit,u=h?100:0,f=window.requestAnimationFrame&&!h?requestAnimationFrame:setTimeout;return r.setHtml('<span data-cke-copybin-start="1">\u200b</span>'+e+'<span data-cke-copybin-end="1">\u200b</span>'),o.fire("lockSnapshot"),a.append(r),o.editable().append(a),t=o.on("selectionChange",k,null,null,0),n=o.widgets.on("checkSelection",k,null,null,0),s&&(i=l.scrollTop),d.selectNodeContents(r),d.select(),s&&(l.scrollTop=i),new CKEDITOR.tools.promise(function(e){f(function(){c.beforeDestroy&&c.beforeDestroy(),a.remove(),t.removeListener(),n.removeListener(),o.fire("unlockSnapshot"),c.afterDestroy&&c.afterDestroy(),e()},u)})}},statics:{hasCopyBin:function(e){return!!J.getCopyBin(e)},getCopyBin:function(e){return e.document.getById("cke_copybin")}}});CKEDITOR.plugins.widget=t,t.repository=e,t.nestedEditable=n}(),CKEDITOR.config.widget_keystrokeInsertLineBefore=CKEDITOR.SHIFT+CKEDITOR.ALT+13,CKEDITOR.config.widget_keystrokeInsertLineAfter=CKEDITOR.SHIFT+13,CKEDITOR.config.plugins="dialogui,dialog,notification,button,toolbar,clipboard,confighelper,entities,undo,lineutils,widgetselection,widget",CKEDITOR.config.skin="minimalist",function(){var e=function(e,t){var n=CKEDITOR.getUrl("plugins/"+t);e=e.split(",");for(var i=0;i<e.length;i++)CKEDITOR.skin.icons[e[i]]={path:n,offset:-e[++i],bgsize:e[++i]}};CKEDITOR.env.hidpi?e("about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,bidiltr,168,,bidirtl,192,,blockquote,216,,copy-rtl,240,,copy,264,,cut-rtl,288,,cut,312,,paste-rtl,336,,paste,360,,codesnippet,384,,bgcolor,408,,textcolor,432,,copyformatting,456,,creatediv,480,,docprops-rtl,504,,docprops,528,,easyimagealigncenter,552,,easyimagealignleft,576,,easyimagealignright,600,,easyimagealt,624,,easyimagefull,648,,easyimageside,672,,easyimageupload,696,,embed,720,,embedsemantic,744,,emojipanel,768,,find-rtl,792,,find,816,,replace,840,,button,864,,checkbox,888,,form,912,,hiddenfield,936,,imagebutton,960,,radio,984,,select-rtl,1008,,select,1032,,textarea-rtl,1056,,textarea,1080,,textfield-rtl,1104,,textfield,1128,,horizontalrule,1152,,iframe,1176,,image,1200,,indent-rtl,1224,,indent,1248,,outdent-rtl,1272,,outdent,1296,,justifyblock,1320,,justifycenter,1344,,justifyleft,1368,,justifyright,1392,,language,1416,,anchor-rtl,1440,,anchor,1464,,link,1488,,unlink,1512,,bulletedlist-rtl,1536,,bulletedlist,1560,,numberedlist-rtl,1584,,numberedlist,1608,,mathjax,1632,,maximize,1656,,newpage-rtl,1680,,newpage,1704,,pagebreak-rtl,1728,,pagebreak,1752,,pastefromword-rtl,1776,,pastefromword,1800,,pastetext-rtl,1824,,pastetext,1848,,placeholder,1872,,preview-rtl,1896,,preview,1920,,print,1944,,removeformat,1968,,save,1992,,selectall,2016,,showblocks-rtl,2040,,showblocks,2064,,smiley,2088,,source-rtl,2112,,source,2136,,sourcedialog-rtl,2160,,sourcedialog,2184,,specialchar,2208,,table,2232,,templates-rtl,2256,,templates,2280,,uicolor,2304,,redo-rtl,2328,,redo,2352,,undo-rtl,2376,,undo,2400,,simplebox,4848,auto","icons_hidpi.png"):e("about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,bidiltr,168,auto,bidirtl,192,auto,blockquote,216,auto,copy-rtl,240,auto,copy,264,auto,cut-rtl,288,auto,cut,312,auto,paste-rtl,336,auto,paste,360,auto,codesnippet,384,auto,bgcolor,408,auto,textcolor,432,auto,copyformatting,456,auto,creatediv,480,auto,docprops-rtl,504,auto,docprops,528,auto,easyimagealigncenter,552,auto,easyimagealignleft,576,auto,easyimagealignright,600,auto,easyimagealt,624,auto,easyimagefull,648,auto,easyimageside,672,auto,easyimageupload,696,auto,embed,720,auto,embedsemantic,744,auto,emojipanel,768,auto,find-rtl,792,auto,find,816,auto,replace,840,auto,button,864,auto,checkbox,888,auto,form,912,auto,hiddenfield,936,auto,imagebutton,960,auto,radio,984,auto,select-rtl,1008,auto,select,1032,auto,textarea-rtl,1056,auto,textarea,1080,auto,textfield-rtl,1104,auto,textfield,1128,auto,horizontalrule,1152,auto,iframe,1176,auto,image,1200,auto,indent-rtl,1224,auto,indent,1248,auto,outdent-rtl,1272,auto,outdent,1296,auto,justifyblock,1320,auto,justifycenter,1344,auto,justifyleft,1368,auto,justifyright,1392,auto,language,1416,auto,anchor-rtl,1440,auto,anchor,1464,auto,link,1488,auto,unlink,1512,auto,bulletedlist-rtl,1536,auto,bulletedlist,1560,auto,numberedlist-rtl,1584,auto,numberedlist,1608,auto,mathjax,1632,auto,maximize,1656,auto,newpage-rtl,1680,auto,newpage,1704,auto,pagebreak-rtl,1728,auto,pagebreak,1752,auto,pastefromword-rtl,1776,auto,pastefromword,1800,auto,pastetext-rtl,1824,auto,pastetext,1848,auto,placeholder,1872,auto,preview-rtl,1896,auto,preview,1920,auto,print,1944,auto,removeformat,1968,auto,save,1992,auto,selectall,2016,auto,showblocks-rtl,2040,auto,showblocks,2064,auto,smiley,2088,auto,source-rtl,2112,auto,source,2136,auto,sourcedialog-rtl,2160,auto,sourcedialog,2184,auto,specialchar,2208,auto,table,2232,auto,templates-rtl,2256,auto,templates,2280,auto,uicolor,2304,auto,redo-rtl,2328,auto,redo,2352,auto,undo-rtl,2376,auto,undo,2400,auto,simplebox,2424,auto","icons.png")}(),CKEDITOR.lang.languages={en:1})}(),define("ckeditor",function(e){return function(){return e.CKEDITOR}}(this)),function(e){if(void 0===e)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal=void 0===CKEDITOR.config.jqueryOverrideVal||CKEDITOR.config.jqueryOverrideVal,e.extend(e.fn,{ckeditorGet:function(){var e=this.eq(0).data("ckeditorInstance");if(!e)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return e},ckeditor:function(t,n){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if("function"!=typeof t){var i=n;n=t,t=i}var r=[];n=n||{},this.each(function(){var i=e(this),o=i.data("ckeditorInstance"),a=i.data("_ckeditorInstanceLock"),s=this,l=new e.Deferred;r.push(l.promise()),o&&!a?(t&&t.apply(o,[this]),l.resolve()):a?o.once("instanceReady",function(){setTimeout(function e(){o.element?(o.element.$==s&&t&&t.apply(o,[s]),l.resolve()):setTimeout(e,100)},0)},null,null,9999):((n.autoUpdateElement||void 0===n.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)&&(n.autoUpdateElementJquery=!0),n.autoUpdateElement=!1,i.data("_ckeditorInstanceLock",!0),o=e(this).is("textarea")?CKEDITOR.replace(s,n):CKEDITOR.inline(s,n),i.data("ckeditorInstance",o),o.on("instanceReady",function(n){var r=n.editor;setTimeout(function o(){if(r.element){if(n.removeListener(),r.on("dataReady",function(){i.trigger("dataReady.ckeditor",[r])}),r.on("setData",function(e){i.trigger("setData.ckeditor",[r,e.data])}),r.on("getData",function(e){i.trigger("getData.ckeditor",[r,e.data])},999),r.on("destroy",function(){i.trigger("destroy.ckeditor",[r])}),r.on("save",function(){return e(s.form).trigger("submit"),!1},null,null,20),r.config.autoUpdateElementJquery&&i.is("textarea")&&e(s.form).length){var a=function(){i.ckeditor(function(){r.updateElement()})};e(s.form).on("submit",a),e(s.form).on("form-pre-serialize",a),i.on("destroy.ckeditor",function(){e(s.form).off("submit",a),e(s.form).off("form-pre-serialize",a)})}r.on("destroy",function(){i.removeData("ckeditorInstance")}),i.removeData("_ckeditorInstanceLock"),i.trigger("instanceReady.ckeditor",[r]),t&&t.apply(r,[s]),l.resolve()}else setTimeout(o,100)},0)},null,null,9999))});var o=new e.Deferred;return this.promise=o.promise(),e.when.apply(this,r).then(function(){o.resolve()}),this.editor=this.eq(0).data("ckeditorInstance"),this}}),CKEDITOR.config.jqueryOverrideVal&&(e.fn.val=CKEDITOR.tools.override(e.fn.val,function(t){return function(n){if(arguments.length){var i=this,r=[],o=this.each(function(){var i=e(this),o=i.data("ckeditorInstance");if(i.is("textarea")&&o){var a=new e.Deferred;return o.setData(n,function(){a.resolve()}),r.push(a.promise()),!0}return t.call(i,n)});if(r.length){var a=new e.Deferred;return e.when.apply(this,r).done(function(){a.resolveWith(i)}),a.promise()}return o}var o=e(this).eq(0),s=o.data("ckeditorInstance");return o.is("textarea")&&s?s.getData():t.call(o)}}))}(window.jQuery),define("ckeditor-jquery",["jquery","ckeditor"],function(e){return function(){return e.$.fn.ckeditor}}(this)),define("css/css!../node_modules/codemirror/lib/codemirror",[],function(){}),define("css/css!../node_modules/at.js/dist/css/jquery.atwho",[],function(){}),define("local-deps",function(){});
\ No newline at end of file
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js b/corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
index 8a10092cca87..61f322f720d2 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
@@ -3351,7 +3351,7 @@ define("json/json!langCodes", function(){ return [
 
 /*!
 
- diff v3.4.0
+ diff v3.2.0
 
 Software License Agreement (BSD License)
 
@@ -3440,18 +3440,20 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ([
 /* 0 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
 	exports.__esModule = true;
-	exports.canonicalize = exports.convertChangesToXML = exports.convertChangesToDMP = exports.merge = exports.parsePatch = exports.applyPatches = exports.applyPatch = exports.createPatch = exports.createTwoFilesPatch = exports.structuredPatch = exports.diffArrays = exports.diffJson = exports.diffCss = exports.diffSentences = exports.diffTrimmedLines = exports.diffLines = exports.diffWordsWithSpace = exports.diffWords = exports.diffChars = exports.Diff = undefined;
-
-	/*istanbul ignore end*/var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
+	exports.canonicalize = exports.convertChangesToXML = exports.convertChangesToDMP = exports.parsePatch = exports.applyPatches = exports.applyPatch = exports.createPatch = exports.createTwoFilesPatch = exports.structuredPatch = exports.diffArrays = exports.diffJson = exports.diffCss = exports.diffSentences = exports.diffTrimmedLines = exports.diffLines = exports.diffWordsWithSpace = exports.diffWords = exports.diffChars = exports.Diff = undefined;
+	/*istanbul ignore end*/
+	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
-	/*istanbul ignore end*/var /*istanbul ignore start*/_character = __webpack_require__(2) /*istanbul ignore end*/;
+	/*istanbul ignore end*/
+	var /*istanbul ignore start*/_character = __webpack_require__(2) /*istanbul ignore end*/;
 
 	var /*istanbul ignore start*/_word = __webpack_require__(3) /*istanbul ignore end*/;
 
@@ -3469,32 +3471,15 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_parse = __webpack_require__(11) /*istanbul ignore end*/;
 
-	var /*istanbul ignore start*/_merge = __webpack_require__(13) /*istanbul ignore end*/;
-
-	var /*istanbul ignore start*/_create = __webpack_require__(14) /*istanbul ignore end*/;
+	var /*istanbul ignore start*/_create = __webpack_require__(13) /*istanbul ignore end*/;
 
-	var /*istanbul ignore start*/_dmp = __webpack_require__(16) /*istanbul ignore end*/;
+	var /*istanbul ignore start*/_dmp = __webpack_require__(14) /*istanbul ignore end*/;
 
-	var /*istanbul ignore start*/_xml = __webpack_require__(17) /*istanbul ignore end*/;
+	var /*istanbul ignore start*/_xml = __webpack_require__(15) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
-
-	/* See LICENSE file for terms of use */
+	/*istanbul ignore start*/
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*
-	 * Text diff implementation.
-	 *
-	 * This library supports the following APIS:
-	 * JsDiff.diffChars: Character by character diff
-	 * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
-	 * JsDiff.diffLines: Line based diff
-	 *
-	 * JsDiff.diffCss: Diff targeted at CSS content
-	 *
-	 * These methods are based on the implementation proposed in
-	 * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
-	 * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
-	 */
 	exports. /*istanbul ignore end*/Diff = _base2['default'];
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/diffChars = _character.diffChars;
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/diffWords = _word.diffWords;
@@ -3511,16 +3496,30 @@ return /******/ (function(modules) { // webpackBootstrap
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/applyPatch = _apply.applyPatch;
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/applyPatches = _apply.applyPatches;
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/parsePatch = _parse.parsePatch;
-	/*istanbul ignore start*/exports. /*istanbul ignore end*/merge = _merge.merge;
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/convertChangesToDMP = _dmp.convertChangesToDMP;
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/convertChangesToXML = _xml.convertChangesToXML;
-	/*istanbul ignore start*/exports. /*istanbul ignore end*/canonicalize = _json.canonicalize;
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6WyJEaWZmIiwiZGlmZkNoYXJzIiwiZGlmZldvcmRzIiwiZGlmZldvcmRzV2l0aFNwYWNlIiwiZGlmZkxpbmVzIiwiZGlmZlRyaW1tZWRMaW5lcyIsImRpZmZTZW50ZW5jZXMiLCJkaWZmQ3NzIiwiZGlmZkpzb24iLCJkaWZmQXJyYXlzIiwic3RydWN0dXJlZFBhdGNoIiwiY3JlYXRlVHdvRmlsZXNQYXRjaCIsImNyZWF0ZVBhdGNoIiwiYXBwbHlQYXRjaCIsImFwcGx5UGF0Y2hlcyIsInBhcnNlUGF0Y2giLCJtZXJnZSIsImNvbnZlcnRDaGFuZ2VzVG9ETVAiLCJjb252ZXJ0Q2hhbmdlc1RvWE1MIiwiY2Fub25pY2FsaXplIl0sIm1hcHBpbmdzIjoiOzs7Ozt1QkFnQkE7Ozs7dUJBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUE7O0FBQ0E7O0FBRUE7O0FBRUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBRUE7O0FBQ0E7Ozs7QUFqQ0E7O0FBRUE7Ozs7Ozs7Ozs7Ozs7O2dDQWtDRUEsSTt5REFFQUMsUzt5REFDQUMsUzt5REFDQUMsa0I7eURBQ0FDLFM7eURBQ0FDLGdCO3lEQUNBQyxhO3lEQUVBQyxPO3lEQUNBQyxRO3lEQUVBQyxVO3lEQUVBQyxlO3lEQUNBQyxtQjt5REFDQUMsVzt5REFDQUMsVTt5REFDQUMsWTt5REFDQUMsVTt5REFDQUMsSzt5REFDQUMsbUI7eURBQ0FDLG1CO3lEQUNBQyxZIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLyogU2VlIExJQ0VOU0UgZmlsZSBmb3IgdGVybXMgb2YgdXNlICovXG5cbi8qXG4gKiBUZXh0IGRpZmYgaW1wbGVtZW50YXRpb24uXG4gKlxuICogVGhpcyBsaWJyYXJ5IHN1cHBvcnRzIHRoZSBmb2xsb3dpbmcgQVBJUzpcbiAqIEpzRGlmZi5kaWZmQ2hhcnM6IENoYXJhY3RlciBieSBjaGFyYWN0ZXIgZGlmZlxuICogSnNEaWZmLmRpZmZXb3JkczogV29yZCAoYXMgZGVmaW5lZCBieSBcXGIgcmVnZXgpIGRpZmYgd2hpY2ggaWdub3JlcyB3aGl0ZXNwYWNlXG4gKiBKc0RpZmYuZGlmZkxpbmVzOiBMaW5lIGJhc2VkIGRpZmZcbiAqXG4gKiBKc0RpZmYuZGlmZkNzczogRGlmZiB0YXJnZXRlZCBhdCBDU1MgY29udGVudFxuICpcbiAqIFRoZXNlIG1ldGhvZHMgYXJlIGJhc2VkIG9uIHRoZSBpbXBsZW1lbnRhdGlvbiBwcm9wb3NlZCBpblxuICogXCJBbiBPKE5EKSBEaWZmZXJlbmNlIEFsZ29yaXRobSBhbmQgaXRzIFZhcmlhdGlvbnNcIiAoTXllcnMsIDE5ODYpLlxuICogaHR0cDovL2NpdGVzZWVyeC5pc3QucHN1LmVkdS92aWV3ZG9jL3N1bW1hcnk/ZG9pPTEwLjEuMS40LjY5MjdcbiAqL1xuaW1wb3J0IERpZmYgZnJvbSAnLi9kaWZmL2Jhc2UnO1xuaW1wb3J0IHtkaWZmQ2hhcnN9IGZyb20gJy4vZGlmZi9jaGFyYWN0ZXInO1xuaW1wb3J0IHtkaWZmV29yZHMsIGRpZmZXb3Jkc1dpdGhTcGFjZX0gZnJvbSAnLi9kaWZmL3dvcmQnO1xuaW1wb3J0IHtkaWZmTGluZXMsIGRpZmZUcmltbWVkTGluZXN9IGZyb20gJy4vZGlmZi9saW5lJztcbmltcG9ydCB7ZGlmZlNlbnRlbmNlc30gZnJvbSAnLi9kaWZmL3NlbnRlbmNlJztcblxuaW1wb3J0IHtkaWZmQ3NzfSBmcm9tICcuL2RpZmYvY3NzJztcbmltcG9ydCB7ZGlmZkpzb24sIGNhbm9uaWNhbGl6ZX0gZnJvbSAnLi9kaWZmL2pzb24nO1xuXG5pbXBvcnQge2RpZmZBcnJheXN9IGZyb20gJy4vZGlmZi9hcnJheSc7XG5cbmltcG9ydCB7YXBwbHlQYXRjaCwgYXBwbHlQYXRjaGVzfSBmcm9tICcuL3BhdGNoL2FwcGx5JztcbmltcG9ydCB7cGFyc2VQYXRjaH0gZnJvbSAnLi9wYXRjaC9wYXJzZSc7XG5pbXBvcnQge21lcmdlfSBmcm9tICcuL3BhdGNoL21lcmdlJztcbmltcG9ydCB7c3RydWN0dXJlZFBhdGNoLCBjcmVhdGVUd29GaWxlc1BhdGNoLCBjcmVhdGVQYXRjaH0gZnJvbSAnLi9wYXRjaC9jcmVhdGUnO1xuXG5pbXBvcnQge2NvbnZlcnRDaGFuZ2VzVG9ETVB9IGZyb20gJy4vY29udmVydC9kbXAnO1xuaW1wb3J0IHtjb252ZXJ0Q2hhbmdlc1RvWE1MfSBmcm9tICcuL2NvbnZlcnQveG1sJztcblxuZXhwb3J0IHtcbiAgRGlmZixcblxuICBkaWZmQ2hhcnMsXG4gIGRpZmZXb3JkcyxcbiAgZGlmZldvcmRzV2l0aFNwYWNlLFxuICBkaWZmTGluZXMsXG4gIGRpZmZUcmltbWVkTGluZXMsXG4gIGRpZmZTZW50ZW5jZXMsXG5cbiAgZGlmZkNzcyxcbiAgZGlmZkpzb24sXG5cbiAgZGlmZkFycmF5cyxcblxuICBzdHJ1Y3R1cmVkUGF0Y2gsXG4gIGNyZWF0ZVR3b0ZpbGVzUGF0Y2gsXG4gIGNyZWF0ZVBhdGNoLFxuICBhcHBseVBhdGNoLFxuICBhcHBseVBhdGNoZXMsXG4gIHBhcnNlUGF0Y2gsXG4gIG1lcmdlLFxuICBjb252ZXJ0Q2hhbmdlc1RvRE1QLFxuICBjb252ZXJ0Q2hhbmdlc1RvWE1MLFxuICBjYW5vbmljYWxpemVcbn07XG4iXX0=
+	/*istanbul ignore start*/exports. /*istanbul ignore end*/canonicalize = _json.canonicalize; /* See LICENSE file for terms of use */
+
+	/*
+	 * Text diff implementation.
+	 *
+	 * This library supports the following APIS:
+	 * JsDiff.diffChars: Character by character diff
+	 * JsDiff.diffWords: Word (as defined by \b regex) diff which ignores whitespace
+	 * JsDiff.diffLines: Line based diff
+	 *
+	 * JsDiff.diffCss: Diff targeted at CSS content
+	 *
+	 * These methods are based on the implementation proposed in
+	 * "An O(ND) Difference Algorithm and its Variations" (Myers, 1986).
+	 * http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.4.6927
+	 */
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQWdCQSxJLHlCQUFBLDhCLHdCQUFBOzs7Ozs7QUFDQSxJLHlCQUFBLHdDLHdCQUFBOztBQUNBLEkseUJBQUEsOEIsd0JBQUE7O0FBQ0EsSSx5QkFBQSw4Qix3QkFBQTs7QUFDQSxJLHlCQUFBLHNDLHdCQUFBOztBQUVBLEkseUJBQUEsNEIsd0JBQUE7O0FBQ0EsSSx5QkFBQSw4Qix3QkFBQTs7QUFFQSxJLHlCQUFBLGdDLHdCQUFBOztBQUVBLEkseUJBQUEsaUMsd0JBQUE7O0FBQ0EsSSx5QkFBQSxpQyx3QkFBQTs7QUFDQSxJLHlCQUFBLG1DLHdCQUFBOztBQUVBLEkseUJBQUEsK0Isd0JBQUE7O0FBQ0EsSSx5QkFBQSwrQix3QkFBQTs7Ozs7Z0NBR0UsSTt5REFFQSxTO3lEQUNBLFM7eURBQ0Esa0I7eURBQ0EsUzt5REFDQSxnQjt5REFDQSxhO3lEQUVBLE87eURBQ0EsUTt5REFFQSxVO3lEQUVBLGU7eURBQ0EsbUI7eURBQ0EsVzt5REFDQSxVO3lEQUNBLFk7eURBQ0EsVTt5REFDQSxtQjt5REFDQSxtQjt5REFDQSxZIiwiZmlsZSI6ImluZGV4LmpzIiwic291cmNlc0NvbnRlbnQiOlsiLyogU2VlIExJQ0VOU0UgZmlsZSBmb3IgdGVybXMgb2YgdXNlICovXG5cbi8qXG4gKiBUZXh0IGRpZmYgaW1wbGVtZW50YXRpb24uXG4gKlxuICogVGhpcyBsaWJyYXJ5IHN1cHBvcnRzIHRoZSBmb2xsb3dpbmcgQVBJUzpcbiAqIEpzRGlmZi5kaWZmQ2hhcnM6IENoYXJhY3RlciBieSBjaGFyYWN0ZXIgZGlmZlxuICogSnNEaWZmLmRpZmZXb3JkczogV29yZCAoYXMgZGVmaW5lZCBieSBcXGIgcmVnZXgpIGRpZmYgd2hpY2ggaWdub3JlcyB3aGl0ZXNwYWNlXG4gKiBKc0RpZmYuZGlmZkxpbmVzOiBMaW5lIGJhc2VkIGRpZmZcbiAqXG4gKiBKc0RpZmYuZGlmZkNzczogRGlmZiB0YXJnZXRlZCBhdCBDU1MgY29udGVudFxuICpcbiAqIFRoZXNlIG1ldGhvZHMgYXJlIGJhc2VkIG9uIHRoZSBpbXBsZW1lbnRhdGlvbiBwcm9wb3NlZCBpblxuICogXCJBbiBPKE5EKSBEaWZmZXJlbmNlIEFsZ29yaXRobSBhbmQgaXRzIFZhcmlhdGlvbnNcIiAoTXllcnMsIDE5ODYpLlxuICogaHR0cDovL2NpdGVzZWVyeC5pc3QucHN1LmVkdS92aWV3ZG9jL3N1bW1hcnk/ZG9pPTEwLjEuMS40LjY5MjdcbiAqL1xuaW1wb3J0IERpZmYgZnJvbSAnLi9kaWZmL2Jhc2UnO1xuaW1wb3J0IHtkaWZmQ2hhcnN9IGZyb20gJy4vZGlmZi9jaGFyYWN0ZXInO1xuaW1wb3J0IHtkaWZmV29yZHMsIGRpZmZXb3Jkc1dpdGhTcGFjZX0gZnJvbSAnLi9kaWZmL3dvcmQnO1xuaW1wb3J0IHtkaWZmTGluZXMsIGRpZmZUcmltbWVkTGluZXN9IGZyb20gJy4vZGlmZi9saW5lJztcbmltcG9ydCB7ZGlmZlNlbnRlbmNlc30gZnJvbSAnLi9kaWZmL3NlbnRlbmNlJztcblxuaW1wb3J0IHtkaWZmQ3NzfSBmcm9tICcuL2RpZmYvY3NzJztcbmltcG9ydCB7ZGlmZkpzb24sIGNhbm9uaWNhbGl6ZX0gZnJvbSAnLi9kaWZmL2pzb24nO1xuXG5pbXBvcnQge2RpZmZBcnJheXN9IGZyb20gJy4vZGlmZi9hcnJheSc7XG5cbmltcG9ydCB7YXBwbHlQYXRjaCwgYXBwbHlQYXRjaGVzfSBmcm9tICcuL3BhdGNoL2FwcGx5JztcbmltcG9ydCB7cGFyc2VQYXRjaH0gZnJvbSAnLi9wYXRjaC9wYXJzZSc7XG5pbXBvcnQge3N0cnVjdHVyZWRQYXRjaCwgY3JlYXRlVHdvRmlsZXNQYXRjaCwgY3JlYXRlUGF0Y2h9IGZyb20gJy4vcGF0Y2gvY3JlYXRlJztcblxuaW1wb3J0IHtjb252ZXJ0Q2hhbmdlc1RvRE1QfSBmcm9tICcuL2NvbnZlcnQvZG1wJztcbmltcG9ydCB7Y29udmVydENoYW5nZXNUb1hNTH0gZnJvbSAnLi9jb252ZXJ0L3htbCc7XG5cbmV4cG9ydCB7XG4gIERpZmYsXG5cbiAgZGlmZkNoYXJzLFxuICBkaWZmV29yZHMsXG4gIGRpZmZXb3Jkc1dpdGhTcGFjZSxcbiAgZGlmZkxpbmVzLFxuICBkaWZmVHJpbW1lZExpbmVzLFxuICBkaWZmU2VudGVuY2VzLFxuXG4gIGRpZmZDc3MsXG4gIGRpZmZKc29uLFxuXG4gIGRpZmZBcnJheXMsXG5cbiAgc3RydWN0dXJlZFBhdGNoLFxuICBjcmVhdGVUd29GaWxlc1BhdGNoLFxuICBjcmVhdGVQYXRjaCxcbiAgYXBwbHlQYXRjaCxcbiAgYXBwbHlQYXRjaGVzLFxuICBwYXJzZVBhdGNoLFxuICBjb252ZXJ0Q2hhbmdlc1RvRE1QLFxuICBjb252ZXJ0Q2hhbmdlc1RvWE1MLFxuICBjYW5vbmljYWxpemVcbn07XG4iXX0=
 
 
-/***/ }),
+/***/ },
 /* 1 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3528,9 +3527,9 @@ return /******/ (function(modules) { // webpackBootstrap
 	exports['default'] = /*istanbul ignore end*/Diff;
 	function Diff() {}
 
-	Diff.prototype = {
-	  /*istanbul ignore start*/ /*istanbul ignore end*/diff: function diff(oldString, newString) {
-	    /*istanbul ignore start*/var /*istanbul ignore end*/options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+	Diff.prototype = { /*istanbul ignore start*/
+	  /*istanbul ignore end*/diff: function diff(oldString, newString) {
+	    /*istanbul ignore start*/var /*istanbul ignore end*/options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
 
 	    var callback = options.callback;
 	    if (typeof options === 'function') {
@@ -3674,11 +3673,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    return oldPos;
 	  },
 	  /*istanbul ignore start*/ /*istanbul ignore end*/equals: function equals(left, right) {
-	    if (this.options.comparator) {
-	      return this.options.comparator(left, right);
-	    } else {
-	      return left === right || this.options.ignoreCase && left.toLowerCase() === right.toLowerCase();
-	    }
+	    return left === right;
 	  },
 	  /*istanbul ignore start*/ /*istanbul ignore end*/removeEmpty: function removeEmpty(array) {
 	    var ret = [];
@@ -3741,11 +3736,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 	  }
 
-	  // Special case handle for when one terminal is ignored (i.e. whitespace).
-	  // For this case we merge the terminal into the prior string and drop the change.
-	  // This is only available for string mode.
+	  // Special case handle for when one terminal is ignored. For this case we merge the
+	  // terminal into the prior string and drop the change.
 	  var lastComponent = components[componentLen - 1];
-	  if (componentLen > 1 && typeof lastComponent.value === 'string' && (lastComponent.added || lastComponent.removed) && diff.equals('', lastComponent.value)) {
+	  if (componentLen > 1 && (lastComponent.added || lastComponent.removed) && diff.equals('', lastComponent.value)) {
 	    components[componentLen - 2].value += lastComponent.value;
 	    components.pop();
 	  }
@@ -3756,12 +3750,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	function clonePath(path) {
 	  return { newPos: path.newPos, components: path.components.slice(0) };
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/diff/base.js"],"names":["Diff","prototype","diff","oldString","newString","options","callback","self","done","value","setTimeout","undefined","castInput","removeEmpty","tokenize","newLen","length","oldLen","editLength","maxEditLength","bestPath","newPos","components","oldPos","extractCommon","join","count","execEditLength","diagonalPath","basePath","addPath","removePath","canAdd","canRemove","clonePath","pushComponent","buildValues","useLongestToken","exec","ret","added","removed","last","push","commonCount","equals","left","right","comparator","ignoreCase","toLowerCase","array","i","split","chars","componentPos","componentLen","component","slice","map","oldValue","tmp","lastComponent","pop","path"],"mappings":";;;4CAAwBA,I;AAAT,SAASA,IAAT,GAAgB,CAAE;;AAEjCA,KAAKC,SAAL,GAAiB;AAAA,mDACfC,IADe,gBACVC,SADU,EACCC,SADD,EAC0B;AAAA,wDAAdC,OAAc,uEAAJ,EAAI;;AACvC,QAAIC,WAAWD,QAAQC,QAAvB;AACA,QAAI,OAAOD,OAAP,KAAmB,UAAvB,EAAmC;AACjCC,iBAAWD,OAAX;AACAA,gBAAU,EAAV;AACD;AACD,SAAKA,OAAL,GAAeA,OAAf;;AAEA,QAAIE,OAAO,IAAX;;AAEA,aAASC,IAAT,CAAcC,KAAd,EAAqB;AACnB,UAAIH,QAAJ,EAAc;AACZI,mBAAW,YAAW;AAAEJ,mBAASK,SAAT,EAAoBF,KAApB;AAA6B,SAArD,EAAuD,CAAvD;AACA,eAAO,IAAP;AACD,OAHD,MAGO;AACL,eAAOA,KAAP;AACD;AACF;;AAED;AACAN,gBAAY,KAAKS,SAAL,CAAeT,SAAf,CAAZ;AACAC,gBAAY,KAAKQ,SAAL,CAAeR,SAAf,CAAZ;;AAEAD,gBAAY,KAAKU,WAAL,CAAiB,KAAKC,QAAL,CAAcX,SAAd,CAAjB,CAAZ;AACAC,gBAAY,KAAKS,WAAL,CAAiB,KAAKC,QAAL,CAAcV,SAAd,CAAjB,CAAZ;;AAEA,QAAIW,SAASX,UAAUY,MAAvB;AAAA,QAA+BC,SAASd,UAAUa,MAAlD;AACA,QAAIE,aAAa,CAAjB;AACA,QAAIC,gBAAgBJ,SAASE,MAA7B;AACA,QAAIG,WAAW,CAAC,EAAEC,QAAQ,CAAC,CAAX,EAAcC,YAAY,EAA1B,EAAD,CAAf;;AAEA;AACA,QAAIC,SAAS,KAAKC,aAAL,CAAmBJ,SAAS,CAAT,CAAnB,EAAgChB,SAAhC,EAA2CD,SAA3C,EAAsD,CAAtD,CAAb;AACA,QAAIiB,SAAS,CAAT,EAAYC,MAAZ,GAAqB,CAArB,IAA0BN,MAA1B,IAAoCQ,SAAS,CAAT,IAAcN,MAAtD,EAA8D;AAC5D;AACA,aAAOT,KAAK,CAAC,EAACC,OAAO,KAAKgB,IAAL,CAAUrB,SAAV,CAAR,EAA8BsB,OAAOtB,UAAUY,MAA/C,EAAD,CAAL,CAAP;AACD;;AAED;AACA,aAASW,cAAT,GAA0B;AACxB,WAAK,IAAIC,eAAe,CAAC,CAAD,GAAKV,UAA7B,EAAyCU,gBAAgBV,UAAzD,EAAqEU,gBAAgB,CAArF,EAAwF;AACtF,YAAIC,0CAAJ;AACA,YAAIC,UAAUV,SAASQ,eAAe,CAAxB,CAAd;AAAA,YACIG,aAAaX,SAASQ,eAAe,CAAxB,CADjB;AAAA,YAEIL,UAAS,CAACQ,aAAaA,WAAWV,MAAxB,GAAiC,CAAlC,IAAuCO,YAFpD;AAGA,YAAIE,OAAJ,EAAa;AACX;AACAV,mBAASQ,eAAe,CAAxB,IAA6BjB,SAA7B;AACD;;AAED,YAAIqB,SAASF,WAAWA,QAAQT,MAAR,GAAiB,CAAjB,GAAqBN,MAA7C;AAAA,YACIkB,YAAYF,cAAc,KAAKR,OAAnB,IAA6BA,UAASN,MADtD;AAEA,YAAI,CAACe,MAAD,IAAW,CAACC,SAAhB,EAA2B;AACzB;AACAb,mBAASQ,YAAT,IAAyBjB,SAAzB;AACA;AACD;;AAED;AACA;AACA;AACA,YAAI,CAACqB,MAAD,IAAYC,aAAaH,QAAQT,MAAR,GAAiBU,WAAWV,MAAzD,EAAkE;AAChEQ,qBAAWK,UAAUH,UAAV,CAAX;AACAxB,eAAK4B,aAAL,CAAmBN,SAASP,UAA5B,EAAwCX,SAAxC,EAAmD,IAAnD;AACD,SAHD,MAGO;AACLkB,qBAAWC,OAAX,CADK,CACiB;AACtBD,mBAASR,MAAT;AACAd,eAAK4B,aAAL,CAAmBN,SAASP,UAA5B,EAAwC,IAAxC,EAA8CX,SAA9C;AACD;;AAEDY,kBAAShB,KAAKiB,aAAL,CAAmBK,QAAnB,EAA6BzB,SAA7B,EAAwCD,SAAxC,EAAmDyB,YAAnD,CAAT;;AAEA;AACA,YAAIC,SAASR,MAAT,GAAkB,CAAlB,IAAuBN,MAAvB,IAAiCQ,UAAS,CAAT,IAAcN,MAAnD,EAA2D;AACzD,iBAAOT,KAAK4B,YAAY7B,IAAZ,EAAkBsB,SAASP,UAA3B,EAAuClB,SAAvC,EAAkDD,SAAlD,EAA6DI,KAAK8B,eAAlE,CAAL,CAAP;AACD,SAFD,MAEO;AACL;AACAjB,mBAASQ,YAAT,IAAyBC,QAAzB;AACD;AACF;;AAEDX;AACD;;AAED;AACA;AACA;AACA,QAAIZ,QAAJ,EAAc;AACX,gBAASgC,IAAT,GAAgB;AACf5B,mBAAW,YAAW;AACpB;AACA;AACA,cAAIQ,aAAaC,aAAjB,EAAgC;AAC9B,mBAAOb,UAAP;AACD;;AAED,cAAI,CAACqB,gBAAL,EAAuB;AACrBW;AACD;AACF,SAVD,EAUG,CAVH;AAWD,OAZA,GAAD;AAaD,KAdD,MAcO;AACL,aAAOpB,cAAcC,aAArB,EAAoC;AAClC,YAAIoB,MAAMZ,gBAAV;AACA,YAAIY,GAAJ,EAAS;AACP,iBAAOA,GAAP;AACD;AACF;AACF;AACF,GA9Gc;AAAA,mDAgHfJ,aAhHe,yBAgHDb,UAhHC,EAgHWkB,KAhHX,EAgHkBC,OAhHlB,EAgH2B;AACxC,QAAIC,OAAOpB,WAAWA,WAAWN,MAAX,GAAoB,CAA/B,CAAX;AACA,QAAI0B,QAAQA,KAAKF,KAAL,KAAeA,KAAvB,IAAgCE,KAAKD,OAAL,KAAiBA,OAArD,EAA8D;AAC5D;AACA;AACAnB,iBAAWA,WAAWN,MAAX,GAAoB,CAA/B,IAAoC,EAACU,OAAOgB,KAAKhB,KAAL,GAAa,CAArB,EAAwBc,OAAOA,KAA/B,EAAsCC,SAASA,OAA/C,EAApC;AACD,KAJD,MAIO;AACLnB,iBAAWqB,IAAX,CAAgB,EAACjB,OAAO,CAAR,EAAWc,OAAOA,KAAlB,EAAyBC,SAASA,OAAlC,EAAhB;AACD;AACF,GAzHc;AAAA,mDA0HfjB,aA1He,yBA0HDK,QA1HC,EA0HSzB,SA1HT,EA0HoBD,SA1HpB,EA0H+ByB,YA1H/B,EA0H6C;AAC1D,QAAIb,SAASX,UAAUY,MAAvB;AAAA,QACIC,SAASd,UAAUa,MADvB;AAAA,QAEIK,SAASQ,SAASR,MAFtB;AAAA,QAGIE,SAASF,SAASO,YAHtB;AAAA,QAKIgB,cAAc,CALlB;AAMA,WAAOvB,SAAS,CAAT,GAAaN,MAAb,IAAuBQ,SAAS,CAAT,GAAaN,MAApC,IAA8C,KAAK4B,MAAL,CAAYzC,UAAUiB,SAAS,CAAnB,CAAZ,EAAmClB,UAAUoB,SAAS,CAAnB,CAAnC,CAArD,EAAgH;AAC9GF;AACAE;AACAqB;AACD;;AAED,QAAIA,WAAJ,EAAiB;AACff,eAASP,UAAT,CAAoBqB,IAApB,CAAyB,EAACjB,OAAOkB,WAAR,EAAzB;AACD;;AAEDf,aAASR,MAAT,GAAkBA,MAAlB;AACA,WAAOE,MAAP;AACD,GA7Ic;AAAA,mDA+IfsB,MA/Ie,kBA+IRC,IA/IQ,EA+IFC,KA/IE,EA+IK;AAClB,QAAI,KAAK1C,OAAL,CAAa2C,UAAjB,EAA6B;AAC3B,aAAO,KAAK3C,OAAL,CAAa2C,UAAb,CAAwBF,IAAxB,EAA8BC,KAA9B,CAAP;AACD,KAFD,MAEO;AACL,aAAOD,SAASC,KAAT,IACD,KAAK1C,OAAL,CAAa4C,UAAb,IAA2BH,KAAKI,WAAL,OAAuBH,MAAMG,WAAN,EADxD;AAED;AACF,GAtJc;AAAA,mDAuJfrC,WAvJe,uBAuJHsC,KAvJG,EAuJI;AACjB,QAAIZ,MAAM,EAAV;AACA,SAAK,IAAIa,IAAI,CAAb,EAAgBA,IAAID,MAAMnC,MAA1B,EAAkCoC,GAAlC,EAAuC;AACrC,UAAID,MAAMC,CAAN,CAAJ,EAAc;AACZb,YAAII,IAAJ,CAASQ,MAAMC,CAAN,CAAT;AACD;AACF;AACD,WAAOb,GAAP;AACD,GA/Jc;AAAA,mDAgKf3B,SAhKe,qBAgKLH,KAhKK,EAgKE;AACf,WAAOA,KAAP;AACD,GAlKc;AAAA,mDAmKfK,QAnKe,oBAmKNL,KAnKM,EAmKC;AACd,WAAOA,MAAM4C,KAAN,CAAY,EAAZ,CAAP;AACD,GArKc;AAAA,mDAsKf5B,IAtKe,gBAsKV6B,KAtKU,EAsKH;AACV,WAAOA,MAAM7B,IAAN,CAAW,EAAX,CAAP;AACD;AAxKc,CAAjB;;AA2KA,SAASW,WAAT,CAAqBlC,IAArB,EAA2BoB,UAA3B,EAAuClB,SAAvC,EAAkDD,SAAlD,EAA6DkC,eAA7D,EAA8E;AAC5E,MAAIkB,eAAe,CAAnB;AAAA,MACIC,eAAelC,WAAWN,MAD9B;AAAA,MAEIK,SAAS,CAFb;AAAA,MAGIE,SAAS,CAHb;;AAKA,SAAOgC,eAAeC,YAAtB,EAAoCD,cAApC,EAAoD;AAClD,QAAIE,YAAYnC,WAAWiC,YAAX,CAAhB;AACA,QAAI,CAACE,UAAUhB,OAAf,EAAwB;AACtB,UAAI,CAACgB,UAAUjB,KAAX,IAAoBH,eAAxB,EAAyC;AACvC,YAAI5B,QAAQL,UAAUsD,KAAV,CAAgBrC,MAAhB,EAAwBA,SAASoC,UAAU/B,KAA3C,CAAZ;AACAjB,gBAAQA,MAAMkD,GAAN,CAAU,UAASlD,KAAT,EAAgB2C,CAAhB,EAAmB;AACnC,cAAIQ,WAAWzD,UAAUoB,SAAS6B,CAAnB,CAAf;AACA,iBAAOQ,SAAS5C,MAAT,GAAkBP,MAAMO,MAAxB,GAAiC4C,QAAjC,GAA4CnD,KAAnD;AACD,SAHO,CAAR;;AAKAgD,kBAAUhD,KAAV,GAAkBP,KAAKuB,IAAL,CAAUhB,KAAV,CAAlB;AACD,OARD,MAQO;AACLgD,kBAAUhD,KAAV,GAAkBP,KAAKuB,IAAL,CAAUrB,UAAUsD,KAAV,CAAgBrC,MAAhB,EAAwBA,SAASoC,UAAU/B,KAA3C,CAAV,CAAlB;AACD;AACDL,gBAAUoC,UAAU/B,KAApB;;AAEA;AACA,UAAI,CAAC+B,UAAUjB,KAAf,EAAsB;AACpBjB,kBAAUkC,UAAU/B,KAApB;AACD;AACF,KAlBD,MAkBO;AACL+B,gBAAUhD,KAAV,GAAkBP,KAAKuB,IAAL,CAAUtB,UAAUuD,KAAV,CAAgBnC,MAAhB,EAAwBA,SAASkC,UAAU/B,KAA3C,CAAV,CAAlB;AACAH,gBAAUkC,UAAU/B,KAApB;;AAEA;AACA;AACA;AACA,UAAI6B,gBAAgBjC,WAAWiC,eAAe,CAA1B,EAA6Bf,KAAjD,EAAwD;AACtD,YAAIqB,MAAMvC,WAAWiC,eAAe,CAA1B,CAAV;AACAjC,mBAAWiC,eAAe,CAA1B,IAA+BjC,WAAWiC,YAAX,CAA/B;AACAjC,mBAAWiC,YAAX,IAA2BM,GAA3B;AACD;AACF;AACF;;AAED;AACA;AACA;AACA,MAAIC,gBAAgBxC,WAAWkC,eAAe,CAA1B,CAApB;AACA,MAAIA,eAAe,CAAf,IACG,OAAOM,cAAcrD,KAArB,KAA+B,QADlC,KAEIqD,cAActB,KAAd,IAAuBsB,cAAcrB,OAFzC,KAGGvC,KAAK2C,MAAL,CAAY,EAAZ,EAAgBiB,cAAcrD,KAA9B,CAHP,EAG6C;AAC3Ca,eAAWkC,eAAe,CAA1B,EAA6B/C,KAA7B,IAAsCqD,cAAcrD,KAApD;AACAa,eAAWyC,GAAX;AACD;;AAED,SAAOzC,UAAP;AACD;;AAED,SAASY,SAAT,CAAmB8B,IAAnB,EAAyB;AACvB,SAAO,EAAE3C,QAAQ2C,KAAK3C,MAAf,EAAuBC,YAAY0C,KAAK1C,UAAL,CAAgBoC,KAAhB,CAAsB,CAAtB,CAAnC,EAAP;AACD","file":"base.js","sourcesContent":["export default function Diff() {}\n\nDiff.prototype = {\n  diff(oldString, newString, options = {}) {\n    let callback = options.callback;\n    if (typeof options === 'function') {\n      callback = options;\n      options = {};\n    }\n    this.options = options;\n\n    let self = this;\n\n    function done(value) {\n      if (callback) {\n        setTimeout(function() { callback(undefined, value); }, 0);\n        return true;\n      } else {\n        return value;\n      }\n    }\n\n    // Allow subclasses to massage the input prior to running\n    oldString = this.castInput(oldString);\n    newString = this.castInput(newString);\n\n    oldString = this.removeEmpty(this.tokenize(oldString));\n    newString = this.removeEmpty(this.tokenize(newString));\n\n    let newLen = newString.length, oldLen = oldString.length;\n    let editLength = 1;\n    let maxEditLength = newLen + oldLen;\n    let bestPath = [{ newPos: -1, components: [] }];\n\n    // Seed editLength = 0, i.e. the content starts with the same values\n    let oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);\n    if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {\n      // Identity per the equality and tokenizer\n      return done([{value: this.join(newString), count: newString.length}]);\n    }\n\n    // Main worker method. checks all permutations of a given edit length for acceptance.\n    function execEditLength() {\n      for (let diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {\n        let basePath;\n        let addPath = bestPath[diagonalPath - 1],\n            removePath = bestPath[diagonalPath + 1],\n            oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;\n        if (addPath) {\n          // No one else is going to attempt to use this value, clear it\n          bestPath[diagonalPath - 1] = undefined;\n        }\n\n        let canAdd = addPath && addPath.newPos + 1 < newLen,\n            canRemove = removePath && 0 <= oldPos && oldPos < oldLen;\n        if (!canAdd && !canRemove) {\n          // If this path is a terminal then prune\n          bestPath[diagonalPath] = undefined;\n          continue;\n        }\n\n        // Select the diagonal that we want to branch from. We select the prior\n        // path whose position in the new string is the farthest from the origin\n        // and does not pass the bounds of the diff graph\n        if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {\n          basePath = clonePath(removePath);\n          self.pushComponent(basePath.components, undefined, true);\n        } else {\n          basePath = addPath;   // No need to clone, we've pulled it from the list\n          basePath.newPos++;\n          self.pushComponent(basePath.components, true, undefined);\n        }\n\n        oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);\n\n        // If we have hit the end of both strings, then we are done\n        if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {\n          return done(buildValues(self, basePath.components, newString, oldString, self.useLongestToken));\n        } else {\n          // Otherwise track this path as a potential candidate and continue.\n          bestPath[diagonalPath] = basePath;\n        }\n      }\n\n      editLength++;\n    }\n\n    // Performs the length of edit iteration. Is a bit fugly as this has to support the\n    // sync and async mode which is never fun. Loops over execEditLength until a value\n    // is produced.\n    if (callback) {\n      (function exec() {\n        setTimeout(function() {\n          // This should not happen, but we want to be safe.\n          /* istanbul ignore next */\n          if (editLength > maxEditLength) {\n            return callback();\n          }\n\n          if (!execEditLength()) {\n            exec();\n          }\n        }, 0);\n      }());\n    } else {\n      while (editLength <= maxEditLength) {\n        let ret = execEditLength();\n        if (ret) {\n          return ret;\n        }\n      }\n    }\n  },\n\n  pushComponent(components, added, removed) {\n    let last = components[components.length - 1];\n    if (last && last.added === added && last.removed === removed) {\n      // We need to clone here as the component clone operation is just\n      // as shallow array clone\n      components[components.length - 1] = {count: last.count + 1, added: added, removed: removed };\n    } else {\n      components.push({count: 1, added: added, removed: removed });\n    }\n  },\n  extractCommon(basePath, newString, oldString, diagonalPath) {\n    let newLen = newString.length,\n        oldLen = oldString.length,\n        newPos = basePath.newPos,\n        oldPos = newPos - diagonalPath,\n\n        commonCount = 0;\n    while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {\n      newPos++;\n      oldPos++;\n      commonCount++;\n    }\n\n    if (commonCount) {\n      basePath.components.push({count: commonCount});\n    }\n\n    basePath.newPos = newPos;\n    return oldPos;\n  },\n\n  equals(left, right) {\n    if (this.options.comparator) {\n      return this.options.comparator(left, right);\n    } else {\n      return left === right\n        || (this.options.ignoreCase && left.toLowerCase() === right.toLowerCase());\n    }\n  },\n  removeEmpty(array) {\n    let ret = [];\n    for (let i = 0; i < array.length; i++) {\n      if (array[i]) {\n        ret.push(array[i]);\n      }\n    }\n    return ret;\n  },\n  castInput(value) {\n    return value;\n  },\n  tokenize(value) {\n    return value.split('');\n  },\n  join(chars) {\n    return chars.join('');\n  }\n};\n\nfunction buildValues(diff, components, newString, oldString, useLongestToken) {\n  let componentPos = 0,\n      componentLen = components.length,\n      newPos = 0,\n      oldPos = 0;\n\n  for (; componentPos < componentLen; componentPos++) {\n    let component = components[componentPos];\n    if (!component.removed) {\n      if (!component.added && useLongestToken) {\n        let value = newString.slice(newPos, newPos + component.count);\n        value = value.map(function(value, i) {\n          let oldValue = oldString[oldPos + i];\n          return oldValue.length > value.length ? oldValue : value;\n        });\n\n        component.value = diff.join(value);\n      } else {\n        component.value = diff.join(newString.slice(newPos, newPos + component.count));\n      }\n      newPos += component.count;\n\n      // Common case\n      if (!component.added) {\n        oldPos += component.count;\n      }\n    } else {\n      component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));\n      oldPos += component.count;\n\n      // Reverse add and remove so removes are output first to match common convention\n      // The diffing algorithm is tied to add then remove output and this is the simplest\n      // route to get the desired output with minimal overhead.\n      if (componentPos && components[componentPos - 1].added) {\n        let tmp = components[componentPos - 1];\n        components[componentPos - 1] = components[componentPos];\n        components[componentPos] = tmp;\n      }\n    }\n  }\n\n  // Special case handle for when one terminal is ignored (i.e. whitespace).\n  // For this case we merge the terminal into the prior string and drop the change.\n  // This is only available for string mode.\n  let lastComponent = components[componentLen - 1];\n  if (componentLen > 1\n      && typeof lastComponent.value === 'string'\n      && (lastComponent.added || lastComponent.removed)\n      && diff.equals('', lastComponent.value)) {\n    components[componentLen - 2].value += lastComponent.value;\n    components.pop();\n  }\n\n  return components;\n}\n\nfunction clonePath(path) {\n  return { newPos: path.newPos, components: path.components.slice(0) };\n}\n"]}
+	//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/diff/base.js"],"names":[],"mappings":";;;4CAAwB,I;AAAT,SAAS,IAAT,GAAgB,CAAE;;AAEjC,KAAK,SAAL,GAAiB,E;yBACf,IADe,gBACV,SADU,EACC,SADD,EAC0B;6BAAA,I,uBAAd,OAAc,yDAAJ,EAAI;;AACvC,QAAI,WAAW,QAAQ,QAAvB;AACA,QAAI,OAAO,OAAP,KAAmB,UAAvB,EAAmC;AACjC,iBAAW,OAAX;AACA,gBAAU,EAAV;AACD;AACD,SAAK,OAAL,GAAe,OAAf;;AAEA,QAAI,OAAO,IAAX;;AAEA,aAAS,IAAT,CAAc,KAAd,EAAqB;AACnB,UAAI,QAAJ,EAAc;AACZ,mBAAW,YAAW;AAAE,mBAAS,SAAT,EAAoB,KAApB;AAA6B,SAArD,EAAuD,CAAvD;AACA,eAAO,IAAP;AACD,OAHD,MAGO;AACL,eAAO,KAAP;AACD;AACF;;;AAGD,gBAAY,KAAK,SAAL,CAAe,SAAf,CAAZ;AACA,gBAAY,KAAK,SAAL,CAAe,SAAf,CAAZ;;AAEA,gBAAY,KAAK,WAAL,CAAiB,KAAK,QAAL,CAAc,SAAd,CAAjB,CAAZ;AACA,gBAAY,KAAK,WAAL,CAAiB,KAAK,QAAL,CAAc,SAAd,CAAjB,CAAZ;;AAEA,QAAI,SAAS,UAAU,MAAvB;AAAA,QAA+B,SAAS,UAAU,MAAlD;AACA,QAAI,aAAa,CAAjB;AACA,QAAI,gBAAgB,SAAS,MAA7B;AACA,QAAI,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAX,EAAc,YAAY,EAA1B,EAAD,CAAf;;;AAGA,QAAI,SAAS,KAAK,aAAL,CAAmB,SAAS,CAAT,CAAnB,EAAgC,SAAhC,EAA2C,SAA3C,EAAsD,CAAtD,CAAb;AACA,QAAI,SAAS,CAAT,EAAY,MAAZ,GAAqB,CAArB,IAA0B,MAA1B,IAAoC,SAAS,CAAT,IAAc,MAAtD,EAA8D;;AAE5D,aAAO,KAAK,CAAC,EAAC,OAAO,KAAK,IAAL,CAAU,SAAV,CAAR,EAA8B,OAAO,UAAU,MAA/C,EAAD,CAAL,CAAP;AACD;;;AAGD,aAAS,cAAT,GAA0B;AACxB,WAAK,IAAI,eAAe,CAAC,CAAD,GAAK,UAA7B,EAAyC,gBAAgB,UAAzD,EAAqE,gBAAgB,CAArF,EAAwF;AACtF,YAAI,W,yBAAA,M,wBAAJ;AACA,YAAI,UAAU,SAAS,eAAe,CAAxB,CAAd;AAAA,YACI,aAAa,SAAS,eAAe,CAAxB,CADjB;AAAA,YAEI,UAAS,CAAC,aAAa,WAAW,MAAxB,GAAiC,CAAlC,IAAuC,YAFpD;AAGA,YAAI,OAAJ,EAAa;;AAEX,mBAAS,eAAe,CAAxB,IAA6B,SAA7B;AACD;;AAED,YAAI,SAAS,WAAW,QAAQ,MAAR,GAAiB,CAAjB,GAAqB,MAA7C;AAAA,YACI,YAAY,cAAc,KAAK,OAAnB,IAA6B,UAAS,MADtD;AAEA,YAAI,CAAC,MAAD,IAAW,CAAC,SAAhB,EAA2B;;AAEzB,mBAAS,YAAT,IAAyB,SAAzB;AACA;AACD;;;;;AAKD,YAAI,CAAC,MAAD,IAAY,aAAa,QAAQ,MAAR,GAAiB,WAAW,MAAzD,EAAkE;AAChE,qBAAW,UAAU,UAAV,CAAX;AACA,eAAK,aAAL,CAAmB,SAAS,UAA5B,EAAwC,SAAxC,EAAmD,IAAnD;AACD,SAHD,MAGO;AACL,qBAAW,OAAX,C;AACA,mBAAS,MAAT;AACA,eAAK,aAAL,CAAmB,SAAS,UAA5B,EAAwC,IAAxC,EAA8C,SAA9C;AACD;;AAED,kBAAS,KAAK,aAAL,CAAmB,QAAnB,EAA6B,SAA7B,EAAwC,SAAxC,EAAmD,YAAnD,CAAT;;;AAGA,YAAI,SAAS,MAAT,GAAkB,CAAlB,IAAuB,MAAvB,IAAiC,UAAS,CAAT,IAAc,MAAnD,EAA2D;AACzD,iBAAO,KAAK,YAAY,IAAZ,EAAkB,SAAS,UAA3B,EAAuC,SAAvC,EAAkD,SAAlD,EAA6D,KAAK,eAAlE,CAAL,CAAP;AACD,SAFD,MAEO;;AAEL,mBAAS,YAAT,IAAyB,QAAzB;AACD;AACF;;AAED;AACD;;;;;AAKD,QAAI,QAAJ,EAAc;AACX,gBAAS,IAAT,GAAgB;AACf,mBAAW,YAAW;;;AAGpB,cAAI,aAAa,aAAjB,EAAgC;AAC9B,mBAAO,UAAP;AACD;;AAED,cAAI,CAAC,gBAAL,EAAuB;AACrB;AACD;AACF,SAVD,EAUG,CAVH;AAWD,OAZA,GAAD;AAaD,KAdD,MAcO;AACL,aAAO,cAAc,aAArB,EAAoC;AAClC,YAAI,MAAM,gBAAV;AACA,YAAI,GAAJ,EAAS;AACP,iBAAO,GAAP;AACD;AACF;AACF;AACF,GA9Gc;mDAgHf,aAhHe,yBAgHD,UAhHC,EAgHW,KAhHX,EAgHkB,OAhHlB,EAgH2B;AACxC,QAAI,OAAO,WAAW,WAAW,MAAX,GAAoB,CAA/B,CAAX;AACA,QAAI,QAAQ,KAAK,KAAL,KAAe,KAAvB,IAAgC,KAAK,OAAL,KAAiB,OAArD,EAA8D;;;AAG5D,iBAAW,WAAW,MAAX,GAAoB,CAA/B,IAAoC,EAAC,OAAO,KAAK,KAAL,GAAa,CAArB,EAAwB,OAAO,KAA/B,EAAsC,SAAS,OAA/C,EAApC;AACD,KAJD,MAIO;AACL,iBAAW,IAAX,CAAgB,EAAC,OAAO,CAAR,EAAW,OAAO,KAAlB,EAAyB,SAAS,OAAlC,EAAhB;AACD;AACF,GAzHc;mDA0Hf,aA1He,yBA0HD,QA1HC,EA0HS,SA1HT,EA0HoB,SA1HpB,EA0H+B,YA1H/B,EA0H6C;AAC1D,QAAI,SAAS,UAAU,MAAvB;AAAA,QACI,SAAS,UAAU,MADvB;AAAA,QAEI,SAAS,SAAS,MAFtB;AAAA,QAGI,SAAS,SAAS,YAHtB;AAAA,QAKI,cAAc,CALlB;AAMA,WAAO,SAAS,CAAT,GAAa,MAAb,IAAuB,SAAS,CAAT,GAAa,MAApC,IAA8C,KAAK,MAAL,CAAY,UAAU,SAAS,CAAnB,CAAZ,EAAmC,UAAU,SAAS,CAAnB,CAAnC,CAArD,EAAgH;AAC9G;AACA;AACA;AACD;;AAED,QAAI,WAAJ,EAAiB;AACf,eAAS,UAAT,CAAoB,IAApB,CAAyB,EAAC,OAAO,WAAR,EAAzB;AACD;;AAED,aAAS,MAAT,GAAkB,MAAlB;AACA,WAAO,MAAP;AACD,GA7Ic;mDA+If,MA/Ie,kBA+IR,IA/IQ,EA+IF,KA/IE,EA+IK;AAClB,WAAO,SAAS,KAAhB;AACD,GAjJc;mDAkJf,WAlJe,uBAkJH,KAlJG,EAkJI;AACjB,QAAI,MAAM,EAAV;AACA,SAAK,IAAI,IAAI,CAAb,EAAgB,IAAI,MAAM,MAA1B,EAAkC,GAAlC,EAAuC;AACrC,UAAI,MAAM,CAAN,CAAJ,EAAc;AACZ,YAAI,IAAJ,CAAS,MAAM,CAAN,CAAT;AACD;AACF;AACD,WAAO,GAAP;AACD,GA1Jc;mDA2Jf,SA3Je,qBA2JL,KA3JK,EA2JE;AACf,WAAO,KAAP;AACD,GA7Jc;mDA8Jf,QA9Je,oBA8JN,KA9JM,EA8JC;AACd,WAAO,MAAM,KAAN,CAAY,EAAZ,CAAP;AACD,GAhKc;mDAiKf,IAjKe,gBAiKV,KAjKU,EAiKH;AACV,WAAO,MAAM,IAAN,CAAW,EAAX,CAAP;AACD;AAnKc,CAAjB;;AAsKA,SAAS,WAAT,CAAqB,IAArB,EAA2B,UAA3B,EAAuC,SAAvC,EAAkD,SAAlD,EAA6D,eAA7D,EAA8E;AAC5E,MAAI,eAAe,CAAnB;AAAA,MACI,eAAe,WAAW,MAD9B;AAAA,MAEI,SAAS,CAFb;AAAA,MAGI,SAAS,CAHb;;AAKA,SAAO,eAAe,YAAtB,EAAoC,cAApC,EAAoD;AAClD,QAAI,YAAY,WAAW,YAAX,CAAhB;AACA,QAAI,CAAC,UAAU,OAAf,EAAwB;AACtB,UAAI,CAAC,UAAU,KAAX,IAAoB,eAAxB,EAAyC;AACvC,YAAI,QAAQ,UAAU,KAAV,CAAgB,MAAhB,EAAwB,SAAS,UAAU,KAA3C,CAAZ;AACA,gBAAQ,MAAM,GAAN,CAAU,UAAS,KAAT,EAAgB,CAAhB,EAAmB;AACnC,cAAI,WAAW,UAAU,SAAS,CAAnB,CAAf;AACA,iBAAO,SAAS,MAAT,GAAkB,MAAM,MAAxB,GAAiC,QAAjC,GAA4C,KAAnD;AACD,SAHO,CAAR;;AAKA,kBAAU,KAAV,GAAkB,KAAK,IAAL,CAAU,KAAV,CAAlB;AACD,OARD,MAQO;AACL,kBAAU,KAAV,GAAkB,KAAK,IAAL,CAAU,UAAU,KAAV,CAAgB,MAAhB,EAAwB,SAAS,UAAU,KAA3C,CAAV,CAAlB;AACD;AACD,gBAAU,UAAU,KAApB;;;AAGA,UAAI,CAAC,UAAU,KAAf,EAAsB;AACpB,kBAAU,UAAU,KAApB;AACD;AACF,KAlBD,MAkBO;AACL,gBAAU,KAAV,GAAkB,KAAK,IAAL,CAAU,UAAU,KAAV,CAAgB,MAAhB,EAAwB,SAAS,UAAU,KAA3C,CAAV,CAAlB;AACA,gBAAU,UAAU,KAApB;;;;;AAKA,UAAI,gBAAgB,WAAW,eAAe,CAA1B,EAA6B,KAAjD,EAAwD;AACtD,YAAI,MAAM,WAAW,eAAe,CAA1B,CAAV;AACA,mBAAW,eAAe,CAA1B,IAA+B,WAAW,YAAX,CAA/B;AACA,mBAAW,YAAX,IAA2B,GAA3B;AACD;AACF;AACF;;;;AAID,MAAI,gBAAgB,WAAW,eAAe,CAA1B,CAApB;AACA,MAAI,eAAe,CAAf,KACI,cAAc,KAAd,IAAuB,cAAc,OADzC,KAEG,KAAK,MAAL,CAAY,EAAZ,EAAgB,cAAc,KAA9B,CAFP,EAE6C;AAC3C,eAAW,eAAe,CAA1B,EAA6B,KAA7B,IAAsC,cAAc,KAApD;AACA,eAAW,GAAX;AACD;;AAED,SAAO,UAAP;AACD;;AAED,SAAS,SAAT,CAAmB,IAAnB,EAAyB;AACvB,SAAO,EAAE,QAAQ,KAAK,MAAf,EAAuB,YAAY,KAAK,UAAL,CAAgB,KAAhB,CAAsB,CAAtB,CAAnC,EAAP;AACD","file":"base.js","sourcesContent":["export default function Diff() {}\n\nDiff.prototype = {\n  diff(oldString, newString, options = {}) {\n    let callback = options.callback;\n    if (typeof options === 'function') {\n      callback = options;\n      options = {};\n    }\n    this.options = options;\n\n    let self = this;\n\n    function done(value) {\n      if (callback) {\n        setTimeout(function() { callback(undefined, value); }, 0);\n        return true;\n      } else {\n        return value;\n      }\n    }\n\n    // Allow subclasses to massage the input prior to running\n    oldString = this.castInput(oldString);\n    newString = this.castInput(newString);\n\n    oldString = this.removeEmpty(this.tokenize(oldString));\n    newString = this.removeEmpty(this.tokenize(newString));\n\n    let newLen = newString.length, oldLen = oldString.length;\n    let editLength = 1;\n    let maxEditLength = newLen + oldLen;\n    let bestPath = [{ newPos: -1, components: [] }];\n\n    // Seed editLength = 0, i.e. the content starts with the same values\n    let oldPos = this.extractCommon(bestPath[0], newString, oldString, 0);\n    if (bestPath[0].newPos + 1 >= newLen && oldPos + 1 >= oldLen) {\n      // Identity per the equality and tokenizer\n      return done([{value: this.join(newString), count: newString.length}]);\n    }\n\n    // Main worker method. checks all permutations of a given edit length for acceptance.\n    function execEditLength() {\n      for (let diagonalPath = -1 * editLength; diagonalPath <= editLength; diagonalPath += 2) {\n        let basePath;\n        let addPath = bestPath[diagonalPath - 1],\n            removePath = bestPath[diagonalPath + 1],\n            oldPos = (removePath ? removePath.newPos : 0) - diagonalPath;\n        if (addPath) {\n          // No one else is going to attempt to use this value, clear it\n          bestPath[diagonalPath - 1] = undefined;\n        }\n\n        let canAdd = addPath && addPath.newPos + 1 < newLen,\n            canRemove = removePath && 0 <= oldPos && oldPos < oldLen;\n        if (!canAdd && !canRemove) {\n          // If this path is a terminal then prune\n          bestPath[diagonalPath] = undefined;\n          continue;\n        }\n\n        // Select the diagonal that we want to branch from. We select the prior\n        // path whose position in the new string is the farthest from the origin\n        // and does not pass the bounds of the diff graph\n        if (!canAdd || (canRemove && addPath.newPos < removePath.newPos)) {\n          basePath = clonePath(removePath);\n          self.pushComponent(basePath.components, undefined, true);\n        } else {\n          basePath = addPath;   // No need to clone, we've pulled it from the list\n          basePath.newPos++;\n          self.pushComponent(basePath.components, true, undefined);\n        }\n\n        oldPos = self.extractCommon(basePath, newString, oldString, diagonalPath);\n\n        // If we have hit the end of both strings, then we are done\n        if (basePath.newPos + 1 >= newLen && oldPos + 1 >= oldLen) {\n          return done(buildValues(self, basePath.components, newString, oldString, self.useLongestToken));\n        } else {\n          // Otherwise track this path as a potential candidate and continue.\n          bestPath[diagonalPath] = basePath;\n        }\n      }\n\n      editLength++;\n    }\n\n    // Performs the length of edit iteration. Is a bit fugly as this has to support the\n    // sync and async mode which is never fun. Loops over execEditLength until a value\n    // is produced.\n    if (callback) {\n      (function exec() {\n        setTimeout(function() {\n          // This should not happen, but we want to be safe.\n          /* istanbul ignore next */\n          if (editLength > maxEditLength) {\n            return callback();\n          }\n\n          if (!execEditLength()) {\n            exec();\n          }\n        }, 0);\n      }());\n    } else {\n      while (editLength <= maxEditLength) {\n        let ret = execEditLength();\n        if (ret) {\n          return ret;\n        }\n      }\n    }\n  },\n\n  pushComponent(components, added, removed) {\n    let last = components[components.length - 1];\n    if (last && last.added === added && last.removed === removed) {\n      // We need to clone here as the component clone operation is just\n      // as shallow array clone\n      components[components.length - 1] = {count: last.count + 1, added: added, removed: removed };\n    } else {\n      components.push({count: 1, added: added, removed: removed });\n    }\n  },\n  extractCommon(basePath, newString, oldString, diagonalPath) {\n    let newLen = newString.length,\n        oldLen = oldString.length,\n        newPos = basePath.newPos,\n        oldPos = newPos - diagonalPath,\n\n        commonCount = 0;\n    while (newPos + 1 < newLen && oldPos + 1 < oldLen && this.equals(newString[newPos + 1], oldString[oldPos + 1])) {\n      newPos++;\n      oldPos++;\n      commonCount++;\n    }\n\n    if (commonCount) {\n      basePath.components.push({count: commonCount});\n    }\n\n    basePath.newPos = newPos;\n    return oldPos;\n  },\n\n  equals(left, right) {\n    return left === right;\n  },\n  removeEmpty(array) {\n    let ret = [];\n    for (let i = 0; i < array.length; i++) {\n      if (array[i]) {\n        ret.push(array[i]);\n      }\n    }\n    return ret;\n  },\n  castInput(value) {\n    return value;\n  },\n  tokenize(value) {\n    return value.split('');\n  },\n  join(chars) {\n    return chars.join('');\n  }\n};\n\nfunction buildValues(diff, components, newString, oldString, useLongestToken) {\n  let componentPos = 0,\n      componentLen = components.length,\n      newPos = 0,\n      oldPos = 0;\n\n  for (; componentPos < componentLen; componentPos++) {\n    let component = components[componentPos];\n    if (!component.removed) {\n      if (!component.added && useLongestToken) {\n        let value = newString.slice(newPos, newPos + component.count);\n        value = value.map(function(value, i) {\n          let oldValue = oldString[oldPos + i];\n          return oldValue.length > value.length ? oldValue : value;\n        });\n\n        component.value = diff.join(value);\n      } else {\n        component.value = diff.join(newString.slice(newPos, newPos + component.count));\n      }\n      newPos += component.count;\n\n      // Common case\n      if (!component.added) {\n        oldPos += component.count;\n      }\n    } else {\n      component.value = diff.join(oldString.slice(oldPos, oldPos + component.count));\n      oldPos += component.count;\n\n      // Reverse add and remove so removes are output first to match common convention\n      // The diffing algorithm is tied to add then remove output and this is the simplest\n      // route to get the desired output with minimal overhead.\n      if (componentPos && components[componentPos - 1].added) {\n        let tmp = components[componentPos - 1];\n        components[componentPos - 1] = components[componentPos];\n        components[componentPos] = tmp;\n      }\n    }\n  }\n\n  // Special case handle for when one terminal is ignored. For this case we merge the\n  // terminal into the prior string and drop the change.\n  let lastComponent = components[componentLen - 1];\n  if (componentLen > 1\n      && (lastComponent.added || lastComponent.removed)\n      && diff.equals('', lastComponent.value)) {\n    components[componentLen - 2].value += lastComponent.value;\n    components.pop();\n  }\n\n  return components;\n}\n\nfunction clonePath(path) {\n  return { newPos: path.newPos, components: path.components.slice(0) };\n}\n"]}
 
 
-/***/ }),
+/***/ },
 /* 2 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3771,20 +3765,21 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore end*/var characterDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/characterDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
-	function diffChars(oldStr, newStr, options) {
-	  return characterDiff.diff(oldStr, newStr, options);
+	/*istanbul ignore end*/var characterDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/characterDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
+	function diffChars(oldStr, newStr, callback) {
+	  return characterDiff.diff(oldStr, newStr, callback);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2NoYXJhY3Rlci5qcyJdLCJuYW1lcyI6WyJkaWZmQ2hhcnMiLCJjaGFyYWN0ZXJEaWZmIiwib2xkU3RyIiwibmV3U3RyIiwib3B0aW9ucyIsImRpZmYiXSwibWFwcGluZ3MiOiI7Ozs7Z0NBR2dCQSxTLEdBQUFBLFM7O0FBSGhCOzs7Ozs7dUJBRU8sSUFBTUMseUZBQWdCLHdFQUF0QjtBQUNBLFNBQVNELFNBQVQsQ0FBbUJFLE1BQW5CLEVBQTJCQyxNQUEzQixFQUFtQ0MsT0FBbkMsRUFBNEM7QUFBRSxTQUFPSCxjQUFjSSxJQUFkLENBQW1CSCxNQUFuQixFQUEyQkMsTUFBM0IsRUFBbUNDLE9BQW5DLENBQVA7QUFBcUQiLCJmaWxlIjoiY2hhcmFjdGVyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IERpZmYgZnJvbSAnLi9iYXNlJztcblxuZXhwb3J0IGNvbnN0IGNoYXJhY3RlckRpZmYgPSBuZXcgRGlmZigpO1xuZXhwb3J0IGZ1bmN0aW9uIGRpZmZDaGFycyhvbGRTdHIsIG5ld1N0ciwgb3B0aW9ucykgeyByZXR1cm4gY2hhcmFjdGVyRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBvcHRpb25zKTsgfVxuIl19
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2NoYXJhY3Rlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O2dDQUdnQixTLEdBQUEsUzs7QUFIaEIsSSx5QkFBQSx5Qix3QkFBQTs7Ozs7Ozt1QkFFTyxJQUFNLGdCLHlCQUFBLFEsd0JBQUEsZ0JBQWdCLEkseUJBQUEsbUIsd0JBQXRCO0FBQ0EsU0FBUyxTQUFULENBQW1CLE1BQW5CLEVBQTJCLE1BQTNCLEVBQW1DLFFBQW5DLEVBQTZDO0FBQUUsU0FBTyxjQUFjLElBQWQsQ0FBbUIsTUFBbkIsRUFBMkIsTUFBM0IsRUFBbUMsUUFBbkMsQ0FBUDtBQUFzRCIsImZpbGUiOiJjaGFyYWN0ZXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgRGlmZiBmcm9tICcuL2Jhc2UnO1xuXG5leHBvcnQgY29uc3QgY2hhcmFjdGVyRGlmZiA9IG5ldyBEaWZmKCk7XG5leHBvcnQgZnVuY3Rpb24gZGlmZkNoYXJzKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjaykgeyByZXR1cm4gY2hhcmFjdGVyRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjayk7IH1cbiJdfQ==
 
 
-/***/ }),
+/***/ },
 /* 3 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3795,13 +3790,18 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
-	/*istanbul ignore end*/var /*istanbul ignore start*/_params = __webpack_require__(4) /*istanbul ignore end*/;
+	/*istanbul ignore end*/
+	var /*istanbul ignore start*/_params = __webpack_require__(4) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+	/*istanbul ignore start*/
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore end*/ // Based on https://en.wikipedia.org/wiki/Latin_script_in_Unicode
+	/*istanbul ignore end*/
+
+	// Based on https://en.wikipedia.org/wiki/Latin_script_in_Unicode
 	//
 	// Ranges and exceptions:
 	// Latin-1 Supplement, 0080–00FF
@@ -3823,12 +3823,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var reWhitespace = /\S/;
 
-	var wordDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/wordDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
+	var wordDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/wordDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
 	wordDiff.equals = function (left, right) {
-	  if (this.options.ignoreCase) {
-	    left = left.toLowerCase();
-	    right = right.toLowerCase();
-	  }
 	  return left === right || this.options.ignoreWhitespace && !reWhitespace.test(left) && !reWhitespace.test(right);
 	};
 	wordDiff.tokenize = function (value) {
@@ -3847,20 +3843,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	  return tokens;
 	};
 
-	function diffWords(oldStr, newStr, options) {
-	  options = /*istanbul ignore start*/(0, _params.generateOptions) /*istanbul ignore end*/(options, { ignoreWhitespace: true });
+	function diffWords(oldStr, newStr, callback) {
+	  var options = /*istanbul ignore start*/(0, _params.generateOptions) /*istanbul ignore end*/(callback, { ignoreWhitespace: true });
 	  return wordDiff.diff(oldStr, newStr, options);
 	}
-
-	function diffWordsWithSpace(oldStr, newStr, options) {
-	  return wordDiff.diff(oldStr, newStr, options);
+	function diffWordsWithSpace(oldStr, newStr, callback) {
+	  return wordDiff.diff(oldStr, newStr, callback);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL3dvcmQuanMiXSwibmFtZXMiOlsiZGlmZldvcmRzIiwiZGlmZldvcmRzV2l0aFNwYWNlIiwiZXh0ZW5kZWRXb3JkQ2hhcnMiLCJyZVdoaXRlc3BhY2UiLCJ3b3JkRGlmZiIsImVxdWFscyIsImxlZnQiLCJyaWdodCIsIm9wdGlvbnMiLCJpZ25vcmVDYXNlIiwidG9Mb3dlckNhc2UiLCJpZ25vcmVXaGl0ZXNwYWNlIiwidGVzdCIsInRva2VuaXplIiwidmFsdWUiLCJ0b2tlbnMiLCJzcGxpdCIsImkiLCJsZW5ndGgiLCJzcGxpY2UiLCJvbGRTdHIiLCJuZXdTdHIiLCJkaWZmIl0sIm1hcHBpbmdzIjoiOzs7O2dDQW1EZ0JBLFMsR0FBQUEsUzt5REFLQUMsa0IsR0FBQUEsa0I7O0FBeERoQjs7Ozt1QkFDQTs7Ozt3QkFFQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQSxJQUFNQyxvQkFBb0IsK0RBQTFCOztBQUVBLElBQU1DLGVBQWUsSUFBckI7O0FBRU8sSUFBTUMsK0VBQVcsd0VBQWpCO0FBQ1BBLFNBQVNDLE1BQVQsR0FBa0IsVUFBU0MsSUFBVCxFQUFlQyxLQUFmLEVBQXNCO0FBQ3RDLE1BQUksS0FBS0MsT0FBTCxDQUFhQyxVQUFqQixFQUE2QjtBQUMzQkgsV0FBT0EsS0FBS0ksV0FBTCxFQUFQO0FBQ0FILFlBQVFBLE1BQU1HLFdBQU4sRUFBUjtBQUNEO0FBQ0QsU0FBT0osU0FBU0MsS0FBVCxJQUFtQixLQUFLQyxPQUFMLENBQWFHLGdCQUFiLElBQWlDLENBQUNSLGFBQWFTLElBQWIsQ0FBa0JOLElBQWxCLENBQWxDLElBQTZELENBQUNILGFBQWFTLElBQWIsQ0FBa0JMLEtBQWxCLENBQXhGO0FBQ0QsQ0FORDtBQU9BSCxTQUFTUyxRQUFULEdBQW9CLFVBQVNDLEtBQVQsRUFBZ0I7QUFDbEMsTUFBSUMsU0FBU0QsTUFBTUUsS0FBTixDQUFZLFVBQVosQ0FBYjs7QUFFQTtBQUNBLE9BQUssSUFBSUMsSUFBSSxDQUFiLEVBQWdCQSxJQUFJRixPQUFPRyxNQUFQLEdBQWdCLENBQXBDLEVBQXVDRCxHQUF2QyxFQUE0QztBQUMxQztBQUNBLFFBQUksQ0FBQ0YsT0FBT0UsSUFBSSxDQUFYLENBQUQsSUFBa0JGLE9BQU9FLElBQUksQ0FBWCxDQUFsQixJQUNLZixrQkFBa0JVLElBQWxCLENBQXVCRyxPQUFPRSxDQUFQLENBQXZCLENBREwsSUFFS2Ysa0JBQWtCVSxJQUFsQixDQUF1QkcsT0FBT0UsSUFBSSxDQUFYLENBQXZCLENBRlQsRUFFZ0Q7QUFDOUNGLGFBQU9FLENBQVAsS0FBYUYsT0FBT0UsSUFBSSxDQUFYLENBQWI7QUFDQUYsYUFBT0ksTUFBUCxDQUFjRixJQUFJLENBQWxCLEVBQXFCLENBQXJCO0FBQ0FBO0FBQ0Q7QUFDRjs7QUFFRCxTQUFPRixNQUFQO0FBQ0QsQ0FoQkQ7O0FBa0JPLFNBQVNmLFNBQVQsQ0FBbUJvQixNQUFuQixFQUEyQkMsTUFBM0IsRUFBbUNiLE9BQW5DLEVBQTRDO0FBQ2pEQSxZQUFVLDhFQUFnQkEsT0FBaEIsRUFBeUIsRUFBQ0csa0JBQWtCLElBQW5CLEVBQXpCLENBQVY7QUFDQSxTQUFPUCxTQUFTa0IsSUFBVCxDQUFjRixNQUFkLEVBQXNCQyxNQUF0QixFQUE4QmIsT0FBOUIsQ0FBUDtBQUNEOztBQUVNLFNBQVNQLGtCQUFULENBQTRCbUIsTUFBNUIsRUFBb0NDLE1BQXBDLEVBQTRDYixPQUE1QyxFQUFxRDtBQUMxRCxTQUFPSixTQUFTa0IsSUFBVCxDQUFjRixNQUFkLEVBQXNCQyxNQUF0QixFQUE4QmIsT0FBOUIsQ0FBUDtBQUNEIiwiZmlsZSI6IndvcmQuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgRGlmZiBmcm9tICcuL2Jhc2UnO1xuaW1wb3J0IHtnZW5lcmF0ZU9wdGlvbnN9IGZyb20gJy4uL3V0aWwvcGFyYW1zJztcblxuLy8gQmFzZWQgb24gaHR0cHM6Ly9lbi53aWtpcGVkaWEub3JnL3dpa2kvTGF0aW5fc2NyaXB0X2luX1VuaWNvZGVcbi8vXG4vLyBSYW5nZXMgYW5kIGV4Y2VwdGlvbnM6XG4vLyBMYXRpbi0xIFN1cHBsZW1lbnQsIDAwODDigJMwMEZGXG4vLyAgLSBVKzAwRDcgIMOXIE11bHRpcGxpY2F0aW9uIHNpZ25cbi8vICAtIFUrMDBGNyAgw7cgRGl2aXNpb24gc2lnblxuLy8gTGF0aW4gRXh0ZW5kZWQtQSwgMDEwMOKAkzAxN0Zcbi8vIExhdGluIEV4dGVuZGVkLUIsIDAxODDigJMwMjRGXG4vLyBJUEEgRXh0ZW5zaW9ucywgMDI1MOKAkzAyQUZcbi8vIFNwYWNpbmcgTW9kaWZpZXIgTGV0dGVycywgMDJCMOKAkzAyRkZcbi8vICAtIFUrMDJDNyAgy4cgJiM3MTE7ICBDYXJvblxuLy8gIC0gVSswMkQ4ICDLmCAmIzcyODsgIEJyZXZlXG4vLyAgLSBVKzAyRDkgIMuZICYjNzI5OyAgRG90IEFib3ZlXG4vLyAgLSBVKzAyREEgIMuaICYjNzMwOyAgUmluZyBBYm92ZVxuLy8gIC0gVSswMkRCICDLmyAmIzczMTsgIE9nb25la1xuLy8gIC0gVSswMkRDICDLnCAmIzczMjsgIFNtYWxsIFRpbGRlXG4vLyAgLSBVKzAyREQgIMudICYjNzMzOyAgRG91YmxlIEFjdXRlIEFjY2VudFxuLy8gTGF0aW4gRXh0ZW5kZWQgQWRkaXRpb25hbCwgMUUwMOKAkzFFRkZcbmNvbnN0IGV4dGVuZGVkV29yZENoYXJzID0gL15bYS16QS1aXFx1e0MwfS1cXHV7RkZ9XFx1e0Q4fS1cXHV7RjZ9XFx1e0Y4fS1cXHV7MkM2fVxcdXsyQzh9LVxcdXsyRDd9XFx1ezJERX0tXFx1ezJGRn1cXHV7MUUwMH0tXFx1ezFFRkZ9XSskL3U7XG5cbmNvbnN0IHJlV2hpdGVzcGFjZSA9IC9cXFMvO1xuXG5leHBvcnQgY29uc3Qgd29yZERpZmYgPSBuZXcgRGlmZigpO1xud29yZERpZmYuZXF1YWxzID0gZnVuY3Rpb24obGVmdCwgcmlnaHQpIHtcbiAgaWYgKHRoaXMub3B0aW9ucy5pZ25vcmVDYXNlKSB7XG4gICAgbGVmdCA9IGxlZnQudG9Mb3dlckNhc2UoKTtcbiAgICByaWdodCA9IHJpZ2h0LnRvTG93ZXJDYXNlKCk7XG4gIH1cbiAgcmV0dXJuIGxlZnQgPT09IHJpZ2h0IHx8ICh0aGlzLm9wdGlvbnMuaWdub3JlV2hpdGVzcGFjZSAmJiAhcmVXaGl0ZXNwYWNlLnRlc3QobGVmdCkgJiYgIXJlV2hpdGVzcGFjZS50ZXN0KHJpZ2h0KSk7XG59O1xud29yZERpZmYudG9rZW5pemUgPSBmdW5jdGlvbih2YWx1ZSkge1xuICBsZXQgdG9rZW5zID0gdmFsdWUuc3BsaXQoLyhcXHMrfFxcYikvKTtcblxuICAvLyBKb2luIHRoZSBib3VuZGFyeSBzcGxpdHMgdGhhdCB3ZSBkbyBub3QgY29uc2lkZXIgdG8gYmUgYm91bmRhcmllcy4gVGhpcyBpcyBwcmltYXJpbHkgdGhlIGV4dGVuZGVkIExhdGluIGNoYXJhY3RlciBzZXQuXG4gIGZvciAobGV0IGkgPSAwOyBpIDwgdG9rZW5zLmxlbmd0aCAtIDE7IGkrKykge1xuICAgIC8vIElmIHdlIGhhdmUgYW4gZW1wdHkgc3RyaW5nIGluIHRoZSBuZXh0IGZpZWxkIGFuZCB3ZSBoYXZlIG9ubHkgd29yZCBjaGFycyBiZWZvcmUgYW5kIGFmdGVyLCBtZXJnZVxuICAgIGlmICghdG9rZW5zW2kgKyAxXSAmJiB0b2tlbnNbaSArIDJdXG4gICAgICAgICAgJiYgZXh0ZW5kZWRXb3JkQ2hhcnMudGVzdCh0b2tlbnNbaV0pXG4gICAgICAgICAgJiYgZXh0ZW5kZWRXb3JkQ2hhcnMudGVzdCh0b2tlbnNbaSArIDJdKSkge1xuICAgICAgdG9rZW5zW2ldICs9IHRva2Vuc1tpICsgMl07XG4gICAgICB0b2tlbnMuc3BsaWNlKGkgKyAxLCAyKTtcbiAgICAgIGktLTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gdG9rZW5zO1xufTtcblxuZXhwb3J0IGZ1bmN0aW9uIGRpZmZXb3JkcyhvbGRTdHIsIG5ld1N0ciwgb3B0aW9ucykge1xuICBvcHRpb25zID0gZ2VuZXJhdGVPcHRpb25zKG9wdGlvbnMsIHtpZ25vcmVXaGl0ZXNwYWNlOiB0cnVlfSk7XG4gIHJldHVybiB3b3JkRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBvcHRpb25zKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGRpZmZXb3Jkc1dpdGhTcGFjZShvbGRTdHIsIG5ld1N0ciwgb3B0aW9ucykge1xuICByZXR1cm4gd29yZERpZmYuZGlmZihvbGRTdHIsIG5ld1N0ciwgb3B0aW9ucyk7XG59XG4iXX0=
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL3dvcmQuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztnQ0ErQ2dCLFMsR0FBQSxTO3lEQUlBLGtCLEdBQUEsa0I7O0FBbkRoQixJLHlCQUFBLHlCLHdCQUFBOzs7Ozs7QUFDQSxJLHlCQUFBLG1DLHdCQUFBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBb0JBLElBQU0sb0JBQW9CLCtEQUExQjs7QUFFQSxJQUFNLGVBQWUsSUFBckI7O0FBRU8sSUFBTSxXLHlCQUFBLFEsd0JBQUEsV0FBVyxJLHlCQUFBLG1CLHdCQUFqQjtBQUNQLFNBQVMsTUFBVCxHQUFrQixVQUFTLElBQVQsRUFBZSxLQUFmLEVBQXNCO0FBQ3RDLFNBQU8sU0FBUyxLQUFULElBQW1CLEtBQUssT0FBTCxDQUFhLGdCQUFiLElBQWlDLENBQUMsYUFBYSxJQUFiLENBQWtCLElBQWxCLENBQWxDLElBQTZELENBQUMsYUFBYSxJQUFiLENBQWtCLEtBQWxCLENBQXhGO0FBQ0QsQ0FGRDtBQUdBLFNBQVMsUUFBVCxHQUFvQixVQUFTLEtBQVQsRUFBZ0I7QUFDbEMsTUFBSSxTQUFTLE1BQU0sS0FBTixDQUFZLFVBQVosQ0FBYjs7O0FBR0EsT0FBSyxJQUFJLElBQUksQ0FBYixFQUFnQixJQUFJLE9BQU8sTUFBUCxHQUFnQixDQUFwQyxFQUF1QyxHQUF2QyxFQUE0Qzs7QUFFMUMsUUFBSSxDQUFDLE9BQU8sSUFBSSxDQUFYLENBQUQsSUFBa0IsT0FBTyxJQUFJLENBQVgsQ0FBbEIsSUFDSyxrQkFBa0IsSUFBbEIsQ0FBdUIsT0FBTyxDQUFQLENBQXZCLENBREwsSUFFSyxrQkFBa0IsSUFBbEIsQ0FBdUIsT0FBTyxJQUFJLENBQVgsQ0FBdkIsQ0FGVCxFQUVnRDtBQUM5QyxhQUFPLENBQVAsS0FBYSxPQUFPLElBQUksQ0FBWCxDQUFiO0FBQ0EsYUFBTyxNQUFQLENBQWMsSUFBSSxDQUFsQixFQUFxQixDQUFyQjtBQUNBO0FBQ0Q7QUFDRjs7QUFFRCxTQUFPLE1BQVA7QUFDRCxDQWhCRDs7QUFrQk8sU0FBUyxTQUFULENBQW1CLE1BQW5CLEVBQTJCLE1BQTNCLEVBQW1DLFFBQW5DLEVBQTZDO0FBQ2xELE1BQUksVSx5QkFBVSw0Qix3QkFBQSxDQUFnQixRQUFoQixFQUEwQixFQUFDLGtCQUFrQixJQUFuQixFQUExQixDQUFkO0FBQ0EsU0FBTyxTQUFTLElBQVQsQ0FBYyxNQUFkLEVBQXNCLE1BQXRCLEVBQThCLE9BQTlCLENBQVA7QUFDRDtBQUNNLFNBQVMsa0JBQVQsQ0FBNEIsTUFBNUIsRUFBb0MsTUFBcEMsRUFBNEMsUUFBNUMsRUFBc0Q7QUFDM0QsU0FBTyxTQUFTLElBQVQsQ0FBYyxNQUFkLEVBQXNCLE1BQXRCLEVBQThCLFFBQTlCLENBQVA7QUFDRCIsImZpbGUiOiJ3b3JkLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IERpZmYgZnJvbSAnLi9iYXNlJztcbmltcG9ydCB7Z2VuZXJhdGVPcHRpb25zfSBmcm9tICcuLi91dGlsL3BhcmFtcyc7XG5cbi8vIEJhc2VkIG9uIGh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0xhdGluX3NjcmlwdF9pbl9Vbmljb2RlXG4vL1xuLy8gUmFuZ2VzIGFuZCBleGNlcHRpb25zOlxuLy8gTGF0aW4tMSBTdXBwbGVtZW50LCAwMDgw4oCTMDBGRlxuLy8gIC0gVSswMEQ3ICDDlyBNdWx0aXBsaWNhdGlvbiBzaWduXG4vLyAgLSBVKzAwRjcgIMO3IERpdmlzaW9uIHNpZ25cbi8vIExhdGluIEV4dGVuZGVkLUEsIDAxMDDigJMwMTdGXG4vLyBMYXRpbiBFeHRlbmRlZC1CLCAwMTgw4oCTMDI0RlxuLy8gSVBBIEV4dGVuc2lvbnMsIDAyNTDigJMwMkFGXG4vLyBTcGFjaW5nIE1vZGlmaWVyIExldHRlcnMsIDAyQjDigJMwMkZGXG4vLyAgLSBVKzAyQzcgIMuHICYjNzExOyAgQ2Fyb25cbi8vICAtIFUrMDJEOCAgy5ggJiM3Mjg7ICBCcmV2ZVxuLy8gIC0gVSswMkQ5ICDLmSAmIzcyOTsgIERvdCBBYm92ZVxuLy8gIC0gVSswMkRBICDLmiAmIzczMDsgIFJpbmcgQWJvdmVcbi8vICAtIFUrMDJEQiAgy5sgJiM3MzE7ICBPZ29uZWtcbi8vICAtIFUrMDJEQyAgy5wgJiM3MzI7ICBTbWFsbCBUaWxkZVxuLy8gIC0gVSswMkREICDLnSAmIzczMzsgIERvdWJsZSBBY3V0ZSBBY2NlbnRcbi8vIExhdGluIEV4dGVuZGVkIEFkZGl0aW9uYWwsIDFFMDDigJMxRUZGXG5jb25zdCBleHRlbmRlZFdvcmRDaGFycyA9IC9eW2EtekEtWlxcdXtDMH0tXFx1e0ZGfVxcdXtEOH0tXFx1e0Y2fVxcdXtGOH0tXFx1ezJDNn1cXHV7MkM4fS1cXHV7MkQ3fVxcdXsyREV9LVxcdXsyRkZ9XFx1ezFFMDB9LVxcdXsxRUZGfV0rJC91O1xuXG5jb25zdCByZVdoaXRlc3BhY2UgPSAvXFxTLztcblxuZXhwb3J0IGNvbnN0IHdvcmREaWZmID0gbmV3IERpZmYoKTtcbndvcmREaWZmLmVxdWFscyA9IGZ1bmN0aW9uKGxlZnQsIHJpZ2h0KSB7XG4gIHJldHVybiBsZWZ0ID09PSByaWdodCB8fCAodGhpcy5vcHRpb25zLmlnbm9yZVdoaXRlc3BhY2UgJiYgIXJlV2hpdGVzcGFjZS50ZXN0KGxlZnQpICYmICFyZVdoaXRlc3BhY2UudGVzdChyaWdodCkpO1xufTtcbndvcmREaWZmLnRva2VuaXplID0gZnVuY3Rpb24odmFsdWUpIHtcbiAgbGV0IHRva2VucyA9IHZhbHVlLnNwbGl0KC8oXFxzK3xcXGIpLyk7XG5cbiAgLy8gSm9pbiB0aGUgYm91bmRhcnkgc3BsaXRzIHRoYXQgd2UgZG8gbm90IGNvbnNpZGVyIHRvIGJlIGJvdW5kYXJpZXMuIFRoaXMgaXMgcHJpbWFyaWx5IHRoZSBleHRlbmRlZCBMYXRpbiBjaGFyYWN0ZXIgc2V0LlxuICBmb3IgKGxldCBpID0gMDsgaSA8IHRva2Vucy5sZW5ndGggLSAxOyBpKyspIHtcbiAgICAvLyBJZiB3ZSBoYXZlIGFuIGVtcHR5IHN0cmluZyBpbiB0aGUgbmV4dCBmaWVsZCBhbmQgd2UgaGF2ZSBvbmx5IHdvcmQgY2hhcnMgYmVmb3JlIGFuZCBhZnRlciwgbWVyZ2VcbiAgICBpZiAoIXRva2Vuc1tpICsgMV0gJiYgdG9rZW5zW2kgKyAyXVxuICAgICAgICAgICYmIGV4dGVuZGVkV29yZENoYXJzLnRlc3QodG9rZW5zW2ldKVxuICAgICAgICAgICYmIGV4dGVuZGVkV29yZENoYXJzLnRlc3QodG9rZW5zW2kgKyAyXSkpIHtcbiAgICAgIHRva2Vuc1tpXSArPSB0b2tlbnNbaSArIDJdO1xuICAgICAgdG9rZW5zLnNwbGljZShpICsgMSwgMik7XG4gICAgICBpLS07XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHRva2Vucztcbn07XG5cbmV4cG9ydCBmdW5jdGlvbiBkaWZmV29yZHMob2xkU3RyLCBuZXdTdHIsIGNhbGxiYWNrKSB7XG4gIGxldCBvcHRpb25zID0gZ2VuZXJhdGVPcHRpb25zKGNhbGxiYWNrLCB7aWdub3JlV2hpdGVzcGFjZTogdHJ1ZX0pO1xuICByZXR1cm4gd29yZERpZmYuZGlmZihvbGRTdHIsIG5ld1N0ciwgb3B0aW9ucyk7XG59XG5leHBvcnQgZnVuY3Rpb24gZGlmZldvcmRzV2l0aFNwYWNlKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjaykge1xuICByZXR1cm4gd29yZERpZmYuZGlmZihvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spO1xufVxuIl19
 
 
-/***/ }),
+/***/ },
 /* 4 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3879,12 +3874,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	  return defaults;
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3BhcmFtcy5qcyJdLCJuYW1lcyI6WyJnZW5lcmF0ZU9wdGlvbnMiLCJvcHRpb25zIiwiZGVmYXVsdHMiLCJjYWxsYmFjayIsIm5hbWUiLCJoYXNPd25Qcm9wZXJ0eSJdLCJtYXBwaW5ncyI6Ijs7O2dDQUFnQkEsZSxHQUFBQSxlO0FBQVQsU0FBU0EsZUFBVCxDQUF5QkMsT0FBekIsRUFBa0NDLFFBQWxDLEVBQTRDO0FBQ2pELE1BQUksT0FBT0QsT0FBUCxLQUFtQixVQUF2QixFQUFtQztBQUNqQ0MsYUFBU0MsUUFBVCxHQUFvQkYsT0FBcEI7QUFDRCxHQUZELE1BRU8sSUFBSUEsT0FBSixFQUFhO0FBQ2xCLFNBQUssSUFBSUcsSUFBVCxJQUFpQkgsT0FBakIsRUFBMEI7QUFDeEI7QUFDQSxVQUFJQSxRQUFRSSxjQUFSLENBQXVCRCxJQUF2QixDQUFKLEVBQWtDO0FBQ2hDRixpQkFBU0UsSUFBVCxJQUFpQkgsUUFBUUcsSUFBUixDQUFqQjtBQUNEO0FBQ0Y7QUFDRjtBQUNELFNBQU9GLFFBQVA7QUFDRCIsImZpbGUiOiJwYXJhbXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gZ2VuZXJhdGVPcHRpb25zKG9wdGlvbnMsIGRlZmF1bHRzKSB7XG4gIGlmICh0eXBlb2Ygb3B0aW9ucyA9PT0gJ2Z1bmN0aW9uJykge1xuICAgIGRlZmF1bHRzLmNhbGxiYWNrID0gb3B0aW9ucztcbiAgfSBlbHNlIGlmIChvcHRpb25zKSB7XG4gICAgZm9yIChsZXQgbmFtZSBpbiBvcHRpb25zKSB7XG4gICAgICAvKiBpc3RhbmJ1bCBpZ25vcmUgZWxzZSAqL1xuICAgICAgaWYgKG9wdGlvbnMuaGFzT3duUHJvcGVydHkobmFtZSkpIHtcbiAgICAgICAgZGVmYXVsdHNbbmFtZV0gPSBvcHRpb25zW25hbWVdO1xuICAgICAgfVxuICAgIH1cbiAgfVxuICByZXR1cm4gZGVmYXVsdHM7XG59XG4iXX0=
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL3BhcmFtcy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Z0NBQWdCLGUsR0FBQSxlO0FBQVQsU0FBUyxlQUFULENBQXlCLE9BQXpCLEVBQWtDLFFBQWxDLEVBQTRDO0FBQ2pELE1BQUksT0FBTyxPQUFQLEtBQW1CLFVBQXZCLEVBQW1DO0FBQ2pDLGFBQVMsUUFBVCxHQUFvQixPQUFwQjtBQUNELEdBRkQsTUFFTyxJQUFJLE9BQUosRUFBYTtBQUNsQixTQUFLLElBQUksSUFBVCxJQUFpQixPQUFqQixFQUEwQjs7QUFFeEIsVUFBSSxRQUFRLGNBQVIsQ0FBdUIsSUFBdkIsQ0FBSixFQUFrQztBQUNoQyxpQkFBUyxJQUFULElBQWlCLFFBQVEsSUFBUixDQUFqQjtBQUNEO0FBQ0Y7QUFDRjtBQUNELFNBQU8sUUFBUDtBQUNEIiwiZmlsZSI6InBhcmFtcy5qcyIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBmdW5jdGlvbiBnZW5lcmF0ZU9wdGlvbnMob3B0aW9ucywgZGVmYXVsdHMpIHtcbiAgaWYgKHR5cGVvZiBvcHRpb25zID09PSAnZnVuY3Rpb24nKSB7XG4gICAgZGVmYXVsdHMuY2FsbGJhY2sgPSBvcHRpb25zO1xuICB9IGVsc2UgaWYgKG9wdGlvbnMpIHtcbiAgICBmb3IgKGxldCBuYW1lIGluIG9wdGlvbnMpIHtcbiAgICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgICBpZiAob3B0aW9ucy5oYXNPd25Qcm9wZXJ0eShuYW1lKSkge1xuICAgICAgICBkZWZhdWx0c1tuYW1lXSA9IG9wdGlvbnNbbmFtZV07XG4gICAgICB9XG4gICAgfVxuICB9XG4gIHJldHVybiBkZWZhdWx0cztcbn1cbiJdfQ==
 
 
-/***/ }),
+/***/ },
 /* 5 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3895,13 +3890,16 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
-	/*istanbul ignore end*/var /*istanbul ignore start*/_params = __webpack_require__(4) /*istanbul ignore end*/;
+	/*istanbul ignore end*/
+	var /*istanbul ignore start*/_params = __webpack_require__(4) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+	/*istanbul ignore start*/
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore end*/var lineDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/lineDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
+	/*istanbul ignore end*/var lineDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/lineDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
 	lineDiff.tokenize = function (value) {
 	  var retLines = [],
 	      linesAndNewlines = value.split(/(\n|\r\n)/);
@@ -3935,12 +3933,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	  var options = /*istanbul ignore start*/(0, _params.generateOptions) /*istanbul ignore end*/(callback, { ignoreWhitespace: true });
 	  return lineDiff.diff(oldStr, newStr, options);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2xpbmUuanMiXSwibmFtZXMiOlsiZGlmZkxpbmVzIiwiZGlmZlRyaW1tZWRMaW5lcyIsImxpbmVEaWZmIiwidG9rZW5pemUiLCJ2YWx1ZSIsInJldExpbmVzIiwibGluZXNBbmROZXdsaW5lcyIsInNwbGl0IiwibGVuZ3RoIiwicG9wIiwiaSIsImxpbmUiLCJvcHRpb25zIiwibmV3bGluZUlzVG9rZW4iLCJpZ25vcmVXaGl0ZXNwYWNlIiwidHJpbSIsInB1c2giLCJvbGRTdHIiLCJuZXdTdHIiLCJjYWxsYmFjayIsImRpZmYiXSwibWFwcGluZ3MiOiI7Ozs7Z0NBOEJnQkEsUyxHQUFBQSxTO3lEQUNBQyxnQixHQUFBQSxnQjs7QUEvQmhCOzs7O3VCQUNBOzs7O3VCQUVPLElBQU1DLCtFQUFXLHdFQUFqQjtBQUNQQSxTQUFTQyxRQUFULEdBQW9CLFVBQVNDLEtBQVQsRUFBZ0I7QUFDbEMsTUFBSUMsV0FBVyxFQUFmO0FBQUEsTUFDSUMsbUJBQW1CRixNQUFNRyxLQUFOLENBQVksV0FBWixDQUR2Qjs7QUFHQTtBQUNBLE1BQUksQ0FBQ0QsaUJBQWlCQSxpQkFBaUJFLE1BQWpCLEdBQTBCLENBQTNDLENBQUwsRUFBb0Q7QUFDbERGLHFCQUFpQkcsR0FBakI7QUFDRDs7QUFFRDtBQUNBLE9BQUssSUFBSUMsSUFBSSxDQUFiLEVBQWdCQSxJQUFJSixpQkFBaUJFLE1BQXJDLEVBQTZDRSxHQUE3QyxFQUFrRDtBQUNoRCxRQUFJQyxPQUFPTCxpQkFBaUJJLENBQWpCLENBQVg7O0FBRUEsUUFBSUEsSUFBSSxDQUFKLElBQVMsQ0FBQyxLQUFLRSxPQUFMLENBQWFDLGNBQTNCLEVBQTJDO0FBQ3pDUixlQUFTQSxTQUFTRyxNQUFULEdBQWtCLENBQTNCLEtBQWlDRyxJQUFqQztBQUNELEtBRkQsTUFFTztBQUNMLFVBQUksS0FBS0MsT0FBTCxDQUFhRSxnQkFBakIsRUFBbUM7QUFDakNILGVBQU9BLEtBQUtJLElBQUwsRUFBUDtBQUNEO0FBQ0RWLGVBQVNXLElBQVQsQ0FBY0wsSUFBZDtBQUNEO0FBQ0Y7O0FBRUQsU0FBT04sUUFBUDtBQUNELENBeEJEOztBQTBCTyxTQUFTTCxTQUFULENBQW1CaUIsTUFBbkIsRUFBMkJDLE1BQTNCLEVBQW1DQyxRQUFuQyxFQUE2QztBQUFFLFNBQU9qQixTQUFTa0IsSUFBVCxDQUFjSCxNQUFkLEVBQXNCQyxNQUF0QixFQUE4QkMsUUFBOUIsQ0FBUDtBQUFpRDtBQUNoRyxTQUFTbEIsZ0JBQVQsQ0FBMEJnQixNQUExQixFQUFrQ0MsTUFBbEMsRUFBMENDLFFBQTFDLEVBQW9EO0FBQ3pELE1BQUlQLFVBQVUsOEVBQWdCTyxRQUFoQixFQUEwQixFQUFDTCxrQkFBa0IsSUFBbkIsRUFBMUIsQ0FBZDtBQUNBLFNBQU9aLFNBQVNrQixJQUFULENBQWNILE1BQWQsRUFBc0JDLE1BQXRCLEVBQThCTixPQUE5QixDQUFQO0FBQ0QiLCJmaWxlIjoibGluZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5pbXBvcnQge2dlbmVyYXRlT3B0aW9uc30gZnJvbSAnLi4vdXRpbC9wYXJhbXMnO1xuXG5leHBvcnQgY29uc3QgbGluZURpZmYgPSBuZXcgRGlmZigpO1xubGluZURpZmYudG9rZW5pemUgPSBmdW5jdGlvbih2YWx1ZSkge1xuICBsZXQgcmV0TGluZXMgPSBbXSxcbiAgICAgIGxpbmVzQW5kTmV3bGluZXMgPSB2YWx1ZS5zcGxpdCgvKFxcbnxcXHJcXG4pLyk7XG5cbiAgLy8gSWdub3JlIHRoZSBmaW5hbCBlbXB0eSB0b2tlbiB0aGF0IG9jY3VycyBpZiB0aGUgc3RyaW5nIGVuZHMgd2l0aCBhIG5ldyBsaW5lXG4gIGlmICghbGluZXNBbmROZXdsaW5lc1tsaW5lc0FuZE5ld2xpbmVzLmxlbmd0aCAtIDFdKSB7XG4gICAgbGluZXNBbmROZXdsaW5lcy5wb3AoKTtcbiAgfVxuXG4gIC8vIE1lcmdlIHRoZSBjb250ZW50IGFuZCBsaW5lIHNlcGFyYXRvcnMgaW50byBzaW5nbGUgdG9rZW5zXG4gIGZvciAobGV0IGkgPSAwOyBpIDwgbGluZXNBbmROZXdsaW5lcy5sZW5ndGg7IGkrKykge1xuICAgIGxldCBsaW5lID0gbGluZXNBbmROZXdsaW5lc1tpXTtcblxuICAgIGlmIChpICUgMiAmJiAhdGhpcy5vcHRpb25zLm5ld2xpbmVJc1Rva2VuKSB7XG4gICAgICByZXRMaW5lc1tyZXRMaW5lcy5sZW5ndGggLSAxXSArPSBsaW5lO1xuICAgIH0gZWxzZSB7XG4gICAgICBpZiAodGhpcy5vcHRpb25zLmlnbm9yZVdoaXRlc3BhY2UpIHtcbiAgICAgICAgbGluZSA9IGxpbmUudHJpbSgpO1xuICAgICAgfVxuICAgICAgcmV0TGluZXMucHVzaChsaW5lKTtcbiAgICB9XG4gIH1cblxuICByZXR1cm4gcmV0TGluZXM7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZGlmZkxpbmVzKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjaykgeyByZXR1cm4gbGluZURpZmYuZGlmZihvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spOyB9XG5leHBvcnQgZnVuY3Rpb24gZGlmZlRyaW1tZWRMaW5lcyhvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spIHtcbiAgbGV0IG9wdGlvbnMgPSBnZW5lcmF0ZU9wdGlvbnMoY2FsbGJhY2ssIHtpZ25vcmVXaGl0ZXNwYWNlOiB0cnVlfSk7XG4gIHJldHVybiBsaW5lRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBvcHRpb25zKTtcbn1cbiJdfQ==
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2xpbmUuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztnQ0E4QmdCLFMsR0FBQSxTO3lEQUNBLGdCLEdBQUEsZ0I7O0FBL0JoQixJLHlCQUFBLHlCLHdCQUFBOzs7Ozs7QUFDQSxJLHlCQUFBLG1DLHdCQUFBOzs7Ozt1QkFFTyxJQUFNLFcseUJBQUEsUSx3QkFBQSxXQUFXLEkseUJBQUEsbUIsd0JBQWpCO0FBQ1AsU0FBUyxRQUFULEdBQW9CLFVBQVMsS0FBVCxFQUFnQjtBQUNsQyxNQUFJLFdBQVcsRUFBZjtBQUFBLE1BQ0ksbUJBQW1CLE1BQU0sS0FBTixDQUFZLFdBQVosQ0FEdkI7OztBQUlBLE1BQUksQ0FBQyxpQkFBaUIsaUJBQWlCLE1BQWpCLEdBQTBCLENBQTNDLENBQUwsRUFBb0Q7QUFDbEQscUJBQWlCLEdBQWpCO0FBQ0Q7OztBQUdELE9BQUssSUFBSSxJQUFJLENBQWIsRUFBZ0IsSUFBSSxpQkFBaUIsTUFBckMsRUFBNkMsR0FBN0MsRUFBa0Q7QUFDaEQsUUFBSSxPQUFPLGlCQUFpQixDQUFqQixDQUFYOztBQUVBLFFBQUksSUFBSSxDQUFKLElBQVMsQ0FBQyxLQUFLLE9BQUwsQ0FBYSxjQUEzQixFQUEyQztBQUN6QyxlQUFTLFNBQVMsTUFBVCxHQUFrQixDQUEzQixLQUFpQyxJQUFqQztBQUNELEtBRkQsTUFFTztBQUNMLFVBQUksS0FBSyxPQUFMLENBQWEsZ0JBQWpCLEVBQW1DO0FBQ2pDLGVBQU8sS0FBSyxJQUFMLEVBQVA7QUFDRDtBQUNELGVBQVMsSUFBVCxDQUFjLElBQWQ7QUFDRDtBQUNGOztBQUVELFNBQU8sUUFBUDtBQUNELENBeEJEOztBQTBCTyxTQUFTLFNBQVQsQ0FBbUIsTUFBbkIsRUFBMkIsTUFBM0IsRUFBbUMsUUFBbkMsRUFBNkM7QUFBRSxTQUFPLFNBQVMsSUFBVCxDQUFjLE1BQWQsRUFBc0IsTUFBdEIsRUFBOEIsUUFBOUIsQ0FBUDtBQUFpRDtBQUNoRyxTQUFTLGdCQUFULENBQTBCLE1BQTFCLEVBQWtDLE1BQWxDLEVBQTBDLFFBQTFDLEVBQW9EO0FBQ3pELE1BQUksVSx5QkFBVSw0Qix3QkFBQSxDQUFnQixRQUFoQixFQUEwQixFQUFDLGtCQUFrQixJQUFuQixFQUExQixDQUFkO0FBQ0EsU0FBTyxTQUFTLElBQVQsQ0FBYyxNQUFkLEVBQXNCLE1BQXRCLEVBQThCLE9BQTlCLENBQVA7QUFDRCIsImZpbGUiOiJsaW5lLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IERpZmYgZnJvbSAnLi9iYXNlJztcbmltcG9ydCB7Z2VuZXJhdGVPcHRpb25zfSBmcm9tICcuLi91dGlsL3BhcmFtcyc7XG5cbmV4cG9ydCBjb25zdCBsaW5lRGlmZiA9IG5ldyBEaWZmKCk7XG5saW5lRGlmZi50b2tlbml6ZSA9IGZ1bmN0aW9uKHZhbHVlKSB7XG4gIGxldCByZXRMaW5lcyA9IFtdLFxuICAgICAgbGluZXNBbmROZXdsaW5lcyA9IHZhbHVlLnNwbGl0KC8oXFxufFxcclxcbikvKTtcblxuICAvLyBJZ25vcmUgdGhlIGZpbmFsIGVtcHR5IHRva2VuIHRoYXQgb2NjdXJzIGlmIHRoZSBzdHJpbmcgZW5kcyB3aXRoIGEgbmV3IGxpbmVcbiAgaWYgKCFsaW5lc0FuZE5ld2xpbmVzW2xpbmVzQW5kTmV3bGluZXMubGVuZ3RoIC0gMV0pIHtcbiAgICBsaW5lc0FuZE5ld2xpbmVzLnBvcCgpO1xuICB9XG5cbiAgLy8gTWVyZ2UgdGhlIGNvbnRlbnQgYW5kIGxpbmUgc2VwYXJhdG9ycyBpbnRvIHNpbmdsZSB0b2tlbnNcbiAgZm9yIChsZXQgaSA9IDA7IGkgPCBsaW5lc0FuZE5ld2xpbmVzLmxlbmd0aDsgaSsrKSB7XG4gICAgbGV0IGxpbmUgPSBsaW5lc0FuZE5ld2xpbmVzW2ldO1xuXG4gICAgaWYgKGkgJSAyICYmICF0aGlzLm9wdGlvbnMubmV3bGluZUlzVG9rZW4pIHtcbiAgICAgIHJldExpbmVzW3JldExpbmVzLmxlbmd0aCAtIDFdICs9IGxpbmU7XG4gICAgfSBlbHNlIHtcbiAgICAgIGlmICh0aGlzLm9wdGlvbnMuaWdub3JlV2hpdGVzcGFjZSkge1xuICAgICAgICBsaW5lID0gbGluZS50cmltKCk7XG4gICAgICB9XG4gICAgICByZXRMaW5lcy5wdXNoKGxpbmUpO1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiByZXRMaW5lcztcbn07XG5cbmV4cG9ydCBmdW5jdGlvbiBkaWZmTGluZXMob2xkU3RyLCBuZXdTdHIsIGNhbGxiYWNrKSB7IHJldHVybiBsaW5lRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjayk7IH1cbmV4cG9ydCBmdW5jdGlvbiBkaWZmVHJpbW1lZExpbmVzKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjaykge1xuICBsZXQgb3B0aW9ucyA9IGdlbmVyYXRlT3B0aW9ucyhjYWxsYmFjaywge2lnbm9yZVdoaXRlc3BhY2U6IHRydWV9KTtcbiAgcmV0dXJuIGxpbmVEaWZmLmRpZmYob2xkU3RyLCBuZXdTdHIsIG9wdGlvbnMpO1xufVxuIl19
 
 
-/***/ }),
+/***/ },
 /* 6 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3950,11 +3948,12 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore end*/var sentenceDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/sentenceDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
+	/*istanbul ignore end*/var sentenceDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/sentenceDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
 	sentenceDiff.tokenize = function (value) {
 	  return value.split(/(\S.+?[.!?])(?=\s+|$)/);
 	};
@@ -3962,12 +3961,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	function diffSentences(oldStr, newStr, callback) {
 	  return sentenceDiff.diff(oldStr, newStr, callback);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL3NlbnRlbmNlLmpzIl0sIm5hbWVzIjpbImRpZmZTZW50ZW5jZXMiLCJzZW50ZW5jZURpZmYiLCJ0b2tlbml6ZSIsInZhbHVlIiwic3BsaXQiLCJvbGRTdHIiLCJuZXdTdHIiLCJjYWxsYmFjayIsImRpZmYiXSwibWFwcGluZ3MiOiI7Ozs7Z0NBUWdCQSxhLEdBQUFBLGE7O0FBUmhCOzs7Ozs7dUJBR08sSUFBTUMsdUZBQWUsd0VBQXJCO0FBQ1BBLGFBQWFDLFFBQWIsR0FBd0IsVUFBU0MsS0FBVCxFQUFnQjtBQUN0QyxTQUFPQSxNQUFNQyxLQUFOLENBQVksdUJBQVosQ0FBUDtBQUNELENBRkQ7O0FBSU8sU0FBU0osYUFBVCxDQUF1QkssTUFBdkIsRUFBK0JDLE1BQS9CLEVBQXVDQyxRQUF2QyxFQUFpRDtBQUFFLFNBQU9OLGFBQWFPLElBQWIsQ0FBa0JILE1BQWxCLEVBQTBCQyxNQUExQixFQUFrQ0MsUUFBbEMsQ0FBUDtBQUFxRCIsImZpbGUiOiJzZW50ZW5jZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5cblxuZXhwb3J0IGNvbnN0IHNlbnRlbmNlRGlmZiA9IG5ldyBEaWZmKCk7XG5zZW50ZW5jZURpZmYudG9rZW5pemUgPSBmdW5jdGlvbih2YWx1ZSkge1xuICByZXR1cm4gdmFsdWUuc3BsaXQoLyhcXFMuKz9bLiE/XSkoPz1cXHMrfCQpLyk7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZGlmZlNlbnRlbmNlcyhvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spIHsgcmV0dXJuIHNlbnRlbmNlRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjayk7IH1cbiJdfQ==
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL3NlbnRlbmNlLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Z0NBUWdCLGEsR0FBQSxhOztBQVJoQixJLHlCQUFBLHlCLHdCQUFBOzs7Ozs7O3VCQUdPLElBQU0sZSx5QkFBQSxRLHdCQUFBLGVBQWUsSSx5QkFBQSxtQix3QkFBckI7QUFDUCxhQUFhLFFBQWIsR0FBd0IsVUFBUyxLQUFULEVBQWdCO0FBQ3RDLFNBQU8sTUFBTSxLQUFOLENBQVksdUJBQVosQ0FBUDtBQUNELENBRkQ7O0FBSU8sU0FBUyxhQUFULENBQXVCLE1BQXZCLEVBQStCLE1BQS9CLEVBQXVDLFFBQXZDLEVBQWlEO0FBQUUsU0FBTyxhQUFhLElBQWIsQ0FBa0IsTUFBbEIsRUFBMEIsTUFBMUIsRUFBa0MsUUFBbEMsQ0FBUDtBQUFxRCIsImZpbGUiOiJzZW50ZW5jZS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5cblxuZXhwb3J0IGNvbnN0IHNlbnRlbmNlRGlmZiA9IG5ldyBEaWZmKCk7XG5zZW50ZW5jZURpZmYudG9rZW5pemUgPSBmdW5jdGlvbih2YWx1ZSkge1xuICByZXR1cm4gdmFsdWUuc3BsaXQoLyhcXFMuKz9bLiE/XSkoPz1cXHMrfCQpLyk7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZGlmZlNlbnRlbmNlcyhvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spIHsgcmV0dXJuIHNlbnRlbmNlRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjayk7IH1cbiJdfQ==
 
 
-/***/ }),
+/***/ },
 /* 7 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -3977,11 +3976,12 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore end*/var cssDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/cssDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
+	/*istanbul ignore end*/var cssDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/cssDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
 	cssDiff.tokenize = function (value) {
 	  return value.split(/([{}:;,]|\s+)/);
 	};
@@ -3989,39 +3989,44 @@ return /******/ (function(modules) { // webpackBootstrap
 	function diffCss(oldStr, newStr, callback) {
 	  return cssDiff.diff(oldStr, newStr, callback);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2Nzcy5qcyJdLCJuYW1lcyI6WyJkaWZmQ3NzIiwiY3NzRGlmZiIsInRva2VuaXplIiwidmFsdWUiLCJzcGxpdCIsIm9sZFN0ciIsIm5ld1N0ciIsImNhbGxiYWNrIiwiZGlmZiJdLCJtYXBwaW5ncyI6Ijs7OztnQ0FPZ0JBLE8sR0FBQUEsTzs7QUFQaEI7Ozs7Ozt1QkFFTyxJQUFNQyw2RUFBVSx3RUFBaEI7QUFDUEEsUUFBUUMsUUFBUixHQUFtQixVQUFTQyxLQUFULEVBQWdCO0FBQ2pDLFNBQU9BLE1BQU1DLEtBQU4sQ0FBWSxlQUFaLENBQVA7QUFDRCxDQUZEOztBQUlPLFNBQVNKLE9BQVQsQ0FBaUJLLE1BQWpCLEVBQXlCQyxNQUF6QixFQUFpQ0MsUUFBakMsRUFBMkM7QUFBRSxTQUFPTixRQUFRTyxJQUFSLENBQWFILE1BQWIsRUFBcUJDLE1BQXJCLEVBQTZCQyxRQUE3QixDQUFQO0FBQWdEIiwiZmlsZSI6ImNzcy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5cbmV4cG9ydCBjb25zdCBjc3NEaWZmID0gbmV3IERpZmYoKTtcbmNzc0RpZmYudG9rZW5pemUgPSBmdW5jdGlvbih2YWx1ZSkge1xuICByZXR1cm4gdmFsdWUuc3BsaXQoLyhbe306OyxdfFxccyspLyk7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZGlmZkNzcyhvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spIHsgcmV0dXJuIGNzc0RpZmYuZGlmZihvbGRTdHIsIG5ld1N0ciwgY2FsbGJhY2spOyB9XG4iXX0=
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2Nzcy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O2dDQU9nQixPLEdBQUEsTzs7QUFQaEIsSSx5QkFBQSx5Qix3QkFBQTs7Ozs7Ozt1QkFFTyxJQUFNLFUseUJBQUEsUSx3QkFBQSxVQUFVLEkseUJBQUEsbUIsd0JBQWhCO0FBQ1AsUUFBUSxRQUFSLEdBQW1CLFVBQVMsS0FBVCxFQUFnQjtBQUNqQyxTQUFPLE1BQU0sS0FBTixDQUFZLGVBQVosQ0FBUDtBQUNELENBRkQ7O0FBSU8sU0FBUyxPQUFULENBQWlCLE1BQWpCLEVBQXlCLE1BQXpCLEVBQWlDLFFBQWpDLEVBQTJDO0FBQUUsU0FBTyxRQUFRLElBQVIsQ0FBYSxNQUFiLEVBQXFCLE1BQXJCLEVBQTZCLFFBQTdCLENBQVA7QUFBZ0QiLCJmaWxlIjoiY3NzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IERpZmYgZnJvbSAnLi9iYXNlJztcblxuZXhwb3J0IGNvbnN0IGNzc0RpZmYgPSBuZXcgRGlmZigpO1xuY3NzRGlmZi50b2tlbml6ZSA9IGZ1bmN0aW9uKHZhbHVlKSB7XG4gIHJldHVybiB2YWx1ZS5zcGxpdCgvKFt7fTo7LF18XFxzKykvKTtcbn07XG5cbmV4cG9ydCBmdW5jdGlvbiBkaWZmQ3NzKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjaykgeyByZXR1cm4gY3NzRGlmZi5kaWZmKG9sZFN0ciwgbmV3U3RyLCBjYWxsYmFjayk7IH1cbiJdfQ==
 
 
-/***/ }),
+/***/ },
 /* 8 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
 	exports.__esModule = true;
 	exports.jsonDiff = undefined;
 
-	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+	var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; };
 
 	exports. /*istanbul ignore end*/diffJson = diffJson;
 	/*istanbul ignore start*/exports. /*istanbul ignore end*/canonicalize = canonicalize;
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
-	/*istanbul ignore end*/var /*istanbul ignore start*/_line = __webpack_require__(5) /*istanbul ignore end*/;
+	/*istanbul ignore end*/
+	var /*istanbul ignore start*/_line = __webpack_require__(5) /*istanbul ignore end*/;
+
+	/*istanbul ignore start*/
+	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore start*/function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+	/*istanbul ignore end*/
 
-	/*istanbul ignore end*/var objectPrototypeToString = Object.prototype.toString;
+	var objectPrototypeToString = Object.prototype.toString;
 
-	var jsonDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/jsonDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
+	var jsonDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/jsonDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
 	// Discriminate between two lines of pretty-printed, serialized JSON where one of them has a
 	// dangling comma and the other doesn't. Turns out including the dangling comma yields the nicest output:
 	jsonDiff.useLongestToken = true;
 
-	jsonDiff.tokenize = /*istanbul ignore start*/_line.lineDiff /*istanbul ignore end*/.tokenize;
+	jsonDiff.tokenize = /*istanbul ignore start*/_line.lineDiff. /*istanbul ignore end*/tokenize;
 	jsonDiff.castInput = function (value) {
 	  /*istanbul ignore start*/var /*istanbul ignore end*/undefinedReplacement = this.options.undefinedReplacement;
 
@@ -4035,7 +4040,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, '  ');
 	};
 	jsonDiff.equals = function (left, right) {
-	  return (/*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/.prototype.equals.call(jsonDiff, left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'))
+	  return (/*istanbul ignore start*/_base2['default']. /*istanbul ignore end*/prototype.equals(left.replace(/,([\r\n])/g, '$1'), right.replace(/,([\r\n])/g, '$1'))
 	  );
 	};
 
@@ -4099,12 +4104,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	  return canonicalizedObj;
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2pzb24uanMiXSwibmFtZXMiOlsiZGlmZkpzb24iLCJjYW5vbmljYWxpemUiLCJvYmplY3RQcm90b3R5cGVUb1N0cmluZyIsIk9iamVjdCIsInByb3RvdHlwZSIsInRvU3RyaW5nIiwianNvbkRpZmYiLCJ1c2VMb25nZXN0VG9rZW4iLCJ0b2tlbml6ZSIsImNhc3RJbnB1dCIsInZhbHVlIiwidW5kZWZpbmVkUmVwbGFjZW1lbnQiLCJvcHRpb25zIiwiSlNPTiIsInN0cmluZ2lmeSIsImsiLCJ2IiwiZXF1YWxzIiwibGVmdCIsInJpZ2h0IiwiY2FsbCIsInJlcGxhY2UiLCJvbGRPYmoiLCJuZXdPYmoiLCJkaWZmIiwib2JqIiwic3RhY2siLCJyZXBsYWNlbWVudFN0YWNrIiwiaSIsImxlbmd0aCIsImNhbm9uaWNhbGl6ZWRPYmoiLCJwdXNoIiwiQXJyYXkiLCJwb3AiLCJ0b0pTT04iLCJzb3J0ZWRLZXlzIiwia2V5IiwiaGFzT3duUHJvcGVydHkiLCJzb3J0Il0sIm1hcHBpbmdzIjoiOzs7Ozs7O2dDQTJCZ0JBLFEsR0FBQUEsUTt5REFJQUMsWSxHQUFBQSxZOztBQS9CaEI7Ozs7dUJBQ0E7Ozs7dUJBRUEsSUFBTUMsMEJBQTBCQyxPQUFPQyxTQUFQLENBQWlCQyxRQUFqRDs7QUFHTyxJQUFNQywrRUFBVyx3RUFBakI7QUFDUDtBQUNBO0FBQ0FBLFNBQVNDLGVBQVQsR0FBMkIsSUFBM0I7O0FBRUFELFNBQVNFLFFBQVQsR0FBb0IsZ0VBQVNBLFFBQTdCO0FBQ0FGLFNBQVNHLFNBQVQsR0FBcUIsVUFBU0MsS0FBVCxFQUFnQjtBQUFBLHNEQUM1QkMsb0JBRDRCLEdBQ0osS0FBS0MsT0FERCxDQUM1QkQsb0JBRDRCOzs7QUFHbkMsU0FBTyxPQUFPRCxLQUFQLEtBQWlCLFFBQWpCLEdBQTRCQSxLQUE1QixHQUFvQ0csS0FBS0MsU0FBTCxDQUFlYixhQUFhUyxLQUFiLENBQWYsRUFBb0MsVUFBU0ssQ0FBVCxFQUFZQyxDQUFaLEVBQWU7QUFDNUYsUUFBSSxPQUFPQSxDQUFQLEtBQWEsV0FBakIsRUFBOEI7QUFDNUIsYUFBT0wsb0JBQVA7QUFDRDs7QUFFRCxXQUFPSyxDQUFQO0FBQ0QsR0FOMEMsRUFNeEMsSUFOd0MsQ0FBM0M7QUFPRCxDQVZEO0FBV0FWLFNBQVNXLE1BQVQsR0FBa0IsVUFBU0MsSUFBVCxFQUFlQyxLQUFmLEVBQXNCO0FBQ3RDLFNBQU8sb0VBQUtmLFNBQUwsQ0FBZWEsTUFBZixDQUFzQkcsSUFBdEIsQ0FBMkJkLFFBQTNCLEVBQXFDWSxLQUFLRyxPQUFMLENBQWEsWUFBYixFQUEyQixJQUEzQixDQUFyQyxFQUF1RUYsTUFBTUUsT0FBTixDQUFjLFlBQWQsRUFBNEIsSUFBNUIsQ0FBdkU7QUFBUDtBQUNELENBRkQ7O0FBSU8sU0FBU3JCLFFBQVQsQ0FBa0JzQixNQUFsQixFQUEwQkMsTUFBMUIsRUFBa0NYLE9BQWxDLEVBQTJDO0FBQUUsU0FBT04sU0FBU2tCLElBQVQsQ0FBY0YsTUFBZCxFQUFzQkMsTUFBdEIsRUFBOEJYLE9BQTlCLENBQVA7QUFBZ0Q7O0FBRXBHO0FBQ0E7QUFDTyxTQUFTWCxZQUFULENBQXNCd0IsR0FBdEIsRUFBMkJDLEtBQTNCLEVBQWtDQyxnQkFBbEMsRUFBb0Q7QUFDekRELFVBQVFBLFNBQVMsRUFBakI7QUFDQUMscUJBQW1CQSxvQkFBb0IsRUFBdkM7O0FBRUEsTUFBSUMsbUNBQUo7O0FBRUEsT0FBS0EsSUFBSSxDQUFULEVBQVlBLElBQUlGLE1BQU1HLE1BQXRCLEVBQThCRCxLQUFLLENBQW5DLEVBQXNDO0FBQ3BDLFFBQUlGLE1BQU1FLENBQU4sTUFBYUgsR0FBakIsRUFBc0I7QUFDcEIsYUFBT0UsaUJBQWlCQyxDQUFqQixDQUFQO0FBQ0Q7QUFDRjs7QUFFRCxNQUFJRSxrREFBSjs7QUFFQSxNQUFJLHFCQUFxQjVCLHdCQUF3QmtCLElBQXhCLENBQTZCSyxHQUE3QixDQUF6QixFQUE0RDtBQUMxREMsVUFBTUssSUFBTixDQUFXTixHQUFYO0FBQ0FLLHVCQUFtQixJQUFJRSxLQUFKLENBQVVQLElBQUlJLE1BQWQsQ0FBbkI7QUFDQUYscUJBQWlCSSxJQUFqQixDQUFzQkQsZ0JBQXRCO0FBQ0EsU0FBS0YsSUFBSSxDQUFULEVBQVlBLElBQUlILElBQUlJLE1BQXBCLEVBQTRCRCxLQUFLLENBQWpDLEVBQW9DO0FBQ2xDRSx1QkFBaUJGLENBQWpCLElBQXNCM0IsYUFBYXdCLElBQUlHLENBQUosQ0FBYixFQUFxQkYsS0FBckIsRUFBNEJDLGdCQUE1QixDQUF0QjtBQUNEO0FBQ0RELFVBQU1PLEdBQU47QUFDQU4scUJBQWlCTSxHQUFqQjtBQUNBLFdBQU9ILGdCQUFQO0FBQ0Q7O0FBRUQsTUFBSUwsT0FBT0EsSUFBSVMsTUFBZixFQUF1QjtBQUNyQlQsVUFBTUEsSUFBSVMsTUFBSixFQUFOO0FBQ0Q7O0FBRUQsTUFBSSx5REFBT1QsR0FBUCx5Q0FBT0EsR0FBUCxPQUFlLFFBQWYsSUFBMkJBLFFBQVEsSUFBdkMsRUFBNkM7QUFDM0NDLFVBQU1LLElBQU4sQ0FBV04sR0FBWDtBQUNBSyx1QkFBbUIsRUFBbkI7QUFDQUgscUJBQWlCSSxJQUFqQixDQUFzQkQsZ0JBQXRCO0FBQ0EsUUFBSUssYUFBYSxFQUFqQjtBQUFBLFFBQ0lDLHFDQURKO0FBRUEsU0FBS0EsR0FBTCxJQUFZWCxHQUFaLEVBQWlCO0FBQ2Y7QUFDQSxVQUFJQSxJQUFJWSxjQUFKLENBQW1CRCxHQUFuQixDQUFKLEVBQTZCO0FBQzNCRCxtQkFBV0osSUFBWCxDQUFnQkssR0FBaEI7QUFDRDtBQUNGO0FBQ0RELGVBQVdHLElBQVg7QUFDQSxTQUFLVixJQUFJLENBQVQsRUFBWUEsSUFBSU8sV0FBV04sTUFBM0IsRUFBbUNELEtBQUssQ0FBeEMsRUFBMkM7QUFDekNRLFlBQU1ELFdBQVdQLENBQVgsQ0FBTjtBQUNBRSx1QkFBaUJNLEdBQWpCLElBQXdCbkMsYUFBYXdCLElBQUlXLEdBQUosQ0FBYixFQUF1QlYsS0FBdkIsRUFBOEJDLGdCQUE5QixDQUF4QjtBQUNEO0FBQ0RELFVBQU1PLEdBQU47QUFDQU4scUJBQWlCTSxHQUFqQjtBQUNELEdBbkJELE1BbUJPO0FBQ0xILHVCQUFtQkwsR0FBbkI7QUFDRDtBQUNELFNBQU9LLGdCQUFQO0FBQ0QiLCJmaWxlIjoianNvbi5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5pbXBvcnQge2xpbmVEaWZmfSBmcm9tICcuL2xpbmUnO1xuXG5jb25zdCBvYmplY3RQcm90b3R5cGVUb1N0cmluZyA9IE9iamVjdC5wcm90b3R5cGUudG9TdHJpbmc7XG5cblxuZXhwb3J0IGNvbnN0IGpzb25EaWZmID0gbmV3IERpZmYoKTtcbi8vIERpc2NyaW1pbmF0ZSBiZXR3ZWVuIHR3byBsaW5lcyBvZiBwcmV0dHktcHJpbnRlZCwgc2VyaWFsaXplZCBKU09OIHdoZXJlIG9uZSBvZiB0aGVtIGhhcyBhXG4vLyBkYW5nbGluZyBjb21tYSBhbmQgdGhlIG90aGVyIGRvZXNuJ3QuIFR1cm5zIG91dCBpbmNsdWRpbmcgdGhlIGRhbmdsaW5nIGNvbW1hIHlpZWxkcyB0aGUgbmljZXN0IG91dHB1dDpcbmpzb25EaWZmLnVzZUxvbmdlc3RUb2tlbiA9IHRydWU7XG5cbmpzb25EaWZmLnRva2VuaXplID0gbGluZURpZmYudG9rZW5pemU7XG5qc29uRGlmZi5jYXN0SW5wdXQgPSBmdW5jdGlvbih2YWx1ZSkge1xuICBjb25zdCB7dW5kZWZpbmVkUmVwbGFjZW1lbnR9ID0gdGhpcy5vcHRpb25zO1xuXG4gIHJldHVybiB0eXBlb2YgdmFsdWUgPT09ICdzdHJpbmcnID8gdmFsdWUgOiBKU09OLnN0cmluZ2lmeShjYW5vbmljYWxpemUodmFsdWUpLCBmdW5jdGlvbihrLCB2KSB7XG4gICAgaWYgKHR5cGVvZiB2ID09PSAndW5kZWZpbmVkJykge1xuICAgICAgcmV0dXJuIHVuZGVmaW5lZFJlcGxhY2VtZW50O1xuICAgIH1cblxuICAgIHJldHVybiB2O1xuICB9LCAnICAnKTtcbn07XG5qc29uRGlmZi5lcXVhbHMgPSBmdW5jdGlvbihsZWZ0LCByaWdodCkge1xuICByZXR1cm4gRGlmZi5wcm90b3R5cGUuZXF1YWxzLmNhbGwoanNvbkRpZmYsIGxlZnQucmVwbGFjZSgvLChbXFxyXFxuXSkvZywgJyQxJyksIHJpZ2h0LnJlcGxhY2UoLywoW1xcclxcbl0pL2csICckMScpKTtcbn07XG5cbmV4cG9ydCBmdW5jdGlvbiBkaWZmSnNvbihvbGRPYmosIG5ld09iaiwgb3B0aW9ucykgeyByZXR1cm4ganNvbkRpZmYuZGlmZihvbGRPYmosIG5ld09iaiwgb3B0aW9ucyk7IH1cblxuLy8gVGhpcyBmdW5jdGlvbiBoYW5kbGVzIHRoZSBwcmVzZW5jZSBvZiBjaXJjdWxhciByZWZlcmVuY2VzIGJ5IGJhaWxpbmcgb3V0IHdoZW4gZW5jb3VudGVyaW5nIGFuXG4vLyBvYmplY3QgdGhhdCBpcyBhbHJlYWR5IG9uIHRoZSBcInN0YWNrXCIgb2YgaXRlbXMgYmVpbmcgcHJvY2Vzc2VkLlxuZXhwb3J0IGZ1bmN0aW9uIGNhbm9uaWNhbGl6ZShvYmosIHN0YWNrLCByZXBsYWNlbWVudFN0YWNrKSB7XG4gIHN0YWNrID0gc3RhY2sgfHwgW107XG4gIHJlcGxhY2VtZW50U3RhY2sgPSByZXBsYWNlbWVudFN0YWNrIHx8IFtdO1xuXG4gIGxldCBpO1xuXG4gIGZvciAoaSA9IDA7IGkgPCBzdGFjay5sZW5ndGg7IGkgKz0gMSkge1xuICAgIGlmIChzdGFja1tpXSA9PT0gb2JqKSB7XG4gICAgICByZXR1cm4gcmVwbGFjZW1lbnRTdGFja1tpXTtcbiAgICB9XG4gIH1cblxuICBsZXQgY2Fub25pY2FsaXplZE9iajtcblxuICBpZiAoJ1tvYmplY3QgQXJyYXldJyA9PT0gb2JqZWN0UHJvdG90eXBlVG9TdHJpbmcuY2FsbChvYmopKSB7XG4gICAgc3RhY2sucHVzaChvYmopO1xuICAgIGNhbm9uaWNhbGl6ZWRPYmogPSBuZXcgQXJyYXkob2JqLmxlbmd0aCk7XG4gICAgcmVwbGFjZW1lbnRTdGFjay5wdXNoKGNhbm9uaWNhbGl6ZWRPYmopO1xuICAgIGZvciAoaSA9IDA7IGkgPCBvYmoubGVuZ3RoOyBpICs9IDEpIHtcbiAgICAgIGNhbm9uaWNhbGl6ZWRPYmpbaV0gPSBjYW5vbmljYWxpemUob2JqW2ldLCBzdGFjaywgcmVwbGFjZW1lbnRTdGFjayk7XG4gICAgfVxuICAgIHN0YWNrLnBvcCgpO1xuICAgIHJlcGxhY2VtZW50U3RhY2sucG9wKCk7XG4gICAgcmV0dXJuIGNhbm9uaWNhbGl6ZWRPYmo7XG4gIH1cblxuICBpZiAob2JqICYmIG9iai50b0pTT04pIHtcbiAgICBvYmogPSBvYmoudG9KU09OKCk7XG4gIH1cblxuICBpZiAodHlwZW9mIG9iaiA9PT0gJ29iamVjdCcgJiYgb2JqICE9PSBudWxsKSB7XG4gICAgc3RhY2sucHVzaChvYmopO1xuICAgIGNhbm9uaWNhbGl6ZWRPYmogPSB7fTtcbiAgICByZXBsYWNlbWVudFN0YWNrLnB1c2goY2Fub25pY2FsaXplZE9iaik7XG4gICAgbGV0IHNvcnRlZEtleXMgPSBbXSxcbiAgICAgICAga2V5O1xuICAgIGZvciAoa2V5IGluIG9iaikge1xuICAgICAgLyogaXN0YW5idWwgaWdub3JlIGVsc2UgKi9cbiAgICAgIGlmIChvYmouaGFzT3duUHJvcGVydHkoa2V5KSkge1xuICAgICAgICBzb3J0ZWRLZXlzLnB1c2goa2V5KTtcbiAgICAgIH1cbiAgICB9XG4gICAgc29ydGVkS2V5cy5zb3J0KCk7XG4gICAgZm9yIChpID0gMDsgaSA8IHNvcnRlZEtleXMubGVuZ3RoOyBpICs9IDEpIHtcbiAgICAgIGtleSA9IHNvcnRlZEtleXNbaV07XG4gICAgICBjYW5vbmljYWxpemVkT2JqW2tleV0gPSBjYW5vbmljYWxpemUob2JqW2tleV0sIHN0YWNrLCByZXBsYWNlbWVudFN0YWNrKTtcbiAgICB9XG4gICAgc3RhY2sucG9wKCk7XG4gICAgcmVwbGFjZW1lbnRTdGFjay5wb3AoKTtcbiAgfSBlbHNlIHtcbiAgICBjYW5vbmljYWxpemVkT2JqID0gb2JqO1xuICB9XG4gIHJldHVybiBjYW5vbmljYWxpemVkT2JqO1xufVxuIl19
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2pzb24uanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7OztnQ0EyQmdCLFEsR0FBQSxRO3lEQUlBLFksR0FBQSxZOztBQS9CaEIsSSx5QkFBQSx5Qix3QkFBQTs7Ozs7O0FBQ0EsSSx5QkFBQSx5Qix3QkFBQTs7Ozs7OztBQUVBLElBQU0sMEJBQTBCLE9BQU8sU0FBUCxDQUFpQixRQUFqRDs7QUFHTyxJQUFNLFcseUJBQUEsUSx3QkFBQSxXQUFXLEkseUJBQUEsbUIsd0JBQWpCOzs7QUFHUCxTQUFTLGVBQVQsR0FBMkIsSUFBM0I7O0FBRUEsU0FBUyxRQUFULEcseUJBQW9CLGUsd0JBQVMsUUFBN0I7QUFDQSxTQUFTLFNBQVQsR0FBcUIsVUFBUyxLQUFULEVBQWdCOzJCQUFBLEksdUJBQzVCLG9CQUQ0QixHQUNKLEtBQUssT0FERCxDQUM1QixvQkFENEI7OztBQUduQyxTQUFPLE9BQU8sS0FBUCxLQUFpQixRQUFqQixHQUE0QixLQUE1QixHQUFvQyxLQUFLLFNBQUwsQ0FBZSxhQUFhLEtBQWIsQ0FBZixFQUFvQyxVQUFTLENBQVQsRUFBWSxDQUFaLEVBQWU7QUFDNUYsUUFBSSxPQUFPLENBQVAsS0FBYSxXQUFqQixFQUE4QjtBQUM1QixhQUFPLG9CQUFQO0FBQ0Q7O0FBRUQsV0FBTyxDQUFQO0FBQ0QsR0FOMEMsRUFNeEMsSUFOd0MsQ0FBM0M7QUFPRCxDQVZEO0FBV0EsU0FBUyxNQUFULEdBQWtCLFVBQVMsSUFBVCxFQUFlLEtBQWYsRUFBc0I7QUFDdEMsUywwQkFBTyxrQix3QkFBSyxTQUFMLENBQWUsTUFBZixDQUFzQixLQUFLLE9BQUwsQ0FBYSxZQUFiLEVBQTJCLElBQTNCLENBQXRCLEVBQXdELE1BQU0sT0FBTixDQUFjLFlBQWQsRUFBNEIsSUFBNUIsQ0FBeEQ7QUFBUDtBQUNELENBRkQ7O0FBSU8sU0FBUyxRQUFULENBQWtCLE1BQWxCLEVBQTBCLE1BQTFCLEVBQWtDLE9BQWxDLEVBQTJDO0FBQUUsU0FBTyxTQUFTLElBQVQsQ0FBYyxNQUFkLEVBQXNCLE1BQXRCLEVBQThCLE9BQTlCLENBQVA7QUFBZ0Q7Ozs7QUFJN0YsU0FBUyxZQUFULENBQXNCLEdBQXRCLEVBQTJCLEtBQTNCLEVBQWtDLGdCQUFsQyxFQUFvRDtBQUN6RCxVQUFRLFNBQVMsRUFBakI7QUFDQSxxQkFBbUIsb0JBQW9CLEVBQXZDOztBQUVBLE1BQUksSSx5QkFBQSxNLHdCQUFKOztBQUVBLE9BQUssSUFBSSxDQUFULEVBQVksSUFBSSxNQUFNLE1BQXRCLEVBQThCLEtBQUssQ0FBbkMsRUFBc0M7QUFDcEMsUUFBSSxNQUFNLENBQU4sTUFBYSxHQUFqQixFQUFzQjtBQUNwQixhQUFPLGlCQUFpQixDQUFqQixDQUFQO0FBQ0Q7QUFDRjs7QUFFRCxNQUFJLG1CLHlCQUFBLE0sd0JBQUo7O0FBRUEsTUFBSSxxQkFBcUIsd0JBQXdCLElBQXhCLENBQTZCLEdBQTdCLENBQXpCLEVBQTREO0FBQzFELFVBQU0sSUFBTixDQUFXLEdBQVg7QUFDQSx1QkFBbUIsSUFBSSxLQUFKLENBQVUsSUFBSSxNQUFkLENBQW5CO0FBQ0EscUJBQWlCLElBQWpCLENBQXNCLGdCQUF0QjtBQUNBLFNBQUssSUFBSSxDQUFULEVBQVksSUFBSSxJQUFJLE1BQXBCLEVBQTRCLEtBQUssQ0FBakMsRUFBb0M7QUFDbEMsdUJBQWlCLENBQWpCLElBQXNCLGFBQWEsSUFBSSxDQUFKLENBQWIsRUFBcUIsS0FBckIsRUFBNEIsZ0JBQTVCLENBQXRCO0FBQ0Q7QUFDRCxVQUFNLEdBQU47QUFDQSxxQkFBaUIsR0FBakI7QUFDQSxXQUFPLGdCQUFQO0FBQ0Q7O0FBRUQsTUFBSSxPQUFPLElBQUksTUFBZixFQUF1QjtBQUNyQixVQUFNLElBQUksTUFBSixFQUFOO0FBQ0Q7O0FBRUQsTSwwQkFBSSxRLHVCQUFPLEdBQVAseUNBQU8sR0FBUCxPQUFlLFFBQWYsSUFBMkIsUUFBUSxJQUF2QyxFQUE2QztBQUMzQyxVQUFNLElBQU4sQ0FBVyxHQUFYO0FBQ0EsdUJBQW1CLEVBQW5CO0FBQ0EscUJBQWlCLElBQWpCLENBQXNCLGdCQUF0QjtBQUNBLFFBQUksYUFBYSxFQUFqQjtBQUFBLFFBQ0ksTSx5QkFBQSxNLHdCQURKO0FBRUEsU0FBSyxHQUFMLElBQVksR0FBWixFQUFpQjs7QUFFZixVQUFJLElBQUksY0FBSixDQUFtQixHQUFuQixDQUFKLEVBQTZCO0FBQzNCLG1CQUFXLElBQVgsQ0FBZ0IsR0FBaEI7QUFDRDtBQUNGO0FBQ0QsZUFBVyxJQUFYO0FBQ0EsU0FBSyxJQUFJLENBQVQsRUFBWSxJQUFJLFdBQVcsTUFBM0IsRUFBbUMsS0FBSyxDQUF4QyxFQUEyQztBQUN6QyxZQUFNLFdBQVcsQ0FBWCxDQUFOO0FBQ0EsdUJBQWlCLEdBQWpCLElBQXdCLGFBQWEsSUFBSSxHQUFKLENBQWIsRUFBdUIsS0FBdkIsRUFBOEIsZ0JBQTlCLENBQXhCO0FBQ0Q7QUFDRCxVQUFNLEdBQU47QUFDQSxxQkFBaUIsR0FBakI7QUFDRCxHQW5CRCxNQW1CTztBQUNMLHVCQUFtQixHQUFuQjtBQUNEO0FBQ0QsU0FBTyxnQkFBUDtBQUNEIiwiZmlsZSI6Impzb24uanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgRGlmZiBmcm9tICcuL2Jhc2UnO1xuaW1wb3J0IHtsaW5lRGlmZn0gZnJvbSAnLi9saW5lJztcblxuY29uc3Qgb2JqZWN0UHJvdG90eXBlVG9TdHJpbmcgPSBPYmplY3QucHJvdG90eXBlLnRvU3RyaW5nO1xuXG5cbmV4cG9ydCBjb25zdCBqc29uRGlmZiA9IG5ldyBEaWZmKCk7XG4vLyBEaXNjcmltaW5hdGUgYmV0d2VlbiB0d28gbGluZXMgb2YgcHJldHR5LXByaW50ZWQsIHNlcmlhbGl6ZWQgSlNPTiB3aGVyZSBvbmUgb2YgdGhlbSBoYXMgYVxuLy8gZGFuZ2xpbmcgY29tbWEgYW5kIHRoZSBvdGhlciBkb2Vzbid0LiBUdXJucyBvdXQgaW5jbHVkaW5nIHRoZSBkYW5nbGluZyBjb21tYSB5aWVsZHMgdGhlIG5pY2VzdCBvdXRwdXQ6XG5qc29uRGlmZi51c2VMb25nZXN0VG9rZW4gPSB0cnVlO1xuXG5qc29uRGlmZi50b2tlbml6ZSA9IGxpbmVEaWZmLnRva2VuaXplO1xuanNvbkRpZmYuY2FzdElucHV0ID0gZnVuY3Rpb24odmFsdWUpIHtcbiAgY29uc3Qge3VuZGVmaW5lZFJlcGxhY2VtZW50fSA9IHRoaXMub3B0aW9ucztcblxuICByZXR1cm4gdHlwZW9mIHZhbHVlID09PSAnc3RyaW5nJyA/IHZhbHVlIDogSlNPTi5zdHJpbmdpZnkoY2Fub25pY2FsaXplKHZhbHVlKSwgZnVuY3Rpb24oaywgdikge1xuICAgIGlmICh0eXBlb2YgdiA9PT0gJ3VuZGVmaW5lZCcpIHtcbiAgICAgIHJldHVybiB1bmRlZmluZWRSZXBsYWNlbWVudDtcbiAgICB9XG5cbiAgICByZXR1cm4gdjtcbiAgfSwgJyAgJyk7XG59O1xuanNvbkRpZmYuZXF1YWxzID0gZnVuY3Rpb24obGVmdCwgcmlnaHQpIHtcbiAgcmV0dXJuIERpZmYucHJvdG90eXBlLmVxdWFscyhsZWZ0LnJlcGxhY2UoLywoW1xcclxcbl0pL2csICckMScpLCByaWdodC5yZXBsYWNlKC8sKFtcXHJcXG5dKS9nLCAnJDEnKSk7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZGlmZkpzb24ob2xkT2JqLCBuZXdPYmosIG9wdGlvbnMpIHsgcmV0dXJuIGpzb25EaWZmLmRpZmYob2xkT2JqLCBuZXdPYmosIG9wdGlvbnMpOyB9XG5cbi8vIFRoaXMgZnVuY3Rpb24gaGFuZGxlcyB0aGUgcHJlc2VuY2Ugb2YgY2lyY3VsYXIgcmVmZXJlbmNlcyBieSBiYWlsaW5nIG91dCB3aGVuIGVuY291bnRlcmluZyBhblxuLy8gb2JqZWN0IHRoYXQgaXMgYWxyZWFkeSBvbiB0aGUgXCJzdGFja1wiIG9mIGl0ZW1zIGJlaW5nIHByb2Nlc3NlZC5cbmV4cG9ydCBmdW5jdGlvbiBjYW5vbmljYWxpemUob2JqLCBzdGFjaywgcmVwbGFjZW1lbnRTdGFjaykge1xuICBzdGFjayA9IHN0YWNrIHx8IFtdO1xuICByZXBsYWNlbWVudFN0YWNrID0gcmVwbGFjZW1lbnRTdGFjayB8fCBbXTtcblxuICBsZXQgaTtcblxuICBmb3IgKGkgPSAwOyBpIDwgc3RhY2subGVuZ3RoOyBpICs9IDEpIHtcbiAgICBpZiAoc3RhY2tbaV0gPT09IG9iaikge1xuICAgICAgcmV0dXJuIHJlcGxhY2VtZW50U3RhY2tbaV07XG4gICAgfVxuICB9XG5cbiAgbGV0IGNhbm9uaWNhbGl6ZWRPYmo7XG5cbiAgaWYgKCdbb2JqZWN0IEFycmF5XScgPT09IG9iamVjdFByb3RvdHlwZVRvU3RyaW5nLmNhbGwob2JqKSkge1xuICAgIHN0YWNrLnB1c2gob2JqKTtcbiAgICBjYW5vbmljYWxpemVkT2JqID0gbmV3IEFycmF5KG9iai5sZW5ndGgpO1xuICAgIHJlcGxhY2VtZW50U3RhY2sucHVzaChjYW5vbmljYWxpemVkT2JqKTtcbiAgICBmb3IgKGkgPSAwOyBpIDwgb2JqLmxlbmd0aDsgaSArPSAxKSB7XG4gICAgICBjYW5vbmljYWxpemVkT2JqW2ldID0gY2Fub25pY2FsaXplKG9ialtpXSwgc3RhY2ssIHJlcGxhY2VtZW50U3RhY2spO1xuICAgIH1cbiAgICBzdGFjay5wb3AoKTtcbiAgICByZXBsYWNlbWVudFN0YWNrLnBvcCgpO1xuICAgIHJldHVybiBjYW5vbmljYWxpemVkT2JqO1xuICB9XG5cbiAgaWYgKG9iaiAmJiBvYmoudG9KU09OKSB7XG4gICAgb2JqID0gb2JqLnRvSlNPTigpO1xuICB9XG5cbiAgaWYgKHR5cGVvZiBvYmogPT09ICdvYmplY3QnICYmIG9iaiAhPT0gbnVsbCkge1xuICAgIHN0YWNrLnB1c2gob2JqKTtcbiAgICBjYW5vbmljYWxpemVkT2JqID0ge307XG4gICAgcmVwbGFjZW1lbnRTdGFjay5wdXNoKGNhbm9uaWNhbGl6ZWRPYmopO1xuICAgIGxldCBzb3J0ZWRLZXlzID0gW10sXG4gICAgICAgIGtleTtcbiAgICBmb3IgKGtleSBpbiBvYmopIHtcbiAgICAgIC8qIGlzdGFuYnVsIGlnbm9yZSBlbHNlICovXG4gICAgICBpZiAob2JqLmhhc093blByb3BlcnR5KGtleSkpIHtcbiAgICAgICAgc29ydGVkS2V5cy5wdXNoKGtleSk7XG4gICAgICB9XG4gICAgfVxuICAgIHNvcnRlZEtleXMuc29ydCgpO1xuICAgIGZvciAoaSA9IDA7IGkgPCBzb3J0ZWRLZXlzLmxlbmd0aDsgaSArPSAxKSB7XG4gICAgICBrZXkgPSBzb3J0ZWRLZXlzW2ldO1xuICAgICAgY2Fub25pY2FsaXplZE9ialtrZXldID0gY2Fub25pY2FsaXplKG9ialtrZXldLCBzdGFjaywgcmVwbGFjZW1lbnRTdGFjayk7XG4gICAgfVxuICAgIHN0YWNrLnBvcCgpO1xuICAgIHJlcGxhY2VtZW50U3RhY2sucG9wKCk7XG4gIH0gZWxzZSB7XG4gICAgY2Fub25pY2FsaXplZE9iaiA9IG9iajtcbiAgfVxuICByZXR1cm4gY2Fub25pY2FsaXplZE9iajtcbn1cbiJdfQ==
 
 
-/***/ }),
+/***/ },
 /* 9 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -4114,27 +4119,25 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_base = __webpack_require__(1) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _base2 = _interopRequireDefault(_base);
+	/*istanbul ignore start*/
+	var _base2 = _interopRequireDefault(_base);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-	/*istanbul ignore end*/var arrayDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/arrayDiff = new /*istanbul ignore start*/_base2['default'] /*istanbul ignore end*/();
+	/*istanbul ignore end*/var arrayDiff = /*istanbul ignore start*/exports. /*istanbul ignore end*/arrayDiff = new /*istanbul ignore start*/_base2['default']() /*istanbul ignore end*/;
 	arrayDiff.tokenize = arrayDiff.join = function (value) {
 	  return value.slice();
 	};
-	arrayDiff.removeEmpty = function (value) {
-	  return value;
-	};
 
 	function diffArrays(oldArr, newArr, callback) {
 	  return arrayDiff.diff(oldArr, newArr, callback);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2FycmF5LmpzIl0sIm5hbWVzIjpbImRpZmZBcnJheXMiLCJhcnJheURpZmYiLCJ0b2tlbml6ZSIsImpvaW4iLCJ2YWx1ZSIsInNsaWNlIiwicmVtb3ZlRW1wdHkiLCJvbGRBcnIiLCJuZXdBcnIiLCJjYWxsYmFjayIsImRpZmYiXSwibWFwcGluZ3MiOiI7Ozs7Z0NBVWdCQSxVLEdBQUFBLFU7O0FBVmhCOzs7Ozs7dUJBRU8sSUFBTUMsaUZBQVksd0VBQWxCO0FBQ1BBLFVBQVVDLFFBQVYsR0FBcUJELFVBQVVFLElBQVYsR0FBaUIsVUFBU0MsS0FBVCxFQUFnQjtBQUNwRCxTQUFPQSxNQUFNQyxLQUFOLEVBQVA7QUFDRCxDQUZEO0FBR0FKLFVBQVVLLFdBQVYsR0FBd0IsVUFBU0YsS0FBVCxFQUFnQjtBQUN0QyxTQUFPQSxLQUFQO0FBQ0QsQ0FGRDs7QUFJTyxTQUFTSixVQUFULENBQW9CTyxNQUFwQixFQUE0QkMsTUFBNUIsRUFBb0NDLFFBQXBDLEVBQThDO0FBQUUsU0FBT1IsVUFBVVMsSUFBVixDQUFlSCxNQUFmLEVBQXVCQyxNQUF2QixFQUErQkMsUUFBL0IsQ0FBUDtBQUFrRCIsImZpbGUiOiJhcnJheS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5cbmV4cG9ydCBjb25zdCBhcnJheURpZmYgPSBuZXcgRGlmZigpO1xuYXJyYXlEaWZmLnRva2VuaXplID0gYXJyYXlEaWZmLmpvaW4gPSBmdW5jdGlvbih2YWx1ZSkge1xuICByZXR1cm4gdmFsdWUuc2xpY2UoKTtcbn07XG5hcnJheURpZmYucmVtb3ZlRW1wdHkgPSBmdW5jdGlvbih2YWx1ZSkge1xuICByZXR1cm4gdmFsdWU7XG59O1xuXG5leHBvcnQgZnVuY3Rpb24gZGlmZkFycmF5cyhvbGRBcnIsIG5ld0FyciwgY2FsbGJhY2spIHsgcmV0dXJuIGFycmF5RGlmZi5kaWZmKG9sZEFyciwgbmV3QXJyLCBjYWxsYmFjayk7IH1cbiJdfQ==
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9kaWZmL2FycmF5LmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Z0NBT2dCLFUsR0FBQSxVOztBQVBoQixJLHlCQUFBLHlCLHdCQUFBOzs7Ozs7O3VCQUVPLElBQU0sWSx5QkFBQSxRLHdCQUFBLFlBQVksSSx5QkFBQSxtQix3QkFBbEI7QUFDUCxVQUFVLFFBQVYsR0FBcUIsVUFBVSxJQUFWLEdBQWlCLFVBQVMsS0FBVCxFQUFnQjtBQUNwRCxTQUFPLE1BQU0sS0FBTixFQUFQO0FBQ0QsQ0FGRDs7QUFJTyxTQUFTLFVBQVQsQ0FBb0IsTUFBcEIsRUFBNEIsTUFBNUIsRUFBb0MsUUFBcEMsRUFBOEM7QUFBRSxTQUFPLFVBQVUsSUFBVixDQUFlLE1BQWYsRUFBdUIsTUFBdkIsRUFBK0IsUUFBL0IsQ0FBUDtBQUFrRCIsImZpbGUiOiJhcnJheS5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBEaWZmIGZyb20gJy4vYmFzZSc7XG5cbmV4cG9ydCBjb25zdCBhcnJheURpZmYgPSBuZXcgRGlmZigpO1xuYXJyYXlEaWZmLnRva2VuaXplID0gYXJyYXlEaWZmLmpvaW4gPSBmdW5jdGlvbih2YWx1ZSkge1xuICByZXR1cm4gdmFsdWUuc2xpY2UoKTtcbn07XG5cbmV4cG9ydCBmdW5jdGlvbiBkaWZmQXJyYXlzKG9sZEFyciwgbmV3QXJyLCBjYWxsYmFjaykgeyByZXR1cm4gYXJyYXlEaWZmLmRpZmYob2xkQXJyLCBuZXdBcnIsIGNhbGxiYWNrKTsgfVxuIl19
 
 
-/***/ }),
+/***/ },
 /* 10 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -4146,12 +4149,13 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_distanceIterator = __webpack_require__(12) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/var _distanceIterator2 = _interopRequireDefault(_distanceIterator);
+	/*istanbul ignore start*/
+	var _distanceIterator2 = _interopRequireDefault(_distanceIterator);
 
 	function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 	/*istanbul ignore end*/function applyPatch(source, uniDiff) {
-	  /*istanbul ignore start*/var /*istanbul ignore end*/options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+	  /*istanbul ignore start*/var /*istanbul ignore end*/options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2];
 
 	  if (typeof uniDiff === 'string') {
 	    uniDiff = /*istanbul ignore start*/(0, _parse.parsePatch) /*istanbul ignore end*/(uniDiff);
@@ -4231,15 +4235,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 
 	  // Apply patch hunks
-	  var diffOffset = 0;
 	  for (var _i = 0; _i < hunks.length; _i++) {
 	    var _hunk = hunks[_i],
-	        _toPos = _hunk.oldStart + _hunk.offset + diffOffset - 1;
-	    diffOffset += _hunk.newLines - _hunk.oldLines;
-
-	    if (_toPos < 0) {
-	      // Creating a new file
-	      _toPos = 0;
+	        _toPos = _hunk.offset + _hunk.newStart - 1;
+	    if (_hunk.newLines == 0) {
+	      _toPos++;
 	    }
 
 	    for (var j = 0; j < _hunk.lines.length; j++) {
@@ -4255,17 +4255,17 @@ return /******/ (function(modules) { // webpackBootstrap
 	        delimiters.splice(_toPos, 1);
 	        /* istanbul ignore else */
 	      } else if (operation === '+') {
-	        lines.splice(_toPos, 0, content);
-	        delimiters.splice(_toPos, 0, delimiter);
-	        _toPos++;
-	      } else if (operation === '\\') {
-	        var previousOperation = _hunk.lines[j - 1] ? _hunk.lines[j - 1][0] : null;
-	        if (previousOperation === '+') {
-	          removeEOFNL = true;
-	        } else if (previousOperation === '-') {
-	          addEOFNL = true;
+	          lines.splice(_toPos, 0, content);
+	          delimiters.splice(_toPos, 0, delimiter);
+	          _toPos++;
+	        } else if (operation === '\\') {
+	          var previousOperation = _hunk.lines[j - 1] ? _hunk.lines[j - 1][0] : null;
+	          if (previousOperation === '+') {
+	            removeEOFNL = true;
+	          } else if (previousOperation === '-') {
+	            addEOFNL = true;
+	          }
 	        }
-	      }
 	    }
 	  }
 
@@ -4315,19 +4315,19 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	  processIndex();
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/patch/apply.js"],"names":["applyPatch","applyPatches","source","uniDiff","options","Array","isArray","length","Error","lines","split","delimiters","match","hunks","compareLine","lineNumber","line","operation","patchContent","errorCount","fuzzFactor","minLine","offset","removeEOFNL","addEOFNL","hunkFits","hunk","toPos","j","content","substr","i","maxLine","oldLines","localOffset","oldStart","iterator","undefined","diffOffset","newLines","delimiter","linedelimiters","splice","previousOperation","pop","push","_k","join","currentIndex","processIndex","index","complete","loadFile","err","data","updatedContent","patched"],"mappings":";;;gCAGgBA,U,GAAAA,U;yDAoIAC,Y,GAAAA,Y;;AAvIhB;;AACA;;;;;;uBAEO,SAASD,UAAT,CAAoBE,MAApB,EAA4BC,OAA5B,EAAmD;AAAA,sDAAdC,OAAc,uEAAJ,EAAI;;AACxD,MAAI,OAAOD,OAAP,KAAmB,QAAvB,EAAiC;AAC/BA,cAAU,wEAAWA,OAAX,CAAV;AACD;;AAED,MAAIE,MAAMC,OAAN,CAAcH,OAAd,CAAJ,EAA4B;AAC1B,QAAIA,QAAQI,MAAR,GAAiB,CAArB,EAAwB;AACtB,YAAM,IAAIC,KAAJ,CAAU,4CAAV,CAAN;AACD;;AAEDL,cAAUA,QAAQ,CAAR,CAAV;AACD;;AAED;AACA,MAAIM,QAAQP,OAAOQ,KAAP,CAAa,qBAAb,CAAZ;AAAA,MACIC,aAAaT,OAAOU,KAAP,CAAa,sBAAb,KAAwC,EADzD;AAAA,MAEIC,QAAQV,QAAQU,KAFpB;AAAA,MAIIC,cAAcV,QAAQU,WAAR,IAAwB,UAACC,UAAD,EAAaC,IAAb,EAAmBC,SAAnB,EAA8BC,YAA9B;AAAA,mCAA+CF,SAASE;AAAxD;AAAA,GAJ1C;AAAA,MAKIC,aAAa,CALjB;AAAA,MAMIC,aAAahB,QAAQgB,UAAR,IAAsB,CANvC;AAAA,MAOIC,UAAU,CAPd;AAAA,MAQIC,SAAS,CARb;AAAA,MAUIC,6CAVJ;AAAA,MAWIC,0CAXJ;;AAaA;;;AAGA,WAASC,QAAT,CAAkBC,IAAlB,EAAwBC,KAAxB,EAA+B;AAC7B,SAAK,IAAIC,IAAI,CAAb,EAAgBA,IAAIF,KAAKjB,KAAL,CAAWF,MAA/B,EAAuCqB,GAAvC,EAA4C;AAC1C,UAAIZ,OAAOU,KAAKjB,KAAL,CAAWmB,CAAX,CAAX;AAAA,UACIX,YAAYD,KAAK,CAAL,CADhB;AAAA,UAEIa,UAAUb,KAAKc,MAAL,CAAY,CAAZ,CAFd;;AAIA,UAAIb,cAAc,GAAd,IAAqBA,cAAc,GAAvC,EAA4C;AAC1C;AACA,YAAI,CAACH,YAAYa,QAAQ,CAApB,EAAuBlB,MAAMkB,KAAN,CAAvB,EAAqCV,SAArC,EAAgDY,OAAhD,CAAL,EAA+D;AAC7DV;;AAEA,cAAIA,aAAaC,UAAjB,EAA6B;AAC3B,mBAAO,KAAP;AACD;AACF;AACDO;AACD;AACF;;AAED,WAAO,IAAP;AACD;;AAED;AACA,OAAK,IAAII,IAAI,CAAb,EAAgBA,IAAIlB,MAAMN,MAA1B,EAAkCwB,GAAlC,EAAuC;AACrC,QAAIL,OAAOb,MAAMkB,CAAN,CAAX;AAAA,QACIC,UAAUvB,MAAMF,MAAN,GAAemB,KAAKO,QADlC;AAAA,QAEIC,cAAc,CAFlB;AAAA,QAGIP,QAAQL,SAASI,KAAKS,QAAd,GAAyB,CAHrC;;AAKA,QAAIC,WAAW,oFAAiBT,KAAjB,EAAwBN,OAAxB,EAAiCW,OAAjC,CAAf;;AAEA,WAAOE,gBAAgBG,SAAvB,EAAkCH,cAAcE,UAAhD,EAA4D;AAC1D,UAAIX,SAASC,IAAT,EAAeC,QAAQO,WAAvB,CAAJ,EAAyC;AACvCR,aAAKJ,MAAL,GAAcA,UAAUY,WAAxB;AACA;AACD;AACF;;AAED,QAAIA,gBAAgBG,SAApB,EAA+B;AAC7B,aAAO,KAAP;AACD;;AAED;AACA;AACAhB,cAAUK,KAAKJ,MAAL,GAAcI,KAAKS,QAAnB,GAA8BT,KAAKO,QAA7C;AACD;;AAED;AACA,MAAIK,aAAa,CAAjB;AACA,OAAK,IAAIP,KAAI,CAAb,EAAgBA,KAAIlB,MAAMN,MAA1B,EAAkCwB,IAAlC,EAAuC;AACrC,QAAIL,QAAOb,MAAMkB,EAAN,CAAX;AAAA,QACIJ,SAAQD,MAAKS,QAAL,GAAgBT,MAAKJ,MAArB,GAA8BgB,UAA9B,GAA2C,CADvD;AAEAA,kBAAcZ,MAAKa,QAAL,GAAgBb,MAAKO,QAAnC;;AAEA,QAAIN,SAAQ,CAAZ,EAAe;AAAE;AACfA,eAAQ,CAAR;AACD;;AAED,SAAK,IAAIC,IAAI,CAAb,EAAgBA,IAAIF,MAAKjB,KAAL,CAAWF,MAA/B,EAAuCqB,GAAvC,EAA4C;AAC1C,UAAIZ,OAAOU,MAAKjB,KAAL,CAAWmB,CAAX,CAAX;AAAA,UACIX,YAAYD,KAAK,CAAL,CADhB;AAAA,UAEIa,UAAUb,KAAKc,MAAL,CAAY,CAAZ,CAFd;AAAA,UAGIU,YAAYd,MAAKe,cAAL,CAAoBb,CAApB,CAHhB;;AAKA,UAAIX,cAAc,GAAlB,EAAuB;AACrBU;AACD,OAFD,MAEO,IAAIV,cAAc,GAAlB,EAAuB;AAC5BR,cAAMiC,MAAN,CAAaf,MAAb,EAAoB,CAApB;AACAhB,mBAAW+B,MAAX,CAAkBf,MAAlB,EAAyB,CAAzB;AACF;AACC,OAJM,MAIA,IAAIV,cAAc,GAAlB,EAAuB;AAC5BR,cAAMiC,MAAN,CAAaf,MAAb,EAAoB,CAApB,EAAuBE,OAAvB;AACAlB,mBAAW+B,MAAX,CAAkBf,MAAlB,EAAyB,CAAzB,EAA4Ba,SAA5B;AACAb;AACD,OAJM,MAIA,IAAIV,cAAc,IAAlB,EAAwB;AAC7B,YAAI0B,oBAAoBjB,MAAKjB,KAAL,CAAWmB,IAAI,CAAf,IAAoBF,MAAKjB,KAAL,CAAWmB,IAAI,CAAf,EAAkB,CAAlB,CAApB,GAA2C,IAAnE;AACA,YAAIe,sBAAsB,GAA1B,EAA+B;AAC7BpB,wBAAc,IAAd;AACD,SAFD,MAEO,IAAIoB,sBAAsB,GAA1B,EAA+B;AACpCnB,qBAAW,IAAX;AACD;AACF;AACF;AACF;;AAED;AACA,MAAID,WAAJ,EAAiB;AACf,WAAO,CAACd,MAAMA,MAAMF,MAAN,GAAe,CAArB,CAAR,EAAiC;AAC/BE,YAAMmC,GAAN;AACAjC,iBAAWiC,GAAX;AACD;AACF,GALD,MAKO,IAAIpB,QAAJ,EAAc;AACnBf,UAAMoC,IAAN,CAAW,EAAX;AACAlC,eAAWkC,IAAX,CAAgB,IAAhB;AACD;AACD,OAAK,IAAIC,KAAK,CAAd,EAAiBA,KAAKrC,MAAMF,MAAN,GAAe,CAArC,EAAwCuC,IAAxC,EAA8C;AAC5CrC,UAAMqC,EAAN,IAAYrC,MAAMqC,EAAN,IAAYnC,WAAWmC,EAAX,CAAxB;AACD;AACD,SAAOrC,MAAMsC,IAAN,CAAW,EAAX,CAAP;AACD;;AAED;AACO,SAAS9C,YAAT,CAAsBE,OAAtB,EAA+BC,OAA/B,EAAwC;AAC7C,MAAI,OAAOD,OAAP,KAAmB,QAAvB,EAAiC;AAC/BA,cAAU,wEAAWA,OAAX,CAAV;AACD;;AAED,MAAI6C,eAAe,CAAnB;AACA,WAASC,YAAT,GAAwB;AACtB,QAAIC,QAAQ/C,QAAQ6C,cAAR,CAAZ;AACA,QAAI,CAACE,KAAL,EAAY;AACV,aAAO9C,QAAQ+C,QAAR,EAAP;AACD;;AAED/C,YAAQgD,QAAR,CAAiBF,KAAjB,EAAwB,UAASG,GAAT,EAAcC,IAAd,EAAoB;AAC1C,UAAID,GAAJ,EAAS;AACP,eAAOjD,QAAQ+C,QAAR,CAAiBE,GAAjB,CAAP;AACD;;AAED,UAAIE,iBAAiBvD,WAAWsD,IAAX,EAAiBJ,KAAjB,EAAwB9C,OAAxB,CAArB;AACAA,cAAQoD,OAAR,CAAgBN,KAAhB,EAAuBK,cAAvB,EAAuC,UAASF,GAAT,EAAc;AACnD,YAAIA,GAAJ,EAAS;AACP,iBAAOjD,QAAQ+C,QAAR,CAAiBE,GAAjB,CAAP;AACD;;AAEDJ;AACD,OAND;AAOD,KAbD;AAcD;AACDA;AACD","file":"apply.js","sourcesContent":["import {parsePatch} from './parse';\nimport distanceIterator from '../util/distance-iterator';\n\nexport function applyPatch(source, uniDiff, options = {}) {\n  if (typeof uniDiff === 'string') {\n    uniDiff = parsePatch(uniDiff);\n  }\n\n  if (Array.isArray(uniDiff)) {\n    if (uniDiff.length > 1) {\n      throw new Error('applyPatch only works with a single input.');\n    }\n\n    uniDiff = uniDiff[0];\n  }\n\n  // Apply the diff to the input\n  let lines = source.split(/\\r\\n|[\\n\\v\\f\\r\\x85]/),\n      delimiters = source.match(/\\r\\n|[\\n\\v\\f\\r\\x85]/g) || [],\n      hunks = uniDiff.hunks,\n\n      compareLine = options.compareLine || ((lineNumber, line, operation, patchContent) => line === patchContent),\n      errorCount = 0,\n      fuzzFactor = options.fuzzFactor || 0,\n      minLine = 0,\n      offset = 0,\n\n      removeEOFNL,\n      addEOFNL;\n\n  /**\n   * Checks if the hunk exactly fits on the provided location\n   */\n  function hunkFits(hunk, toPos) {\n    for (let j = 0; j < hunk.lines.length; j++) {\n      let line = hunk.lines[j],\n          operation = line[0],\n          content = line.substr(1);\n\n      if (operation === ' ' || operation === '-') {\n        // Context sanity check\n        if (!compareLine(toPos + 1, lines[toPos], operation, content)) {\n          errorCount++;\n\n          if (errorCount > fuzzFactor) {\n            return false;\n          }\n        }\n        toPos++;\n      }\n    }\n\n    return true;\n  }\n\n  // Search best fit offsets for each hunk based on the previous ones\n  for (let i = 0; i < hunks.length; i++) {\n    let hunk = hunks[i],\n        maxLine = lines.length - hunk.oldLines,\n        localOffset = 0,\n        toPos = offset + hunk.oldStart - 1;\n\n    let iterator = distanceIterator(toPos, minLine, maxLine);\n\n    for (; localOffset !== undefined; localOffset = iterator()) {\n      if (hunkFits(hunk, toPos + localOffset)) {\n        hunk.offset = offset += localOffset;\n        break;\n      }\n    }\n\n    if (localOffset === undefined) {\n      return false;\n    }\n\n    // Set lower text limit to end of the current hunk, so next ones don't try\n    // to fit over already patched text\n    minLine = hunk.offset + hunk.oldStart + hunk.oldLines;\n  }\n\n  // Apply patch hunks\n  let diffOffset = 0;\n  for (let i = 0; i < hunks.length; i++) {\n    let hunk = hunks[i],\n        toPos = hunk.oldStart + hunk.offset + diffOffset - 1;\n    diffOffset += hunk.newLines - hunk.oldLines;\n\n    if (toPos < 0) { // Creating a new file\n      toPos = 0;\n    }\n\n    for (let j = 0; j < hunk.lines.length; j++) {\n      let line = hunk.lines[j],\n          operation = line[0],\n          content = line.substr(1),\n          delimiter = hunk.linedelimiters[j];\n\n      if (operation === ' ') {\n        toPos++;\n      } else if (operation === '-') {\n        lines.splice(toPos, 1);\n        delimiters.splice(toPos, 1);\n      /* istanbul ignore else */\n      } else if (operation === '+') {\n        lines.splice(toPos, 0, content);\n        delimiters.splice(toPos, 0, delimiter);\n        toPos++;\n      } else if (operation === '\\\\') {\n        let previousOperation = hunk.lines[j - 1] ? hunk.lines[j - 1][0] : null;\n        if (previousOperation === '+') {\n          removeEOFNL = true;\n        } else if (previousOperation === '-') {\n          addEOFNL = true;\n        }\n      }\n    }\n  }\n\n  // Handle EOFNL insertion/removal\n  if (removeEOFNL) {\n    while (!lines[lines.length - 1]) {\n      lines.pop();\n      delimiters.pop();\n    }\n  } else if (addEOFNL) {\n    lines.push('');\n    delimiters.push('\\n');\n  }\n  for (let _k = 0; _k < lines.length - 1; _k++) {\n    lines[_k] = lines[_k] + delimiters[_k];\n  }\n  return lines.join('');\n}\n\n// Wrapper that supports multiple file patches via callbacks.\nexport function applyPatches(uniDiff, options) {\n  if (typeof uniDiff === 'string') {\n    uniDiff = parsePatch(uniDiff);\n  }\n\n  let currentIndex = 0;\n  function processIndex() {\n    let index = uniDiff[currentIndex++];\n    if (!index) {\n      return options.complete();\n    }\n\n    options.loadFile(index, function(err, data) {\n      if (err) {\n        return options.complete(err);\n      }\n\n      let updatedContent = applyPatch(data, index, options);\n      options.patched(index, updatedContent, function(err) {\n        if (err) {\n          return options.complete(err);\n        }\n\n        processIndex();\n      });\n    });\n  }\n  processIndex();\n}\n"]}
+	//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/patch/apply.js"],"names":[],"mappings":";;;gCAGgB,U,GAAA,U;yDA+HA,Y,GAAA,Y;;AAlIhB,I,yBAAA,2B,wBAAA;;AACA,I,yBAAA,wD,wBAAA;;;;;;;uBAEO,SAAS,UAAT,CAAoB,MAApB,EAA4B,OAA5B,EAAmD;2BAAA,I,uBAAd,OAAc,yDAAJ,EAAI;;AACxD,MAAI,OAAO,OAAP,KAAmB,QAAvB,EAAiC;AAC/B,c,yBAAU,sB,wBAAA,CAAW,OAAX,CAAV;AACD;;AAED,MAAI,MAAM,OAAN,CAAc,OAAd,CAAJ,EAA4B;AAC1B,QAAI,QAAQ,MAAR,GAAiB,CAArB,EAAwB;AACtB,YAAM,IAAI,KAAJ,CAAU,4CAAV,CAAN;AACD;;AAED,cAAU,QAAQ,CAAR,CAAV;AACD;;;AAGD,MAAI,QAAQ,OAAO,KAAP,CAAa,qBAAb,CAAZ;AAAA,MACI,aAAa,OAAO,KAAP,CAAa,sBAAb,KAAwC,EADzD;AAAA,MAEI,QAAQ,QAAQ,KAFpB;AAAA,MAII,cAAc,QAAQ,WAAR,IAAwB,UAAC,UAAD,EAAa,IAAb,EAAmB,SAAnB,EAA8B,YAA9B,E,yBAAA;AAAA,W,wBAA+C,SAAS;AAAxD;AAAA,GAJ1C;AAAA,MAKI,aAAa,CALjB;AAAA,MAMI,aAAa,QAAQ,UAAR,IAAsB,CANvC;AAAA,MAOI,UAAU,CAPd;AAAA,MAQI,SAAS,CARb;AAAA,MAUI,c,yBAAA,M,wBAVJ;AAAA,MAWI,W,yBAAA,M,wBAXJ;;;;;AAgBA,WAAS,QAAT,CAAkB,IAAlB,EAAwB,KAAxB,EAA+B;AAC7B,SAAK,IAAI,IAAI,CAAb,EAAgB,IAAI,KAAK,KAAL,CAAW,MAA/B,EAAuC,GAAvC,EAA4C;AAC1C,UAAI,OAAO,KAAK,KAAL,CAAW,CAAX,CAAX;AAAA,UACI,YAAY,KAAK,CAAL,CADhB;AAAA,UAEI,UAAU,KAAK,MAAL,CAAY,CAAZ,CAFd;;AAIA,UAAI,cAAc,GAAd,IAAqB,cAAc,GAAvC,EAA4C;;AAE1C,YAAI,CAAC,YAAY,QAAQ,CAApB,EAAuB,MAAM,KAAN,CAAvB,EAAqC,SAArC,EAAgD,OAAhD,CAAL,EAA+D;AAC7D;;AAEA,cAAI,aAAa,UAAjB,EAA6B;AAC3B,mBAAO,KAAP;AACD;AACF;AACD;AACD;AACF;;AAED,WAAO,IAAP;AACD;;;AAGD,OAAK,IAAI,IAAI,CAAb,EAAgB,IAAI,MAAM,MAA1B,EAAkC,GAAlC,EAAuC;AACrC,QAAI,OAAO,MAAM,CAAN,CAAX;AAAA,QACI,UAAU,MAAM,MAAN,GAAe,KAAK,QADlC;AAAA,QAEI,cAAc,CAFlB;AAAA,QAGI,QAAQ,SAAS,KAAK,QAAd,GAAyB,CAHrC;;AAKA,QAAI,W,yBAAW,kC,wBAAA,CAAiB,KAAjB,EAAwB,OAAxB,EAAiC,OAAjC,CAAf;;AAEA,WAAO,gBAAgB,SAAvB,EAAkC,cAAc,UAAhD,EAA4D;AAC1D,UAAI,SAAS,IAAT,EAAe,QAAQ,WAAvB,CAAJ,EAAyC;AACvC,aAAK,MAAL,GAAc,UAAU,WAAxB;AACA;AACD;AACF;;AAED,QAAI,gBAAgB,SAApB,EAA+B;AAC7B,aAAO,KAAP;AACD;;;;AAID,cAAU,KAAK,MAAL,GAAc,KAAK,QAAnB,GAA8B,KAAK,QAA7C;AACD;;;AAGD,OAAK,IAAI,KAAI,CAAb,EAAgB,KAAI,MAAM,MAA1B,EAAkC,IAAlC,EAAuC;AACrC,QAAI,QAAO,MAAM,EAAN,CAAX;AAAA,QACI,SAAQ,MAAK,MAAL,GAAc,MAAK,QAAnB,GAA8B,CAD1C;AAEA,QAAI,MAAK,QAAL,IAAiB,CAArB,EAAwB;AAAE;AAAU;;AAEpC,SAAK,IAAI,IAAI,CAAb,EAAgB,IAAI,MAAK,KAAL,CAAW,MAA/B,EAAuC,GAAvC,EAA4C;AAC1C,UAAI,OAAO,MAAK,KAAL,CAAW,CAAX,CAAX;AAAA,UACI,YAAY,KAAK,CAAL,CADhB;AAAA,UAEI,UAAU,KAAK,MAAL,CAAY,CAAZ,CAFd;AAAA,UAGI,YAAY,MAAK,cAAL,CAAoB,CAApB,CAHhB;;AAKA,UAAI,cAAc,GAAlB,EAAuB;AACrB;AACD,OAFD,MAEO,IAAI,cAAc,GAAlB,EAAuB;AAC5B,cAAM,MAAN,CAAa,MAAb,EAAoB,CAApB;AACA,mBAAW,MAAX,CAAkB,MAAlB,EAAyB,CAAzB;;AAED,OAJM,MAIA,IAAI,cAAc,GAAlB,EAAuB;AAC5B,gBAAM,MAAN,CAAa,MAAb,EAAoB,CAApB,EAAuB,OAAvB;AACA,qBAAW,MAAX,CAAkB,MAAlB,EAAyB,CAAzB,EAA4B,SAA5B;AACA;AACD,SAJM,MAIA,IAAI,cAAc,IAAlB,EAAwB;AAC7B,cAAI,oBAAoB,MAAK,KAAL,CAAW,IAAI,CAAf,IAAoB,MAAK,KAAL,CAAW,IAAI,CAAf,EAAkB,CAAlB,CAApB,GAA2C,IAAnE;AACA,cAAI,sBAAsB,GAA1B,EAA+B;AAC7B,0BAAc,IAAd;AACD,WAFD,MAEO,IAAI,sBAAsB,GAA1B,EAA+B;AACpC,uBAAW,IAAX;AACD;AACF;AACF;AACF;;;AAGD,MAAI,WAAJ,EAAiB;AACf,WAAO,CAAC,MAAM,MAAM,MAAN,GAAe,CAArB,CAAR,EAAiC;AAC/B,YAAM,GAAN;AACA,iBAAW,GAAX;AACD;AACF,GALD,MAKO,IAAI,QAAJ,EAAc;AACnB,UAAM,IAAN,CAAW,EAAX;AACA,eAAW,IAAX,CAAgB,IAAhB;AACD;AACD,OAAK,IAAI,KAAK,CAAd,EAAiB,KAAK,MAAM,MAAN,GAAe,CAArC,EAAwC,IAAxC,EAA8C;AAC5C,UAAM,EAAN,IAAY,MAAM,EAAN,IAAY,WAAW,EAAX,CAAxB;AACD;AACD,SAAO,MAAM,IAAN,CAAW,EAAX,CAAP;AACD;;;AAGM,SAAS,YAAT,CAAsB,OAAtB,EAA+B,OAA/B,EAAwC;AAC7C,MAAI,OAAO,OAAP,KAAmB,QAAvB,EAAiC;AAC/B,c,yBAAU,sB,wBAAA,CAAW,OAAX,CAAV;AACD;;AAED,MAAI,eAAe,CAAnB;AACA,WAAS,YAAT,GAAwB;AACtB,QAAI,QAAQ,QAAQ,cAAR,CAAZ;AACA,QAAI,CAAC,KAAL,EAAY;AACV,aAAO,QAAQ,QAAR,EAAP;AACD;;AAED,YAAQ,QAAR,CAAiB,KAAjB,EAAwB,UAAS,GAAT,EAAc,IAAd,EAAoB;AAC1C,UAAI,GAAJ,EAAS;AACP,eAAO,QAAQ,QAAR,CAAiB,GAAjB,CAAP;AACD;;AAED,UAAI,iBAAiB,WAAW,IAAX,EAAiB,KAAjB,EAAwB,OAAxB,CAArB;AACA,cAAQ,OAAR,CAAgB,KAAhB,EAAuB,cAAvB,EAAuC,UAAS,GAAT,EAAc;AACnD,YAAI,GAAJ,EAAS;AACP,iBAAO,QAAQ,QAAR,CAAiB,GAAjB,CAAP;AACD;;AAED;AACD,OAND;AAOD,KAbD;AAcD;AACD;AACD","file":"apply.js","sourcesContent":["import {parsePatch} from './parse';\nimport distanceIterator from '../util/distance-iterator';\n\nexport function applyPatch(source, uniDiff, options = {}) {\n  if (typeof uniDiff === 'string') {\n    uniDiff = parsePatch(uniDiff);\n  }\n\n  if (Array.isArray(uniDiff)) {\n    if (uniDiff.length > 1) {\n      throw new Error('applyPatch only works with a single input.');\n    }\n\n    uniDiff = uniDiff[0];\n  }\n\n  // Apply the diff to the input\n  let lines = source.split(/\\r\\n|[\\n\\v\\f\\r\\x85]/),\n      delimiters = source.match(/\\r\\n|[\\n\\v\\f\\r\\x85]/g) || [],\n      hunks = uniDiff.hunks,\n\n      compareLine = options.compareLine || ((lineNumber, line, operation, patchContent) => line === patchContent),\n      errorCount = 0,\n      fuzzFactor = options.fuzzFactor || 0,\n      minLine = 0,\n      offset = 0,\n\n      removeEOFNL,\n      addEOFNL;\n\n  /**\n   * Checks if the hunk exactly fits on the provided location\n   */\n  function hunkFits(hunk, toPos) {\n    for (let j = 0; j < hunk.lines.length; j++) {\n      let line = hunk.lines[j],\n          operation = line[0],\n          content = line.substr(1);\n\n      if (operation === ' ' || operation === '-') {\n        // Context sanity check\n        if (!compareLine(toPos + 1, lines[toPos], operation, content)) {\n          errorCount++;\n\n          if (errorCount > fuzzFactor) {\n            return false;\n          }\n        }\n        toPos++;\n      }\n    }\n\n    return true;\n  }\n\n  // Search best fit offsets for each hunk based on the previous ones\n  for (let i = 0; i < hunks.length; i++) {\n    let hunk = hunks[i],\n        maxLine = lines.length - hunk.oldLines,\n        localOffset = 0,\n        toPos = offset + hunk.oldStart - 1;\n\n    let iterator = distanceIterator(toPos, minLine, maxLine);\n\n    for (; localOffset !== undefined; localOffset = iterator()) {\n      if (hunkFits(hunk, toPos + localOffset)) {\n        hunk.offset = offset += localOffset;\n        break;\n      }\n    }\n\n    if (localOffset === undefined) {\n      return false;\n    }\n\n    // Set lower text limit to end of the current hunk, so next ones don't try\n    // to fit over already patched text\n    minLine = hunk.offset + hunk.oldStart + hunk.oldLines;\n  }\n\n  // Apply patch hunks\n  for (let i = 0; i < hunks.length; i++) {\n    let hunk = hunks[i],\n        toPos = hunk.offset + hunk.newStart - 1;\n    if (hunk.newLines == 0) { toPos++; }\n\n    for (let j = 0; j < hunk.lines.length; j++) {\n      let line = hunk.lines[j],\n          operation = line[0],\n          content = line.substr(1),\n          delimiter = hunk.linedelimiters[j];\n\n      if (operation === ' ') {\n        toPos++;\n      } else if (operation === '-') {\n        lines.splice(toPos, 1);\n        delimiters.splice(toPos, 1);\n      /* istanbul ignore else */\n      } else if (operation === '+') {\n        lines.splice(toPos, 0, content);\n        delimiters.splice(toPos, 0, delimiter);\n        toPos++;\n      } else if (operation === '\\\\') {\n        let previousOperation = hunk.lines[j - 1] ? hunk.lines[j - 1][0] : null;\n        if (previousOperation === '+') {\n          removeEOFNL = true;\n        } else if (previousOperation === '-') {\n          addEOFNL = true;\n        }\n      }\n    }\n  }\n\n  // Handle EOFNL insertion/removal\n  if (removeEOFNL) {\n    while (!lines[lines.length - 1]) {\n      lines.pop();\n      delimiters.pop();\n    }\n  } else if (addEOFNL) {\n    lines.push('');\n    delimiters.push('\\n');\n  }\n  for (let _k = 0; _k < lines.length - 1; _k++) {\n    lines[_k] = lines[_k] + delimiters[_k];\n  }\n  return lines.join('');\n}\n\n// Wrapper that supports multiple file patches via callbacks.\nexport function applyPatches(uniDiff, options) {\n  if (typeof uniDiff === 'string') {\n    uniDiff = parsePatch(uniDiff);\n  }\n\n  let currentIndex = 0;\n  function processIndex() {\n    let index = uniDiff[currentIndex++];\n    if (!index) {\n      return options.complete();\n    }\n\n    options.loadFile(index, function(err, data) {\n      if (err) {\n        return options.complete(err);\n      }\n\n      let updatedContent = applyPatch(data, index, options);\n      options.patched(index, updatedContent, function(err) {\n        if (err) {\n          return options.complete(err);\n        }\n\n        processIndex();\n      });\n    });\n  }\n  processIndex();\n}\n"]}
 
 
-/***/ }),
+/***/ },
 /* 11 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {
 
 	/*istanbul ignore start*/'use strict';
 
 	exports.__esModule = true;
 	exports. /*istanbul ignore end*/parsePatch = parsePatch;
 	function parsePatch(uniDiff) {
-	  /*istanbul ignore start*/var /*istanbul ignore end*/options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+	  /*istanbul ignore start*/var /*istanbul ignore end*/options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
 	  var diffstr = uniDiff.split(/\r\n|[\n\v\f\r\x85]/),
 	      delimiters = uniDiff.match(/\r\n|[\n\v\f\r\x85]/g) || [],
@@ -4387,11 +4387,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var fileHeader = headerPattern.exec(diffstr[i]);
 	    if (fileHeader) {
 	      var keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';
-	      var fileName = fileHeader[2].replace(/\\\\/g, '\\');
-	      if (/^".*"$/.test(fileName)) {
-	        fileName = fileName.substr(1, fileName.length - 2);
-	      }
-	      index[keyPrefix + 'FileName'] = fileName;
+	      index[keyPrefix + 'FileName'] = fileHeader[2];
 	      index[keyPrefix + 'Header'] = fileHeader[3];
 
 	      i++;
@@ -4468,12 +4464,12 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  return list;
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/patch/parse.js"],"names":["parsePatch","uniDiff","options","diffstr","split","delimiters","match","list","i","parseIndex","index","push","length","line","test","header","exec","parseFileHeader","hunks","parseHunk","strict","Error","JSON","stringify","headerPattern","fileHeader","keyPrefix","fileName","replace","substr","chunkHeaderIndex","chunkHeaderLine","chunkHeader","hunk","oldStart","oldLines","newStart","newLines","lines","linedelimiters","addCount","removeCount","indexOf","operation"],"mappings":";;;gCAAgBA,U,GAAAA,U;AAAT,SAASA,UAAT,CAAoBC,OAApB,EAA2C;AAAA,sDAAdC,OAAc,uEAAJ,EAAI;;AAChD,MAAIC,UAAUF,QAAQG,KAAR,CAAc,qBAAd,CAAd;AAAA,MACIC,aAAaJ,QAAQK,KAAR,CAAc,sBAAd,KAAyC,EAD1D;AAAA,MAEIC,OAAO,EAFX;AAAA,MAGIC,IAAI,CAHR;;AAKA,WAASC,UAAT,GAAsB;AACpB,QAAIC,QAAQ,EAAZ;AACAH,SAAKI,IAAL,CAAUD,KAAV;;AAEA;AACA,WAAOF,IAAIL,QAAQS,MAAnB,EAA2B;AACzB,UAAIC,OAAOV,QAAQK,CAAR,CAAX;;AAEA;AACA,UAAI,wBAAwBM,IAAxB,CAA6BD,IAA7B,CAAJ,EAAwC;AACtC;AACD;;AAED;AACA,UAAIE,SAAU,0CAAD,CAA6CC,IAA7C,CAAkDH,IAAlD,CAAb;AACA,UAAIE,MAAJ,EAAY;AACVL,cAAMA,KAAN,GAAcK,OAAO,CAAP,CAAd;AACD;;AAEDP;AACD;;AAED;AACA;AACAS,oBAAgBP,KAAhB;AACAO,oBAAgBP,KAAhB;;AAEA;AACAA,UAAMQ,KAAN,GAAc,EAAd;;AAEA,WAAOV,IAAIL,QAAQS,MAAnB,EAA2B;AACzB,UAAIC,QAAOV,QAAQK,CAAR,CAAX;;AAEA,UAAI,iCAAiCM,IAAjC,CAAsCD,KAAtC,CAAJ,EAAiD;AAC/C;AACD,OAFD,MAEO,IAAI,MAAMC,IAAN,CAAWD,KAAX,CAAJ,EAAsB;AAC3BH,cAAMQ,KAAN,CAAYP,IAAZ,CAAiBQ,WAAjB;AACD,OAFM,MAEA,IAAIN,SAAQX,QAAQkB,MAApB,EAA4B;AACjC;AACA,cAAM,IAAIC,KAAJ,CAAU,mBAAmBb,IAAI,CAAvB,IAA4B,GAA5B,GAAkCc,KAAKC,SAAL,CAAeV,KAAf,CAA5C,CAAN;AACD,OAHM,MAGA;AACLL;AACD;AACF;AACF;;AAED;AACA;AACA,WAASS,eAAT,CAAyBP,KAAzB,EAAgC;AAC9B,QAAMc,gBAAgB,0CAAtB;AACA,QAAMC,aAAaD,cAAcR,IAAd,CAAmBb,QAAQK,CAAR,CAAnB,CAAnB;AACA,QAAIiB,UAAJ,EAAgB;AACd,UAAIC,YAAYD,WAAW,CAAX,MAAkB,KAAlB,GAA0B,KAA1B,GAAkC,KAAlD;AACA,UAAIE,WAAWF,WAAW,CAAX,EAAcG,OAAd,CAAsB,OAAtB,EAA+B,IAA/B,CAAf;AACA,UAAI,SAASd,IAAT,CAAca,QAAd,CAAJ,EAA6B;AAC3BA,mBAAWA,SAASE,MAAT,CAAgB,CAAhB,EAAmBF,SAASf,MAAT,GAAkB,CAArC,CAAX;AACD;AACDF,YAAMgB,YAAY,UAAlB,IAAgCC,QAAhC;AACAjB,YAAMgB,YAAY,QAAlB,IAA8BD,WAAW,CAAX,CAA9B;;AAEAjB;AACD;AACF;;AAED;AACA;AACA,WAASW,SAAT,GAAqB;AACnB,QAAIW,mBAAmBtB,CAAvB;AAAA,QACIuB,kBAAkB5B,QAAQK,GAAR,CADtB;AAAA,QAEIwB,cAAcD,gBAAgB3B,KAAhB,CAAsB,4CAAtB,CAFlB;;AAIA,QAAI6B,OAAO;AACTC,gBAAU,CAACF,YAAY,CAAZ,CADF;AAETG,gBAAU,CAACH,YAAY,CAAZ,CAAD,IAAmB,CAFpB;AAGTI,gBAAU,CAACJ,YAAY,CAAZ,CAHF;AAITK,gBAAU,CAACL,YAAY,CAAZ,CAAD,IAAmB,CAJpB;AAKTM,aAAO,EALE;AAMTC,sBAAgB;AANP,KAAX;;AASA,QAAIC,WAAW,CAAf;AAAA,QACIC,cAAc,CADlB;AAEA,WAAOjC,IAAIL,QAAQS,MAAnB,EAA2BJ,GAA3B,EAAgC;AAC9B;AACA;AACA,UAAIL,QAAQK,CAAR,EAAWkC,OAAX,CAAmB,MAAnB,MAA+B,CAA/B,IACMlC,IAAI,CAAJ,GAAQL,QAAQS,MADtB,IAEKT,QAAQK,IAAI,CAAZ,EAAekC,OAAf,CAAuB,MAAvB,MAAmC,CAFxC,IAGKvC,QAAQK,IAAI,CAAZ,EAAekC,OAAf,CAAuB,IAAvB,MAAiC,CAH1C,EAG6C;AACzC;AACH;AACD,UAAIC,YAAYxC,QAAQK,CAAR,EAAW,CAAX,CAAhB;;AAEA,UAAImC,cAAc,GAAd,IAAqBA,cAAc,GAAnC,IAA0CA,cAAc,GAAxD,IAA+DA,cAAc,IAAjF,EAAuF;AACrFV,aAAKK,KAAL,CAAW3B,IAAX,CAAgBR,QAAQK,CAAR,CAAhB;AACAyB,aAAKM,cAAL,CAAoB5B,IAApB,CAAyBN,WAAWG,CAAX,KAAiB,IAA1C;;AAEA,YAAImC,cAAc,GAAlB,EAAuB;AACrBH;AACD,SAFD,MAEO,IAAIG,cAAc,GAAlB,EAAuB;AAC5BF;AACD,SAFM,MAEA,IAAIE,cAAc,GAAlB,EAAuB;AAC5BH;AACAC;AACD;AACF,OAZD,MAYO;AACL;AACD;AACF;;AAED;AACA,QAAI,CAACD,QAAD,IAAaP,KAAKI,QAAL,KAAkB,CAAnC,EAAsC;AACpCJ,WAAKI,QAAL,GAAgB,CAAhB;AACD;AACD,QAAI,CAACI,WAAD,IAAgBR,KAAKE,QAAL,KAAkB,CAAtC,EAAyC;AACvCF,WAAKE,QAAL,GAAgB,CAAhB;AACD;;AAED;AACA,QAAIjC,QAAQkB,MAAZ,EAAoB;AAClB,UAAIoB,aAAaP,KAAKI,QAAtB,EAAgC;AAC9B,cAAM,IAAIhB,KAAJ,CAAU,sDAAsDS,mBAAmB,CAAzE,CAAV,CAAN;AACD;AACD,UAAIW,gBAAgBR,KAAKE,QAAzB,EAAmC;AACjC,cAAM,IAAId,KAAJ,CAAU,wDAAwDS,mBAAmB,CAA3E,CAAV,CAAN;AACD;AACF;;AAED,WAAOG,IAAP;AACD;;AAED,SAAOzB,IAAIL,QAAQS,MAAnB,EAA2B;AACzBH;AACD;;AAED,SAAOF,IAAP;AACD","file":"parse.js","sourcesContent":["export function parsePatch(uniDiff, options = {}) {\n  let diffstr = uniDiff.split(/\\r\\n|[\\n\\v\\f\\r\\x85]/),\n      delimiters = uniDiff.match(/\\r\\n|[\\n\\v\\f\\r\\x85]/g) || [],\n      list = [],\n      i = 0;\n\n  function parseIndex() {\n    let index = {};\n    list.push(index);\n\n    // Parse diff metadata\n    while (i < diffstr.length) {\n      let line = diffstr[i];\n\n      // File header found, end parsing diff metadata\n      if (/^(\\-\\-\\-|\\+\\+\\+|@@)\\s/.test(line)) {\n        break;\n      }\n\n      // Diff index\n      let header = (/^(?:Index:|diff(?: -r \\w+)+)\\s+(.+?)\\s*$/).exec(line);\n      if (header) {\n        index.index = header[1];\n      }\n\n      i++;\n    }\n\n    // Parse file headers if they are defined. Unified diff requires them, but\n    // there's no technical issues to have an isolated hunk without file header\n    parseFileHeader(index);\n    parseFileHeader(index);\n\n    // Parse hunks\n    index.hunks = [];\n\n    while (i < diffstr.length) {\n      let line = diffstr[i];\n\n      if (/^(Index:|diff|\\-\\-\\-|\\+\\+\\+)\\s/.test(line)) {\n        break;\n      } else if (/^@@/.test(line)) {\n        index.hunks.push(parseHunk());\n      } else if (line && options.strict) {\n        // Ignore unexpected content unless in strict mode\n        throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(line));\n      } else {\n        i++;\n      }\n    }\n  }\n\n  // Parses the --- and +++ headers, if none are found, no lines\n  // are consumed.\n  function parseFileHeader(index) {\n    const headerPattern = /^(---|\\+\\+\\+)\\s+([\\S ]*)(?:\\t(.*?)\\s*)?$/;\n    const fileHeader = headerPattern.exec(diffstr[i]);\n    if (fileHeader) {\n      let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';\n      let fileName = fileHeader[2].replace(/\\\\\\\\/g, '\\\\');\n      if (/^\".*\"$/.test(fileName)) {\n        fileName = fileName.substr(1, fileName.length - 2);\n      }\n      index[keyPrefix + 'FileName'] = fileName;\n      index[keyPrefix + 'Header'] = fileHeader[3];\n\n      i++;\n    }\n  }\n\n  // Parses a hunk\n  // This assumes that we are at the start of a hunk.\n  function parseHunk() {\n    let chunkHeaderIndex = i,\n        chunkHeaderLine = diffstr[i++],\n        chunkHeader = chunkHeaderLine.split(/@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@/);\n\n    let hunk = {\n      oldStart: +chunkHeader[1],\n      oldLines: +chunkHeader[2] || 1,\n      newStart: +chunkHeader[3],\n      newLines: +chunkHeader[4] || 1,\n      lines: [],\n      linedelimiters: []\n    };\n\n    let addCount = 0,\n        removeCount = 0;\n    for (; i < diffstr.length; i++) {\n      // Lines starting with '---' could be mistaken for the \"remove line\" operation\n      // But they could be the header for the next file. Therefore prune such cases out.\n      if (diffstr[i].indexOf('--- ') === 0\n            && (i + 2 < diffstr.length)\n            && diffstr[i + 1].indexOf('+++ ') === 0\n            && diffstr[i + 2].indexOf('@@') === 0) {\n          break;\n      }\n      let operation = diffstr[i][0];\n\n      if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\\\') {\n        hunk.lines.push(diffstr[i]);\n        hunk.linedelimiters.push(delimiters[i] || '\\n');\n\n        if (operation === '+') {\n          addCount++;\n        } else if (operation === '-') {\n          removeCount++;\n        } else if (operation === ' ') {\n          addCount++;\n          removeCount++;\n        }\n      } else {\n        break;\n      }\n    }\n\n    // Handle the empty block count case\n    if (!addCount && hunk.newLines === 1) {\n      hunk.newLines = 0;\n    }\n    if (!removeCount && hunk.oldLines === 1) {\n      hunk.oldLines = 0;\n    }\n\n    // Perform optional sanity checking\n    if (options.strict) {\n      if (addCount !== hunk.newLines) {\n        throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n      if (removeCount !== hunk.oldLines) {\n        throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n    }\n\n    return hunk;\n  }\n\n  while (i < diffstr.length) {\n    parseIndex();\n  }\n\n  return list;\n}\n"]}
+	//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/patch/parse.js"],"names":[],"mappings":";;;gCAAgB,U,GAAA,U;AAAT,SAAS,UAAT,CAAoB,OAApB,EAA2C;2BAAA,I,uBAAd,OAAc,yDAAJ,EAAI;;AAChD,MAAI,UAAU,QAAQ,KAAR,CAAc,qBAAd,CAAd;AAAA,MACI,aAAa,QAAQ,KAAR,CAAc,sBAAd,KAAyC,EAD1D;AAAA,MAEI,OAAO,EAFX;AAAA,MAGI,IAAI,CAHR;;AAKA,WAAS,UAAT,GAAsB;AACpB,QAAI,QAAQ,EAAZ;AACA,SAAK,IAAL,CAAU,KAAV;;;AAGA,WAAO,IAAI,QAAQ,MAAnB,EAA2B;AACzB,UAAI,OAAO,QAAQ,CAAR,CAAX;;;AAGA,UAAI,wBAAwB,IAAxB,CAA6B,IAA7B,CAAJ,EAAwC;AACtC;AACD;;;AAGD,UAAI,SAAU,0CAAD,CAA6C,IAA7C,CAAkD,IAAlD,CAAb;AACA,UAAI,MAAJ,EAAY;AACV,cAAM,KAAN,GAAc,OAAO,CAAP,CAAd;AACD;;AAED;AACD;;;;AAID,oBAAgB,KAAhB;AACA,oBAAgB,KAAhB;;;AAGA,UAAM,KAAN,GAAc,EAAd;;AAEA,WAAO,IAAI,QAAQ,MAAnB,EAA2B;AACzB,UAAI,QAAO,QAAQ,CAAR,CAAX;;AAEA,UAAI,iCAAiC,IAAjC,CAAsC,KAAtC,CAAJ,EAAiD;AAC/C;AACD,OAFD,MAEO,IAAI,MAAM,IAAN,CAAW,KAAX,CAAJ,EAAsB;AAC3B,cAAM,KAAN,CAAY,IAAZ,CAAiB,WAAjB;AACD,OAFM,MAEA,IAAI,SAAQ,QAAQ,MAApB,EAA4B;;AAEjC,cAAM,IAAI,KAAJ,CAAU,mBAAmB,IAAI,CAAvB,IAA4B,GAA5B,GAAkC,KAAK,SAAL,CAAe,KAAf,CAA5C,CAAN;AACD,OAHM,MAGA;AACL;AACD;AACF;AACF;;;;AAID,WAAS,eAAT,CAAyB,KAAzB,EAAgC;AAC9B,QAAM,gBAAgB,0CAAtB;AACA,QAAM,aAAa,cAAc,IAAd,CAAmB,QAAQ,CAAR,CAAnB,CAAnB;AACA,QAAI,UAAJ,EAAgB;AACd,UAAI,YAAY,WAAW,CAAX,MAAkB,KAAlB,GAA0B,KAA1B,GAAkC,KAAlD;AACA,YAAM,YAAY,UAAlB,IAAgC,WAAW,CAAX,CAAhC;AACA,YAAM,YAAY,QAAlB,IAA8B,WAAW,CAAX,CAA9B;;AAEA;AACD;AACF;;;;AAID,WAAS,SAAT,GAAqB;AACnB,QAAI,mBAAmB,CAAvB;AAAA,QACI,kBAAkB,QAAQ,GAAR,CADtB;AAAA,QAEI,cAAc,gBAAgB,KAAhB,CAAsB,4CAAtB,CAFlB;;AAIA,QAAI,OAAO;AACT,gBAAU,CAAC,YAAY,CAAZ,CADF;AAET,gBAAU,CAAC,YAAY,CAAZ,CAAD,IAAmB,CAFpB;AAGT,gBAAU,CAAC,YAAY,CAAZ,CAHF;AAIT,gBAAU,CAAC,YAAY,CAAZ,CAAD,IAAmB,CAJpB;AAKT,aAAO,EALE;AAMT,sBAAgB;AANP,KAAX;;AASA,QAAI,WAAW,CAAf;AAAA,QACI,cAAc,CADlB;AAEA,WAAO,IAAI,QAAQ,MAAnB,EAA2B,GAA3B,EAAgC;;;AAG9B,UAAI,QAAQ,CAAR,EAAW,OAAX,CAAmB,MAAnB,MAA+B,CAA/B,IACM,IAAI,CAAJ,GAAQ,QAAQ,MADtB,IAEK,QAAQ,IAAI,CAAZ,EAAe,OAAf,CAAuB,MAAvB,MAAmC,CAFxC,IAGK,QAAQ,IAAI,CAAZ,EAAe,OAAf,CAAuB,IAAvB,MAAiC,CAH1C,EAG6C;AACzC;AACH;AACD,UAAI,YAAY,QAAQ,CAAR,EAAW,CAAX,CAAhB;;AAEA,UAAI,cAAc,GAAd,IAAqB,cAAc,GAAnC,IAA0C,cAAc,GAAxD,IAA+D,cAAc,IAAjF,EAAuF;AACrF,aAAK,KAAL,CAAW,IAAX,CAAgB,QAAQ,CAAR,CAAhB;AACA,aAAK,cAAL,CAAoB,IAApB,CAAyB,WAAW,CAAX,KAAiB,IAA1C;;AAEA,YAAI,cAAc,GAAlB,EAAuB;AACrB;AACD,SAFD,MAEO,IAAI,cAAc,GAAlB,EAAuB;AAC5B;AACD,SAFM,MAEA,IAAI,cAAc,GAAlB,EAAuB;AAC5B;AACA;AACD;AACF,OAZD,MAYO;AACL;AACD;AACF;;;AAGD,QAAI,CAAC,QAAD,IAAa,KAAK,QAAL,KAAkB,CAAnC,EAAsC;AACpC,WAAK,QAAL,GAAgB,CAAhB;AACD;AACD,QAAI,CAAC,WAAD,IAAgB,KAAK,QAAL,KAAkB,CAAtC,EAAyC;AACvC,WAAK,QAAL,GAAgB,CAAhB;AACD;;;AAGD,QAAI,QAAQ,MAAZ,EAAoB;AAClB,UAAI,aAAa,KAAK,QAAtB,EAAgC;AAC9B,cAAM,IAAI,KAAJ,CAAU,sDAAsD,mBAAmB,CAAzE,CAAV,CAAN;AACD;AACD,UAAI,gBAAgB,KAAK,QAAzB,EAAmC;AACjC,cAAM,IAAI,KAAJ,CAAU,wDAAwD,mBAAmB,CAA3E,CAAV,CAAN;AACD;AACF;;AAED,WAAO,IAAP;AACD;;AAED,SAAO,IAAI,QAAQ,MAAnB,EAA2B;AACzB;AACD;;AAED,SAAO,IAAP;AACD","file":"parse.js","sourcesContent":["export function parsePatch(uniDiff, options = {}) {\n  let diffstr = uniDiff.split(/\\r\\n|[\\n\\v\\f\\r\\x85]/),\n      delimiters = uniDiff.match(/\\r\\n|[\\n\\v\\f\\r\\x85]/g) || [],\n      list = [],\n      i = 0;\n\n  function parseIndex() {\n    let index = {};\n    list.push(index);\n\n    // Parse diff metadata\n    while (i < diffstr.length) {\n      let line = diffstr[i];\n\n      // File header found, end parsing diff metadata\n      if (/^(\\-\\-\\-|\\+\\+\\+|@@)\\s/.test(line)) {\n        break;\n      }\n\n      // Diff index\n      let header = (/^(?:Index:|diff(?: -r \\w+)+)\\s+(.+?)\\s*$/).exec(line);\n      if (header) {\n        index.index = header[1];\n      }\n\n      i++;\n    }\n\n    // Parse file headers if they are defined. Unified diff requires them, but\n    // there's no technical issues to have an isolated hunk without file header\n    parseFileHeader(index);\n    parseFileHeader(index);\n\n    // Parse hunks\n    index.hunks = [];\n\n    while (i < diffstr.length) {\n      let line = diffstr[i];\n\n      if (/^(Index:|diff|\\-\\-\\-|\\+\\+\\+)\\s/.test(line)) {\n        break;\n      } else if (/^@@/.test(line)) {\n        index.hunks.push(parseHunk());\n      } else if (line && options.strict) {\n        // Ignore unexpected content unless in strict mode\n        throw new Error('Unknown line ' + (i + 1) + ' ' + JSON.stringify(line));\n      } else {\n        i++;\n      }\n    }\n  }\n\n  // Parses the --- and +++ headers, if none are found, no lines\n  // are consumed.\n  function parseFileHeader(index) {\n    const headerPattern = /^(---|\\+\\+\\+)\\s+([\\S ]*)(?:\\t(.*?)\\s*)?$/;\n    const fileHeader = headerPattern.exec(diffstr[i]);\n    if (fileHeader) {\n      let keyPrefix = fileHeader[1] === '---' ? 'old' : 'new';\n      index[keyPrefix + 'FileName'] = fileHeader[2];\n      index[keyPrefix + 'Header'] = fileHeader[3];\n\n      i++;\n    }\n  }\n\n  // Parses a hunk\n  // This assumes that we are at the start of a hunk.\n  function parseHunk() {\n    let chunkHeaderIndex = i,\n        chunkHeaderLine = diffstr[i++],\n        chunkHeader = chunkHeaderLine.split(/@@ -(\\d+)(?:,(\\d+))? \\+(\\d+)(?:,(\\d+))? @@/);\n\n    let hunk = {\n      oldStart: +chunkHeader[1],\n      oldLines: +chunkHeader[2] || 1,\n      newStart: +chunkHeader[3],\n      newLines: +chunkHeader[4] || 1,\n      lines: [],\n      linedelimiters: []\n    };\n\n    let addCount = 0,\n        removeCount = 0;\n    for (; i < diffstr.length; i++) {\n      // Lines starting with '---' could be mistaken for the \"remove line\" operation\n      // But they could be the header for the next file. Therefore prune such cases out.\n      if (diffstr[i].indexOf('--- ') === 0\n            && (i + 2 < diffstr.length)\n            && diffstr[i + 1].indexOf('+++ ') === 0\n            && diffstr[i + 2].indexOf('@@') === 0) {\n          break;\n      }\n      let operation = diffstr[i][0];\n\n      if (operation === '+' || operation === '-' || operation === ' ' || operation === '\\\\') {\n        hunk.lines.push(diffstr[i]);\n        hunk.linedelimiters.push(delimiters[i] || '\\n');\n\n        if (operation === '+') {\n          addCount++;\n        } else if (operation === '-') {\n          removeCount++;\n        } else if (operation === ' ') {\n          addCount++;\n          removeCount++;\n        }\n      } else {\n        break;\n      }\n    }\n\n    // Handle the empty block count case\n    if (!addCount && hunk.newLines === 1) {\n      hunk.newLines = 0;\n    }\n    if (!removeCount && hunk.oldLines === 1) {\n      hunk.oldLines = 0;\n    }\n\n    // Perform optional sanity checking\n    if (options.strict) {\n      if (addCount !== hunk.newLines) {\n        throw new Error('Added line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n      if (removeCount !== hunk.oldLines) {\n        throw new Error('Removed line count did not match for hunk at line ' + (chunkHeaderIndex + 1));\n      }\n    }\n\n    return hunk;\n  }\n\n  while (i < diffstr.length) {\n    parseIndex();\n  }\n\n  return list;\n}\n"]}
 
 
-/***/ }),
+/***/ },
 /* 12 */
-/***/ (function(module, exports) {
+/***/ function(module, exports) {
 
 	/*istanbul ignore start*/"use strict";
 
@@ -4517,418 +4513,16 @@ return /******/ (function(modules) { // webpackBootstrap
 	      return iterator();
 	    }
 
-	    // We tried to fit hunk before text beginning and beyond text length, then
+	    // We tried to fit hunk before text beginning and beyond text lenght, then
 	    // hunk can't fit on the text. Return undefined
 	  };
 	};
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2Rpc3RhbmNlLWl0ZXJhdG9yLmpzIl0sIm5hbWVzIjpbInN0YXJ0IiwibWluTGluZSIsIm1heExpbmUiLCJ3YW50Rm9yd2FyZCIsImJhY2t3YXJkRXhoYXVzdGVkIiwiZm9yd2FyZEV4aGF1c3RlZCIsImxvY2FsT2Zmc2V0IiwiaXRlcmF0b3IiXSwibWFwcGluZ3MiOiI7Ozs7NENBR2UsVUFBU0EsS0FBVCxFQUFnQkMsT0FBaEIsRUFBeUJDLE9BQXpCLEVBQWtDO0FBQy9DLE1BQUlDLGNBQWMsSUFBbEI7QUFBQSxNQUNJQyxvQkFBb0IsS0FEeEI7QUFBQSxNQUVJQyxtQkFBbUIsS0FGdkI7QUFBQSxNQUdJQyxjQUFjLENBSGxCOztBQUtBLFNBQU8sU0FBU0MsUUFBVCxHQUFvQjtBQUN6QixRQUFJSixlQUFlLENBQUNFLGdCQUFwQixFQUFzQztBQUNwQyxVQUFJRCxpQkFBSixFQUF1QjtBQUNyQkU7QUFDRCxPQUZELE1BRU87QUFDTEgsc0JBQWMsS0FBZDtBQUNEOztBQUVEO0FBQ0E7QUFDQSxVQUFJSCxRQUFRTSxXQUFSLElBQXVCSixPQUEzQixFQUFvQztBQUNsQyxlQUFPSSxXQUFQO0FBQ0Q7O0FBRURELHlCQUFtQixJQUFuQjtBQUNEOztBQUVELFFBQUksQ0FBQ0QsaUJBQUwsRUFBd0I7QUFDdEIsVUFBSSxDQUFDQyxnQkFBTCxFQUF1QjtBQUNyQkYsc0JBQWMsSUFBZDtBQUNEOztBQUVEO0FBQ0E7QUFDQSxVQUFJRixXQUFXRCxRQUFRTSxXQUF2QixFQUFvQztBQUNsQyxlQUFPLENBQUNBLGFBQVI7QUFDRDs7QUFFREYsMEJBQW9CLElBQXBCO0FBQ0EsYUFBT0csVUFBUDtBQUNEOztBQUVEO0FBQ0E7QUFDRCxHQWxDRDtBQW1DRCxDIiwiZmlsZSI6ImRpc3RhbmNlLWl0ZXJhdG9yLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8gSXRlcmF0b3IgdGhhdCB0cmF2ZXJzZXMgaW4gdGhlIHJhbmdlIG9mIFttaW4sIG1heF0sIHN0ZXBwaW5nXG4vLyBieSBkaXN0YW5jZSBmcm9tIGEgZ2l2ZW4gc3RhcnQgcG9zaXRpb24uIEkuZS4gZm9yIFswLCA0XSwgd2l0aFxuLy8gc3RhcnQgb2YgMiwgdGhpcyB3aWxsIGl0ZXJhdGUgMiwgMywgMSwgNCwgMC5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKHN0YXJ0LCBtaW5MaW5lLCBtYXhMaW5lKSB7XG4gIGxldCB3YW50Rm9yd2FyZCA9IHRydWUsXG4gICAgICBiYWNrd2FyZEV4aGF1c3RlZCA9IGZhbHNlLFxuICAgICAgZm9yd2FyZEV4aGF1c3RlZCA9IGZhbHNlLFxuICAgICAgbG9jYWxPZmZzZXQgPSAxO1xuXG4gIHJldHVybiBmdW5jdGlvbiBpdGVyYXRvcigpIHtcbiAgICBpZiAod2FudEZvcndhcmQgJiYgIWZvcndhcmRFeGhhdXN0ZWQpIHtcbiAgICAgIGlmIChiYWNrd2FyZEV4aGF1c3RlZCkge1xuICAgICAgICBsb2NhbE9mZnNldCsrO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgd2FudEZvcndhcmQgPSBmYWxzZTtcbiAgICAgIH1cblxuICAgICAgLy8gQ2hlY2sgaWYgdHJ5aW5nIHRvIGZpdCBiZXlvbmQgdGV4dCBsZW5ndGgsIGFuZCBpZiBub3QsIGNoZWNrIGl0IGZpdHNcbiAgICAgIC8vIGFmdGVyIG9mZnNldCBsb2NhdGlvbiAob3IgZGVzaXJlZCBsb2NhdGlvbiBvbiBmaXJzdCBpdGVyYXRpb24pXG4gICAgICBpZiAoc3RhcnQgKyBsb2NhbE9mZnNldCA8PSBtYXhMaW5lKSB7XG4gICAgICAgIHJldHVybiBsb2NhbE9mZnNldDtcbiAgICAgIH1cblxuICAgICAgZm9yd2FyZEV4aGF1c3RlZCA9IHRydWU7XG4gICAgfVxuXG4gICAgaWYgKCFiYWNrd2FyZEV4aGF1c3RlZCkge1xuICAgICAgaWYgKCFmb3J3YXJkRXhoYXVzdGVkKSB7XG4gICAgICAgIHdhbnRGb3J3YXJkID0gdHJ1ZTtcbiAgICAgIH1cblxuICAgICAgLy8gQ2hlY2sgaWYgdHJ5aW5nIHRvIGZpdCBiZWZvcmUgdGV4dCBiZWdpbm5pbmcsIGFuZCBpZiBub3QsIGNoZWNrIGl0IGZpdHNcbiAgICAgIC8vIGJlZm9yZSBvZmZzZXQgbG9jYXRpb25cbiAgICAgIGlmIChtaW5MaW5lIDw9IHN0YXJ0IC0gbG9jYWxPZmZzZXQpIHtcbiAgICAgICAgcmV0dXJuIC1sb2NhbE9mZnNldCsrO1xuICAgICAgfVxuXG4gICAgICBiYWNrd2FyZEV4aGF1c3RlZCA9IHRydWU7XG4gICAgICByZXR1cm4gaXRlcmF0b3IoKTtcbiAgICB9XG5cbiAgICAvLyBXZSB0cmllZCB0byBmaXQgaHVuayBiZWZvcmUgdGV4dCBiZWdpbm5pbmcgYW5kIGJleW9uZCB0ZXh0IGxlbmd0aCwgdGhlblxuICAgIC8vIGh1bmsgY2FuJ3QgZml0IG9uIHRoZSB0ZXh0LiBSZXR1cm4gdW5kZWZpbmVkXG4gIH07XG59XG4iXX0=
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2Rpc3RhbmNlLWl0ZXJhdG9yLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7NENBR2UsVUFBUyxLQUFULEVBQWdCLE9BQWhCLEVBQXlCLE9BQXpCLEVBQWtDO0FBQy9DLE1BQUksY0FBYyxJQUFsQjtBQUFBLE1BQ0ksb0JBQW9CLEtBRHhCO0FBQUEsTUFFSSxtQkFBbUIsS0FGdkI7QUFBQSxNQUdJLGNBQWMsQ0FIbEI7O0FBS0EsU0FBTyxTQUFTLFFBQVQsR0FBb0I7QUFDekIsUUFBSSxlQUFlLENBQUMsZ0JBQXBCLEVBQXNDO0FBQ3BDLFVBQUksaUJBQUosRUFBdUI7QUFDckI7QUFDRCxPQUZELE1BRU87QUFDTCxzQkFBYyxLQUFkO0FBQ0Q7Ozs7QUFJRCxVQUFJLFFBQVEsV0FBUixJQUF1QixPQUEzQixFQUFvQztBQUNsQyxlQUFPLFdBQVA7QUFDRDs7QUFFRCx5QkFBbUIsSUFBbkI7QUFDRDs7QUFFRCxRQUFJLENBQUMsaUJBQUwsRUFBd0I7QUFDdEIsVUFBSSxDQUFDLGdCQUFMLEVBQXVCO0FBQ3JCLHNCQUFjLElBQWQ7QUFDRDs7OztBQUlELFVBQUksV0FBVyxRQUFRLFdBQXZCLEVBQW9DO0FBQ2xDLGVBQU8sQ0FBQyxhQUFSO0FBQ0Q7O0FBRUQsMEJBQW9CLElBQXBCO0FBQ0EsYUFBTyxVQUFQO0FBQ0Q7Ozs7QUFJRixHQWxDRDtBQW1DRCxDIiwiZmlsZSI6ImRpc3RhbmNlLWl0ZXJhdG9yLmpzIiwic291cmNlc0NvbnRlbnQiOlsiLy8gSXRlcmF0b3IgdGhhdCB0cmF2ZXJzZXMgaW4gdGhlIHJhbmdlIG9mIFttaW4sIG1heF0sIHN0ZXBwaW5nXG4vLyBieSBkaXN0YW5jZSBmcm9tIGEgZ2l2ZW4gc3RhcnQgcG9zaXRpb24uIEkuZS4gZm9yIFswLCA0XSwgd2l0aFxuLy8gc3RhcnQgb2YgMiwgdGhpcyB3aWxsIGl0ZXJhdGUgMiwgMywgMSwgNCwgMC5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uKHN0YXJ0LCBtaW5MaW5lLCBtYXhMaW5lKSB7XG4gIGxldCB3YW50Rm9yd2FyZCA9IHRydWUsXG4gICAgICBiYWNrd2FyZEV4aGF1c3RlZCA9IGZhbHNlLFxuICAgICAgZm9yd2FyZEV4aGF1c3RlZCA9IGZhbHNlLFxuICAgICAgbG9jYWxPZmZzZXQgPSAxO1xuXG4gIHJldHVybiBmdW5jdGlvbiBpdGVyYXRvcigpIHtcbiAgICBpZiAod2FudEZvcndhcmQgJiYgIWZvcndhcmRFeGhhdXN0ZWQpIHtcbiAgICAgIGlmIChiYWNrd2FyZEV4aGF1c3RlZCkge1xuICAgICAgICBsb2NhbE9mZnNldCsrO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgd2FudEZvcndhcmQgPSBmYWxzZTtcbiAgICAgIH1cblxuICAgICAgLy8gQ2hlY2sgaWYgdHJ5aW5nIHRvIGZpdCBiZXlvbmQgdGV4dCBsZW5ndGgsIGFuZCBpZiBub3QsIGNoZWNrIGl0IGZpdHNcbiAgICAgIC8vIGFmdGVyIG9mZnNldCBsb2NhdGlvbiAob3IgZGVzaXJlZCBsb2NhdGlvbiBvbiBmaXJzdCBpdGVyYXRpb24pXG4gICAgICBpZiAoc3RhcnQgKyBsb2NhbE9mZnNldCA8PSBtYXhMaW5lKSB7XG4gICAgICAgIHJldHVybiBsb2NhbE9mZnNldDtcbiAgICAgIH1cblxuICAgICAgZm9yd2FyZEV4aGF1c3RlZCA9IHRydWU7XG4gICAgfVxuXG4gICAgaWYgKCFiYWNrd2FyZEV4aGF1c3RlZCkge1xuICAgICAgaWYgKCFmb3J3YXJkRXhoYXVzdGVkKSB7XG4gICAgICAgIHdhbnRGb3J3YXJkID0gdHJ1ZTtcbiAgICAgIH1cblxuICAgICAgLy8gQ2hlY2sgaWYgdHJ5aW5nIHRvIGZpdCBiZWZvcmUgdGV4dCBiZWdpbm5pbmcsIGFuZCBpZiBub3QsIGNoZWNrIGl0IGZpdHNcbiAgICAgIC8vIGJlZm9yZSBvZmZzZXQgbG9jYXRpb25cbiAgICAgIGlmIChtaW5MaW5lIDw9IHN0YXJ0IC0gbG9jYWxPZmZzZXQpIHtcbiAgICAgICAgcmV0dXJuIC1sb2NhbE9mZnNldCsrO1xuICAgICAgfVxuXG4gICAgICBiYWNrd2FyZEV4aGF1c3RlZCA9IHRydWU7XG4gICAgICByZXR1cm4gaXRlcmF0b3IoKTtcbiAgICB9XG5cbiAgICAvLyBXZSB0cmllZCB0byBmaXQgaHVuayBiZWZvcmUgdGV4dCBiZWdpbm5pbmcgYW5kIGJleW9uZCB0ZXh0IGxlbmdodCwgdGhlblxuICAgIC8vIGh1bmsgY2FuJ3QgZml0IG9uIHRoZSB0ZXh0LiBSZXR1cm4gdW5kZWZpbmVkXG4gIH07XG59XG4iXX0=
 
 
-/***/ }),
+/***/ },
 /* 13 */
-/***/ (function(module, exports, __webpack_require__) {
-
-	/*istanbul ignore start*/'use strict';
-
-	exports.__esModule = true;
-	exports. /*istanbul ignore end*/calcLineCount = calcLineCount;
-	/*istanbul ignore start*/exports. /*istanbul ignore end*/merge = merge;
-
-	var /*istanbul ignore start*/_create = __webpack_require__(14) /*istanbul ignore end*/;
-
-	var /*istanbul ignore start*/_parse = __webpack_require__(11) /*istanbul ignore end*/;
-
-	var /*istanbul ignore start*/_array = __webpack_require__(15) /*istanbul ignore end*/;
-
-	/*istanbul ignore start*/function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
-
-	/*istanbul ignore end*/function calcLineCount(hunk) {
-	  /*istanbul ignore start*/var _calcOldNewLineCount = /*istanbul ignore end*/calcOldNewLineCount(hunk.lines),
-	      oldLines = _calcOldNewLineCount.oldLines,
-	      newLines = _calcOldNewLineCount.newLines;
-
-	  if (oldLines !== undefined) {
-	    hunk.oldLines = oldLines;
-	  } else {
-	    delete hunk.oldLines;
-	  }
-
-	  if (newLines !== undefined) {
-	    hunk.newLines = newLines;
-	  } else {
-	    delete hunk.newLines;
-	  }
-	}
-
-	function merge(mine, theirs, base) {
-	  mine = loadPatch(mine, base);
-	  theirs = loadPatch(theirs, base);
-
-	  var ret = {};
-
-	  // For index we just let it pass through as it doesn't have any necessary meaning.
-	  // Leaving sanity checks on this to the API consumer that may know more about the
-	  // meaning in their own context.
-	  if (mine.index || theirs.index) {
-	    ret.index = mine.index || theirs.index;
-	  }
-
-	  if (mine.newFileName || theirs.newFileName) {
-	    if (!fileNameChanged(mine)) {
-	      // No header or no change in ours, use theirs (and ours if theirs does not exist)
-	      ret.oldFileName = theirs.oldFileName || mine.oldFileName;
-	      ret.newFileName = theirs.newFileName || mine.newFileName;
-	      ret.oldHeader = theirs.oldHeader || mine.oldHeader;
-	      ret.newHeader = theirs.newHeader || mine.newHeader;
-	    } else if (!fileNameChanged(theirs)) {
-	      // No header or no change in theirs, use ours
-	      ret.oldFileName = mine.oldFileName;
-	      ret.newFileName = mine.newFileName;
-	      ret.oldHeader = mine.oldHeader;
-	      ret.newHeader = mine.newHeader;
-	    } else {
-	      // Both changed... figure it out
-	      ret.oldFileName = selectField(ret, mine.oldFileName, theirs.oldFileName);
-	      ret.newFileName = selectField(ret, mine.newFileName, theirs.newFileName);
-	      ret.oldHeader = selectField(ret, mine.oldHeader, theirs.oldHeader);
-	      ret.newHeader = selectField(ret, mine.newHeader, theirs.newHeader);
-	    }
-	  }
-
-	  ret.hunks = [];
-
-	  var mineIndex = 0,
-	      theirsIndex = 0,
-	      mineOffset = 0,
-	      theirsOffset = 0;
-
-	  while (mineIndex < mine.hunks.length || theirsIndex < theirs.hunks.length) {
-	    var mineCurrent = mine.hunks[mineIndex] || { oldStart: Infinity },
-	        theirsCurrent = theirs.hunks[theirsIndex] || { oldStart: Infinity };
-
-	    if (hunkBefore(mineCurrent, theirsCurrent)) {
-	      // This patch does not overlap with any of the others, yay.
-	      ret.hunks.push(cloneHunk(mineCurrent, mineOffset));
-	      mineIndex++;
-	      theirsOffset += mineCurrent.newLines - mineCurrent.oldLines;
-	    } else if (hunkBefore(theirsCurrent, mineCurrent)) {
-	      // This patch does not overlap with any of the others, yay.
-	      ret.hunks.push(cloneHunk(theirsCurrent, theirsOffset));
-	      theirsIndex++;
-	      mineOffset += theirsCurrent.newLines - theirsCurrent.oldLines;
-	    } else {
-	      // Overlap, merge as best we can
-	      var mergedHunk = {
-	        oldStart: Math.min(mineCurrent.oldStart, theirsCurrent.oldStart),
-	        oldLines: 0,
-	        newStart: Math.min(mineCurrent.newStart + mineOffset, theirsCurrent.oldStart + theirsOffset),
-	        newLines: 0,
-	        lines: []
-	      };
-	      mergeLines(mergedHunk, mineCurrent.oldStart, mineCurrent.lines, theirsCurrent.oldStart, theirsCurrent.lines);
-	      theirsIndex++;
-	      mineIndex++;
-
-	      ret.hunks.push(mergedHunk);
-	    }
-	  }
-
-	  return ret;
-	}
-
-	function loadPatch(param, base) {
-	  if (typeof param === 'string') {
-	    if (/^@@/m.test(param) || /^Index:/m.test(param)) {
-	      return (/*istanbul ignore start*/(0, _parse.parsePatch) /*istanbul ignore end*/(param)[0]
-	      );
-	    }
-
-	    if (!base) {
-	      throw new Error('Must provide a base reference or pass in a patch');
-	    }
-	    return (/*istanbul ignore start*/(0, _create.structuredPatch) /*istanbul ignore end*/(undefined, undefined, base, param)
-	    );
-	  }
-
-	  return param;
-	}
-
-	function fileNameChanged(patch) {
-	  return patch.newFileName && patch.newFileName !== patch.oldFileName;
-	}
-
-	function selectField(index, mine, theirs) {
-	  if (mine === theirs) {
-	    return mine;
-	  } else {
-	    index.conflict = true;
-	    return { mine: mine, theirs: theirs };
-	  }
-	}
-
-	function hunkBefore(test, check) {
-	  return test.oldStart < check.oldStart && test.oldStart + test.oldLines < check.oldStart;
-	}
-
-	function cloneHunk(hunk, offset) {
-	  return {
-	    oldStart: hunk.oldStart, oldLines: hunk.oldLines,
-	    newStart: hunk.newStart + offset, newLines: hunk.newLines,
-	    lines: hunk.lines
-	  };
-	}
-
-	function mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) {
-	  // This will generally result in a conflicted hunk, but there are cases where the context
-	  // is the only overlap where we can successfully merge the content here.
-	  var mine = { offset: mineOffset, lines: mineLines, index: 0 },
-	      their = { offset: theirOffset, lines: theirLines, index: 0 };
-
-	  // Handle any leading content
-	  insertLeading(hunk, mine, their);
-	  insertLeading(hunk, their, mine);
-
-	  // Now in the overlap content. Scan through and select the best changes from each.
-	  while (mine.index < mine.lines.length && their.index < their.lines.length) {
-	    var mineCurrent = mine.lines[mine.index],
-	        theirCurrent = their.lines[their.index];
-
-	    if ((mineCurrent[0] === '-' || mineCurrent[0] === '+') && (theirCurrent[0] === '-' || theirCurrent[0] === '+')) {
-	      // Both modified ...
-	      mutualChange(hunk, mine, their);
-	    } else if (mineCurrent[0] === '+' && theirCurrent[0] === ' ') {
-	      /*istanbul ignore start*/var _hunk$lines;
-
-	      /*istanbul ignore end*/ // Mine inserted
-	      /*istanbul ignore start*/(_hunk$lines = /*istanbul ignore end*/hunk.lines).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_hunk$lines /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/collectChange(mine)));
-	    } else if (theirCurrent[0] === '+' && mineCurrent[0] === ' ') {
-	      /*istanbul ignore start*/var _hunk$lines2;
-
-	      /*istanbul ignore end*/ // Theirs inserted
-	      /*istanbul ignore start*/(_hunk$lines2 = /*istanbul ignore end*/hunk.lines).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_hunk$lines2 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/collectChange(their)));
-	    } else if (mineCurrent[0] === '-' && theirCurrent[0] === ' ') {
-	      // Mine removed or edited
-	      removal(hunk, mine, their);
-	    } else if (theirCurrent[0] === '-' && mineCurrent[0] === ' ') {
-	      // Their removed or edited
-	      removal(hunk, their, mine, true);
-	    } else if (mineCurrent === theirCurrent) {
-	      // Context identity
-	      hunk.lines.push(mineCurrent);
-	      mine.index++;
-	      their.index++;
-	    } else {
-	      // Context mismatch
-	      conflict(hunk, collectChange(mine), collectChange(their));
-	    }
-	  }
-
-	  // Now push anything that may be remaining
-	  insertTrailing(hunk, mine);
-	  insertTrailing(hunk, their);
-
-	  calcLineCount(hunk);
-	}
-
-	function mutualChange(hunk, mine, their) {
-	  var myChanges = collectChange(mine),
-	      theirChanges = collectChange(their);
-
-	  if (allRemoves(myChanges) && allRemoves(theirChanges)) {
-	    // Special case for remove changes that are supersets of one another
-	    if ( /*istanbul ignore start*/(0, _array.arrayStartsWith) /*istanbul ignore end*/(myChanges, theirChanges) && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {
-	      /*istanbul ignore start*/var _hunk$lines3;
-
-	      /*istanbul ignore end*/ /*istanbul ignore start*/(_hunk$lines3 = /*istanbul ignore end*/hunk.lines).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_hunk$lines3 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/myChanges));
-	      return;
-	    } else if ( /*istanbul ignore start*/(0, _array.arrayStartsWith) /*istanbul ignore end*/(theirChanges, myChanges) && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {
-	      /*istanbul ignore start*/var _hunk$lines4;
-
-	      /*istanbul ignore end*/ /*istanbul ignore start*/(_hunk$lines4 = /*istanbul ignore end*/hunk.lines).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_hunk$lines4 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/theirChanges));
-	      return;
-	    }
-	  } else if ( /*istanbul ignore start*/(0, _array.arrayEqual) /*istanbul ignore end*/(myChanges, theirChanges)) {
-	    /*istanbul ignore start*/var _hunk$lines5;
-
-	    /*istanbul ignore end*/ /*istanbul ignore start*/(_hunk$lines5 = /*istanbul ignore end*/hunk.lines).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_hunk$lines5 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/myChanges));
-	    return;
-	  }
-
-	  conflict(hunk, myChanges, theirChanges);
-	}
-
-	function removal(hunk, mine, their, swap) {
-	  var myChanges = collectChange(mine),
-	      theirChanges = collectContext(their, myChanges);
-	  if (theirChanges.merged) {
-	    /*istanbul ignore start*/var _hunk$lines6;
-
-	    /*istanbul ignore end*/ /*istanbul ignore start*/(_hunk$lines6 = /*istanbul ignore end*/hunk.lines).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_hunk$lines6 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/theirChanges.merged));
-	  } else {
-	    conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges);
-	  }
-	}
-
-	function conflict(hunk, mine, their) {
-	  hunk.conflict = true;
-	  hunk.lines.push({
-	    conflict: true,
-	    mine: mine,
-	    theirs: their
-	  });
-	}
-
-	function insertLeading(hunk, insert, their) {
-	  while (insert.offset < their.offset && insert.index < insert.lines.length) {
-	    var line = insert.lines[insert.index++];
-	    hunk.lines.push(line);
-	    insert.offset++;
-	  }
-	}
-	function insertTrailing(hunk, insert) {
-	  while (insert.index < insert.lines.length) {
-	    var line = insert.lines[insert.index++];
-	    hunk.lines.push(line);
-	  }
-	}
-
-	function collectChange(state) {
-	  var ret = [],
-	      operation = state.lines[state.index][0];
-	  while (state.index < state.lines.length) {
-	    var line = state.lines[state.index];
-
-	    // Group additions that are immediately after subtractions and treat them as one "atomic" modify change.
-	    if (operation === '-' && line[0] === '+') {
-	      operation = '+';
-	    }
-
-	    if (operation === line[0]) {
-	      ret.push(line);
-	      state.index++;
-	    } else {
-	      break;
-	    }
-	  }
-
-	  return ret;
-	}
-	function collectContext(state, matchChanges) {
-	  var changes = [],
-	      merged = [],
-	      matchIndex = 0,
-	      contextChanges = false,
-	      conflicted = false;
-	  while (matchIndex < matchChanges.length && state.index < state.lines.length) {
-	    var change = state.lines[state.index],
-	        match = matchChanges[matchIndex];
-
-	    // Once we've hit our add, then we are done
-	    if (match[0] === '+') {
-	      break;
-	    }
-
-	    contextChanges = contextChanges || change[0] !== ' ';
-
-	    merged.push(match);
-	    matchIndex++;
-
-	    // Consume any additions in the other block as a conflict to attempt
-	    // to pull in the remaining context after this
-	    if (change[0] === '+') {
-	      conflicted = true;
-
-	      while (change[0] === '+') {
-	        changes.push(change);
-	        change = state.lines[++state.index];
-	      }
-	    }
-
-	    if (match.substr(1) === change.substr(1)) {
-	      changes.push(change);
-	      state.index++;
-	    } else {
-	      conflicted = true;
-	    }
-	  }
-
-	  if ((matchChanges[matchIndex] || '')[0] === '+' && contextChanges) {
-	    conflicted = true;
-	  }
-
-	  if (conflicted) {
-	    return changes;
-	  }
-
-	  while (matchIndex < matchChanges.length) {
-	    merged.push(matchChanges[matchIndex++]);
-	  }
-
-	  return {
-	    merged: merged,
-	    changes: changes
-	  };
-	}
-
-	function allRemoves(changes) {
-	  return changes.reduce(function (prev, change) {
-	    return prev && change[0] === '-';
-	  }, true);
-	}
-	function skipRemoveSuperset(state, removeChanges, delta) {
-	  for (var i = 0; i < delta; i++) {
-	    var changeContent = removeChanges[removeChanges.length - delta + i].substr(1);
-	    if (state.lines[state.index + i] !== ' ' + changeContent) {
-	      return false;
-	    }
-	  }
-
-	  state.index += delta;
-	  return true;
-	}
-
-	function calcOldNewLineCount(lines) {
-	  var oldLines = 0;
-	  var newLines = 0;
-
-	  lines.forEach(function (line) {
-	    if (typeof line !== 'string') {
-	      var myCount = calcOldNewLineCount(line.mine);
-	      var theirCount = calcOldNewLineCount(line.theirs);
-
-	      if (oldLines !== undefined) {
-	        if (myCount.oldLines === theirCount.oldLines) {
-	          oldLines += myCount.oldLines;
-	        } else {
-	          oldLines = undefined;
-	        }
-	      }
-
-	      if (newLines !== undefined) {
-	        if (myCount.newLines === theirCount.newLines) {
-	          newLines += myCount.newLines;
-	        } else {
-	          newLines = undefined;
-	        }
-	      }
-	    } else {
-	      if (newLines !== undefined && (line[0] === '+' || line[0] === ' ')) {
-	        newLines++;
-	      }
-	      if (oldLines !== undefined && (line[0] === '-' || line[0] === ' ')) {
-	        oldLines++;
-	      }
-	    }
-	  });
-
-	  return { oldLines: oldLines, newLines: newLines };
-	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/patch/merge.js"],"names":["calcLineCount","merge","hunk","calcOldNewLineCount","lines","oldLines","newLines","undefined","mine","theirs","base","loadPatch","ret","index","newFileName","fileNameChanged","oldFileName","oldHeader","newHeader","selectField","hunks","mineIndex","theirsIndex","mineOffset","theirsOffset","length","mineCurrent","oldStart","Infinity","theirsCurrent","hunkBefore","push","cloneHunk","mergedHunk","Math","min","newStart","mergeLines","param","test","Error","patch","conflict","check","offset","mineLines","theirOffset","theirLines","their","insertLeading","theirCurrent","mutualChange","collectChange","removal","insertTrailing","myChanges","theirChanges","allRemoves","skipRemoveSuperset","swap","collectContext","merged","insert","line","state","operation","matchChanges","changes","matchIndex","contextChanges","conflicted","change","match","substr","reduce","prev","removeChanges","delta","i","changeContent","forEach","myCount","theirCount"],"mappings":";;;gCAKgBA,a,GAAAA,a;yDAgBAC,K,GAAAA,K;;AArBhB;;AACA;;AAEA;;;;uBAEO,SAASD,aAAT,CAAuBE,IAAvB,EAA6B;AAAA,6EACLC,oBAAoBD,KAAKE,KAAzB,CADK;AAAA,MAC3BC,QAD2B,wBAC3BA,QAD2B;AAAA,MACjBC,QADiB,wBACjBA,QADiB;;AAGlC,MAAID,aAAaE,SAAjB,EAA4B;AAC1BL,SAAKG,QAAL,GAAgBA,QAAhB;AACD,GAFD,MAEO;AACL,WAAOH,KAAKG,QAAZ;AACD;;AAED,MAAIC,aAAaC,SAAjB,EAA4B;AAC1BL,SAAKI,QAAL,GAAgBA,QAAhB;AACD,GAFD,MAEO;AACL,WAAOJ,KAAKI,QAAZ;AACD;AACF;;AAEM,SAASL,KAAT,CAAeO,IAAf,EAAqBC,MAArB,EAA6BC,IAA7B,EAAmC;AACxCF,SAAOG,UAAUH,IAAV,EAAgBE,IAAhB,CAAP;AACAD,WAASE,UAAUF,MAAV,EAAkBC,IAAlB,CAAT;;AAEA,MAAIE,MAAM,EAAV;;AAEA;AACA;AACA;AACA,MAAIJ,KAAKK,KAAL,IAAcJ,OAAOI,KAAzB,EAAgC;AAC9BD,QAAIC,KAAJ,GAAYL,KAAKK,KAAL,IAAcJ,OAAOI,KAAjC;AACD;;AAED,MAAIL,KAAKM,WAAL,IAAoBL,OAAOK,WAA/B,EAA4C;AAC1C,QAAI,CAACC,gBAAgBP,IAAhB,CAAL,EAA4B;AAC1B;AACAI,UAAII,WAAJ,GAAkBP,OAAOO,WAAP,IAAsBR,KAAKQ,WAA7C;AACAJ,UAAIE,WAAJ,GAAkBL,OAAOK,WAAP,IAAsBN,KAAKM,WAA7C;AACAF,UAAIK,SAAJ,GAAgBR,OAAOQ,SAAP,IAAoBT,KAAKS,SAAzC;AACAL,UAAIM,SAAJ,GAAgBT,OAAOS,SAAP,IAAoBV,KAAKU,SAAzC;AACD,KAND,MAMO,IAAI,CAACH,gBAAgBN,MAAhB,CAAL,EAA8B;AACnC;AACAG,UAAII,WAAJ,GAAkBR,KAAKQ,WAAvB;AACAJ,UAAIE,WAAJ,GAAkBN,KAAKM,WAAvB;AACAF,UAAIK,SAAJ,GAAgBT,KAAKS,SAArB;AACAL,UAAIM,SAAJ,GAAgBV,KAAKU,SAArB;AACD,KANM,MAMA;AACL;AACAN,UAAII,WAAJ,GAAkBG,YAAYP,GAAZ,EAAiBJ,KAAKQ,WAAtB,EAAmCP,OAAOO,WAA1C,CAAlB;AACAJ,UAAIE,WAAJ,GAAkBK,YAAYP,GAAZ,EAAiBJ,KAAKM,WAAtB,EAAmCL,OAAOK,WAA1C,CAAlB;AACAF,UAAIK,SAAJ,GAAgBE,YAAYP,GAAZ,EAAiBJ,KAAKS,SAAtB,EAAiCR,OAAOQ,SAAxC,CAAhB;AACAL,UAAIM,SAAJ,GAAgBC,YAAYP,GAAZ,EAAiBJ,KAAKU,SAAtB,EAAiCT,OAAOS,SAAxC,CAAhB;AACD;AACF;;AAEDN,MAAIQ,KAAJ,GAAY,EAAZ;;AAEA,MAAIC,YAAY,CAAhB;AAAA,MACIC,cAAc,CADlB;AAAA,MAEIC,aAAa,CAFjB;AAAA,MAGIC,eAAe,CAHnB;;AAKA,SAAOH,YAAYb,KAAKY,KAAL,CAAWK,MAAvB,IAAiCH,cAAcb,OAAOW,KAAP,CAAaK,MAAnE,EAA2E;AACzE,QAAIC,cAAclB,KAAKY,KAAL,CAAWC,SAAX,KAAyB,EAACM,UAAUC,QAAX,EAA3C;AAAA,QACIC,gBAAgBpB,OAAOW,KAAP,CAAaE,WAAb,KAA6B,EAACK,UAAUC,QAAX,EADjD;;AAGA,QAAIE,WAAWJ,WAAX,EAAwBG,aAAxB,CAAJ,EAA4C;AAC1C;AACAjB,UAAIQ,KAAJ,CAAUW,IAAV,CAAeC,UAAUN,WAAV,EAAuBH,UAAvB,CAAf;AACAF;AACAG,sBAAgBE,YAAYpB,QAAZ,GAAuBoB,YAAYrB,QAAnD;AACD,KALD,MAKO,IAAIyB,WAAWD,aAAX,EAA0BH,WAA1B,CAAJ,EAA4C;AACjD;AACAd,UAAIQ,KAAJ,CAAUW,IAAV,CAAeC,UAAUH,aAAV,EAAyBL,YAAzB,CAAf;AACAF;AACAC,oBAAcM,cAAcvB,QAAd,GAAyBuB,cAAcxB,QAArD;AACD,KALM,MAKA;AACL;AACA,UAAI4B,aAAa;AACfN,kBAAUO,KAAKC,GAAL,CAAST,YAAYC,QAArB,EAA+BE,cAAcF,QAA7C,CADK;AAEftB,kBAAU,CAFK;AAGf+B,kBAAUF,KAAKC,GAAL,CAAST,YAAYU,QAAZ,GAAuBb,UAAhC,EAA4CM,cAAcF,QAAd,GAAyBH,YAArE,CAHK;AAIflB,kBAAU,CAJK;AAKfF,eAAO;AALQ,OAAjB;AAOAiC,iBAAWJ,UAAX,EAAuBP,YAAYC,QAAnC,EAA6CD,YAAYtB,KAAzD,EAAgEyB,cAAcF,QAA9E,EAAwFE,cAAczB,KAAtG;AACAkB;AACAD;;AAEAT,UAAIQ,KAAJ,CAAUW,IAAV,CAAeE,UAAf;AACD;AACF;;AAED,SAAOrB,GAAP;AACD;;AAED,SAASD,SAAT,CAAmB2B,KAAnB,EAA0B5B,IAA1B,EAAgC;AAC9B,MAAI,OAAO4B,KAAP,KAAiB,QAArB,EAA+B;AAC7B,QAAI,OAAOC,IAAP,CAAYD,KAAZ,KAAuB,WAAWC,IAAX,CAAgBD,KAAhB,CAA3B,EAAoD;AAClD,aAAO,yEAAWA,KAAX,EAAkB,CAAlB;AAAP;AACD;;AAED,QAAI,CAAC5B,IAAL,EAAW;AACT,YAAM,IAAI8B,KAAJ,CAAU,kDAAV,CAAN;AACD;AACD,WAAO,+EAAgBjC,SAAhB,EAA2BA,SAA3B,EAAsCG,IAAtC,EAA4C4B,KAA5C;AAAP;AACD;;AAED,SAAOA,KAAP;AACD;;AAED,SAASvB,eAAT,CAAyB0B,KAAzB,EAAgC;AAC9B,SAAOA,MAAM3B,WAAN,IAAqB2B,MAAM3B,WAAN,KAAsB2B,MAAMzB,WAAxD;AACD;;AAED,SAASG,WAAT,CAAqBN,KAArB,EAA4BL,IAA5B,EAAkCC,MAAlC,EAA0C;AACxC,MAAID,SAASC,MAAb,EAAqB;AACnB,WAAOD,IAAP;AACD,GAFD,MAEO;AACLK,UAAM6B,QAAN,GAAiB,IAAjB;AACA,WAAO,EAAClC,UAAD,EAAOC,cAAP,EAAP;AACD;AACF;;AAED,SAASqB,UAAT,CAAoBS,IAApB,EAA0BI,KAA1B,EAAiC;AAC/B,SAAOJ,KAAKZ,QAAL,GAAgBgB,MAAMhB,QAAtB,IACDY,KAAKZ,QAAL,GAAgBY,KAAKlC,QAAtB,GAAkCsC,MAAMhB,QAD7C;AAED;;AAED,SAASK,SAAT,CAAmB9B,IAAnB,EAAyB0C,MAAzB,EAAiC;AAC/B,SAAO;AACLjB,cAAUzB,KAAKyB,QADV,EACoBtB,UAAUH,KAAKG,QADnC;AAEL+B,cAAUlC,KAAKkC,QAAL,GAAgBQ,MAFrB,EAE6BtC,UAAUJ,KAAKI,QAF5C;AAGLF,WAAOF,KAAKE;AAHP,GAAP;AAKD;;AAED,SAASiC,UAAT,CAAoBnC,IAApB,EAA0BqB,UAA1B,EAAsCsB,SAAtC,EAAiDC,WAAjD,EAA8DC,UAA9D,EAA0E;AACxE;AACA;AACA,MAAIvC,OAAO,EAACoC,QAAQrB,UAAT,EAAqBnB,OAAOyC,SAA5B,EAAuChC,OAAO,CAA9C,EAAX;AAAA,MACImC,QAAQ,EAACJ,QAAQE,WAAT,EAAsB1C,OAAO2C,UAA7B,EAAyClC,OAAO,CAAhD,EADZ;;AAGA;AACAoC,gBAAc/C,IAAd,EAAoBM,IAApB,EAA0BwC,KAA1B;AACAC,gBAAc/C,IAAd,EAAoB8C,KAApB,EAA2BxC,IAA3B;;AAEA;AACA,SAAOA,KAAKK,KAAL,GAAaL,KAAKJ,KAAL,CAAWqB,MAAxB,IAAkCuB,MAAMnC,KAAN,GAAcmC,MAAM5C,KAAN,CAAYqB,MAAnE,EAA2E;AACzE,QAAIC,cAAclB,KAAKJ,KAAL,CAAWI,KAAKK,KAAhB,CAAlB;AAAA,QACIqC,eAAeF,MAAM5C,KAAN,CAAY4C,MAAMnC,KAAlB,CADnB;;AAGA,QAAI,CAACa,YAAY,CAAZ,MAAmB,GAAnB,IAA0BA,YAAY,CAAZ,MAAmB,GAA9C,MACIwB,aAAa,CAAb,MAAoB,GAApB,IAA2BA,aAAa,CAAb,MAAoB,GADnD,CAAJ,EAC6D;AAC3D;AACAC,mBAAajD,IAAb,EAAmBM,IAAnB,EAAyBwC,KAAzB;AACD,KAJD,MAIO,IAAItB,YAAY,CAAZ,MAAmB,GAAnB,IAA0BwB,aAAa,CAAb,MAAoB,GAAlD,EAAuD;AAAA;;AAAA,8BAC5D;AACA,0EAAK9C,KAAL,EAAW2B,IAAX,4LAAoBqB,cAAc5C,IAAd,CAApB;AACD,KAHM,MAGA,IAAI0C,aAAa,CAAb,MAAoB,GAApB,IAA2BxB,YAAY,CAAZ,MAAmB,GAAlD,EAAuD;AAAA;;AAAA,8BAC5D;AACA,2EAAKtB,KAAL,EAAW2B,IAAX,6LAAoBqB,cAAcJ,KAAd,CAApB;AACD,KAHM,MAGA,IAAItB,YAAY,CAAZ,MAAmB,GAAnB,IAA0BwB,aAAa,CAAb,MAAoB,GAAlD,EAAuD;AAC5D;AACAG,cAAQnD,IAAR,EAAcM,IAAd,EAAoBwC,KAApB;AACD,KAHM,MAGA,IAAIE,aAAa,CAAb,MAAoB,GAApB,IAA2BxB,YAAY,CAAZ,MAAmB,GAAlD,EAAuD;AAC5D;AACA2B,cAAQnD,IAAR,EAAc8C,KAAd,EAAqBxC,IAArB,EAA2B,IAA3B;AACD,KAHM,MAGA,IAAIkB,gBAAgBwB,YAApB,EAAkC;AACvC;AACAhD,WAAKE,KAAL,CAAW2B,IAAX,CAAgBL,WAAhB;AACAlB,WAAKK,KAAL;AACAmC,YAAMnC,KAAN;AACD,KALM,MAKA;AACL;AACA6B,eAASxC,IAAT,EAAekD,cAAc5C,IAAd,CAAf,EAAoC4C,cAAcJ,KAAd,CAApC;AACD;AACF;;AAED;AACAM,iBAAepD,IAAf,EAAqBM,IAArB;AACA8C,iBAAepD,IAAf,EAAqB8C,KAArB;;AAEAhD,gBAAcE,IAAd;AACD;;AAED,SAASiD,YAAT,CAAsBjD,IAAtB,EAA4BM,IAA5B,EAAkCwC,KAAlC,EAAyC;AACvC,MAAIO,YAAYH,cAAc5C,IAAd,CAAhB;AAAA,MACIgD,eAAeJ,cAAcJ,KAAd,CADnB;;AAGA,MAAIS,WAAWF,SAAX,KAAyBE,WAAWD,YAAX,CAA7B,EAAuD;AACrD;AACA,QAAI,8EAAgBD,SAAhB,EAA2BC,YAA3B,KACGE,mBAAmBV,KAAnB,EAA0BO,SAA1B,EAAqCA,UAAU9B,MAAV,GAAmB+B,aAAa/B,MAArE,CADP,EACqF;AAAA;;AAAA,6BACnF,sEAAKrB,KAAL,EAAW2B,IAAX,6LAAoBwB,SAApB;AACA;AACD,KAJD,MAIO,IAAI,8EAAgBC,YAAhB,EAA8BD,SAA9B,KACJG,mBAAmBlD,IAAnB,EAAyBgD,YAAzB,EAAuCA,aAAa/B,MAAb,GAAsB8B,UAAU9B,MAAvE,CADA,EACgF;AAAA;;AAAA,6BACrF,sEAAKrB,KAAL,EAAW2B,IAAX,6LAAoByB,YAApB;AACA;AACD;AACF,GAXD,MAWO,IAAI,yEAAWD,SAAX,EAAsBC,YAAtB,CAAJ,EAAyC;AAAA;;AAAA,2BAC9C,sEAAKpD,KAAL,EAAW2B,IAAX,6LAAoBwB,SAApB;AACA;AACD;;AAEDb,WAASxC,IAAT,EAAeqD,SAAf,EAA0BC,YAA1B;AACD;;AAED,SAASH,OAAT,CAAiBnD,IAAjB,EAAuBM,IAAvB,EAA6BwC,KAA7B,EAAoCW,IAApC,EAA0C;AACxC,MAAIJ,YAAYH,cAAc5C,IAAd,CAAhB;AAAA,MACIgD,eAAeI,eAAeZ,KAAf,EAAsBO,SAAtB,CADnB;AAEA,MAAIC,aAAaK,MAAjB,EAAyB;AAAA;;AAAA,2BACvB,sEAAKzD,KAAL,EAAW2B,IAAX,6LAAoByB,aAAaK,MAAjC;AACD,GAFD,MAEO;AACLnB,aAASxC,IAAT,EAAeyD,OAAOH,YAAP,GAAsBD,SAArC,EAAgDI,OAAOJ,SAAP,GAAmBC,YAAnE;AACD;AACF;;AAED,SAASd,QAAT,CAAkBxC,IAAlB,EAAwBM,IAAxB,EAA8BwC,KAA9B,EAAqC;AACnC9C,OAAKwC,QAAL,GAAgB,IAAhB;AACAxC,OAAKE,KAAL,CAAW2B,IAAX,CAAgB;AACdW,cAAU,IADI;AAEdlC,UAAMA,IAFQ;AAGdC,YAAQuC;AAHM,GAAhB;AAKD;;AAED,SAASC,aAAT,CAAuB/C,IAAvB,EAA6B4D,MAA7B,EAAqCd,KAArC,EAA4C;AAC1C,SAAOc,OAAOlB,MAAP,GAAgBI,MAAMJ,MAAtB,IAAgCkB,OAAOjD,KAAP,GAAeiD,OAAO1D,KAAP,CAAaqB,MAAnE,EAA2E;AACzE,QAAIsC,OAAOD,OAAO1D,KAAP,CAAa0D,OAAOjD,KAAP,EAAb,CAAX;AACAX,SAAKE,KAAL,CAAW2B,IAAX,CAAgBgC,IAAhB;AACAD,WAAOlB,MAAP;AACD;AACF;AACD,SAASU,cAAT,CAAwBpD,IAAxB,EAA8B4D,MAA9B,EAAsC;AACpC,SAAOA,OAAOjD,KAAP,GAAeiD,OAAO1D,KAAP,CAAaqB,MAAnC,EAA2C;AACzC,QAAIsC,OAAOD,OAAO1D,KAAP,CAAa0D,OAAOjD,KAAP,EAAb,CAAX;AACAX,SAAKE,KAAL,CAAW2B,IAAX,CAAgBgC,IAAhB;AACD;AACF;;AAED,SAASX,aAAT,CAAuBY,KAAvB,EAA8B;AAC5B,MAAIpD,MAAM,EAAV;AAAA,MACIqD,YAAYD,MAAM5D,KAAN,CAAY4D,MAAMnD,KAAlB,EAAyB,CAAzB,CADhB;AAEA,SAAOmD,MAAMnD,KAAN,GAAcmD,MAAM5D,KAAN,CAAYqB,MAAjC,EAAyC;AACvC,QAAIsC,OAAOC,MAAM5D,KAAN,CAAY4D,MAAMnD,KAAlB,CAAX;;AAEA;AACA,QAAIoD,cAAc,GAAd,IAAqBF,KAAK,CAAL,MAAY,GAArC,EAA0C;AACxCE,kBAAY,GAAZ;AACD;;AAED,QAAIA,cAAcF,KAAK,CAAL,CAAlB,EAA2B;AACzBnD,UAAImB,IAAJ,CAASgC,IAAT;AACAC,YAAMnD,KAAN;AACD,KAHD,MAGO;AACL;AACD;AACF;;AAED,SAAOD,GAAP;AACD;AACD,SAASgD,cAAT,CAAwBI,KAAxB,EAA+BE,YAA/B,EAA6C;AAC3C,MAAIC,UAAU,EAAd;AAAA,MACIN,SAAS,EADb;AAAA,MAEIO,aAAa,CAFjB;AAAA,MAGIC,iBAAiB,KAHrB;AAAA,MAIIC,aAAa,KAJjB;AAKA,SAAOF,aAAaF,aAAazC,MAA1B,IACEuC,MAAMnD,KAAN,GAAcmD,MAAM5D,KAAN,CAAYqB,MADnC,EAC2C;AACzC,QAAI8C,SAASP,MAAM5D,KAAN,CAAY4D,MAAMnD,KAAlB,CAAb;AAAA,QACI2D,QAAQN,aAAaE,UAAb,CADZ;;AAGA;AACA,QAAII,MAAM,CAAN,MAAa,GAAjB,EAAsB;AACpB;AACD;;AAEDH,qBAAiBA,kBAAkBE,OAAO,CAAP,MAAc,GAAjD;;AAEAV,WAAO9B,IAAP,CAAYyC,KAAZ;AACAJ;;AAEA;AACA;AACA,QAAIG,OAAO,CAAP,MAAc,GAAlB,EAAuB;AACrBD,mBAAa,IAAb;;AAEA,aAAOC,OAAO,CAAP,MAAc,GAArB,EAA0B;AACxBJ,gBAAQpC,IAAR,CAAawC,MAAb;AACAA,iBAASP,MAAM5D,KAAN,CAAY,EAAE4D,MAAMnD,KAApB,CAAT;AACD;AACF;;AAED,QAAI2D,MAAMC,MAAN,CAAa,CAAb,MAAoBF,OAAOE,MAAP,CAAc,CAAd,CAAxB,EAA0C;AACxCN,cAAQpC,IAAR,CAAawC,MAAb;AACAP,YAAMnD,KAAN;AACD,KAHD,MAGO;AACLyD,mBAAa,IAAb;AACD;AACF;;AAED,MAAI,CAACJ,aAAaE,UAAb,KAA4B,EAA7B,EAAiC,CAAjC,MAAwC,GAAxC,IACGC,cADP,EACuB;AACrBC,iBAAa,IAAb;AACD;;AAED,MAAIA,UAAJ,EAAgB;AACd,WAAOH,OAAP;AACD;;AAED,SAAOC,aAAaF,aAAazC,MAAjC,EAAyC;AACvCoC,WAAO9B,IAAP,CAAYmC,aAAaE,YAAb,CAAZ;AACD;;AAED,SAAO;AACLP,kBADK;AAELM;AAFK,GAAP;AAID;;AAED,SAASV,UAAT,CAAoBU,OAApB,EAA6B;AAC3B,SAAOA,QAAQO,MAAR,CAAe,UAASC,IAAT,EAAeJ,MAAf,EAAuB;AAC3C,WAAOI,QAAQJ,OAAO,CAAP,MAAc,GAA7B;AACD,GAFM,EAEJ,IAFI,CAAP;AAGD;AACD,SAASb,kBAAT,CAA4BM,KAA5B,EAAmCY,aAAnC,EAAkDC,KAAlD,EAAyD;AACvD,OAAK,IAAIC,IAAI,CAAb,EAAgBA,IAAID,KAApB,EAA2BC,GAA3B,EAAgC;AAC9B,QAAIC,gBAAgBH,cAAcA,cAAcnD,MAAd,GAAuBoD,KAAvB,GAA+BC,CAA7C,EAAgDL,MAAhD,CAAuD,CAAvD,CAApB;AACA,QAAIT,MAAM5D,KAAN,CAAY4D,MAAMnD,KAAN,GAAciE,CAA1B,MAAiC,MAAMC,aAA3C,EAA0D;AACxD,aAAO,KAAP;AACD;AACF;;AAEDf,QAAMnD,KAAN,IAAegE,KAAf;AACA,SAAO,IAAP;AACD;;AAED,SAAS1E,mBAAT,CAA6BC,KAA7B,EAAoC;AAClC,MAAIC,WAAW,CAAf;AACA,MAAIC,WAAW,CAAf;;AAEAF,QAAM4E,OAAN,CAAc,UAASjB,IAAT,EAAe;AAC3B,QAAI,OAAOA,IAAP,KAAgB,QAApB,EAA8B;AAC5B,UAAIkB,UAAU9E,oBAAoB4D,KAAKvD,IAAzB,CAAd;AACA,UAAI0E,aAAa/E,oBAAoB4D,KAAKtD,MAAzB,CAAjB;;AAEA,UAAIJ,aAAaE,SAAjB,EAA4B;AAC1B,YAAI0E,QAAQ5E,QAAR,KAAqB6E,WAAW7E,QAApC,EAA8C;AAC5CA,sBAAY4E,QAAQ5E,QAApB;AACD,SAFD,MAEO;AACLA,qBAAWE,SAAX;AACD;AACF;;AAED,UAAID,aAAaC,SAAjB,EAA4B;AAC1B,YAAI0E,QAAQ3E,QAAR,KAAqB4E,WAAW5E,QAApC,EAA8C;AAC5CA,sBAAY2E,QAAQ3E,QAApB;AACD,SAFD,MAEO;AACLA,qBAAWC,SAAX;AACD;AACF;AACF,KAnBD,MAmBO;AACL,UAAID,aAAaC,SAAb,KAA2BwD,KAAK,CAAL,MAAY,GAAZ,IAAmBA,KAAK,CAAL,MAAY,GAA1D,CAAJ,EAAoE;AAClEzD;AACD;AACD,UAAID,aAAaE,SAAb,KAA2BwD,KAAK,CAAL,MAAY,GAAZ,IAAmBA,KAAK,CAAL,MAAY,GAA1D,CAAJ,EAAoE;AAClE1D;AACD;AACF;AACF,GA5BD;;AA8BA,SAAO,EAACA,kBAAD,EAAWC,kBAAX,EAAP;AACD","file":"merge.js","sourcesContent":["import {structuredPatch} from './create';\nimport {parsePatch} from './parse';\n\nimport {arrayEqual, arrayStartsWith} from '../util/array';\n\nexport function calcLineCount(hunk) {\n  const {oldLines, newLines} = calcOldNewLineCount(hunk.lines);\n\n  if (oldLines !== undefined) {\n    hunk.oldLines = oldLines;\n  } else {\n    delete hunk.oldLines;\n  }\n\n  if (newLines !== undefined) {\n    hunk.newLines = newLines;\n  } else {\n    delete hunk.newLines;\n  }\n}\n\nexport function merge(mine, theirs, base) {\n  mine = loadPatch(mine, base);\n  theirs = loadPatch(theirs, base);\n\n  let ret = {};\n\n  // For index we just let it pass through as it doesn't have any necessary meaning.\n  // Leaving sanity checks on this to the API consumer that may know more about the\n  // meaning in their own context.\n  if (mine.index || theirs.index) {\n    ret.index = mine.index || theirs.index;\n  }\n\n  if (mine.newFileName || theirs.newFileName) {\n    if (!fileNameChanged(mine)) {\n      // No header or no change in ours, use theirs (and ours if theirs does not exist)\n      ret.oldFileName = theirs.oldFileName || mine.oldFileName;\n      ret.newFileName = theirs.newFileName || mine.newFileName;\n      ret.oldHeader = theirs.oldHeader || mine.oldHeader;\n      ret.newHeader = theirs.newHeader || mine.newHeader;\n    } else if (!fileNameChanged(theirs)) {\n      // No header or no change in theirs, use ours\n      ret.oldFileName = mine.oldFileName;\n      ret.newFileName = mine.newFileName;\n      ret.oldHeader = mine.oldHeader;\n      ret.newHeader = mine.newHeader;\n    } else {\n      // Both changed... figure it out\n      ret.oldFileName = selectField(ret, mine.oldFileName, theirs.oldFileName);\n      ret.newFileName = selectField(ret, mine.newFileName, theirs.newFileName);\n      ret.oldHeader = selectField(ret, mine.oldHeader, theirs.oldHeader);\n      ret.newHeader = selectField(ret, mine.newHeader, theirs.newHeader);\n    }\n  }\n\n  ret.hunks = [];\n\n  let mineIndex = 0,\n      theirsIndex = 0,\n      mineOffset = 0,\n      theirsOffset = 0;\n\n  while (mineIndex < mine.hunks.length || theirsIndex < theirs.hunks.length) {\n    let mineCurrent = mine.hunks[mineIndex] || {oldStart: Infinity},\n        theirsCurrent = theirs.hunks[theirsIndex] || {oldStart: Infinity};\n\n    if (hunkBefore(mineCurrent, theirsCurrent)) {\n      // This patch does not overlap with any of the others, yay.\n      ret.hunks.push(cloneHunk(mineCurrent, mineOffset));\n      mineIndex++;\n      theirsOffset += mineCurrent.newLines - mineCurrent.oldLines;\n    } else if (hunkBefore(theirsCurrent, mineCurrent)) {\n      // This patch does not overlap with any of the others, yay.\n      ret.hunks.push(cloneHunk(theirsCurrent, theirsOffset));\n      theirsIndex++;\n      mineOffset += theirsCurrent.newLines - theirsCurrent.oldLines;\n    } else {\n      // Overlap, merge as best we can\n      let mergedHunk = {\n        oldStart: Math.min(mineCurrent.oldStart, theirsCurrent.oldStart),\n        oldLines: 0,\n        newStart: Math.min(mineCurrent.newStart + mineOffset, theirsCurrent.oldStart + theirsOffset),\n        newLines: 0,\n        lines: []\n      };\n      mergeLines(mergedHunk, mineCurrent.oldStart, mineCurrent.lines, theirsCurrent.oldStart, theirsCurrent.lines);\n      theirsIndex++;\n      mineIndex++;\n\n      ret.hunks.push(mergedHunk);\n    }\n  }\n\n  return ret;\n}\n\nfunction loadPatch(param, base) {\n  if (typeof param === 'string') {\n    if (/^@@/m.test(param) || (/^Index:/m.test(param))) {\n      return parsePatch(param)[0];\n    }\n\n    if (!base) {\n      throw new Error('Must provide a base reference or pass in a patch');\n    }\n    return structuredPatch(undefined, undefined, base, param);\n  }\n\n  return param;\n}\n\nfunction fileNameChanged(patch) {\n  return patch.newFileName && patch.newFileName !== patch.oldFileName;\n}\n\nfunction selectField(index, mine, theirs) {\n  if (mine === theirs) {\n    return mine;\n  } else {\n    index.conflict = true;\n    return {mine, theirs};\n  }\n}\n\nfunction hunkBefore(test, check) {\n  return test.oldStart < check.oldStart\n    && (test.oldStart + test.oldLines) < check.oldStart;\n}\n\nfunction cloneHunk(hunk, offset) {\n  return {\n    oldStart: hunk.oldStart, oldLines: hunk.oldLines,\n    newStart: hunk.newStart + offset, newLines: hunk.newLines,\n    lines: hunk.lines\n  };\n}\n\nfunction mergeLines(hunk, mineOffset, mineLines, theirOffset, theirLines) {\n  // This will generally result in a conflicted hunk, but there are cases where the context\n  // is the only overlap where we can successfully merge the content here.\n  let mine = {offset: mineOffset, lines: mineLines, index: 0},\n      their = {offset: theirOffset, lines: theirLines, index: 0};\n\n  // Handle any leading content\n  insertLeading(hunk, mine, their);\n  insertLeading(hunk, their, mine);\n\n  // Now in the overlap content. Scan through and select the best changes from each.\n  while (mine.index < mine.lines.length && their.index < their.lines.length) {\n    let mineCurrent = mine.lines[mine.index],\n        theirCurrent = their.lines[their.index];\n\n    if ((mineCurrent[0] === '-' || mineCurrent[0] === '+')\n        && (theirCurrent[0] === '-' || theirCurrent[0] === '+')) {\n      // Both modified ...\n      mutualChange(hunk, mine, their);\n    } else if (mineCurrent[0] === '+' && theirCurrent[0] === ' ') {\n      // Mine inserted\n      hunk.lines.push(... collectChange(mine));\n    } else if (theirCurrent[0] === '+' && mineCurrent[0] === ' ') {\n      // Theirs inserted\n      hunk.lines.push(... collectChange(their));\n    } else if (mineCurrent[0] === '-' && theirCurrent[0] === ' ') {\n      // Mine removed or edited\n      removal(hunk, mine, their);\n    } else if (theirCurrent[0] === '-' && mineCurrent[0] === ' ') {\n      // Their removed or edited\n      removal(hunk, their, mine, true);\n    } else if (mineCurrent === theirCurrent) {\n      // Context identity\n      hunk.lines.push(mineCurrent);\n      mine.index++;\n      their.index++;\n    } else {\n      // Context mismatch\n      conflict(hunk, collectChange(mine), collectChange(their));\n    }\n  }\n\n  // Now push anything that may be remaining\n  insertTrailing(hunk, mine);\n  insertTrailing(hunk, their);\n\n  calcLineCount(hunk);\n}\n\nfunction mutualChange(hunk, mine, their) {\n  let myChanges = collectChange(mine),\n      theirChanges = collectChange(their);\n\n  if (allRemoves(myChanges) && allRemoves(theirChanges)) {\n    // Special case for remove changes that are supersets of one another\n    if (arrayStartsWith(myChanges, theirChanges)\n        && skipRemoveSuperset(their, myChanges, myChanges.length - theirChanges.length)) {\n      hunk.lines.push(... myChanges);\n      return;\n    } else if (arrayStartsWith(theirChanges, myChanges)\n        && skipRemoveSuperset(mine, theirChanges, theirChanges.length - myChanges.length)) {\n      hunk.lines.push(... theirChanges);\n      return;\n    }\n  } else if (arrayEqual(myChanges, theirChanges)) {\n    hunk.lines.push(... myChanges);\n    return;\n  }\n\n  conflict(hunk, myChanges, theirChanges);\n}\n\nfunction removal(hunk, mine, their, swap) {\n  let myChanges = collectChange(mine),\n      theirChanges = collectContext(their, myChanges);\n  if (theirChanges.merged) {\n    hunk.lines.push(... theirChanges.merged);\n  } else {\n    conflict(hunk, swap ? theirChanges : myChanges, swap ? myChanges : theirChanges);\n  }\n}\n\nfunction conflict(hunk, mine, their) {\n  hunk.conflict = true;\n  hunk.lines.push({\n    conflict: true,\n    mine: mine,\n    theirs: their\n  });\n}\n\nfunction insertLeading(hunk, insert, their) {\n  while (insert.offset < their.offset && insert.index < insert.lines.length) {\n    let line = insert.lines[insert.index++];\n    hunk.lines.push(line);\n    insert.offset++;\n  }\n}\nfunction insertTrailing(hunk, insert) {\n  while (insert.index < insert.lines.length) {\n    let line = insert.lines[insert.index++];\n    hunk.lines.push(line);\n  }\n}\n\nfunction collectChange(state) {\n  let ret = [],\n      operation = state.lines[state.index][0];\n  while (state.index < state.lines.length) {\n    let line = state.lines[state.index];\n\n    // Group additions that are immediately after subtractions and treat them as one \"atomic\" modify change.\n    if (operation === '-' && line[0] === '+') {\n      operation = '+';\n    }\n\n    if (operation === line[0]) {\n      ret.push(line);\n      state.index++;\n    } else {\n      break;\n    }\n  }\n\n  return ret;\n}\nfunction collectContext(state, matchChanges) {\n  let changes = [],\n      merged = [],\n      matchIndex = 0,\n      contextChanges = false,\n      conflicted = false;\n  while (matchIndex < matchChanges.length\n        && state.index < state.lines.length) {\n    let change = state.lines[state.index],\n        match = matchChanges[matchIndex];\n\n    // Once we've hit our add, then we are done\n    if (match[0] === '+') {\n      break;\n    }\n\n    contextChanges = contextChanges || change[0] !== ' ';\n\n    merged.push(match);\n    matchIndex++;\n\n    // Consume any additions in the other block as a conflict to attempt\n    // to pull in the remaining context after this\n    if (change[0] === '+') {\n      conflicted = true;\n\n      while (change[0] === '+') {\n        changes.push(change);\n        change = state.lines[++state.index];\n      }\n    }\n\n    if (match.substr(1) === change.substr(1)) {\n      changes.push(change);\n      state.index++;\n    } else {\n      conflicted = true;\n    }\n  }\n\n  if ((matchChanges[matchIndex] || '')[0] === '+'\n      && contextChanges) {\n    conflicted = true;\n  }\n\n  if (conflicted) {\n    return changes;\n  }\n\n  while (matchIndex < matchChanges.length) {\n    merged.push(matchChanges[matchIndex++]);\n  }\n\n  return {\n    merged,\n    changes\n  };\n}\n\nfunction allRemoves(changes) {\n  return changes.reduce(function(prev, change) {\n    return prev && change[0] === '-';\n  }, true);\n}\nfunction skipRemoveSuperset(state, removeChanges, delta) {\n  for (let i = 0; i < delta; i++) {\n    let changeContent = removeChanges[removeChanges.length - delta + i].substr(1);\n    if (state.lines[state.index + i] !== ' ' + changeContent) {\n      return false;\n    }\n  }\n\n  state.index += delta;\n  return true;\n}\n\nfunction calcOldNewLineCount(lines) {\n  let oldLines = 0;\n  let newLines = 0;\n\n  lines.forEach(function(line) {\n    if (typeof line !== 'string') {\n      let myCount = calcOldNewLineCount(line.mine);\n      let theirCount = calcOldNewLineCount(line.theirs);\n\n      if (oldLines !== undefined) {\n        if (myCount.oldLines === theirCount.oldLines) {\n          oldLines += myCount.oldLines;\n        } else {\n          oldLines = undefined;\n        }\n      }\n\n      if (newLines !== undefined) {\n        if (myCount.newLines === theirCount.newLines) {\n          newLines += myCount.newLines;\n        } else {\n          newLines = undefined;\n        }\n      }\n    } else {\n      if (newLines !== undefined && (line[0] === '+' || line[0] === ' ')) {\n        newLines++;\n      }\n      if (oldLines !== undefined && (line[0] === '-' || line[0] === ' ')) {\n        oldLines++;\n      }\n    }\n  });\n\n  return {oldLines, newLines};\n}\n"]}
-
-
-/***/ }),
-/* 14 */
-/***/ (function(module, exports, __webpack_require__) {
+/***/ function(module, exports, __webpack_require__) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -4939,7 +4533,8 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var /*istanbul ignore start*/_line = __webpack_require__(5) /*istanbul ignore end*/;
 
-	/*istanbul ignore start*/function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+	/*istanbul ignore start*/
+	function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
 
 	/*istanbul ignore end*/function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {
 	  if (!options) {
@@ -4964,16 +4559,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	      curRange = [],
 	      oldLine = 1,
 	      newLine = 1;
-
-	  /*istanbul ignore start*/var _loop = function _loop( /*istanbul ignore end*/i) {
+	  /*istanbul ignore start*/
+	  var _loop = function _loop( /*istanbul ignore end*/i) {
 	    var current = diff[i],
 	        lines = current.lines || current.value.replace(/\n$/, '').split('\n');
 	    current.lines = lines;
 
 	    if (current.added || current.removed) {
-	      /*istanbul ignore start*/var _curRange;
+	      /*istanbul ignore start*/
+	      var _curRange;
 
-	      /*istanbul ignore end*/ // If we have previous context, start with that
+	      /*istanbul ignore end*/
+	      // If we have previous context, start with that
 	      if (!oldRangeStart) {
 	        var prev = diff[i - 1];
 	        oldRangeStart = oldLine;
@@ -5002,14 +4599,18 @@ return /******/ (function(modules) { // webpackBootstrap
 	      if (oldRangeStart) {
 	        // Close out any changes that have been output (or join overlapping)
 	        if (lines.length <= options.context * 2 && i < diff.length - 2) {
-	          /*istanbul ignore start*/var _curRange2;
+	          /*istanbul ignore start*/
+	          var _curRange2;
 
-	          /*istanbul ignore end*/ // Overlapping
+	          /*istanbul ignore end*/
+	          // Overlapping
 	          /*istanbul ignore start*/(_curRange2 = /*istanbul ignore end*/curRange).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_curRange2 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/contextLines(lines)));
 	        } else {
-	          /*istanbul ignore start*/var _curRange3;
+	          /*istanbul ignore start*/
+	          var _curRange3;
 
-	          /*istanbul ignore end*/ // end the range and output
+	          /*istanbul ignore end*/
+	          // end the range and output
 	          var contextSize = Math.min(lines.length, options.context);
 	          /*istanbul ignore start*/(_curRange3 = /*istanbul ignore end*/curRange).push. /*istanbul ignore start*/apply /*istanbul ignore end*/( /*istanbul ignore start*/_curRange3 /*istanbul ignore end*/, /*istanbul ignore start*/_toConsumableArray( /*istanbul ignore end*/contextLines(lines.slice(0, contextSize))));
 
@@ -5044,7 +4645,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	  };
 
 	  for (var i = 0; i < diff.length; i++) {
-	    /*istanbul ignore start*/_loop( /*istanbul ignore end*/i);
+	    /*istanbul ignore start*/
+	    _loop( /*istanbul ignore end*/i);
 	  }
 
 	  return {
@@ -5077,45 +4679,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {
 	  return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/patch/create.js"],"names":["structuredPatch","createTwoFilesPatch","createPatch","oldFileName","newFileName","oldStr","newStr","oldHeader","newHeader","options","context","diff","push","value","lines","contextLines","map","entry","hunks","oldRangeStart","newRangeStart","curRange","oldLine","newLine","i","current","replace","split","added","removed","prev","slice","length","contextSize","Math","min","hunk","oldStart","oldLines","newStart","newLines","oldEOFNewline","test","newEOFNewline","splice","ret","apply","join","fileName"],"mappings":";;;gCAEgBA,e,GAAAA,e;yDAiGAC,mB,GAAAA,mB;yDAwBAC,W,GAAAA,W;;AA3HhB;;;;uBAEO,SAASF,eAAT,CAAyBG,WAAzB,EAAsCC,WAAtC,EAAmDC,MAAnD,EAA2DC,MAA3D,EAAmEC,SAAnE,EAA8EC,SAA9E,EAAyFC,OAAzF,EAAkG;AACvG,MAAI,CAACA,OAAL,EAAc;AACZA,cAAU,EAAV;AACD;AACD,MAAI,OAAOA,QAAQC,OAAf,KAA2B,WAA/B,EAA4C;AAC1CD,YAAQC,OAAR,GAAkB,CAAlB;AACD;;AAED,MAAMC,OAAO,sEAAUN,MAAV,EAAkBC,MAAlB,EAA0BG,OAA1B,CAAb;AACAE,OAAKC,IAAL,CAAU,EAACC,OAAO,EAAR,EAAYC,OAAO,EAAnB,EAAV,EATuG,CASlE;;AAErC,WAASC,YAAT,CAAsBD,KAAtB,EAA6B;AAC3B,WAAOA,MAAME,GAAN,CAAU,UAASC,KAAT,EAAgB;AAAE,aAAO,MAAMA,KAAb;AAAqB,KAAjD,CAAP;AACD;;AAED,MAAIC,QAAQ,EAAZ;AACA,MAAIC,gBAAgB,CAApB;AAAA,MAAuBC,gBAAgB,CAAvC;AAAA,MAA0CC,WAAW,EAArD;AAAA,MACIC,UAAU,CADd;AAAA,MACiBC,UAAU,CAD3B;;AAhBuG,8EAkB9FC,CAlB8F;AAmBrG,QAAMC,UAAUd,KAAKa,CAAL,CAAhB;AAAA,QACMV,QAAQW,QAAQX,KAAR,IAAiBW,QAAQZ,KAAR,CAAca,OAAd,CAAsB,KAAtB,EAA6B,EAA7B,EAAiCC,KAAjC,CAAuC,IAAvC,CAD/B;AAEAF,YAAQX,KAAR,GAAgBA,KAAhB;;AAEA,QAAIW,QAAQG,KAAR,IAAiBH,QAAQI,OAA7B,EAAsC;AAAA;;AAAA,8BACpC;AACA,UAAI,CAACV,aAAL,EAAoB;AAClB,YAAMW,OAAOnB,KAAKa,IAAI,CAAT,CAAb;AACAL,wBAAgBG,OAAhB;AACAF,wBAAgBG,OAAhB;;AAEA,YAAIO,IAAJ,EAAU;AACRT,qBAAWZ,QAAQC,OAAR,GAAkB,CAAlB,GAAsBK,aAAae,KAAKhB,KAAL,CAAWiB,KAAX,CAAiB,CAACtB,QAAQC,OAA1B,CAAb,CAAtB,GAAyE,EAApF;AACAS,2BAAiBE,SAASW,MAA1B;AACAZ,2BAAiBC,SAASW,MAA1B;AACD;AACF;;AAED;AACA,6EAASpB,IAAT,0LAAkBE,MAAME,GAAN,CAAU,UAASC,KAAT,EAAgB;AAC1C,eAAO,CAACQ,QAAQG,KAAR,GAAgB,GAAhB,GAAsB,GAAvB,IAA8BX,KAArC;AACD,OAFiB,CAAlB;;AAIA;AACA,UAAIQ,QAAQG,KAAZ,EAAmB;AACjBL,mBAAWT,MAAMkB,MAAjB;AACD,OAFD,MAEO;AACLV,mBAAWR,MAAMkB,MAAjB;AACD;AACF,KAzBD,MAyBO;AACL;AACA,UAAIb,aAAJ,EAAmB;AACjB;AACA,YAAIL,MAAMkB,MAAN,IAAgBvB,QAAQC,OAAR,GAAkB,CAAlC,IAAuCc,IAAIb,KAAKqB,MAAL,GAAc,CAA7D,EAAgE;AAAA;;AAAA,kCAC9D;AACA,kFAASpB,IAAT,2LAAkBG,aAAaD,KAAb,CAAlB;AACD,SAHD,MAGO;AAAA;;AAAA,kCACL;AACA,cAAImB,cAAcC,KAAKC,GAAL,CAASrB,MAAMkB,MAAf,EAAuBvB,QAAQC,OAA/B,CAAlB;AACA,kFAASE,IAAT,2LAAkBG,aAAaD,MAAMiB,KAAN,CAAY,CAAZ,EAAeE,WAAf,CAAb,CAAlB;;AAEA,cAAIG,OAAO;AACTC,sBAAUlB,aADD;AAETmB,sBAAWhB,UAAUH,aAAV,GAA0Bc,WAF5B;AAGTM,sBAAUnB,aAHD;AAIToB,sBAAWjB,UAAUH,aAAV,GAA0Ba,WAJ5B;AAKTnB,mBAAOO;AALE,WAAX;AAOA,cAAIG,KAAKb,KAAKqB,MAAL,GAAc,CAAnB,IAAwBlB,MAAMkB,MAAN,IAAgBvB,QAAQC,OAApD,EAA6D;AAC3D;AACA,gBAAI+B,gBAAiB,MAAMC,IAAN,CAAWrC,MAAX,CAArB;AACA,gBAAIsC,gBAAiB,MAAMD,IAAN,CAAWpC,MAAX,CAArB;AACA,gBAAIQ,MAAMkB,MAAN,IAAgB,CAAhB,IAAqB,CAACS,aAA1B,EAAyC;AACvC;AACApB,uBAASuB,MAAT,CAAgBR,KAAKE,QAArB,EAA+B,CAA/B,EAAkC,8BAAlC;AACD,aAHD,MAGO,IAAI,CAACG,aAAD,IAAkB,CAACE,aAAvB,EAAsC;AAC3CtB,uBAAST,IAAT,CAAc,8BAAd;AACD;AACF;AACDM,gBAAMN,IAAN,CAAWwB,IAAX;;AAEAjB,0BAAgB,CAAhB;AACAC,0BAAgB,CAAhB;AACAC,qBAAW,EAAX;AACD;AACF;AACDC,iBAAWR,MAAMkB,MAAjB;AACAT,iBAAWT,MAAMkB,MAAjB;AACD;AAvFoG;;AAkBvG,OAAK,IAAIR,IAAI,CAAb,EAAgBA,IAAIb,KAAKqB,MAAzB,EAAiCR,GAAjC,EAAsC;AAAA,2DAA7BA,CAA6B;AAsErC;;AAED,SAAO;AACLrB,iBAAaA,WADR,EACqBC,aAAaA,WADlC;AAELG,eAAWA,SAFN,EAEiBC,WAAWA,SAF5B;AAGLU,WAAOA;AAHF,GAAP;AAKD;;AAEM,SAASjB,mBAAT,CAA6BE,WAA7B,EAA0CC,WAA1C,EAAuDC,MAAvD,EAA+DC,MAA/D,EAAuEC,SAAvE,EAAkFC,SAAlF,EAA6FC,OAA7F,EAAsG;AAC3G,MAAME,OAAOX,gBAAgBG,WAAhB,EAA6BC,WAA7B,EAA0CC,MAA1C,EAAkDC,MAAlD,EAA0DC,SAA1D,EAAqEC,SAArE,EAAgFC,OAAhF,CAAb;;AAEA,MAAMoC,MAAM,EAAZ;AACA,MAAI1C,eAAeC,WAAnB,EAAgC;AAC9ByC,QAAIjC,IAAJ,CAAS,YAAYT,WAArB;AACD;AACD0C,MAAIjC,IAAJ,CAAS,qEAAT;AACAiC,MAAIjC,IAAJ,CAAS,SAASD,KAAKR,WAAd,IAA6B,OAAOQ,KAAKJ,SAAZ,KAA0B,WAA1B,GAAwC,EAAxC,GAA6C,OAAOI,KAAKJ,SAAtF,CAAT;AACAsC,MAAIjC,IAAJ,CAAS,SAASD,KAAKP,WAAd,IAA6B,OAAOO,KAAKH,SAAZ,KAA0B,WAA1B,GAAwC,EAAxC,GAA6C,OAAOG,KAAKH,SAAtF,CAAT;;AAEA,OAAK,IAAIgB,IAAI,CAAb,EAAgBA,IAAIb,KAAKO,KAAL,CAAWc,MAA/B,EAAuCR,GAAvC,EAA4C;AAC1C,QAAMY,OAAOzB,KAAKO,KAAL,CAAWM,CAAX,CAAb;AACAqB,QAAIjC,IAAJ,CACE,SAASwB,KAAKC,QAAd,GAAyB,GAAzB,GAA+BD,KAAKE,QAApC,GACE,IADF,GACSF,KAAKG,QADd,GACyB,GADzB,GAC+BH,KAAKI,QADpC,GAEE,KAHJ;AAKAK,QAAIjC,IAAJ,CAASkC,KAAT,CAAeD,GAAf,EAAoBT,KAAKtB,KAAzB;AACD;;AAED,SAAO+B,IAAIE,IAAJ,CAAS,IAAT,IAAiB,IAAxB;AACD;;AAEM,SAAS7C,WAAT,CAAqB8C,QAArB,EAA+B3C,MAA/B,EAAuCC,MAAvC,EAA+CC,SAA/C,EAA0DC,SAA1D,EAAqEC,OAArE,EAA8E;AACnF,SAAOR,oBAAoB+C,QAApB,EAA8BA,QAA9B,EAAwC3C,MAAxC,EAAgDC,MAAhD,EAAwDC,SAAxD,EAAmEC,SAAnE,EAA8EC,OAA9E,CAAP;AACD","file":"create.js","sourcesContent":["import {diffLines} from '../diff/line';\n\nexport function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {\n  if (!options) {\n    options = {};\n  }\n  if (typeof options.context === 'undefined') {\n    options.context = 4;\n  }\n\n  const diff = diffLines(oldStr, newStr, options);\n  diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier\n\n  function contextLines(lines) {\n    return lines.map(function(entry) { return ' ' + entry; });\n  }\n\n  let hunks = [];\n  let oldRangeStart = 0, newRangeStart = 0, curRange = [],\n      oldLine = 1, newLine = 1;\n  for (let i = 0; i < diff.length; i++) {\n    const current = diff[i],\n          lines = current.lines || current.value.replace(/\\n$/, '').split('\\n');\n    current.lines = lines;\n\n    if (current.added || current.removed) {\n      // If we have previous context, start with that\n      if (!oldRangeStart) {\n        const prev = diff[i - 1];\n        oldRangeStart = oldLine;\n        newRangeStart = newLine;\n\n        if (prev) {\n          curRange = options.context > 0 ? contextLines(prev.lines.slice(-options.context)) : [];\n          oldRangeStart -= curRange.length;\n          newRangeStart -= curRange.length;\n        }\n      }\n\n      // Output our changes\n      curRange.push(... lines.map(function(entry) {\n        return (current.added ? '+' : '-') + entry;\n      }));\n\n      // Track the updated file position\n      if (current.added) {\n        newLine += lines.length;\n      } else {\n        oldLine += lines.length;\n      }\n    } else {\n      // Identical context lines. Track line changes\n      if (oldRangeStart) {\n        // Close out any changes that have been output (or join overlapping)\n        if (lines.length <= options.context * 2 && i < diff.length - 2) {\n          // Overlapping\n          curRange.push(... contextLines(lines));\n        } else {\n          // end the range and output\n          let contextSize = Math.min(lines.length, options.context);\n          curRange.push(... contextLines(lines.slice(0, contextSize)));\n\n          let hunk = {\n            oldStart: oldRangeStart,\n            oldLines: (oldLine - oldRangeStart + contextSize),\n            newStart: newRangeStart,\n            newLines: (newLine - newRangeStart + contextSize),\n            lines: curRange\n          };\n          if (i >= diff.length - 2 && lines.length <= options.context) {\n            // EOF is inside this hunk\n            let oldEOFNewline = (/\\n$/.test(oldStr));\n            let newEOFNewline = (/\\n$/.test(newStr));\n            if (lines.length == 0 && !oldEOFNewline) {\n              // special case: old has no eol and no trailing context; no-nl can end up before adds\n              curRange.splice(hunk.oldLines, 0, '\\\\ No newline at end of file');\n            } else if (!oldEOFNewline || !newEOFNewline) {\n              curRange.push('\\\\ No newline at end of file');\n            }\n          }\n          hunks.push(hunk);\n\n          oldRangeStart = 0;\n          newRangeStart = 0;\n          curRange = [];\n        }\n      }\n      oldLine += lines.length;\n      newLine += lines.length;\n    }\n  }\n\n  return {\n    oldFileName: oldFileName, newFileName: newFileName,\n    oldHeader: oldHeader, newHeader: newHeader,\n    hunks: hunks\n  };\n}\n\nexport function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {\n  const diff = structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options);\n\n  const ret = [];\n  if (oldFileName == newFileName) {\n    ret.push('Index: ' + oldFileName);\n  }\n  ret.push('===================================================================');\n  ret.push('--- ' + diff.oldFileName + (typeof diff.oldHeader === 'undefined' ? '' : '\\t' + diff.oldHeader));\n  ret.push('+++ ' + diff.newFileName + (typeof diff.newHeader === 'undefined' ? '' : '\\t' + diff.newHeader));\n\n  for (let i = 0; i < diff.hunks.length; i++) {\n    const hunk = diff.hunks[i];\n    ret.push(\n      '@@ -' + hunk.oldStart + ',' + hunk.oldLines\n      + ' +' + hunk.newStart + ',' + hunk.newLines\n      + ' @@'\n    );\n    ret.push.apply(ret, hunk.lines);\n  }\n\n  return ret.join('\\n') + '\\n';\n}\n\nexport function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {\n  return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);\n}\n"]}
-
-
-/***/ }),
-/* 15 */
-/***/ (function(module, exports) {
-
-	/*istanbul ignore start*/"use strict";
-
-	exports.__esModule = true;
-	exports. /*istanbul ignore end*/arrayEqual = arrayEqual;
-	/*istanbul ignore start*/exports. /*istanbul ignore end*/arrayStartsWith = arrayStartsWith;
-	function arrayEqual(a, b) {
-	  if (a.length !== b.length) {
-	    return false;
-	  }
+	//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/patch/create.js"],"names":[],"mappings":";;;gCAEgB,e,GAAA,e;yDAiGA,mB,GAAA,mB;yDAwBA,W,GAAA,W;;AA3HhB,I,yBAAA,+B,wBAAA;;;;;uBAEO,SAAS,eAAT,CAAyB,WAAzB,EAAsC,WAAtC,EAAmD,MAAnD,EAA2D,MAA3D,EAAmE,SAAnE,EAA8E,SAA9E,EAAyF,OAAzF,EAAkG;AACvG,MAAI,CAAC,OAAL,EAAc;AACZ,cAAU,EAAV;AACD;AACD,MAAI,OAAO,QAAQ,OAAf,KAA2B,WAA/B,EAA4C;AAC1C,YAAQ,OAAR,GAAkB,CAAlB;AACD;;AAED,MAAM,O,yBAAO,oB,wBAAA,CAAU,MAAV,EAAkB,MAAlB,EAA0B,OAA1B,CAAb;AACA,OAAK,IAAL,CAAU,EAAC,OAAO,EAAR,EAAY,OAAO,EAAnB,EAAV,E;;AAEA,WAAS,YAAT,CAAsB,KAAtB,EAA6B;AAC3B,WAAO,MAAM,GAAN,CAAU,UAAS,KAAT,EAAgB;AAAE,aAAO,MAAM,KAAb;AAAqB,KAAjD,CAAP;AACD;;AAED,MAAI,QAAQ,EAAZ;AACA,MAAI,gBAAgB,CAApB;AAAA,MAAuB,gBAAgB,CAAvC;AAAA,MAA0C,WAAW,EAArD;AAAA,MACI,UAAU,CADd;AAAA,MACiB,UAAU,CAD3B;;AAhBuG,6B,wBAkB9F,CAlB8F;AAmBrG,QAAM,UAAU,KAAK,CAAL,CAAhB;AAAA,QACM,QAAQ,QAAQ,KAAR,IAAiB,QAAQ,KAAR,CAAc,OAAd,CAAsB,KAAtB,EAA6B,EAA7B,EAAiC,KAAjC,CAAuC,IAAvC,CAD/B;AAEA,YAAQ,KAAR,GAAgB,KAAhB;;AAEA,QAAI,QAAQ,KAAR,IAAiB,QAAQ,OAA7B,EAAsC;;AAAA;;;;AAEpC,UAAI,CAAC,aAAL,EAAoB;AAClB,YAAM,OAAO,KAAK,IAAI,CAAT,CAAb;AACA,wBAAgB,OAAhB;AACA,wBAAgB,OAAhB;;AAEA,YAAI,IAAJ,EAAU;AACR,qBAAW,QAAQ,OAAR,GAAkB,CAAlB,GAAsB,aAAa,KAAK,KAAL,CAAW,KAAX,CAAiB,CAAC,QAAQ,OAA1B,CAAb,CAAtB,GAAyE,EAApF;AACA,2BAAiB,SAAS,MAA1B;AACA,2BAAiB,SAAS,MAA1B;AACD;AACF;;;+BAGD,a,uBAAA,UAAS,IAAT,C,0BAAA,K,wBAAA,C,0BAAA,S,wBAAA,E,yBAAA,mB,wBAAkB,MAAM,GAAN,CAAU,UAAS,KAAT,EAAgB;AAC1C,eAAO,CAAC,QAAQ,KAAR,GAAgB,GAAhB,GAAsB,GAAvB,IAA8B,KAArC;AACD,OAFiB,CAAlB;;;AAKA,UAAI,QAAQ,KAAZ,EAAmB;AACjB,mBAAW,MAAM,MAAjB;AACD,OAFD,MAEO;AACL,mBAAW,MAAM,MAAjB;AACD;AACF,KAzBD,MAyBO;;AAEL,UAAI,aAAJ,EAAmB;;AAEjB,YAAI,MAAM,MAAN,IAAgB,QAAQ,OAAR,GAAkB,CAAlC,IAAuC,IAAI,KAAK,MAAL,GAAc,CAA7D,EAAgE;;AAAA;;;;mCAE9D,c,uBAAA,UAAS,IAAT,C,0BAAA,K,wBAAA,C,0BAAA,U,wBAAA,E,yBAAA,mB,wBAAkB,aAAa,KAAb,CAAlB;AACD,SAHD,MAGO;;AAAA;;;;AAEL,cAAI,cAAc,KAAK,GAAL,CAAS,MAAM,MAAf,EAAuB,QAAQ,OAA/B,CAAlB;mCACA,c,uBAAA,UAAS,IAAT,C,0BAAA,K,wBAAA,C,0BAAA,U,wBAAA,E,yBAAA,mB,wBAAkB,aAAa,MAAM,KAAN,CAAY,CAAZ,EAAe,WAAf,CAAb,CAAlB;;AAEA,cAAI,OAAO;AACT,sBAAU,aADD;AAET,sBAAW,UAAU,aAAV,GAA0B,WAF5B;AAGT,sBAAU,aAHD;AAIT,sBAAW,UAAU,aAAV,GAA0B,WAJ5B;AAKT,mBAAO;AALE,WAAX;AAOA,cAAI,KAAK,KAAK,MAAL,GAAc,CAAnB,IAAwB,MAAM,MAAN,IAAgB,QAAQ,OAApD,EAA6D;;AAE3D,gBAAI,gBAAiB,MAAM,IAAN,CAAW,MAAX,CAArB;AACA,gBAAI,gBAAiB,MAAM,IAAN,CAAW,MAAX,CAArB;AACA,gBAAI,MAAM,MAAN,IAAgB,CAAhB,IAAqB,CAAC,aAA1B,EAAyC;;AAEvC,uBAAS,MAAT,CAAgB,KAAK,QAArB,EAA+B,CAA/B,EAAkC,8BAAlC;AACD,aAHD,MAGO,IAAI,CAAC,aAAD,IAAkB,CAAC,aAAvB,EAAsC;AAC3C,uBAAS,IAAT,CAAc,8BAAd;AACD;AACF;AACD,gBAAM,IAAN,CAAW,IAAX;;AAEA,0BAAgB,CAAhB;AACA,0BAAgB,CAAhB;AACA,qBAAW,EAAX;AACD;AACF;AACD,iBAAW,MAAM,MAAjB;AACA,iBAAW,MAAM,MAAjB;AACD;AAvFoG;;AAkBvG,OAAK,IAAI,IAAI,CAAb,EAAgB,IAAI,KAAK,MAAzB,EAAiC,GAAjC,EAAsC;;AAAA,U,wBAA7B,CAA6B;AAsErC;;AAED,SAAO;AACL,iBAAa,WADR,EACqB,aAAa,WADlC;AAEL,eAAW,SAFN,EAEiB,WAAW,SAF5B;AAGL,WAAO;AAHF,GAAP;AAKD;;AAEM,SAAS,mBAAT,CAA6B,WAA7B,EAA0C,WAA1C,EAAuD,MAAvD,EAA+D,MAA/D,EAAuE,SAAvE,EAAkF,SAAlF,EAA6F,OAA7F,EAAsG;AAC3G,MAAM,OAAO,gBAAgB,WAAhB,EAA6B,WAA7B,EAA0C,MAA1C,EAAkD,MAAlD,EAA0D,SAA1D,EAAqE,SAArE,EAAgF,OAAhF,CAAb;;AAEA,MAAM,MAAM,EAAZ;AACA,MAAI,eAAe,WAAnB,EAAgC;AAC9B,QAAI,IAAJ,CAAS,YAAY,WAArB;AACD;AACD,MAAI,IAAJ,CAAS,qEAAT;AACA,MAAI,IAAJ,CAAS,SAAS,KAAK,WAAd,IAA6B,OAAO,KAAK,SAAZ,KAA0B,WAA1B,GAAwC,EAAxC,GAA6C,OAAO,KAAK,SAAtF,CAAT;AACA,MAAI,IAAJ,CAAS,SAAS,KAAK,WAAd,IAA6B,OAAO,KAAK,SAAZ,KAA0B,WAA1B,GAAwC,EAAxC,GAA6C,OAAO,KAAK,SAAtF,CAAT;;AAEA,OAAK,IAAI,IAAI,CAAb,EAAgB,IAAI,KAAK,KAAL,CAAW,MAA/B,EAAuC,GAAvC,EAA4C;AAC1C,QAAM,OAAO,KAAK,KAAL,CAAW,CAAX,CAAb;AACA,QAAI,IAAJ,CACE,SAAS,KAAK,QAAd,GAAyB,GAAzB,GAA+B,KAAK,QAApC,GACE,IADF,GACS,KAAK,QADd,GACyB,GADzB,GAC+B,KAAK,QADpC,GAEE,KAHJ;AAKA,QAAI,IAAJ,CAAS,KAAT,CAAe,GAAf,EAAoB,KAAK,KAAzB;AACD;;AAED,SAAO,IAAI,IAAJ,CAAS,IAAT,IAAiB,IAAxB;AACD;;AAEM,SAAS,WAAT,CAAqB,QAArB,EAA+B,MAA/B,EAAuC,MAAvC,EAA+C,SAA/C,EAA0D,SAA1D,EAAqE,OAArE,EAA8E;AACnF,SAAO,oBAAoB,QAApB,EAA8B,QAA9B,EAAwC,MAAxC,EAAgD,MAAhD,EAAwD,SAAxD,EAAmE,SAAnE,EAA8E,OAA9E,CAAP;AACD","file":"create.js","sourcesContent":["import {diffLines} from '../diff/line';\n\nexport function structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {\n  if (!options) {\n    options = {};\n  }\n  if (typeof options.context === 'undefined') {\n    options.context = 4;\n  }\n\n  const diff = diffLines(oldStr, newStr, options);\n  diff.push({value: '', lines: []});   // Append an empty value to make cleanup easier\n\n  function contextLines(lines) {\n    return lines.map(function(entry) { return ' ' + entry; });\n  }\n\n  let hunks = [];\n  let oldRangeStart = 0, newRangeStart = 0, curRange = [],\n      oldLine = 1, newLine = 1;\n  for (let i = 0; i < diff.length; i++) {\n    const current = diff[i],\n          lines = current.lines || current.value.replace(/\\n$/, '').split('\\n');\n    current.lines = lines;\n\n    if (current.added || current.removed) {\n      // If we have previous context, start with that\n      if (!oldRangeStart) {\n        const prev = diff[i - 1];\n        oldRangeStart = oldLine;\n        newRangeStart = newLine;\n\n        if (prev) {\n          curRange = options.context > 0 ? contextLines(prev.lines.slice(-options.context)) : [];\n          oldRangeStart -= curRange.length;\n          newRangeStart -= curRange.length;\n        }\n      }\n\n      // Output our changes\n      curRange.push(... lines.map(function(entry) {\n        return (current.added ? '+' : '-') + entry;\n      }));\n\n      // Track the updated file position\n      if (current.added) {\n        newLine += lines.length;\n      } else {\n        oldLine += lines.length;\n      }\n    } else {\n      // Identical context lines. Track line changes\n      if (oldRangeStart) {\n        // Close out any changes that have been output (or join overlapping)\n        if (lines.length <= options.context * 2 && i < diff.length - 2) {\n          // Overlapping\n          curRange.push(... contextLines(lines));\n        } else {\n          // end the range and output\n          let contextSize = Math.min(lines.length, options.context);\n          curRange.push(... contextLines(lines.slice(0, contextSize)));\n\n          let hunk = {\n            oldStart: oldRangeStart,\n            oldLines: (oldLine - oldRangeStart + contextSize),\n            newStart: newRangeStart,\n            newLines: (newLine - newRangeStart + contextSize),\n            lines: curRange\n          };\n          if (i >= diff.length - 2 && lines.length <= options.context) {\n            // EOF is inside this hunk\n            let oldEOFNewline = (/\\n$/.test(oldStr));\n            let newEOFNewline = (/\\n$/.test(newStr));\n            if (lines.length == 0 && !oldEOFNewline) {\n              // special case: old has no eol and no trailing context; no-nl can end up before adds\n              curRange.splice(hunk.oldLines, 0, '\\\\ No newline at end of file');\n            } else if (!oldEOFNewline || !newEOFNewline) {\n              curRange.push('\\\\ No newline at end of file');\n            }\n          }\n          hunks.push(hunk);\n\n          oldRangeStart = 0;\n          newRangeStart = 0;\n          curRange = [];\n        }\n      }\n      oldLine += lines.length;\n      newLine += lines.length;\n    }\n  }\n\n  return {\n    oldFileName: oldFileName, newFileName: newFileName,\n    oldHeader: oldHeader, newHeader: newHeader,\n    hunks: hunks\n  };\n}\n\nexport function createTwoFilesPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options) {\n  const diff = structuredPatch(oldFileName, newFileName, oldStr, newStr, oldHeader, newHeader, options);\n\n  const ret = [];\n  if (oldFileName == newFileName) {\n    ret.push('Index: ' + oldFileName);\n  }\n  ret.push('===================================================================');\n  ret.push('--- ' + diff.oldFileName + (typeof diff.oldHeader === 'undefined' ? '' : '\\t' + diff.oldHeader));\n  ret.push('+++ ' + diff.newFileName + (typeof diff.newHeader === 'undefined' ? '' : '\\t' + diff.newHeader));\n\n  for (let i = 0; i < diff.hunks.length; i++) {\n    const hunk = diff.hunks[i];\n    ret.push(\n      '@@ -' + hunk.oldStart + ',' + hunk.oldLines\n      + ' +' + hunk.newStart + ',' + hunk.newLines\n      + ' @@'\n    );\n    ret.push.apply(ret, hunk.lines);\n  }\n\n  return ret.join('\\n') + '\\n';\n}\n\nexport function createPatch(fileName, oldStr, newStr, oldHeader, newHeader, options) {\n  return createTwoFilesPatch(fileName, fileName, oldStr, newStr, oldHeader, newHeader, options);\n}\n"]}
 
-	  return arrayStartsWith(a, b);
-	}
 
-	function arrayStartsWith(array, start) {
-	  if (start.length > array.length) {
-	    return false;
-	  }
-
-	  for (var i = 0; i < start.length; i++) {
-	    if (start[i] !== array[i]) {
-	      return false;
-	    }
-	  }
-
-	  return true;
-	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsL2FycmF5LmpzIl0sIm5hbWVzIjpbImFycmF5RXF1YWwiLCJhcnJheVN0YXJ0c1dpdGgiLCJhIiwiYiIsImxlbmd0aCIsImFycmF5Iiwic3RhcnQiLCJpIl0sIm1hcHBpbmdzIjoiOzs7Z0NBQWdCQSxVLEdBQUFBLFU7eURBUUFDLGUsR0FBQUEsZTtBQVJULFNBQVNELFVBQVQsQ0FBb0JFLENBQXBCLEVBQXVCQyxDQUF2QixFQUEwQjtBQUMvQixNQUFJRCxFQUFFRSxNQUFGLEtBQWFELEVBQUVDLE1BQW5CLEVBQTJCO0FBQ3pCLFdBQU8sS0FBUDtBQUNEOztBQUVELFNBQU9ILGdCQUFnQkMsQ0FBaEIsRUFBbUJDLENBQW5CLENBQVA7QUFDRDs7QUFFTSxTQUFTRixlQUFULENBQXlCSSxLQUF6QixFQUFnQ0MsS0FBaEMsRUFBdUM7QUFDNUMsTUFBSUEsTUFBTUYsTUFBTixHQUFlQyxNQUFNRCxNQUF6QixFQUFpQztBQUMvQixXQUFPLEtBQVA7QUFDRDs7QUFFRCxPQUFLLElBQUlHLElBQUksQ0FBYixFQUFnQkEsSUFBSUQsTUFBTUYsTUFBMUIsRUFBa0NHLEdBQWxDLEVBQXVDO0FBQ3JDLFFBQUlELE1BQU1DLENBQU4sTUFBYUYsTUFBTUUsQ0FBTixDQUFqQixFQUEyQjtBQUN6QixhQUFPLEtBQVA7QUFDRDtBQUNGOztBQUVELFNBQU8sSUFBUDtBQUNEIiwiZmlsZSI6ImFycmF5LmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGFycmF5RXF1YWwoYSwgYikge1xuICBpZiAoYS5sZW5ndGggIT09IGIubGVuZ3RoKSB7XG4gICAgcmV0dXJuIGZhbHNlO1xuICB9XG5cbiAgcmV0dXJuIGFycmF5U3RhcnRzV2l0aChhLCBiKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGFycmF5U3RhcnRzV2l0aChhcnJheSwgc3RhcnQpIHtcbiAgaWYgKHN0YXJ0Lmxlbmd0aCA+IGFycmF5Lmxlbmd0aCkge1xuICAgIHJldHVybiBmYWxzZTtcbiAgfVxuXG4gIGZvciAobGV0IGkgPSAwOyBpIDwgc3RhcnQubGVuZ3RoOyBpKyspIHtcbiAgICBpZiAoc3RhcnRbaV0gIT09IGFycmF5W2ldKSB7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfVxuICB9XG5cbiAgcmV0dXJuIHRydWU7XG59XG4iXX0=
-
-
-/***/ }),
-/* 16 */
-/***/ (function(module, exports) {
+/***/ },
+/* 14 */
+/***/ function(module, exports) {
 
 	/*istanbul ignore start*/"use strict";
 
@@ -5140,12 +4709,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 	  return ret;
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb252ZXJ0L2RtcC5qcyJdLCJuYW1lcyI6WyJjb252ZXJ0Q2hhbmdlc1RvRE1QIiwiY2hhbmdlcyIsInJldCIsImNoYW5nZSIsIm9wZXJhdGlvbiIsImkiLCJsZW5ndGgiLCJhZGRlZCIsInJlbW92ZWQiLCJwdXNoIiwidmFsdWUiXSwibWFwcGluZ3MiOiI7OztnQ0FDZ0JBLG1CLEdBQUFBLG1CO0FBRGhCO0FBQ08sU0FBU0EsbUJBQVQsQ0FBNkJDLE9BQTdCLEVBQXNDO0FBQzNDLE1BQUlDLE1BQU0sRUFBVjtBQUFBLE1BQ0lDLHdDQURKO0FBQUEsTUFFSUMsMkNBRko7QUFHQSxPQUFLLElBQUlDLElBQUksQ0FBYixFQUFnQkEsSUFBSUosUUFBUUssTUFBNUIsRUFBb0NELEdBQXBDLEVBQXlDO0FBQ3ZDRixhQUFTRixRQUFRSSxDQUFSLENBQVQ7QUFDQSxRQUFJRixPQUFPSSxLQUFYLEVBQWtCO0FBQ2hCSCxrQkFBWSxDQUFaO0FBQ0QsS0FGRCxNQUVPLElBQUlELE9BQU9LLE9BQVgsRUFBb0I7QUFDekJKLGtCQUFZLENBQUMsQ0FBYjtBQUNELEtBRk0sTUFFQTtBQUNMQSxrQkFBWSxDQUFaO0FBQ0Q7O0FBRURGLFFBQUlPLElBQUosQ0FBUyxDQUFDTCxTQUFELEVBQVlELE9BQU9PLEtBQW5CLENBQVQ7QUFDRDtBQUNELFNBQU9SLEdBQVA7QUFDRCIsImZpbGUiOiJkbXAuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBTZWU6IGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9nb29nbGUtZGlmZi1tYXRjaC1wYXRjaC93aWtpL0FQSVxuZXhwb3J0IGZ1bmN0aW9uIGNvbnZlcnRDaGFuZ2VzVG9ETVAoY2hhbmdlcykge1xuICBsZXQgcmV0ID0gW10sXG4gICAgICBjaGFuZ2UsXG4gICAgICBvcGVyYXRpb247XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgY2hhbmdlcy5sZW5ndGg7IGkrKykge1xuICAgIGNoYW5nZSA9IGNoYW5nZXNbaV07XG4gICAgaWYgKGNoYW5nZS5hZGRlZCkge1xuICAgICAgb3BlcmF0aW9uID0gMTtcbiAgICB9IGVsc2UgaWYgKGNoYW5nZS5yZW1vdmVkKSB7XG4gICAgICBvcGVyYXRpb24gPSAtMTtcbiAgICB9IGVsc2Uge1xuICAgICAgb3BlcmF0aW9uID0gMDtcbiAgICB9XG5cbiAgICByZXQucHVzaChbb3BlcmF0aW9uLCBjaGFuZ2UudmFsdWVdKTtcbiAgfVxuICByZXR1cm4gcmV0O1xufVxuIl19
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb252ZXJ0L2RtcC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Z0NBQ2dCLG1CLEdBQUEsbUI7O0FBQVQsU0FBUyxtQkFBVCxDQUE2QixPQUE3QixFQUFzQztBQUMzQyxNQUFJLE1BQU0sRUFBVjtBQUFBLE1BQ0ksUyx5QkFBQSxNLHdCQURKO0FBQUEsTUFFSSxZLHlCQUFBLE0sd0JBRko7QUFHQSxPQUFLLElBQUksSUFBSSxDQUFiLEVBQWdCLElBQUksUUFBUSxNQUE1QixFQUFvQyxHQUFwQyxFQUF5QztBQUN2QyxhQUFTLFFBQVEsQ0FBUixDQUFUO0FBQ0EsUUFBSSxPQUFPLEtBQVgsRUFBa0I7QUFDaEIsa0JBQVksQ0FBWjtBQUNELEtBRkQsTUFFTyxJQUFJLE9BQU8sT0FBWCxFQUFvQjtBQUN6QixrQkFBWSxDQUFDLENBQWI7QUFDRCxLQUZNLE1BRUE7QUFDTCxrQkFBWSxDQUFaO0FBQ0Q7O0FBRUQsUUFBSSxJQUFKLENBQVMsQ0FBQyxTQUFELEVBQVksT0FBTyxLQUFuQixDQUFUO0FBQ0Q7QUFDRCxTQUFPLEdBQVA7QUFDRCIsImZpbGUiOiJkbXAuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBTZWU6IGh0dHA6Ly9jb2RlLmdvb2dsZS5jb20vcC9nb29nbGUtZGlmZi1tYXRjaC1wYXRjaC93aWtpL0FQSVxuZXhwb3J0IGZ1bmN0aW9uIGNvbnZlcnRDaGFuZ2VzVG9ETVAoY2hhbmdlcykge1xuICBsZXQgcmV0ID0gW10sXG4gICAgICBjaGFuZ2UsXG4gICAgICBvcGVyYXRpb247XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgY2hhbmdlcy5sZW5ndGg7IGkrKykge1xuICAgIGNoYW5nZSA9IGNoYW5nZXNbaV07XG4gICAgaWYgKGNoYW5nZS5hZGRlZCkge1xuICAgICAgb3BlcmF0aW9uID0gMTtcbiAgICB9IGVsc2UgaWYgKGNoYW5nZS5yZW1vdmVkKSB7XG4gICAgICBvcGVyYXRpb24gPSAtMTtcbiAgICB9IGVsc2Uge1xuICAgICAgb3BlcmF0aW9uID0gMDtcbiAgICB9XG5cbiAgICByZXQucHVzaChbb3BlcmF0aW9uLCBjaGFuZ2UudmFsdWVdKTtcbiAgfVxuICByZXR1cm4gcmV0O1xufVxuIl19
 
 
-/***/ }),
-/* 17 */
-/***/ (function(module, exports) {
+/***/ },
+/* 15 */
+/***/ function(module, exports) {
 
 	/*istanbul ignore start*/'use strict';
 
@@ -5181,10 +4750,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	  return n;
 	}
-	//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb252ZXJ0L3htbC5qcyJdLCJuYW1lcyI6WyJjb252ZXJ0Q2hhbmdlc1RvWE1MIiwiY2hhbmdlcyIsInJldCIsImkiLCJsZW5ndGgiLCJjaGFuZ2UiLCJhZGRlZCIsInB1c2giLCJyZW1vdmVkIiwiZXNjYXBlSFRNTCIsInZhbHVlIiwiam9pbiIsInMiLCJuIiwicmVwbGFjZSJdLCJtYXBwaW5ncyI6Ijs7O2dDQUFnQkEsbUIsR0FBQUEsbUI7QUFBVCxTQUFTQSxtQkFBVCxDQUE2QkMsT0FBN0IsRUFBc0M7QUFDM0MsTUFBSUMsTUFBTSxFQUFWO0FBQ0EsT0FBSyxJQUFJQyxJQUFJLENBQWIsRUFBZ0JBLElBQUlGLFFBQVFHLE1BQTVCLEVBQW9DRCxHQUFwQyxFQUF5QztBQUN2QyxRQUFJRSxTQUFTSixRQUFRRSxDQUFSLENBQWI7QUFDQSxRQUFJRSxPQUFPQyxLQUFYLEVBQWtCO0FBQ2hCSixVQUFJSyxJQUFKLENBQVMsT0FBVDtBQUNELEtBRkQsTUFFTyxJQUFJRixPQUFPRyxPQUFYLEVBQW9CO0FBQ3pCTixVQUFJSyxJQUFKLENBQVMsT0FBVDtBQUNEOztBQUVETCxRQUFJSyxJQUFKLENBQVNFLFdBQVdKLE9BQU9LLEtBQWxCLENBQVQ7O0FBRUEsUUFBSUwsT0FBT0MsS0FBWCxFQUFrQjtBQUNoQkosVUFBSUssSUFBSixDQUFTLFFBQVQ7QUFDRCxLQUZELE1BRU8sSUFBSUYsT0FBT0csT0FBWCxFQUFvQjtBQUN6Qk4sVUFBSUssSUFBSixDQUFTLFFBQVQ7QUFDRDtBQUNGO0FBQ0QsU0FBT0wsSUFBSVMsSUFBSixDQUFTLEVBQVQsQ0FBUDtBQUNEOztBQUVELFNBQVNGLFVBQVQsQ0FBb0JHLENBQXBCLEVBQXVCO0FBQ3JCLE1BQUlDLElBQUlELENBQVI7QUFDQUMsTUFBSUEsRUFBRUMsT0FBRixDQUFVLElBQVYsRUFBZ0IsT0FBaEIsQ0FBSjtBQUNBRCxNQUFJQSxFQUFFQyxPQUFGLENBQVUsSUFBVixFQUFnQixNQUFoQixDQUFKO0FBQ0FELE1BQUlBLEVBQUVDLE9BQUYsQ0FBVSxJQUFWLEVBQWdCLE1BQWhCLENBQUo7QUFDQUQsTUFBSUEsRUFBRUMsT0FBRixDQUFVLElBQVYsRUFBZ0IsUUFBaEIsQ0FBSjs7QUFFQSxTQUFPRCxDQUFQO0FBQ0QiLCJmaWxlIjoieG1sLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnZlcnRDaGFuZ2VzVG9YTUwoY2hhbmdlcykge1xuICBsZXQgcmV0ID0gW107XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgY2hhbmdlcy5sZW5ndGg7IGkrKykge1xuICAgIGxldCBjaGFuZ2UgPSBjaGFuZ2VzW2ldO1xuICAgIGlmIChjaGFuZ2UuYWRkZWQpIHtcbiAgICAgIHJldC5wdXNoKCc8aW5zPicpO1xuICAgIH0gZWxzZSBpZiAoY2hhbmdlLnJlbW92ZWQpIHtcbiAgICAgIHJldC5wdXNoKCc8ZGVsPicpO1xuICAgIH1cblxuICAgIHJldC5wdXNoKGVzY2FwZUhUTUwoY2hhbmdlLnZhbHVlKSk7XG5cbiAgICBpZiAoY2hhbmdlLmFkZGVkKSB7XG4gICAgICByZXQucHVzaCgnPC9pbnM+Jyk7XG4gICAgfSBlbHNlIGlmIChjaGFuZ2UucmVtb3ZlZCkge1xuICAgICAgcmV0LnB1c2goJzwvZGVsPicpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gcmV0LmpvaW4oJycpO1xufVxuXG5mdW5jdGlvbiBlc2NhcGVIVE1MKHMpIHtcbiAgbGV0IG4gPSBzO1xuICBuID0gbi5yZXBsYWNlKC8mL2csICcmYW1wOycpO1xuICBuID0gbi5yZXBsYWNlKC88L2csICcmbHQ7Jyk7XG4gIG4gPSBuLnJlcGxhY2UoLz4vZywgJyZndDsnKTtcbiAgbiA9IG4ucmVwbGFjZSgvXCIvZywgJyZxdW90OycpO1xuXG4gIHJldHVybiBuO1xufVxuIl19
+	//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb252ZXJ0L3htbC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Z0NBQWdCLG1CLEdBQUEsbUI7QUFBVCxTQUFTLG1CQUFULENBQTZCLE9BQTdCLEVBQXNDO0FBQzNDLE1BQUksTUFBTSxFQUFWO0FBQ0EsT0FBSyxJQUFJLElBQUksQ0FBYixFQUFnQixJQUFJLFFBQVEsTUFBNUIsRUFBb0MsR0FBcEMsRUFBeUM7QUFDdkMsUUFBSSxTQUFTLFFBQVEsQ0FBUixDQUFiO0FBQ0EsUUFBSSxPQUFPLEtBQVgsRUFBa0I7QUFDaEIsVUFBSSxJQUFKLENBQVMsT0FBVDtBQUNELEtBRkQsTUFFTyxJQUFJLE9BQU8sT0FBWCxFQUFvQjtBQUN6QixVQUFJLElBQUosQ0FBUyxPQUFUO0FBQ0Q7O0FBRUQsUUFBSSxJQUFKLENBQVMsV0FBVyxPQUFPLEtBQWxCLENBQVQ7O0FBRUEsUUFBSSxPQUFPLEtBQVgsRUFBa0I7QUFDaEIsVUFBSSxJQUFKLENBQVMsUUFBVDtBQUNELEtBRkQsTUFFTyxJQUFJLE9BQU8sT0FBWCxFQUFvQjtBQUN6QixVQUFJLElBQUosQ0FBUyxRQUFUO0FBQ0Q7QUFDRjtBQUNELFNBQU8sSUFBSSxJQUFKLENBQVMsRUFBVCxDQUFQO0FBQ0Q7O0FBRUQsU0FBUyxVQUFULENBQW9CLENBQXBCLEVBQXVCO0FBQ3JCLE1BQUksSUFBSSxDQUFSO0FBQ0EsTUFBSSxFQUFFLE9BQUYsQ0FBVSxJQUFWLEVBQWdCLE9BQWhCLENBQUo7QUFDQSxNQUFJLEVBQUUsT0FBRixDQUFVLElBQVYsRUFBZ0IsTUFBaEIsQ0FBSjtBQUNBLE1BQUksRUFBRSxPQUFGLENBQVUsSUFBVixFQUFnQixNQUFoQixDQUFKO0FBQ0EsTUFBSSxFQUFFLE9BQUYsQ0FBVSxJQUFWLEVBQWdCLFFBQWhCLENBQUo7O0FBRUEsU0FBTyxDQUFQO0FBQ0QiLCJmaWxlIjoieG1sLmpzIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGNvbnZlcnRDaGFuZ2VzVG9YTUwoY2hhbmdlcykge1xuICBsZXQgcmV0ID0gW107XG4gIGZvciAobGV0IGkgPSAwOyBpIDwgY2hhbmdlcy5sZW5ndGg7IGkrKykge1xuICAgIGxldCBjaGFuZ2UgPSBjaGFuZ2VzW2ldO1xuICAgIGlmIChjaGFuZ2UuYWRkZWQpIHtcbiAgICAgIHJldC5wdXNoKCc8aW5zPicpO1xuICAgIH0gZWxzZSBpZiAoY2hhbmdlLnJlbW92ZWQpIHtcbiAgICAgIHJldC5wdXNoKCc8ZGVsPicpO1xuICAgIH1cblxuICAgIHJldC5wdXNoKGVzY2FwZUhUTUwoY2hhbmdlLnZhbHVlKSk7XG5cbiAgICBpZiAoY2hhbmdlLmFkZGVkKSB7XG4gICAgICByZXQucHVzaCgnPC9pbnM+Jyk7XG4gICAgfSBlbHNlIGlmIChjaGFuZ2UucmVtb3ZlZCkge1xuICAgICAgcmV0LnB1c2goJzwvZGVsPicpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gcmV0LmpvaW4oJycpO1xufVxuXG5mdW5jdGlvbiBlc2NhcGVIVE1MKHMpIHtcbiAgbGV0IG4gPSBzO1xuICBuID0gbi5yZXBsYWNlKC8mL2csICcmYW1wOycpO1xuICBuID0gbi5yZXBsYWNlKC88L2csICcmbHQ7Jyk7XG4gIG4gPSBuLnJlcGxhY2UoLz4vZywgJyZndDsnKTtcbiAgbiA9IG4ucmVwbGFjZSgvXCIvZywgJyZxdW90OycpO1xuXG4gIHJldHVybiBuO1xufVxuIl19
 
 
-/***/ })
+/***/ }
 /******/ ])
 });
 ;
@@ -27196,7 +26765,8 @@ define('vellum/mugs',[
         icon: 'fa fa-retweet',
         possibleDataParent: 'limited',
         controlNodeChildren: function ($node) {
-            return $node.children('repeat').children();
+            var repeatChildren = $node.children('repeat').children();
+            return repeatChildren.not('jr\\:addEmptyCaption, jr\\:addCaption');
         },
         getExtraDataAttributes: function (mug) {
             return {"jr:template": ""};
@@ -27212,10 +26782,13 @@ define('vellum/mugs',[
                 getAppearanceAttribute: function () {},
                 form: mug.form,
                 p: {
-                    rawControlAttributes: attrs
+                    rawControlAttributes: attrs,
+                    addEmptyCaptionItext: mug.p.addEmptyCaptionItext,
+                    addCaptionItext: mug.p.addCaptionItext,
                 },
                 options: {
                     tagName: 'repeat',
+                    writeRepeatItexts: mug.options.customRepeatButtonText,
                     writeControlLabel: false,
                     writeControlHint: false,
                     writeControlHelp: false,
@@ -28926,6 +28499,9 @@ define('vellum/writer',[
             if (opts.writeControlAlert) {
                 createAlert(xmlWriter, mug);
             }
+            if (opts.writeRepeatItexts) {
+                createRepeatButtonItexts(xmlWriter, mug);
+            }
             // Write custom attributes first
             var attributes = mug.p.rawControlAttributes;
             for (var k in attributes) {
@@ -29013,6 +28589,24 @@ define('vellum/writer',[
         }
     }
 
+    function createRepeatButtonItexts(xmlWriter, mug) {
+        var addEmptyCaptionItext = mug.p.addEmptyCaptionItext;
+        if (addEmptyCaptionItext && !addEmptyCaptionItext.isEmpty()) {
+            xmlWriter.writeStartElement('jr:addEmptyCaption');
+            var addEmptyCaptionRef = "jr:itext('" + addEmptyCaptionItext.id + "')";
+            xmlWriter.writeAttributeString('ref', addEmptyCaptionRef);
+            xmlWriter.writeEndElement();
+        }
+        var addCaptionItext = mug.p.addCaptionItext;
+        if (addCaptionItext && !addCaptionItext.isEmpty()) {
+            xmlWriter.writeStartElement('jr:addCaption');
+            var addCaptionRef = "jr:itext('" + addCaptionItext.id + "')";
+            xmlWriter.writeAttributeString('ref', addCaptionRef);
+            xmlWriter.writeEndElement();
+        }
+    }
+
+
     return {
         createXForm: createXForm
     };
@@ -29167,8 +28761,12 @@ define('vellum/exporter',[
             "Required",
             "Hint Text",
             "Help Text",
-            "Comment"
+            "Comment",
         ]);
+        const formContainsRepeatGroup = Boolean(form.getMugList().find(mug => mug.options.isRepeat));
+        if (formContainsRepeatGroup && form.vellum.opts().features.use_custom_repeat_button_text) {
+            columnOrder = columnOrder.concat(["'Add New' Button Text", "'Add Another' Button Text"]);
+        }
 
         var mugToExportRow = function (mug) {
             var row = {},
@@ -29221,6 +28819,10 @@ define('vellum/exporter',[
 
             row["Hint Text"] = defaultOrNothing(mug.p.hintItext, defaultLanguage, 'default');
             row["Help Text"] = defaultOrNothing(mug.p.helpItext, defaultLanguage, 'default');
+            if (formContainsRepeatGroup && mug.options.customRepeatButtonText) {
+                row["'Add New' Button Text"] = defaultOrNothing(mug.p.addEmptyCaptionItext, defaultLanguage, 'default');
+                row["'Add Another' Button Text"] = defaultOrNothing(mug.p.addCaptionItext, defaultLanguage, 'default');
+            }
             row.Comment = richText.sanitizeInput(mug.p.comment);
 
             // make sure there aren't any null values
@@ -31780,7 +31382,9 @@ define('vellum/javaRosa/util',[
             'labelItext',
             'hintItext',
             'helpItext',
-            'constraintMsgItext'
+            'constraintMsgItext',
+            'addEmptyCaptionItext',
+            'addCaptionItext',
         ];
 
     var getDefaultItextRoot = function(mug) {
@@ -49456,7 +49060,7 @@ define('vellum/core',[
                     title: gettext("Advanced"),
                     text: gettext("These are advanced settings and are not needed for most applications.  " +
                         "Please only change these if you have a specific need!"),
-                    link: "https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143946283/Application+Development"
+                    link: "https://confluence.dimagi.com/display/commcarepublic/Application+Building"
                 }
             }
         ];
@@ -51869,6 +51473,14 @@ define('vellum/javaRosa/itext',[
                 if (!mug.p.helpItext && mug.getPresence("helpItext") !== "notallowed") {
                     mug.p.helpItext = this.createItem();
                 }
+                if (mug.options.isRepeat && mug.options.customRepeatButtonText) {
+                    if (!mug.p.addEmptyCaptionItext) {
+                        mug.p.addEmptyCaptionItext = this.createItem();
+                    }
+                    if (!mug.p.addCaptionItext) {
+                        mug.p.addCaptionItext = this.createItem();
+                    }
+                }
             }
             if (!mug.options.isControlOnly) {
                 // set constraint msg if legal and not there
@@ -51964,7 +51576,7 @@ define('vellum/javaRosa/itextWidget',[
             currentValue = null;
 
         function autoGenerateId() {
-            return jrUtil.getDefaultItextId(mug, widget.path);
+            return jrUtil.getDefaultItextId(mug, widget.path.replace(/Itext$/, ""));
         }
 
         function updateAutoId() {
@@ -53101,6 +52713,21 @@ define('vellum/javaRosa/plugin',[
                     mug.p.constraintMsgAttr = null;
                 }
             }
+
+            function parseRepeatItexts(mug, controlElement) {
+                var repeatEl = controlElement.children('repeat');
+                var addEmptyCaptionEl = repeatEl.children('jr\\:addEmptyCaption'),
+                    addCaptionEl = repeatEl.children('jr\\:addCaption');
+                if (addEmptyCaptionEl.length) {
+                    mug.p.addEmptyCaptionItext = parseItextRef(addEmptyCaptionEl, "addEmptyCaption");
+                }
+                if (addCaptionEl.length) {
+                    mug.p.addCaptionItext = parseItextRef(addCaptionEl, "addCaption");
+                }
+            }
+            if (mug.options.isRepeat && mug.options.customRepeatButtonText) {
+                parseRepeatItexts(mug, controlElement);
+            }
         },
         handleMugParseFinish: function (mug) {
             this.__callOld();
@@ -53563,13 +53190,13 @@ define('vellum/javaRosa/plugin',[
                 lstring: gettext("Help Message"),
                 widget: trackLogicRefs(function (mug, options) {
                     var block = itextBlock.label(mug, $.extend(options, {
-                            itextType: "help",
-                            messagesPath: "helpItext",
-                            getItextByMug: function (mug) {
-                                return mug.p.helpItext;
-                            },
-                            displayName: gettext("Help Message")
-                        }));
+                        itextType: "help",
+                        messagesPath: "helpItext",
+                        getItextByMug: function (mug) {
+                            return mug.p.helpItext;
+                        },
+                        displayName: gettext("Help Message"),
+                    }));
 
                     return block;
                 }),
@@ -53583,6 +53210,60 @@ define('vellum/javaRosa/plugin',[
                 widgetValuePath: "helpItext"
             };
 
+            control.addEmptyCaptionItext = addSerializer({
+                visibility: 'visible',
+                presence: function (mug) {
+                    return mug.options.isRepeat && mug.options.customRepeatButtonText ? 'optional' : 'notallowed';
+                },
+                lstring: gettext("Add New Item Button Text"),
+                widget: trackLogicRefs(function (mug, options) {
+                    var block = itextBlock.label(mug, $.extend(options, {
+                        itextType: "addEmptyCaption",
+                        messagesPath: "addEmptyCaptionItext",
+                        getItextByMug: function (mug) {
+                            return mug.p.addEmptyCaptionItext;
+                        },
+                        displayName: gettext("Add New Item Button Text"),
+                    }));
+                    return block;
+                }),
+                validationFunc: itextValidator("addEmptyCaptionItext", gettext("Add New Item Button Text")),
+            });
+            // virtual property used to get a widget
+            control.addEmptyCaptionItextID = {
+                visibility: 'addEmptyCaptionItext',
+                lstring: gettext("Add New Itext ID"),
+                widget: itextWidget.id,
+                widgetValuePath: "addEmptyCaptionItext",
+            };
+
+            control.addCaptionItext = addSerializer({
+                visibility: 'visible',
+                presence: function (mug) {
+                    return mug.options.isRepeat && mug.options.customRepeatButtonText ? 'optional' : 'notallowed';
+                },
+                lstring: gettext("Add Another Item Button Text"),
+                widget: trackLogicRefs(function (mug, options) {
+                    var block = itextBlock.label(mug, $.extend(options, {
+                        itextType: "addCaption",
+                        messagesPath: "addCaptionItext",
+                        getItextByMug: function (mug) {
+                            return mug.p.addCaptionItext;
+                        },
+                        displayName: gettext("Add Another Item Button Text"),
+                    }));
+                    return block;
+                }),
+                validationFunc: itextValidator("addCaptionItext", gettext("Add Another Item Button Text")),
+            });
+            // virtual property used to get a widget
+            control.addCaptionItextID = {
+                visibility: 'addCaptionItext',
+                lstring: gettext("Add Another Itext ID"),
+                widget: itextWidget.id,
+                widgetValuePath: "addCaptionItext",
+            };
+
             // virtual property used to get a widget
             control.otherItext = function (mugOptions) {
                 return mugOptions.isSpecialGroup ? undefined : {
@@ -53669,6 +53350,10 @@ define('vellum/javaRosa/plugin',[
                 'hintItext',
                 'helpItextID',
                 'helpItext',
+                'addEmptyCaptionItextID',
+                'addEmptyCaptionItext',
+                'addCaptionItextID',
+                'addCaptionItext',
                 'helpMediaIText',
             ]);
 
@@ -54791,6 +54476,7 @@ define('vellum/modeliteration',[
         modelRepeatMugOptions = {
             //typeName: 'Model Repeat',
             supportsDataNodeRole: true,
+            isRepeat: true,
             getPathName: function (mug, name) {
                 if (mug.p.dataSource.idsQuery) {
                     name += "/item";
@@ -54858,6 +54544,7 @@ define('vellum/modeliteration',[
                 mug.p.originalPath = null;
                 mug.p.dataSource = {};
                 mug.p.dataSourceChanged = false;
+                mug.options.customRepeatButtonText = form.vellum.opts().features.use_custom_repeat_button_text;
             },
             spec: {
                 nodeID: {
@@ -56034,38520 +55721,79 @@ __p+='<div class="modal fade" id="'+
 ((__t=(gettext("Select new")))==null?'':_.escape(__t))+
 ' '+
 ((__t=( mediaType ))==null?'':__t)+
-'\n                    </label>\n                    <div class="col-sm-8">\n                        <div class="hqm-select-files-container">\n                            <button class="hqm-select btn btn-primary" type="button">'+
+'\n                    </label>\n                    <div class="col-sm-8">\n                        <button class="btn btn-primary" type="button">'+
 ((__t=(gettext("Select File")))==null?'':_.escape(__t))+
-'</button>\n                        </div>\n                        <div class="hqm-queue"></div>\n                    </div>\n                </div>\n                <div class="form-group hqm-existing hide">\n                    <label class="col-sm-4 control-label">\n                        '+
+'</button>\n                        <input type="file" class="hide" />\n                        <div class="hqm-upload-status"></div>\n                    </div>\n                </div>\n                <div class="form-group hqm-existing hide">\n                    <label class="col-sm-4 control-label">\n                        '+
 ((__t=(gettext("Current")))==null?'':_.escape(__t))+
 ' '+
 ((__t=( mediaType ))==null?'':__t)+
-'\n                    </label>\n                    <div class="col-sm-8 hqm-existing-controls">\n                    </div>\n                </div>\n                <div class="hqm-upload-form">\n                    <fieldset class="hqm-sharing hide">\n                        <legend>'+
-((__t=(gettext("Multimedia Sharing Options")))==null?'':_.escape(__t))+
-'</legend>\n                        <div class="form-group">\n                            <label class="control-label col-sm-4" for="fd-mm-'+
-((__t=( mediaType ))==null?'':__t)+
-'-license">'+
-((__t=(gettext("License")))==null?'':_.escape(__t))+
-'</label>\n                            <div class="col-sm-8">\n                                <select name="license" id="fd-mm-'+
-((__t=( mediaType ))==null?'':__t)+
-'-license">\n                                    <option value="cc-nc">'+
-((__t=(gettext("Creative Commons Attribution, Non-Commercial")))==null?'':_.escape(__t))+
-'</option>\n                                    <option value="cc-nd">'+
-((__t=(gettext("Creative Commons Attribution, No Derivatives")))==null?'':_.escape(__t))+
-'</option>\n                                    <option value="cc" selected="selected">'+
-((__t=(gettext("Creative Commons Attribution")))==null?'':_.escape(__t))+
-'</option>\n                                    <option value="cc-nc-sa">'+
-((__t=(gettext("Creative Commons Attribution, Non-Commercial, and Share Alike")))==null?'':_.escape(__t))+
-'</option>\n                                    <option value="cc-nc-nd">'+
-((__t=(gettext("Creative Commons Attribution, Non-Commercial, and No Derivatives")))==null?'':_.escape(__t))+
-'</option>\n                                    <option value="cc-sa">'+
-((__t=(gettext("Creative Commons Attribution, Share Alike")))==null?'':_.escape(__t))+
-'</option>\n                                </select>\n                            </div>\n                        </div>\n                        <div class="form-group">\n                            <label class="col-sm-4 control-label" for="fd-mm-'+
-((__t=( mediaType ))==null?'':__t)+
-'-author">'+
-((__t=(gettext("Author")))==null?'':_.escape(__t))+
-'</label>\n                            <div class="col-sm-8">\n                                <input type="text"\n                                       name="author"\n                                       id="fd-mm-'+
-((__t=( mediaType ))==null?'':__t)+
-'-author"\n                                       placeholder="'+
-((__t=(gettext("Enter the name of the author.")))==null?'':_.escape(__t))+
-'" />\n                            </div>\n                        </div>\n                        <div class="form-group">\n                            <label class="col-sm-4 control-label" for="fd-mm-'+
-((__t=( mediaType ))==null?'':__t)+
-'-attribution">\n                                '+
-((__t=(gettext("Attribution Notes")))==null?'':_.escape(__t))+
-'\n                            </label>\n                            <div class="col-sm-8">\n                                <textarea name="attribution-notes"\n                                       id="fd-mm-'+
-((__t=( mediaType ))==null?'':__t)+
-'-attribution"\n                                       rows="2"></textarea>\n                            </div>\n                        </div>\n                    </fieldset>\n                </div>\n            </div>\n            <div class="modal-footer">\n                <a class="btn btn-default" data-dismiss="modal">'+
-((__t=(gettext("Close")))==null?'':_.escape(__t))+
-'</a>\n                <a class="btn btn-default disabled hqm-upload hqm-upload-confirm">\n                    <i class="fa-solid fa-cloud-arrow-up"></i> '+
-((__t=(gettext("Begin Upload")))==null?'':_.escape(__t))+
-'\n                </a>\n            </div>\n        </div>\n    </div>\n</div>\n';
-}
-return __p;
-}; });
-
-
-define('tpl/tpl!vellum/templates/multimedia_upload_trigger', ['underscore'], function (_) { return function(obj){
-var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};
-with(obj||{}){
-__p+='<a href="#'+
-((__t=( uploaderId ))==null?'':__t)+
-'"\n   class="btn btn-primary"\n   data-toggle="modal">\n    '+
-((__t=( multimediaExists ? gettext("Replace") : gettext("Upload") ))==null?'':_.escape(__t))+
-' '+
-((__t=(mediaType))==null?'':__t)+
-'\n</a>\n';
-}
-return __p;
-}; });
-
-
-define('text/text!vellum/templates/multimedia_queue.html',[],function () { return '<div id="<%= unique_id %>" style="clear: both;">\n    <div class="alert alert-success" style="margin-bottom: 2px; margin-top: 10px;">\n        <i class="fa fa-check"></i> <%= file_name %> <strong>[<%= file_size %> MB]</strong>\n    </div>\n    <div class="hqm-progress">\n        <div class="progress progress-striped active" style="margin-bottom: 5px;">\n            <div class="progress-bar" style="width: 0%;"></div>\n        </div>\n        <p class="text-success hqm-begin">\n        <%\n            var msg = gettext("Ready to upload. Click {btn} below to start."),\n                btn = "<strong>" + gettext("Begin Upload") + "</strong>";\n            print(msg.replace(/\\{btn\\}/g, btn));\n        %>\n        </p>\n        <p class="text-danger hqm-error hide">\n            <span class="label label-danger"><%-gettext("There were errors.")%></span>\n        </p>\n        <a class="btn btn-danger btn-xs pull-right hqm-cancel hide">\n            <i class="fa fa-remove"></i> <%-gettext("Cancel Upload")%>\n        </a>\n    </div>\n    <div class="hqm-status"></div>\n</div>\n';});
-
-
-define('text/text!vellum/templates/multimedia_errors.html',[],function () { return '<% if (errors.length > 0) { %>\n    <div class="alert alert-danger">\n        <h5><%-gettext("Errors found")%></h5>\n        <% for (var e = 0; e < errors.length; e++) {\n            var error = errors[e]; %>\n            <p><%- error %></p>\n        <% } %>\n    </div>\n<% } %>\n';});
-
-
-define('text/text!vellum/templates/multimedia_existing_image.html',[],function () { return '<p>\n    <img src="<%=url %>?thumb=100" alt="uploaded image" />\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens image in new tab.")%>"><%-gettext("View Full Size")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New Image Uploaded Successfully")%></span>\n</p>\n';});
-
-
-define('text/text!vellum/templates/multimedia_existing_audio.html',[],function () { return '<p>\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens file in new tab.")%>"><%-gettext("Open Audio")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New Audio Uploaded Successfully")%></span>\n</p>\n';});
-
-
-define('text/text!vellum/templates/multimedia_existing_video.html',[],function () { return '<p>\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens file in new tab.")%>"><%-gettext("Open Video")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New Video Uploaded Successfully")%></span>\n</p>\n';});
-
-
-define('text/text!vellum/templates/multimedia_existing_text.html',[],function () { return '<p>\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens file in new tab.")%>"><%-gettext("Open HTML")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New HTML Document Uploaded Successfully")%></span>\n</p>\n';});
-
-
-define('tpl/tpl!vellum/templates/multimedia_nomedia', ['underscore'], function (_) { return function(obj){
-var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};
-with(obj||{}){
-__p+='<p class="fd-mm-no-ref">\n    <i class="'+
-((__t=(iconClass))==null?'':__t)+
-'"></i>\n    '+
-((__t=(gettext("No Reference")))==null?'':_.escape(__t))+
-'\n</p>\n';
-}
-return __p;
-}; });
-
-
-define('tpl/tpl!vellum/templates/multimedia_block', ['underscore'], function (_) { return function(obj){
-var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};
-with(obj||{}){
-__p+='<div class="control-row">\n    <div class="col-sm-12">\n        <button type="button" class="btn btn-default fd-mm-path-show pull-right">\n            <i class="fa fa-cog"></i>\n            '+
-((__t=(gettext("Advanced: Show Path")))==null?'':_.escape(__t))+
-'\n        </button>\n        <div class="fd-mm-upload-trigger"></div>\n    </div>\n</div>\n<div class="control-row">\n    <div class="fd-mm-path hide col-sm-12">\n        <button type="button" class="btn btn-default fd-mm-path-hide pull-right">'+
-((__t=(gettext("Hide Path")))==null?'':_.escape(__t))+
-'</button>\n        <div class="fd-mm-path-input"></div>\n    </div>\n</div>\n';
-}
-return __p;
-}; });
-
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-/**
-The YUI module contains the components required for building the YUI seed file.
-This includes the script loading mechanism, a simple queue, and the core
-utilities for the library.
-
-@module yui
-@main yui
-@submodule yui-base
-**/
-
-/*jshint eqeqeq: false*/
-if (typeof YUI != 'undefined') {
-    YUI._YUI = YUI;
-}
-
-/**
-The YUI global namespace object. This is the constructor for all YUI instances.
-
-This is a self-instantiable factory function, meaning you don't need to precede
-it with the `new` operator. You can invoke it directly like this:
-
-    YUI().use('*', function (Y) {
-        // Y is a new YUI instance.
-    });
-
-But it also works like this:
-
-    var Y = YUI();
-
-The `YUI` constructor accepts an optional config object, like this:
-
-    YUI({
-        debug: true,
-        combine: false
-    }).use('node', function (Y) {
-        // Y.Node is ready to use.
-    });
-
-See the API docs for the <a href="config.html">Config</a> class for the complete
-list of supported configuration properties accepted by the YUI constuctor.
-
-If a global `YUI` object is already defined, the existing YUI object will not be
-overwritten, to ensure that defined namespaces are preserved.
-
-Each YUI instance has full custom event support, but only if the event system is
-available.
-
-@class YUI
-@uses EventTarget
-@constructor
-@global
-@param {Object} [config]* Zero or more optional configuration objects. Config
-    values are stored in the `Y.config` property. See the
-    <a href="config.html">Config</a> docs for the list of supported properties.
-**/
-
-    /*global YUI*/
-    /*global YUI_config*/
-    var YUI = function() {
-        var i = 0,
-            Y = this,
-            args = arguments,
-            l = args.length,
-            instanceOf = function(o, type) {
-                return (o && o.hasOwnProperty && (o instanceof type));
-            },
-            gconf = (typeof YUI_config !== 'undefined') && YUI_config;
-
-        if (!(instanceOf(Y, YUI))) {
-            Y = new YUI();
-        } else {
-            // set up the core environment
-            Y._init();
-
-            /**
-            Master configuration that might span multiple contexts in a non-
-            browser environment. It is applied first to all instances in all
-            contexts.
-
-            @example
-
-                YUI.GlobalConfig = {
-                    filter: 'debug'
-                };
-
-                YUI().use('node', function (Y) {
-                    // debug files used here
-                });
-
-                YUI({
-                    filter: 'min'
-                }).use('node', function (Y) {
-                    // min files used here
-                });
-
-            @property {Object} GlobalConfig
-            @global
-            @static
-            **/
-            if (YUI.GlobalConfig) {
-                Y.applyConfig(YUI.GlobalConfig);
-            }
-
-            /**
-            Page-level config applied to all YUI instances created on the
-            current page. This is applied after `YUI.GlobalConfig` and before
-            any instance-level configuration.
-
-            @example
-
-                // Single global var to include before YUI seed file
-                YUI_config = {
-                    filter: 'debug'
-                };
-
-                YUI().use('node', function (Y) {
-                    // debug files used here
-                });
-
-                YUI({
-                    filter: 'min'
-                }).use('node', function (Y) {
-                    // min files used here
-                });
-
-            @property {Object} YUI_config
-            @global
-            **/
-            if (gconf) {
-                Y.applyConfig(gconf);
-            }
-
-            // bind the specified additional modules for this instance
-            if (!l) {
-                Y._setup();
-            }
-        }
-
-        if (l) {
-            // Each instance can accept one or more configuration objects.
-            // These are applied after YUI.GlobalConfig and YUI_Config,
-            // overriding values set in those config files if there is a
-            // matching property.
-            for (; i < l; i++) {
-                Y.applyConfig(args[i]);
-            }
-
-            Y._setup();
-        }
-
-        Y.instanceOf = instanceOf;
-
-        return Y;
-    };
-
-(function() {
-
-    var proto, prop,
-        VERSION = '3.16.0',
-        PERIOD = '.',
-        BASE = 'http://yui.yahooapis.com/',
-        /*
-            These CSS class names can't be generated by
-            getClassName since it is not available at the
-            time they are being used.
-        */
-        DOC_LABEL = 'yui3-js-enabled',
-        CSS_STAMP_EL = 'yui3-css-stamp',
-        NOOP = function() {},
-        SLICE = Array.prototype.slice,
-        APPLY_TO_AUTH = { 'io.xdrReady': 1,   // the functions applyTo
-                          'io.xdrResponse': 1,   // can call. this should
-                          'SWF.eventHandler': 1 }, // be done at build time
-        hasWin = (typeof window != 'undefined'),
-        win = (hasWin) ? window : null,
-        doc = (hasWin) ? win.document : null,
-        docEl = doc && doc.documentElement,
-        docClass = docEl && docEl.className,
-        instances = {},
-        time = new Date().getTime(),
-        add = function(el, type, fn, capture) {
-            if (el && el.addEventListener) {
-                el.addEventListener(type, fn, capture);
-            } else if (el && el.attachEvent) {
-                el.attachEvent('on' + type, fn);
-            }
-        },
-        remove = function(el, type, fn, capture) {
-            if (el && el.removeEventListener) {
-                // this can throw an uncaught exception in FF
-                try {
-                    el.removeEventListener(type, fn, capture);
-                } catch (ex) {}
-            } else if (el && el.detachEvent) {
-                el.detachEvent('on' + type, fn);
-            }
-        },
-        handleReady = function() {
-            YUI.Env.DOMReady = true;
-            if (hasWin) {
-                remove(doc, 'DOMContentLoaded', handleReady);
-            }        
-        },
-        handleLoad = function() {
-            YUI.Env.windowLoaded = true;
-            YUI.Env.DOMReady = true;
-            if (hasWin) {
-                remove(window, 'load', handleLoad);
-            }
-        },
-        getLoader = function(Y, o) {
-            var loader = Y.Env._loader,
-                lCore = [ 'loader-base' ],
-                G_ENV = YUI.Env,
-                mods = G_ENV.mods;
-
-            if (loader) {
-                //loader._config(Y.config);
-                loader.ignoreRegistered = false;
-                loader.onEnd = null;
-                loader.data = null;
-                loader.required = [];
-                loader.loadType = null;
-            } else {
-                loader = new Y.Loader(Y.config);
-                Y.Env._loader = loader;
-            }
-            if (mods && mods.loader) {
-                lCore = [].concat(lCore, YUI.Env.loaderExtras);
-            }
-            YUI.Env.core = Y.Array.dedupe([].concat(YUI.Env.core, lCore));
-
-            return loader;
-        },
-
-        clobber = function(r, s) {
-            for (var i in s) {
-                if (s.hasOwnProperty(i)) {
-                    r[i] = s[i];
-                }
-            }
-        },
-
-        ALREADY_DONE = { success: true };
-
-//  Stamp the documentElement (HTML) with a class of "yui-loaded" to
-//  enable styles that need to key off of JS being enabled.
-if (docEl && docClass.indexOf(DOC_LABEL) == -1) {
-    if (docClass) {
-        docClass += ' ';
-    }
-    docClass += DOC_LABEL;
-    docEl.className = docClass;
-}
-
-if (VERSION.indexOf('@') > -1) {
-    VERSION = '3.5.0'; // dev time hack for cdn test
-}
-
-proto = {
-    /**
-    Applies a new configuration object to the config of this YUI instance. This
-    will merge new group/module definitions, and will also update the loader
-    cache if necessary. Updating `Y.config` directly will not update the cache.
-
-    @method applyConfig
-    @param {Object} o the configuration object.
-    @since 3.2.0
-    **/
-    applyConfig: function(o) {
-
-        o = o || NOOP;
-
-        var attr,
-            name,
-            // detail,
-            config = this.config,
-            mods = config.modules,
-            groups = config.groups,
-            aliases = config.aliases,
-            loader = this.Env._loader;
-
-        for (name in o) {
-            if (o.hasOwnProperty(name)) {
-                attr = o[name];
-                if (mods && name == 'modules') {
-                    clobber(mods, attr);
-                } else if (aliases && name == 'aliases') {
-                    clobber(aliases, attr);
-                } else if (groups && name == 'groups') {
-                    clobber(groups, attr);
-                } else if (name == 'win') {
-                    config[name] = (attr && attr.contentWindow) || attr;
-                    config.doc = config[name] ? config[name].document : null;
-                } else if (name == '_yuid') {
-                    // preserve the guid
-                } else {
-                    config[name] = attr;
-                }
-            }
-        }
-
-        if (loader) {
-            loader._config(o);
-        }
-
-    },
-
-    /**
-    Old way to apply a config to this instance (calls `applyConfig` under the
-    hood).
-
-    @private
-    @method _config
-    @param {Object} o The config to apply
-    **/
-    _config: function(o) {
-        this.applyConfig(o);
-    },
-
-    /**
-    Initializes this YUI instance.
-
-    @private
-    @method _init
-    **/
-    _init: function() {
-        var filter, el,
-            Y = this,
-            G_ENV = YUI.Env,
-            Env = Y.Env,
-            prop;
-
-        /**
-        The version number of this YUI instance.
-
-        This value is typically updated by a script when a YUI release is built,
-        so it may not reflect the correct version number when YUI is run from
-        the development source tree.
-
-        @property {String} version
-        **/
-        Y.version = VERSION;
-
-        if (!Env) {
-            Y.Env = {
-                core: ['get', 'features', 'intl-base', 'yui-log', 'yui-later'],
-                loaderExtras: ['loader-rollup', 'loader-yui3'],
-                mods: {}, // flat module map
-                versions: {}, // version module map
-                base: BASE,
-                cdn: BASE + VERSION + '/build/',
-                // bootstrapped: false,
-                _idx: 0,
-                _used: {},
-                _attached: {},
-                _exported: {},
-                _missed: [],
-                _yidx: 0,
-                _uidx: 0,
-                _guidp: 'y',
-                _loaded: {},
-                // serviced: {},
-                // Regex in English:
-                // I'll start at the \b(yui).
-                // 1. Look in the test string for "yui" or
-                //    "yui-base" or "yui-davglass" or "yui-foobar" that comes after a word break.  That is, it
-                //    can't match "foyui" or "i_heart_yui". This can be anywhere in the string.
-                // 2. After #1 must come a forward slash followed by the string matched in #1, so
-                //    "yui-base/yui-base" or "yui-pants/yui-pants".
-                // 3. The second occurence of the #1 token can optionally be followed by "-debug" or "-min",
-                //    so "yui/yui-min", "yui/yui-debug", "yui-base/yui-base-debug". NOT "yui/yui-tshirt".
-                // 4. This is followed by ".js", so "yui/yui.js".
-                // 0. Going back to the beginning, now. If all that stuff in 1-4 comes after a "?" in the string,
-                //    then capture the junk between the LAST "&" and the string in 1-4.  So
-                //    "blah?foo/yui/yui.js" will capture "foo/" and "blah?some/thing.js&3.3.0/build/yui-davglass/yui-davglass.js"
-                //    will capture "3.3.0/build/"
-                //
-                // Regex Exploded:
-                // (?:\?             Find a ?
-                //   (?:[^&]*&)      followed by 0..n characters followed by an &
-                //   *               in fact, find as many sets of characters followed by a & as you can
-                //   ([^&]*)         capture the stuff after the last & in \1
-                // )?                but it's ok if all this ?junk&more_junk stuff isn't even there
-                // \b(               after a word break find either the string
-                //    yui(?:-\w+)?   "yui" optionally followed by a -, then more characters
-                // )                 and store the yui-* string in \2
-                // \/\2              then comes a / followed by the yui-* string in \2
-                // (?:-(min|debug))? optionally followed by "-min" or "-debug"
-                // .js               and ending in ".js"
-                _BASE_RE: /(?:\?(?:[^&]*&)*([^&]*))?\b(yui(?:-\w+)?)\/\2(?:-(min|debug))?\.js/,
-                parseBasePath: function(src, pattern) {
-                    var match = src.match(pattern),
-                        path, filter;
-
-                    if (match) {
-                        path = RegExp.leftContext || src.slice(0, src.indexOf(match[0]));
-
-                        // this is to set up the path to the loader.  The file
-                        // filter for loader should match the yui include.
-                        filter = match[3];
-
-                        // extract correct path for mixed combo urls
-                        // http://yuilibrary.com/projects/yui3/ticket/2528423
-                        if (match[1]) {
-                            path += '?' + match[1];
-                        }
-                        path = {
-                            filter: filter,
-                            path: path
-                        };
-                    }
-                    return path;
-                },
-                getBase: G_ENV && G_ENV.getBase ||
-                        function(pattern) {
-                            var nodes = (doc && doc.getElementsByTagName('script')) || [],
-                                path = Env.cdn, parsed,
-                                i, len, src;
-
-                            for (i = 0, len = nodes.length; i < len; ++i) {
-                                src = nodes[i].src;
-                                if (src) {
-                                    parsed = Y.Env.parseBasePath(src, pattern);
-                                    if (parsed) {
-                                        filter = parsed.filter;
-                                        path = parsed.path;
-                                        break;
-                                    }
-                                }
-                            }
-
-                            // use CDN default
-                            return path;
-                        }
-
-            };
-
-            Env = Y.Env;
-
-            Env._loaded[VERSION] = {};
-
-            if (G_ENV && Y !== YUI) {
-                Env._yidx = ++G_ENV._yidx;
-                Env._guidp = ('yui_' + VERSION + '_' +
-                             Env._yidx + '_' + time).replace(/[^a-z0-9_]+/g, '_');
-            } else if (YUI._YUI) {
-
-                G_ENV = YUI._YUI.Env;
-                Env._yidx += G_ENV._yidx;
-                Env._uidx += G_ENV._uidx;
-
-                for (prop in G_ENV) {
-                    if (!(prop in Env)) {
-                        Env[prop] = G_ENV[prop];
-                    }
-                }
-
-                delete YUI._YUI;
-            }
-
-            Y.id = Y.stamp(Y);
-            instances[Y.id] = Y;
-
-        }
-
-        Y.constructor = YUI;
-
-        // configuration defaults
-        Y.config = Y.config || {
-            bootstrap: true,
-            cacheUse: true,
-            debug: true,
-            doc: doc,
-            fetchCSS: true,
-            throwFail: true,
-            useBrowserConsole: true,
-            useNativeES5: true,
-            win: win,
-            global: Function('return this')()
-        };
-
-        //Register the CSS stamp element
-        if (doc && !doc.getElementById(CSS_STAMP_EL)) {
-            el = doc.createElement('div');
-            el.innerHTML = '<div id="' + CSS_STAMP_EL + '" style="position: absolute !important; visibility: hidden !important"></div>';
-            YUI.Env.cssStampEl = el.firstChild;
-            if (doc.body) {
-                doc.body.appendChild(YUI.Env.cssStampEl);
-            } else {
-                docEl.insertBefore(YUI.Env.cssStampEl, docEl.firstChild);
-            }
-        } else if (doc && doc.getElementById(CSS_STAMP_EL) && !YUI.Env.cssStampEl) {
-            YUI.Env.cssStampEl = doc.getElementById(CSS_STAMP_EL);
-        }
-
-        Y.config.lang = Y.config.lang || 'en-US';
-
-        Y.config.base = YUI.config.base || Y.Env.getBase(Y.Env._BASE_RE);
-
-        if (!filter || (!('mindebug').indexOf(filter))) {
-            filter = 'min';
-        }
-        filter = (filter) ? '-' + filter : filter;
-        Y.config.loaderPath = YUI.config.loaderPath || 'loader/loader' + filter + '.js';
-
-    },
-
-    /**
-    Finishes the instance setup. Attaches whatever YUI modules were defined
-    at the time that this instance was created.
-
-    @method _setup
-    @private
-    **/
-    _setup: function() {
-        var i, Y = this,
-            core = [],
-            mods = YUI.Env.mods,
-            extras = Y.config.core || [].concat(YUI.Env.core); //Clone it..
-
-        for (i = 0; i < extras.length; i++) {
-            if (mods[extras[i]]) {
-                core.push(extras[i]);
-            }
-        }
-
-        Y._attach(['yui-base']);
-        Y._attach(core);
-
-        if (Y.Loader) {
-            getLoader(Y);
-        }
-
-    },
-
-    /**
-    Executes the named method on the specified YUI instance if that method is
-    whitelisted.
-
-    @method applyTo
-    @param {String} id YUI instance id.
-    @param {String} method Name of the method to execute. For example:
-        'Object.keys'.
-    @param {Array} args Arguments to apply to the method.
-    @return {Mixed} Return value from the applied method, or `null` if the
-        specified instance was not found or the method was not whitelisted.
-    **/
-    applyTo: function(id, method, args) {
-        if (!(method in APPLY_TO_AUTH)) {
-            this.log(method + ': applyTo not allowed', 'warn', 'yui');
-            return null;
-        }
-
-        var instance = instances[id], nest, m, i;
-        if (instance) {
-            nest = method.split('.');
-            m = instance;
-            for (i = 0; i < nest.length; i = i + 1) {
-                m = m[nest[i]];
-                if (!m) {
-                    this.log('applyTo not found: ' + method, 'warn', 'yui');
-                }
-            }
-            return m && m.apply(instance, args);
-        }
-
-        return null;
-    },
-
-/**
-Registers a YUI module and makes it available for use in a `YUI().use()` call or
-as a dependency for other modules.
-
-The easiest way to create a first-class YUI module is to use
-<a href="http://yui.github.com/shifter/">Shifter</a>, the YUI component build
-tool.
-
-Shifter will automatically wrap your module code in a `YUI.add()` call along
-with any configuration info required for the module.
-
-@example
-
-    YUI.add('davglass', function (Y) {
-        Y.davglass = function () {
-        };
-    }, '3.4.0', {
-        requires: ['harley-davidson', 'mt-dew']
-    });
-
-@method add
-@param {String} name Module name.
-@param {Function} fn Function containing module code. This function will be
-    executed whenever the module is attached to a specific YUI instance.
-
-    @param {YUI} fn.Y The YUI instance to which this module is attached.
-    @param {String} fn.name Name of the module
-
-@param {String} version Module version number. This is currently used only for
-    informational purposes, and is not used internally by YUI.
-
-@param {Object} [config] Module config.
-    @param {Array} [config.requires] Array of other module names that must be
-        attached before this module can be attached.
-    @param {Array} [config.optional] Array of optional module names that should
-        be attached before this module is attached if they've already been
-        loaded. If the `loadOptional` YUI option is `true`, optional modules
-        that have not yet been loaded will be loaded just as if they were hard
-        requirements.
-    @param {Array} [config.use] Array of module names that are included within
-        or otherwise provided by this module, and which should be attached
-        automatically when this module is attached. This makes it possible to
-        create "virtual rollup" modules that simply attach a collection of other
-        modules or submodules.
-
-@return {YUI} This YUI instance.
-**/
-    add: function(name, fn, version, details) {
-        details = details || {};
-        var env = YUI.Env,
-            mod = {
-                name: name,
-                fn: fn,
-                version: version,
-                details: details
-            },
-            //Instance hash so we don't apply it to the same instance twice
-            applied = {},
-            loader, inst, modInfo,
-            i, versions = env.versions;
-
-        env.mods[name] = mod;
-        versions[version] = versions[version] || {};
-        versions[version][name] = mod;
-
-        for (i in instances) {
-            if (instances.hasOwnProperty(i)) {
-                inst = instances[i];
-                if (!applied[inst.id]) {
-                    applied[inst.id] = true;
-                    loader = inst.Env._loader;
-                    if (loader) {
-                        modInfo = loader.getModuleInfo(name);
-                        if (!modInfo || modInfo.temp) {
-                            loader.addModule(details, name);
-                        }
-                    }
-                }
-            }
-        }
-
-        return this;
-    },
-
-    /**
-    Executes the callback function associated with each required module,
-    attaching the module to this YUI instance.
-
-    @method _attach
-    @param {Array} r The array of modules to attach
-    @param {Boolean} [moot=false] If `true`, don't throw a warning if the module
-        is not attached.
-    @private
-    **/
-    _attach: function(r, moot) {
-        var i, name, mod, details, req, use, after,
-            mods = YUI.Env.mods,
-            aliases = YUI.Env.aliases,
-            Y = this, j,
-            cache = YUI.Env._renderedMods,
-            loader = Y.Env._loader,
-            done = Y.Env._attached,
-            exported = Y.Env._exported,
-            len = r.length, loader, def, go,
-            c = [],
-            modArgs, esCompat, reqlen, modInfo,
-            condition,
-            __exports__, __imports__;
-
-        //Check for conditional modules (in a second+ instance) and add their requirements
-        //TODO I hate this entire method, it needs to be fixed ASAP (3.5.0) ^davglass
-        for (i = 0; i < len; i++) {
-            name = r[i];
-            mod = mods[name];
-            c.push(name);
-            if (loader && loader.conditions[name]) {
-                for (j in loader.conditions[name]) {
-                    if (loader.conditions[name].hasOwnProperty(j)) {
-                        def = loader.conditions[name][j];
-                        go = def && ((def.ua && Y.UA[def.ua]) || (def.test && def.test(Y)));
-                        if (go) {
-                            c.push(def.name);
-                        }
-                    }
-                }
-            }
-        }
-        r = c;
-        len = r.length;
-
-        for (i = 0; i < len; i++) {
-            if (!done[r[i]]) {
-                name = r[i];
-                mod = mods[name];
-
-                if (aliases && aliases[name] && !mod) {
-                    Y._attach(aliases[name]);
-                    continue;
-                }
-                if (!mod) {
-                    modInfo = loader && loader.getModuleInfo(name);
-                    if (modInfo) {
-                        mod = modInfo;
-                        moot = true;
-                    }
-
-
-                    //if (!loader || !loader.moduleInfo[name]) {
-                    //if ((!loader || !loader.moduleInfo[name]) && !moot) {
-                    if (!moot && name) {
-                        if ((name.indexOf('skin-') === -1) && (name.indexOf('css') === -1)) {
-                            Y.Env._missed.push(name);
-                            Y.Env._missed = Y.Array.dedupe(Y.Env._missed);
-                            Y.message('NOT loaded: ' + name, 'warn', 'yui');
-                        }
-                    }
-                } else {
-                    done[name] = true;
-                    //Don't like this, but in case a mod was asked for once, then we fetch it
-                    //We need to remove it from the missed list ^davglass
-                    for (j = 0; j < Y.Env._missed.length; j++) {
-                        if (Y.Env._missed[j] === name) {
-                            Y.message('Found: ' + name + ' (was reported as missing earlier)', 'warn', 'yui');
-                            Y.Env._missed.splice(j, 1);
-                        }
-                    }
-                    /*
-                        If it's a temp module, we need to redo it's requirements if it's already loaded
-                        since it may have been loaded by another instance and it's dependencies might
-                        have been redefined inside the fetched file.
-                    */
-                    if (loader && cache && cache[name] && cache[name].temp) {
-                        loader.getRequires(cache[name]);
-                        req = [];
-                        modInfo = loader.getModuleInfo(name);
-                        for (j in modInfo.expanded_map) {
-                            if (modInfo.expanded_map.hasOwnProperty(j)) {
-                                req.push(j);
-                            }
-                        }
-                        Y._attach(req);
-                    }
-
-                    details = mod.details;
-                    req = details.requires;
-                    esCompat = details.es;
-                    use = details.use;
-                    after = details.after;
-                    //Force Intl load if there is a language (Loader logic) @todo fix this shit
-                    if (details.lang) {
-                        req = req || [];
-                        req.unshift('intl');
-                    }
-
-                    if (req) {
-                        reqlen = req.length;
-                        for (j = 0; j < reqlen; j++) {
-                            if (!done[req[j]]) {
-                                if (!Y._attach(req)) {
-                                    return false;
-                                }
-                                break;
-                            }
-                        }
-                    }
-
-                    if (after) {
-                        for (j = 0; j < after.length; j++) {
-                            if (!done[after[j]]) {
-                                if (!Y._attach(after, true)) {
-                                    return false;
-                                }
-                                break;
-                            }
-                        }
-                    }
-
-                    if (mod.fn) {
-                        modArgs = [Y, name];
-                        if (esCompat) {
-                            __imports__ = {};
-                            __exports__ = {};
-                            // passing `exports` and `imports` onto the module function
-                            modArgs.push(__imports__, __exports__);
-                            if (req) {
-                                reqlen = req.length;
-                                for (j = 0; j < reqlen; j++) {
-                                    __imports__[req[j]] = exported.hasOwnProperty(req[j]) ? exported[req[j]] : Y;
-                                }
-                            }
-                        }
-                        if (Y.config.throwFail) {
-                            __exports__ = mod.fn.apply(esCompat ? undefined : mod, modArgs);
-                        } else {
-                            try {
-                                __exports__ = mod.fn.apply(esCompat ? undefined : mod, modArgs);
-                            } catch (e) {
-                                Y.error('Attach error: ' + name, e, name);
-                                return false;
-                            }
-                        }
-                        if (esCompat) {
-                            // store the `exports` in case others `es` modules requires it
-                            exported[name] = __exports__;
-
-                            // If an ES module is conditionally loaded and set
-                            // to be used "instead" another module, replace the
-                            // trigger module's content with the conditionally
-                            // loaded one so the values returned by require()
-                            // still makes sense
-                            condition = mod.details.condition;
-                            if (condition && condition.when === 'instead') {
-                                exported[condition.trigger] = __exports__;
-                            }
-                        }
-                    }
-
-                    if (use) {
-                        for (j = 0; j < use.length; j++) {
-                            if (!done[use[j]]) {
-                                if (!Y._attach(use)) {
-                                    return false;
-                                }
-                                break;
-                            }
-                        }
-                    }
-
-
-
-                }
-            }
-        }
-
-        return true;
-    },
-
-    /**
-    Delays the `use` callback until another event has taken place such as
-    `window.onload`, `domready`, `contentready`, or `available`.
-
-    @private
-    @method _delayCallback
-    @param {Function} cb The original `use` callback.
-    @param {String|Object} until Either an event name ('load', 'domready', etc.)
-        or an object containing event/args keys for contentready/available.
-    @return {Function}
-    **/
-    _delayCallback: function(cb, until) {
-
-        var Y = this,
-            mod = ['event-base'];
-
-        until = (Y.Lang.isObject(until) ? until : { event: until });
-
-        if (until.event === 'load') {
-            mod.push('event-synthetic');
-        }
-
-        return function() {
-            var args = arguments;
-            Y._use(mod, function() {
-                Y.on(until.event, function() {
-                    args[1].delayUntil = until.event;
-                    cb.apply(Y, args);
-                }, until.args);
-            });
-        };
-    },
-
-    /**
-    Attaches one or more modules to this YUI instance. When this is executed,
-    the requirements of the desired modules are analyzed, and one of several
-    things can happen:
-
-
-      * All required modules have already been loaded, and just need to be
-        attached to this YUI instance. In this case, the `use()` callback will
-        be executed synchronously after the modules are attached.
-
-      * One or more modules have not yet been loaded, or the Get utility is not
-        available, or the `bootstrap` config option is `false`. In this case,
-        a warning is issued indicating that modules are missing, but all
-        available modules will still be attached and the `use()` callback will
-        be executed synchronously.
-
-      * One or more modules are missing and the Loader is not available but the
-        Get utility is, and `bootstrap` is not `false`. In this case, the Get
-        utility will be used to load the Loader, and we will then proceed to
-        the following state:
-
-      * One or more modules are missing and the Loader is available. In this
-        case, the Loader will be used to resolve the dependency tree for the
-        missing modules and load them and their dependencies. When the Loader is
-        finished loading modules, the `use()` callback will be executed
-        asynchronously.
-
-    @example
-
-        // Loads and attaches dd and its dependencies.
-        YUI().use('dd', function (Y) {
-            // ...
-        });
-
-        // Loads and attaches dd and node as well as all of their dependencies.
-        YUI().use(['dd', 'node'], function (Y) {
-            // ...
-        });
-
-        // Attaches all modules that have already been loaded.
-        YUI().use('*', function (Y) {
-            // ...
-        });
-
-        // Attaches a gallery module.
-        YUI().use('gallery-yql', function (Y) {
-            // ...
-        });
-
-        // Attaches a YUI 2in3 module.
-        YUI().use('yui2-datatable', function (Y) {
-            // ...
-        });
-
-    @method use
-    @param {String|Array} modules* One or more module names to attach.
-    @param {Function} [callback] Callback function to be executed once all
-        specified modules and their dependencies have been attached.
-    @param {YUI} callback.Y The YUI instance created for this sandbox.
-    @param {Object} callback.status Object containing `success`, `msg` and
-        `data` properties.
-    @chainable
-    **/
-    use: function() {
-        var args = SLICE.call(arguments, 0),
-            callback = args[args.length - 1],
-            Y = this,
-            i = 0,
-            name,
-            Env = Y.Env,
-            provisioned = true;
-
-        // The last argument supplied to use can be a load complete callback
-        if (Y.Lang.isFunction(callback)) {
-            args.pop();
-            if (Y.config.delayUntil) {
-                callback = Y._delayCallback(callback, Y.config.delayUntil);
-            }
-        } else {
-            callback = null;
-        }
-        if (Y.Lang.isArray(args[0])) {
-            args = args[0];
-        }
-
-        if (Y.config.cacheUse) {
-            while ((name = args[i++])) {
-                if (!Env._attached[name]) {
-                    provisioned = false;
-                    break;
-                }
-            }
-
-            if (provisioned) {
-                if (args.length) {
-                }
-                Y._notify(callback, ALREADY_DONE, args);
-                return Y;
-            }
-        }
-
-        if (Y._loading) {
-            Y._useQueue = Y._useQueue || new Y.Queue();
-            Y._useQueue.add([args, callback]);
-        } else {
-            Y._use(args, function(Y, response) {
-                Y._notify(callback, response, args);
-            });
-        }
-
-        return Y;
-    },
-
-    /**
-    Sugar for loading both legacy and ES6-based YUI modules.
-
-    @method require
-    @param {String} [modules*] List of module names to import or a single
-        module name.
-    @param {Function} callback Callback that gets called once all the modules
-        were loaded. Each parameter of the callback is the export value of the
-        corresponding module in the list. If the module is a legacy YUI module,
-        the YUI instance is used instead of the module exports.
-    @example
-    ```
-    YUI().require(['es6-set'], function (Y, imports) {
-        var Set = imports.Set,
-            set = new Set();
-    });
-    ```
-    **/
-    require: function () {
-        var args = SLICE.call(arguments),
-            callback;
-
-        if (typeof args[args.length - 1] === 'function') {
-            callback = args.pop();
-
-            // only add the callback if one was provided
-            // YUI().require('foo'); is valid
-            args.push(function (Y) {
-                var i, length = args.length,
-                    exported = Y.Env._exported,
-                    __imports__ = {};
-
-                // Get only the imports requested as arguments
-                for (i = 0; i < length; i++) {
-                    if (exported.hasOwnProperty(args[i])) {
-                        __imports__[args[i]] = exported[args[i]];
-                    }
-                }
-
-                // Using `undefined` because:
-                // - Using `Y.config.global` would force the value of `this` to be
-                //   the global object even in strict mode
-                // - Using `Y` goes against the goal of moving away from a shared
-                //   object and start thinking in terms of imported and exported
-                //   objects
-                callback.call(undefined, Y, __imports__);
-            });
-        }
-        // Do not return the Y object. This makes it hard to follow this
-        // traditional pattern:
-        //   var Y = YUI().use(...);
-        // This is a good idea in the light of ES6 modules, to avoid working
-        // in the global scope.
-        // This also leaves the door open for returning a promise, once the
-        // YUI loader is based on the ES6 loader which uses
-        // loader.import(...).then(...)
-        this.use.apply(this, args);
-    },
-
-    /**
-    Handles Loader notifications about attachment/load errors.
-
-    @method _notify
-    @param {Function} callback Callback to pass to `Y.config.loadErrorFn`.
-    @param {Object} response Response returned from Loader.
-    @param {Array} args Arguments passed from Loader.
-    @private
-    **/
-    _notify: function(callback, response, args) {
-        if (!response.success && this.config.loadErrorFn) {
-            this.config.loadErrorFn.call(this, this, callback, response, args);
-        } else if (callback) {
-            if (this.Env._missed && this.Env._missed.length) {
-                response.msg = 'Missing modules: ' + this.Env._missed.join();
-                response.success = false;
-            }
-            if (this.config.throwFail) {
-                callback(this, response);
-            } else {
-                try {
-                    callback(this, response);
-                } catch (e) {
-                    this.error('use callback error', e, args);
-                }
-            }
-        }
-    },
-
-    /**
-    Called from the `use` method queue to ensure that only one set of loading
-    logic is performed at a time.
-
-    @method _use
-    @param {String} args* One or more modules to attach.
-    @param {Function} [callback] Function to call once all required modules have
-        been attached.
-    @private
-    **/
-    _use: function(args, callback) {
-
-        if (!this.Array) {
-            this._attach(['yui-base']);
-        }
-
-        var len, loader, handleBoot,
-            Y = this,
-            G_ENV = YUI.Env,
-            mods = G_ENV.mods,
-            Env = Y.Env,
-            used = Env._used,
-            aliases = G_ENV.aliases,
-            queue = G_ENV._loaderQueue,
-            firstArg = args[0],
-            YArray = Y.Array,
-            config = Y.config,
-            boot = config.bootstrap,
-            missing = [],
-            i,
-            r = [],
-            ret = true,
-            fetchCSS = config.fetchCSS,
-            process = function(names, skip) {
-
-                var i = 0, a = [], name, len, m, req, use;
-
-                if (!names.length) {
-                    return;
-                }
-
-                if (aliases) {
-                    len = names.length;
-                    for (i = 0; i < len; i++) {
-                        if (aliases[names[i]] && !mods[names[i]]) {
-                            a = [].concat(a, aliases[names[i]]);
-                        } else {
-                            a.push(names[i]);
-                        }
-                    }
-                    names = a;
-                }
-
-                len = names.length;
-
-                for (i = 0; i < len; i++) {
-                    name = names[i];
-                    if (!skip) {
-                        r.push(name);
-                    }
-
-                    // only attach a module once
-                    if (used[name]) {
-                        continue;
-                    }
-
-                    m = mods[name];
-                    req = null;
-                    use = null;
-
-                    if (m) {
-                        used[name] = true;
-                        req = m.details.requires;
-                        use = m.details.use;
-                    } else {
-                        // CSS files don't register themselves, see if it has
-                        // been loaded
-                        if (!G_ENV._loaded[VERSION][name]) {
-                            missing.push(name);
-                        } else {
-                            used[name] = true; // probably css
-                        }
-                    }
-
-                    // make sure requirements are attached
-                    if (req && req.length) {
-                        process(req);
-                    }
-
-                    // make sure we grab the submodule dependencies too
-                    if (use && use.length) {
-                        process(use, 1);
-                    }
-                }
-
-            },
-
-            handleLoader = function(fromLoader) {
-                var response = fromLoader || {
-                        success: true,
-                        msg: 'not dynamic'
-                    },
-                    redo, origMissing,
-                    ret = true,
-                    data = response.data;
-
-                Y._loading = false;
-
-                if (data) {
-                    origMissing = missing;
-                    missing = [];
-                    r = [];
-                    process(data);
-                    redo = missing.length;
-                    if (redo) {
-                        if ([].concat(missing).sort().join() ==
-                                origMissing.sort().join()) {
-                            redo = false;
-                        }
-                    }
-                }
-
-                if (redo && data) {
-                    Y._loading = true;
-                    Y._use(missing, function() {
-                        if (Y._attach(data)) {
-                            Y._notify(callback, response, data);
-                        }
-                    });
-                } else {
-                    if (data) {
-                        ret = Y._attach(data);
-                    }
-                    if (ret) {
-                        Y._notify(callback, response, args);
-                    }
-                }
-
-                if (Y._useQueue && Y._useQueue.size() && !Y._loading) {
-                    Y._use.apply(Y, Y._useQueue.next());
-                }
-
-            };
-
-
-        // YUI().use('*'); // bind everything available
-        if (firstArg === '*') {
-            args = [];
-            for (i in mods) {
-                if (mods.hasOwnProperty(i)) {
-                    args.push(i);
-                }
-            }
-            ret = Y._attach(args);
-            if (ret) {
-                handleLoader();
-            }
-            return Y;
-        }
-
-        if ((mods.loader || mods['loader-base']) && !Y.Loader) {
-            Y._attach(['loader' + ((!mods.loader) ? '-base' : '')]);
-        }
-
-
-        // use loader to expand dependencies and sort the
-        // requirements if it is available.
-        if (boot && Y.Loader && args.length) {
-            loader = getLoader(Y);
-            loader.require(args);
-            loader.ignoreRegistered = true;
-            loader._boot = true;
-            loader.calculate(null, (fetchCSS) ? null : 'js');
-            args = loader.sorted;
-            loader._boot = false;
-        }
-
-        process(args);
-
-        len = missing.length;
-
-
-        if (len) {
-            missing = YArray.dedupe(missing);
-            len = missing.length;
-        }
-
-
-        // dynamic load
-        if (boot && len && Y.Loader) {
-            Y._loading = true;
-            loader = getLoader(Y);
-            loader.onEnd = handleLoader;
-            loader.context = Y;
-            loader.data = args;
-            loader.ignoreRegistered = false;
-            loader.require(missing);
-            loader.insert(null, (fetchCSS) ? null : 'js');
-
-        } else if (boot && len && Y.Get && !Env.bootstrapped) {
-
-            Y._loading = true;
-
-            handleBoot = function() {
-                Y._loading = false;
-                queue.running = false;
-                Env.bootstrapped = true;
-                G_ENV._bootstrapping = false;
-                if (Y._attach(['loader'])) {
-                    Y._use(args, callback);
-                }
-            };
-
-            if (G_ENV._bootstrapping) {
-                queue.add(handleBoot);
-            } else {
-                G_ENV._bootstrapping = true;
-                Y.Get.script(config.base + config.loaderPath, {
-                    onEnd: handleBoot
-                });
-            }
-
-        } else {
-            ret = Y._attach(args);
-            if (ret) {
-                handleLoader();
-            }
-        }
-
-        return Y;
-    },
-
-
-    /**
-    Utility method for safely creating namespaces if they don't already exist.
-    May be called statically on the YUI global object or as a method on a YUI
-    instance.
-
-    When called statically, a namespace will be created on the YUI global
-    object:
-
-        // Create `YUI.your.namespace.here` as nested objects, preserving any
-        // objects that already exist instead of overwriting them.
-        YUI.namespace('your.namespace.here');
-
-    When called as a method on a YUI instance, a namespace will be created on
-    that instance:
-
-        // Creates `Y.property.package`.
-        Y.namespace('property.package');
-
-    Dots in the input string cause `namespace` to create nested objects for each
-    token. If any part of the requested namespace already exists, the current
-    object will be left in place and will not be overwritten. This allows
-    multiple calls to `namespace` to preserve existing namespaced properties.
-
-    If the first token in the namespace string is "YAHOO", that token is
-    discarded. This is legacy behavior for backwards compatibility with YUI 2.
-
-    Be careful with namespace tokens. Reserved words may work in some browsers
-    and not others. For instance, the following will fail in some browsers
-    because the supported version of JavaScript reserves the word "long":
-
-        Y.namespace('really.long.nested.namespace');
-
-    Note: If you pass multiple arguments to create multiple namespaces, only the
-    last one created is returned from this function.
-
-    @method namespace
-    @param {String} namespace* One or more namespaces to create.
-    @return {Object} Reference to the last namespace object created.
-    **/
-    namespace: function() {
-        var a = arguments, o, i = 0, j, d, arg;
-
-        for (; i < a.length; i++) {
-            o = this; //Reset base object per argument or it will get reused from the last
-            arg = a[i];
-            if (arg.indexOf(PERIOD) > -1) { //Skip this if no "." is present
-                d = arg.split(PERIOD);
-                for (j = (d[0] == 'YAHOO') ? 1 : 0; j < d.length; j++) {
-                    o[d[j]] = o[d[j]] || {};
-                    o = o[d[j]];
-                }
-            } else {
-                o[arg] = o[arg] || {};
-                o = o[arg]; //Reset base object to the new object so it's returned
-            }
-        }
-        return o;
-    },
-
-    // this is replaced if the log module is included
-    log: NOOP,
-    message: NOOP,
-    // this is replaced if the dump module is included
-    dump: function (o) { return ''+o; },
-
-    /**
-    Reports an error.
-
-    The reporting mechanism is controlled by the `throwFail` configuration
-    attribute. If `throwFail` is falsy, the message is logged. If `throwFail` is
-    truthy, a JS exception is thrown.
-
-    If an `errorFn` is specified in the config it must return `true` to indicate
-    that the exception was handled and keep it from being thrown.
-
-    @method error
-    @param {String} msg Error message.
-    @param {Error|String} [e] JavaScript error object or an error string.
-    @param {String} [src] Source of the error (such as the name of the module in
-        which the error occurred).
-    @chainable
-    **/
-    error: function(msg, e, src) {
-        //TODO Add check for window.onerror here
-
-        var Y = this, ret;
-
-        if (Y.config.errorFn) {
-            ret = Y.config.errorFn.apply(Y, arguments);
-        }
-
-        if (!ret) {
-            throw (e || new Error(msg));
-        } else {
-            Y.message(msg, 'error', ''+src); // don't scrub this one
-        }
-
-        return Y;
-    },
-
-    /**
-    Generates an id string that is unique among all YUI instances in this
-    execution context.
-
-    @method guid
-    @param {String} [pre] Prefix.
-    @return {String} Unique id.
-    **/
-    guid: function(pre) {
-        var id = this.Env._guidp + '_' + (++this.Env._uidx);
-        return (pre) ? (pre + id) : id;
-    },
-
-    /**
-    Returns a unique id associated with the given object and (if *readOnly* is
-    falsy) stamps the object with that id so it can be identified in the future.
-
-    Stamping an object involves adding a `_yuid` property to it that contains
-    the object's id. One exception to this is that in Internet Explorer, DOM
-    nodes have a `uniqueID` property that contains a browser-generated unique
-    id, which will be used instead of a YUI-generated id when available.
-
-    @method stamp
-    @param {Object} o Object to stamp.
-    @param {Boolean} readOnly If truthy and the given object has not already
-        been stamped, the object will not be modified and `null` will be
-        returned.
-    @return {String} Object's unique id, or `null` if *readOnly* was truthy and
-        the given object was not already stamped.
-    **/
-    stamp: function(o, readOnly) {
-        var uid;
-        if (!o) {
-            return o;
-        }
-
-        // IE generates its own unique ID for dom nodes
-        // The uniqueID property of a document node returns a new ID
-        if (o.uniqueID && o.nodeType && o.nodeType !== 9) {
-            uid = o.uniqueID;
-        } else {
-            uid = (typeof o === 'string') ? o : o._yuid;
-        }
-
-        if (!uid) {
-            uid = this.guid();
-            if (!readOnly) {
-                try {
-                    o._yuid = uid;
-                } catch (e) {
-                    uid = null;
-                }
-            }
-        }
-        return uid;
-    },
-
-    /**
-    Destroys this YUI instance.
-
-    @method destroy
-    @since 3.3.0
-    **/
-    destroy: function() {
-        var Y = this;
-        if (Y.Event) {
-            Y.Event._unload();
-        }
-        delete instances[Y.id];
-        delete Y.Env;
-        delete Y.config;
-    }
-
-    /**
-    Safe `instanceof` wrapper that works around a memory leak in IE when the
-    object being tested is `window` or `document`.
-
-    Unless you are testing objects that may be `window` or `document`, you
-    should use the native `instanceof` operator instead of this method.
-
-    @method instanceOf
-    @param {Object} o Object to check.
-    @param {Object} type Class to check against.
-    @since 3.3.0
-    **/
-};
-
-    YUI.prototype = proto;
-
-    // inheritance utilities are not available yet
-    for (prop in proto) {
-        if (proto.hasOwnProperty(prop)) {
-            YUI[prop] = proto[prop];
-        }
-    }
-
-    /**
-    Applies a configuration to all YUI instances in this execution context.
-
-    The main use case for this method is in "mashups" where several third-party
-    scripts need to write to a global YUI config, but cannot share a single
-    centrally-managed config object. This way they can all call
-    `YUI.applyConfig({})` instead of overwriting the single global config.
-
-    @example
-
-        YUI.applyConfig({
-            modules: {
-                davglass: {
-                    fullpath: './davglass.js'
-                }
-            }
-        });
-
-        YUI.applyConfig({
-            modules: {
-                foo: {
-                    fullpath: './foo.js'
-                }
-            }
-        });
-
-        YUI().use('davglass', function (Y) {
-            // Module davglass will be available here.
-        });
-
-    @method applyConfig
-    @param {Object} o Configuration object to apply.
-    @static
-    @since 3.5.0
-    **/
-    YUI.applyConfig = function(o) {
-        if (!o) {
-            return;
-        }
-        //If there is a GlobalConfig, apply it first to set the defaults
-        if (YUI.GlobalConfig) {
-            this.prototype.applyConfig.call(this, YUI.GlobalConfig);
-        }
-        //Apply this config to it
-        this.prototype.applyConfig.call(this, o);
-        //Reset GlobalConfig to the combined config
-        YUI.GlobalConfig = this.config;
-    };
-
-    // set up the environment
-    YUI._init();
-
-    if (hasWin) {
-        add(doc, 'DOMContentLoaded', handleReady);
-
-        // add a window load event at load time so we can capture
-        // the case where it fires before dynamic loading is
-        // complete.
-        add(window, 'load', handleLoad);
-    } else {
-        handleReady();
-        handleLoad();
-    }
-
-    YUI.Env.add = add;
-    YUI.Env.remove = remove;
-
-    /*global exports*/
-    // Support the CommonJS method for exporting our single global
-    if (typeof exports == 'object') {
-        exports.YUI = YUI;
-        /**
-        * Set a method to be called when `Get.script` is called in Node.js
-        * `Get` will open the file, then pass it's content and it's path
-        * to this method before attaching it. Commonly used for code coverage
-        * instrumentation. <strong>Calling this multiple times will only
-        * attach the last hook method</strong>. This method is only
-        * available in Node.js.
-        * @method setLoadHook
-        * @static
-        * @param {Function} fn The function to set
-        * @param {String} fn.data The content of the file
-        * @param {String} fn.path The file path of the file
-        */
-        YUI.setLoadHook = function(fn) {
-            YUI._getLoadHook = fn;
-        };
-        /**
-        * Load hook for `Y.Get.script` in Node.js, see `YUI.setLoadHook`
-        * @method _getLoadHook
-        * @private
-        * @param {String} data The content of the file
-        * @param {String} path The file path of the file
-        */
-        YUI._getLoadHook = null;
-    }
-
-    YUI.Env[VERSION] = {};
-}());
-
-
-/**
-Config object that contains all of the configuration options for
-this `YUI` instance.
-
-This object is supplied by the implementer when instantiating YUI. Some
-properties have default values if they are not supplied by the implementer.
-
-This object should not be updated directly because some values are cached. Use
-`applyConfig()` to update the config object on a YUI instance that has already
-been configured.
-
-@class config
-@static
-**/
-
-/**
-If `true` (the default), YUI will "bootstrap" the YUI Loader and module metadata
-if they're needed to load additional dependencies and aren't already available.
-
-Setting this to `false` will prevent YUI from automatically loading the Loader
-and module metadata, so you will need to manually ensure that they're available
-or handle dependency resolution yourself.
-
-@property {Boolean} bootstrap
-@default true
-**/
-
-/**
-
-@property {Object} filters
-**/
-
-/**
-If `true`, YUI will use a combo handler to load multiple modules in as few
-requests as possible.
-
-The YUI CDN (which YUI uses by default) supports combo handling, but other
-servers may not. If the server from which you're loading YUI does not support
-combo handling, set this to `false`.
-
-Providing a value for the `base` config property will cause `combine` to default
-to `false` instead of `true`.
-
-@property {Boolean} combine
-@default true
-*/
-
-/**
-Array of module names that should never be dynamically loaded.
-
-@property {String[]} ignore
-**/
-
-/**
-Array of module names that should always be loaded when required, even if
-already present on the page.
-
-@property {String[]} force
-**/
-
-/**
-DOM element or id that should be used as the insertion point for dynamically
-added `<script>` and `<link>` nodes.
-
-@property {HTMLElement|String} insertBefore
-**/
-
-/**
-Object hash containing attributes to add to dynamically added `<script>` nodes.
-
-@property {Object} jsAttributes
-**/
-
-/**
-Object hash containing attributes to add to dynamically added `<link>` nodes.
-
-@property {Object} cssAttributes
-**/
-
-/**
-Timeout in milliseconds before a dynamic JS or CSS request will be considered a
-failure. If not set, no timeout will be enforced.
-
-@property {Number} timeout
-**/
-
-/**
-A hash of module definitions to add to the list of available YUI modules. These
-modules can then be dynamically loaded via the `use()` method.
-
-This is a hash in which keys are module names and values are objects containing
-module metadata.
-
-See `Loader.addModule()` for the supported module metadata fields. Also see
-`groups`, which provides a way to configure the base and combo spec for a set of
-modules.
-
-@example
-
-    modules: {
-        mymod1: {
-            requires: ['node'],
-            fullpath: '/mymod1/mymod1.js'
-        },
-
-        mymod2: {
-            requires: ['mymod1'],
-            fullpath: '/mymod2/mymod2.js'
-        },
-
-        mymod3: '/js/mymod3.js',
-        mycssmod: '/css/mycssmod.css'
-    }
-
-@property {Object} modules
-**/
-
-/**
-Aliases are dynamic groups of modules that can be used as shortcuts.
-
-@example
-
-    YUI({
-        aliases: {
-            davglass: [ 'node', 'yql', 'dd' ],
-            mine: [ 'davglass', 'autocomplete']
-        }
-    }).use('mine', function (Y) {
-        // Node, YQL, DD & AutoComplete available here.
-    });
-
-@property {Object} aliases
-**/
-
-/**
-A hash of module group definitions.
-
-For each group you can specify a list of modules and the base path and
-combo spec to use when dynamically loading the modules.
-
-@example
-
-    groups: {
-        yui2: {
-            // specify whether or not this group has a combo service
-            combine: true,
-
-            // The comboSeperator to use with this group's combo handler
-            comboSep: ';',
-
-            // The maxURLLength for this server
-            maxURLLength: 500,
-
-            // the base path for non-combo paths
-            base: 'http://yui.yahooapis.com/2.8.0r4/build/',
-
-            // the path to the combo service
-            comboBase: 'http://yui.yahooapis.com/combo?',
-
-            // a fragment to prepend to the path attribute when
-            // when building combo urls
-            root: '2.8.0r4/build/',
-
-            // the module definitions
-            modules:  {
-                yui2_yde: {
-                    path: "yahoo-dom-event/yahoo-dom-event.js"
-                },
-                yui2_anim: {
-                    path: "animation/animation.js",
-                    requires: ['yui2_yde']
-                }
-            }
-        }
-    }
-
-@property {Object} groups
-**/
-
-/**
-Path to the Loader JS file, relative to the `base` path.
-
-This is used to dynamically bootstrap the Loader when it's needed and isn't yet
-available.
-
-@property {String} loaderPath
-@default "loader/loader-min.js"
-**/
-
-/**
-If `true`, YUI will attempt to load CSS dependencies and skins. Set this to
-`false` to prevent YUI from loading any CSS, or set it to the string `"force"`
-to force CSS dependencies to be loaded even if their associated JS modules are
-already loaded.
-
-@property {Boolean|String} fetchCSS
-@default true
-**/
-
-/**
-Default gallery version used to build gallery module urls.
-
-@property {String} gallery
-@since 3.1.0
-**/
-
-/**
-Default YUI 2 version used to build YUI 2 module urls.
-
-This is used for intrinsic YUI 2 support via the 2in3 project. Also see the
-`2in3` config for pulling different revisions of the wrapped YUI 2 modules.
-
-@property {String} yui2
-@default "2.9.0"
-@since 3.1.0
-**/
-
-/**
-Revision number of YUI 2in3 modules that should be used when loading YUI 2in3.
-
-@property {String} 2in3
-@default "4"
-@since 3.1.0
-**/
-
-/**
-Alternate console log function that should be used in environments without a
-supported native console. This function is executed with the YUI instance as its
-`this` object.
-
-@property {Function} logFn
-@since 3.1.0
-**/
-
-/**
-The minimum log level to log messages for. Log levels are defined
-incrementally. Messages greater than or equal to the level specified will
-be shown. All others will be discarded. The order of log levels in
-increasing priority is:
-
-    debug
-    info
-    warn
-    error
-
-@property {String} logLevel
-@default 'debug'
-@since 3.10.0
-**/
-
-/**
-Callback to execute when `Y.error()` is called. It receives the error message
-and a JavaScript error object if one was provided.
-
-This function is executed with the YUI instance as its `this` object.
-
-Returning `true` from this function will prevent an exception from being thrown.
-
-@property {Function} errorFn
-@param {String} errorFn.msg Error message
-@param {Object} [errorFn.err] Error object (if one was provided).
-@since 3.2.0
-**/
-
-/**
-A callback to execute when Loader fails to load one or more resources.
-
-This could be because of a script load failure. It could also be because a
-module fails to register itself when the `requireRegistration` config is `true`.
-
-If this function is defined, the `use()` callback will only be called when the
-loader succeeds. Otherwise, `use()` will always executes unless there was a
-JavaScript error when attaching a module.
-
-@property {Function} loadErrorFn
-@since 3.3.0
-**/
-
-/**
-If `true`, Loader will expect all loaded scripts to be first-class YUI modules
-that register themselves with the YUI global, and will trigger a failure if a
-loaded script does not register a YUI module.
-
-@property {Boolean} requireRegistration
-@default false
-@since 3.3.0
-**/
-
-/**
-Cache serviced use() requests.
-
-@property {Boolean} cacheUse
-@default true
-@since 3.3.0
-@deprecated No longer used.
-**/
-
-/**
-Whether or not YUI should use native ES5 functionality when available for
-features like `Y.Array.each()`, `Y.Object()`, etc.
-
-When `false`, YUI will always use its own fallback implementations instead of
-relying on ES5 functionality, even when ES5 functionality is available.
-
-@property {Boolean} useNativeES5
-@default true
-@since 3.5.0
-**/
-
-/**
- * Leverage native JSON stringify if the browser has a native
- * implementation.  In general, this is a good idea.  See the Known Issues
- * section in the JSON user guide for caveats.  The default value is true
- * for browsers with native JSON support.
- *
- * @property useNativeJSONStringify
- * @type Boolean
- * @default true
- * @since 3.8.0
- */
-
- /**
- * Leverage native JSON parse if the browser has a native implementation.
- * In general, this is a good idea.  See the Known Issues section in the
- * JSON user guide for caveats.  The default value is true for browsers with
- * native JSON support.
- *
- * @property useNativeJSONParse
- * @type Boolean
- * @default true
- * @since 3.8.0
- */
-
-/**
-Delay the `use` callback until a specific event has passed (`load`, `domready`, `contentready` or `available`)
-
-@property {Object|String} delayUntil
-@since 3.6.0
-@example
-
-You can use `load` or `domready` strings by default:
-
-    YUI({
-        delayUntil: 'domready'
-    }, function (Y) {
-        // This will not execute until 'domeready' occurs.
-    });
-
-Or you can delay until a node is available (with `available` or `contentready`):
-
-    YUI({
-        delayUntil: {
-            event: 'available',
-            args : '#foo'
-        }
-    }, function (Y) {
-        // This will not execute until a node matching the selector "#foo" is
-        // available in the DOM.
-    });
-
-**/
-YUI.add('yui-base', function (Y, NAME) {
-
-/*
- * YUI stub
- * @module yui
- * @submodule yui-base
- */
-/**
- * The YUI module contains the components required for building the YUI
- * seed file.  This includes the script loading mechanism, a simple queue,
- * and the core utilities for the library.
- * @module yui
- * @submodule yui-base
- */
-
-/**
- * Provides core language utilites and extensions used throughout YUI.
- *
- * @class Lang
- * @static
- */
-
-var L = Y.Lang || (Y.Lang = {}),
-
-STRING_PROTO = String.prototype,
-TOSTRING     = Object.prototype.toString,
-
-TYPES = {
-    'undefined'        : 'undefined',
-    'number'           : 'number',
-    'boolean'          : 'boolean',
-    'string'           : 'string',
-    '[object Function]': 'function',
-    '[object RegExp]'  : 'regexp',
-    '[object Array]'   : 'array',
-    '[object Date]'    : 'date',
-    '[object Error]'   : 'error'
-},
-
-SUBREGEX         = /\{\s*([^|}]+?)\s*(?:\|([^}]*))?\s*\}/g,
-
-WHITESPACE       = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF",
-WHITESPACE_CLASS = "[\x09-\x0D\x20\xA0\u1680\u180E\u2000-\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF]+",
-TRIM_LEFT_REGEX  = new RegExp("^" + WHITESPACE_CLASS),
-TRIM_RIGHT_REGEX = new RegExp(WHITESPACE_CLASS + "$"),
-TRIMREGEX        = new RegExp(TRIM_LEFT_REGEX.source + "|" + TRIM_RIGHT_REGEX.source, "g"),
-
-NATIVE_FN_REGEX  = /\{\s*\[(?:native code|function)\]\s*\}/i;
-
-// -- Protected Methods --------------------------------------------------------
-
-/**
-Returns `true` if the given function appears to be implemented in native code,
-`false` otherwise. Will always return `false` -- even in ES5-capable browsers --
-if the `useNativeES5` YUI config option is set to `false`.
-
-This isn't guaranteed to be 100% accurate and won't work for anything other than
-functions, but it can be useful for determining whether a function like
-`Array.prototype.forEach` is native or a JS shim provided by another library.
-
-There's a great article by @kangax discussing certain flaws with this technique:
-<http://perfectionkills.com/detecting-built-in-host-methods/>
-
-While his points are valid, it's still possible to benefit from this function
-as long as it's used carefully and sparingly, and in such a way that false
-negatives have minimal consequences. It's used internally to avoid using
-potentially broken non-native ES5 shims that have been added to the page by
-other libraries.
-
-@method _isNative
-@param {Function} fn Function to test.
-@return {Boolean} `true` if _fn_ appears to be native, `false` otherwise.
-@static
-@protected
-@since 3.5.0
-**/
-L._isNative = function (fn) {
-    return !!(Y.config.useNativeES5 && fn && NATIVE_FN_REGEX.test(fn));
-};
-
-// -- Public Methods -----------------------------------------------------------
-
-/**
- * Determines whether or not the provided item is an array.
- *
- * Returns `false` for array-like collections such as the function `arguments`
- * collection or `HTMLElement` collections. Use `Y.Array.test()` if you want to
- * test for an array-like collection.
- *
- * @method isArray
- * @param o The object to test.
- * @return {boolean} true if o is an array.
- * @static
- */
-L.isArray = L._isNative(Array.isArray) ? Array.isArray : function (o) {
-    return L.type(o) === 'array';
-};
-
-/**
- * Determines whether or not the provided item is a boolean.
- * @method isBoolean
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is a boolean.
- */
-L.isBoolean = function(o) {
-    return typeof o === 'boolean';
-};
-
-/**
- * Determines whether or not the supplied item is a date instance.
- * @method isDate
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is a date.
- */
-L.isDate = function(o) {
-    return L.type(o) === 'date' && o.toString() !== 'Invalid Date' && !isNaN(o);
-};
-
-/**
- * <p>
- * Determines whether or not the provided item is a function.
- * Note: Internet Explorer thinks certain functions are objects:
- * </p>
- *
- * <pre>
- * var obj = document.createElement("object");
- * Y.Lang.isFunction(obj.getAttribute) // reports false in IE
- * &nbsp;
- * var input = document.createElement("input"); // append to body
- * Y.Lang.isFunction(input.focus) // reports false in IE
- * </pre>
- *
- * <p>
- * You will have to implement additional tests if these functions
- * matter to you.
- * </p>
- *
- * @method isFunction
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is a function.
- */
-L.isFunction = function(o) {
-    return L.type(o) === 'function';
-};
-
-/**
- * Determines whether or not the provided item is null.
- * @method isNull
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is null.
- */
-L.isNull = function(o) {
-    return o === null;
-};
-
-/**
- * Determines whether or not the provided item is a legal number.
- * @method isNumber
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is a number.
- */
-L.isNumber = function(o) {
-    return typeof o === 'number' && isFinite(o);
-};
-
-/**
- * Determines whether or not the provided item is of type object
- * or function. Note that arrays are also objects, so
- * <code>Y.Lang.isObject([]) === true</code>.
- * @method isObject
- * @static
- * @param o The object to test.
- * @param failfn {boolean} fail if the input is a function.
- * @return {boolean} true if o is an object.
- * @see isPlainObject
- */
-L.isObject = function(o, failfn) {
-    var t = typeof o;
-    return (o && (t === 'object' ||
-        (!failfn && (t === 'function' || L.isFunction(o))))) || false;
-};
-
-/**
- * Determines whether or not the provided value is a regexp.
- * @method isRegExp
- * @static
- * @param value The value or object to test.
- * @return {boolean} true if value is a regexp.
- */
-L.isRegExp = function(value) {
-    return L.type(value) === 'regexp';
-};
-
-/**
- * Determines whether or not the provided item is a string.
- * @method isString
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is a string.
- */
-L.isString = function(o) {
-    return typeof o === 'string';
-};
-
-/**
- * Determines whether or not the provided item is undefined.
- * @method isUndefined
- * @static
- * @param o The object to test.
- * @return {boolean} true if o is undefined.
- */
-L.isUndefined = function(o) {
-    return typeof o === 'undefined';
-};
-
-/**
- * A convenience method for detecting a legitimate non-null value.
- * Returns false for null/undefined/NaN, true for other values,
- * including 0/false/''
- * @method isValue
- * @static
- * @param o The item to test.
- * @return {boolean} true if it is not null/undefined/NaN || false.
- */
-L.isValue = function(o) {
-    var t = L.type(o);
-
-    switch (t) {
-        case 'number':
-            return isFinite(o);
-
-        case 'null': // fallthru
-        case 'undefined':
-            return false;
-
-        default:
-            return !!t;
-    }
-};
-
-/**
- * Returns the current time in milliseconds.
- *
- * @method now
- * @return {Number} Current time in milliseconds.
- * @static
- * @since 3.3.0
- */
-L.now = Date.now || function () {
-    return new Date().getTime();
-};
-
-/**
- * Performs `{placeholder}` substitution on a string. The object passed as the 
- * second parameter provides values to replace the `{placeholder}`s.
- * `{placeholder}` token names must match property names of the object. For example,
- * 
- *`var greeting = Y.Lang.sub("Hello, {who}!", { who: "World" });`
- *
- * `{placeholder}` tokens that are undefined on the object map will be left 
- * in tact (leaving unsightly `{placeholder}`'s in the output string). 
- *
- * @method sub
- * @param {string} s String to be modified.
- * @param {object} o Object containing replacement values.
- * @return {string} the substitute result.
- * @static
- * @since 3.2.0
- */
-L.sub = function(s, o) {
-    return s.replace ? s.replace(SUBREGEX, function (match, key) {
-        return L.isUndefined(o[key]) ? match : o[key];
-    }) : s;
-};
-
-/**
- * Returns a string without any leading or trailing whitespace.  If
- * the input is not a string, the input will be returned untouched.
- * @method trim
- * @static
- * @param s {string} the string to trim.
- * @return {string} the trimmed string.
- */
-L.trim = L._isNative(STRING_PROTO.trim) && !WHITESPACE.trim() ? function(s) {
-    return s && s.trim ? s.trim() : s;
-} : function (s) {
-    try {
-        return s.replace(TRIMREGEX, '');
-    } catch (e) {
-        return s;
-    }
-};
-
-/**
- * Returns a string without any leading whitespace.
- * @method trimLeft
- * @static
- * @param s {string} the string to trim.
- * @return {string} the trimmed string.
- */
-L.trimLeft = L._isNative(STRING_PROTO.trimLeft) && !WHITESPACE.trimLeft() ? function (s) {
-    return s.trimLeft();
-} : function (s) {
-    return s.replace(TRIM_LEFT_REGEX, '');
-};
-
-/**
- * Returns a string without any trailing whitespace.
- * @method trimRight
- * @static
- * @param s {string} the string to trim.
- * @return {string} the trimmed string.
- */
-L.trimRight = L._isNative(STRING_PROTO.trimRight) && !WHITESPACE.trimRight() ? function (s) {
-    return s.trimRight();
-} : function (s) {
-    return s.replace(TRIM_RIGHT_REGEX, '');
-};
-
-/**
-Returns one of the following strings, representing the type of the item passed
-in:
-
- * "array"
- * "boolean"
- * "date"
- * "error"
- * "function"
- * "null"
- * "number"
- * "object"
- * "regexp"
- * "string"
- * "undefined"
-
-Known issues:
-
- * `typeof HTMLElementCollection` returns function in Safari, but
-    `Y.Lang.type()` reports "object", which could be a good thing --
-    but it actually caused the logic in <code>Y.Lang.isObject</code> to fail.
-
-@method type
-@param o the item to test.
-@return {string} the detected type.
-@static
-**/
-L.type = function(o) {
-    return TYPES[typeof o] || TYPES[TOSTRING.call(o)] || (o ? 'object' : 'null');
-};
-/**
-@module yui
-@submodule yui-base
-*/
-
-var Lang   = Y.Lang,
-    Native = Array.prototype,
-
-    hasOwn = Object.prototype.hasOwnProperty;
-
-/**
-Provides utility methods for working with arrays. Additional array helpers can
-be found in the `collection` and `array-extras` modules.
-
-`Y.Array(thing)` returns a native array created from _thing_. Depending on
-_thing_'s type, one of the following will happen:
-
-  * Arrays are returned unmodified unless a non-zero _startIndex_ is
-    specified.
-  * Array-like collections (see `Array.test()`) are converted to arrays.
-  * For everything else, a new array is created with _thing_ as the sole
-    item.
-
-Note: elements that are also collections, such as `<form>` and `<select>`
-elements, are not automatically converted to arrays. To force a conversion,
-pass `true` as the value of the _force_ parameter.
-
-@class Array
-@constructor
-@param {Any} thing The thing to arrayify.
-@param {Number} [startIndex=0] If non-zero and _thing_ is an array or array-like
-  collection, a subset of items starting at the specified index will be
-  returned.
-@param {Boolean} [force=false] If `true`, _thing_ will be treated as an
-  array-like collection no matter what.
-@return {Array} A native array created from _thing_, according to the rules
-  described above.
-**/
-function YArray(thing, startIndex, force) {
-    var len, result;
-
-    /*jshint expr: true*/
-    startIndex || (startIndex = 0);
-
-    if (force || YArray.test(thing)) {
-        // IE throws when trying to slice HTMLElement collections.
-        try {
-            return Native.slice.call(thing, startIndex);
-        } catch (ex) {
-            result = [];
-
-            for (len = thing.length; startIndex < len; ++startIndex) {
-                result.push(thing[startIndex]);
-            }
-
-            return result;
-        }
-    }
-
-    return [thing];
-}
-
-Y.Array = YArray;
-
-/**
-Dedupes an array of strings, returning an array that's guaranteed to contain
-only one copy of a given string.
-
-This method differs from `Array.unique()` in that it's optimized for use only
-with arrays consisting entirely of strings or entirely of numbers, whereas
-`unique` may be used with other value types (but is slower).
-
-Using `dedupe()` with values other than strings or numbers, or with arrays
-containing a mix of strings and numbers, may result in unexpected behavior.
-
-@method dedupe
-@param {String[]|Number[]} array Array of strings or numbers to dedupe.
-@return {Array} Copy of _array_ containing no duplicate values.
-@static
-@since 3.4.0
-**/
-YArray.dedupe = Lang._isNative(Object.create) ? function (array) {
-    var hash    = Object.create(null),
-        results = [],
-        i, item, len;
-
-    for (i = 0, len = array.length; i < len; ++i) {
-        item = array[i];
-
-        if (!hash[item]) {
-            hash[item] = 1;
-            results.push(item);
-        }
-    }
-
-    return results;
-} : function (array) {
-    var hash    = {},
-        results = [],
-        i, item, len;
-
-    for (i = 0, len = array.length; i < len; ++i) {
-        item = array[i];
-
-        if (!hasOwn.call(hash, item)) {
-            hash[item] = 1;
-            results.push(item);
-        }
-    }
-
-    return results;
-};
-
-/**
-Executes the supplied function on each item in the array. This method wraps
-the native ES5 `Array.forEach()` method if available.
-
-@method each
-@param {Array} array Array to iterate.
-@param {Function} fn Function to execute on each item in the array. The function
-  will receive the following arguments:
-    @param {Any} fn.item Current array item.
-    @param {Number} fn.index Current array index.
-    @param {Array} fn.array Array being iterated.
-@param {Object} [thisObj] `this` object to use when calling _fn_.
-@return {YUI} The YUI instance.
-@static
-**/
-YArray.each = YArray.forEach = Lang._isNative(Native.forEach) ? function (array, fn, thisObj) {
-    Native.forEach.call(array || [], fn, thisObj || Y);
-    return Y;
-} : function (array, fn, thisObj) {
-    for (var i = 0, len = (array && array.length) || 0; i < len; ++i) {
-        if (i in array) {
-            fn.call(thisObj || Y, array[i], i, array);
-        }
-    }
-
-    return Y;
-};
-
-/**
-Alias for `each()`.
-
-@method forEach
-@static
-**/
-
-/**
-Returns an object using the first array as keys and the second as values. If
-the second array is not provided, or if it doesn't contain the same number of
-values as the first array, then `true` will be used in place of the missing
-values.
-
-@example
-
-    Y.Array.hash(['a', 'b', 'c'], ['foo', 'bar']);
-    // => {a: 'foo', b: 'bar', c: true}
-
-@method hash
-@param {String[]} keys Array of strings to use as keys.
-@param {Array} [values] Array to use as values.
-@return {Object} Hash using the first array as keys and the second as values.
-@static
-**/
-YArray.hash = function (keys, values) {
-    var hash = {},
-        vlen = (values && values.length) || 0,
-        i, len;
-
-    for (i = 0, len = keys.length; i < len; ++i) {
-        if (i in keys) {
-            hash[keys[i]] = vlen > i && i in values ? values[i] : true;
-        }
-    }
-
-    return hash;
-};
-
-/**
-Returns the index of the first item in the array that's equal (using a strict
-equality check) to the specified _value_, or `-1` if the value isn't found.
-
-This method wraps the native ES5 `Array.indexOf()` method if available.
-
-@method indexOf
-@param {Array} array Array to search.
-@param {Any} value Value to search for.
-@param {Number} [from=0] The index at which to begin the search.
-@return {Number} Index of the item strictly equal to _value_, or `-1` if not
-    found.
-@static
-**/
-YArray.indexOf = Lang._isNative(Native.indexOf) ? function (array, value, from) {
-    return Native.indexOf.call(array, value, from);
-} : function (array, value, from) {
-    // http://es5.github.com/#x15.4.4.14
-    var len = array.length;
-
-    from = +from || 0;
-    from = (from > 0 || -1) * Math.floor(Math.abs(from));
-
-    if (from < 0) {
-        from += len;
-
-        if (from < 0) {
-            from = 0;
-        }
-    }
-
-    for (; from < len; ++from) {
-        if (from in array && array[from] === value) {
-            return from;
-        }
-    }
-
-    return -1;
-};
-
-/**
-Numeric sort convenience function.
-
-The native `Array.prototype.sort()` function converts values to strings and
-sorts them in lexicographic order, which is unsuitable for sorting numeric
-values. Provide `Array.numericSort` as a custom sort function when you want
-to sort values in numeric order.
-
-@example
-
-    [42, 23, 8, 16, 4, 15].sort(Y.Array.numericSort);
-    // => [4, 8, 15, 16, 23, 42]
-
-@method numericSort
-@param {Number} a First value to compare.
-@param {Number} b Second value to compare.
-@return {Number} Difference between _a_ and _b_.
-@static
-**/
-YArray.numericSort = function (a, b) {
-    return a - b;
-};
-
-/**
-Executes the supplied function on each item in the array. Returning a truthy
-value from the function will stop the processing of remaining items.
-
-@method some
-@param {Array} array Array to iterate over.
-@param {Function} fn Function to execute on each item. The function will receive
-  the following arguments:
-    @param {Any} fn.value Current array item.
-    @param {Number} fn.index Current array index.
-    @param {Array} fn.array Array being iterated over.
-@param {Object} [thisObj] `this` object to use when calling _fn_.
-@return {Boolean} `true` if the function returns a truthy value on any of the
-  items in the array; `false` otherwise.
-@static
-**/
-YArray.some = Lang._isNative(Native.some) ? function (array, fn, thisObj) {
-    return Native.some.call(array, fn, thisObj);
-} : function (array, fn, thisObj) {
-    for (var i = 0, len = array.length; i < len; ++i) {
-        if (i in array && fn.call(thisObj, array[i], i, array)) {
-            return true;
-        }
-    }
-
-    return false;
-};
-
-/**
-Evaluates _obj_ to determine if it's an array, an array-like collection, or
-something else. This is useful when working with the function `arguments`
-collection and `HTMLElement` collections.
-
-Note: This implementation doesn't consider elements that are also
-collections, such as `<form>` and `<select>`, to be array-like.
-
-@method test
-@param {Object} obj Object to test.
-@return {Number} A number indicating the results of the test:
-
-  * 0: Neither an array nor an array-like collection.
-  * 1: Real array.
-  * 2: Array-like collection.
-
-@static
-**/
-YArray.test = function (obj) {
-    var result = 0;
-
-    if (Lang.isArray(obj)) {
-        result = 1;
-    } else if (Lang.isObject(obj)) {
-        try {
-            // indexed, but no tagName (element) or scrollTo/document (window. From DOM.isWindow test which we can't use here),
-            // or functions without apply/call (Safari
-            // HTMLElementCollection bug).
-            if ('length' in obj && !obj.tagName && !(obj.scrollTo && obj.document) && !obj.apply) {
-                result = 2;
-            }
-        } catch (ex) {}
-    }
-
-    return result;
-};
-/**
- * The YUI module contains the components required for building the YUI
- * seed file.  This includes the script loading mechanism, a simple queue,
- * and the core utilities for the library.
- * @module yui
- * @submodule yui-base
- */
-
-/**
- * A simple FIFO queue.  Items are added to the Queue with add(1..n items) and
- * removed using next().
- *
- * @class Queue
- * @constructor
- * @param {MIXED} item* 0..n items to seed the queue.
- */
-function Queue() {
-    this._init();
-    this.add.apply(this, arguments);
-}
-
-Queue.prototype = {
-    /**
-     * Initialize the queue
-     *
-     * @method _init
-     * @protected
-     */
-    _init: function() {
-        /**
-         * The collection of enqueued items
-         *
-         * @property _q
-         * @type Array
-         * @protected
-         */
-        this._q = [];
-    },
-
-    /**
-     * Get the next item in the queue. FIFO support
-     *
-     * @method next
-     * @return {MIXED} the next item in the queue.
-     */
-    next: function() {
-        return this._q.shift();
-    },
-
-    /**
-     * Get the last in the queue. LIFO support.
-     *
-     * @method last
-     * @return {MIXED} the last item in the queue.
-     */
-    last: function() {
-        return this._q.pop();
-    },
-
-    /**
-     * Add 0..n items to the end of the queue.
-     *
-     * @method add
-     * @param {MIXED} item* 0..n items.
-     * @return {object} this queue.
-     */
-    add: function() {
-        this._q.push.apply(this._q, arguments);
-
-        return this;
-    },
-
-    /**
-     * Returns the current number of queued items.
-     *
-     * @method size
-     * @return {Number} The size.
-     */
-    size: function() {
-        return this._q.length;
-    }
-};
-
-Y.Queue = Queue;
-
-YUI.Env._loaderQueue = YUI.Env._loaderQueue || new Queue();
-
-/**
-The YUI module contains the components required for building the YUI seed file.
-This includes the script loading mechanism, a simple queue, and the core
-utilities for the library.
-
-@module yui
-@submodule yui-base
-**/
-
-var CACHED_DELIMITER = '__',
-
-    hasOwn   = Object.prototype.hasOwnProperty,
-    isObject = Y.Lang.isObject;
-
-/**
-Returns a wrapper for a function which caches the return value of that function,
-keyed off of the combined string representation of the argument values provided
-when the wrapper is called.
-
-Calling this function again with the same arguments will return the cached value
-rather than executing the wrapped function.
-
-Note that since the cache is keyed off of the string representation of arguments
-passed to the wrapper function, arguments that aren't strings and don't provide
-a meaningful `toString()` method may result in unexpected caching behavior. For
-example, the objects `{}` and `{foo: 'bar'}` would both be converted to the
-string `[object Object]` when used as a cache key.
-
-@method cached
-@param {Function} source The function to memoize.
-@param {Object} [cache={}] Object in which to store cached values. You may seed
-  this object with pre-existing cached values if desired.
-@param {any} [refetch] If supplied, this value is compared with the cached value
-  using a `==` comparison. If the values are equal, the wrapped function is
-  executed again even though a cached value exists.
-@return {Function} Wrapped function.
-@for YUI
-**/
-Y.cached = function (source, cache, refetch) {
-    /*jshint expr: true*/
-    cache || (cache = {});
-
-    return function (arg) {
-        var key = arguments.length > 1 ?
-                Array.prototype.join.call(arguments, CACHED_DELIMITER) :
-                String(arg);
-
-        /*jshint eqeqeq: false*/
-        if (!(key in cache) || (refetch && cache[key] == refetch)) {
-            cache[key] = source.apply(source, arguments);
-        }
-
-        return cache[key];
-    };
-};
-
-/**
-Returns the `location` object from the window/frame in which this YUI instance
-operates, or `undefined` when executing in a non-browser environment
-(e.g. Node.js).
-
-It is _not_ recommended to hold references to the `window.location` object
-outside of the scope of a function in which its properties are being accessed or
-its methods are being called. This is because of a nasty bug/issue that exists
-in both Safari and MobileSafari browsers:
-[WebKit Bug 34679](https://bugs.webkit.org/show_bug.cgi?id=34679).
-
-@method getLocation
-@return {location} The `location` object from the window/frame in which this YUI
-    instance operates.
-@since 3.5.0
-**/
-Y.getLocation = function () {
-    // It is safer to look this up every time because yui-base is attached to a
-    // YUI instance before a user's config is applied; i.e. `Y.config.win` does
-    // not point the correct window object when this file is loaded.
-    var win = Y.config.win;
-
-    // It is not safe to hold a reference to the `location` object outside the
-    // scope in which it is being used. The WebKit engine used in Safari and
-    // MobileSafari will "disconnect" the `location` object from the `window`
-    // when a page is restored from back/forward history cache.
-    return win && win.location;
-};
-
-/**
-Returns a new object containing all of the properties of all the supplied
-objects. The properties from later objects will overwrite those in earlier
-objects.
-
-Passing in a single object will create a shallow copy of it. For a deep copy,
-use `clone()`.
-
-@method merge
-@param {Object} objects* One or more objects to merge.
-@return {Object} A new merged object.
-**/
-Y.merge = function () {
-    var i      = 0,
-        len    = arguments.length,
-        result = {},
-        key,
-        obj;
-
-    for (; i < len; ++i) {
-        obj = arguments[i];
-
-        for (key in obj) {
-            if (hasOwn.call(obj, key)) {
-                result[key] = obj[key];
-            }
-        }
-    }
-
-    return result;
-};
-
-/**
-Mixes _supplier_'s properties into _receiver_.
-
-Properties on _receiver_ or _receiver_'s prototype will not be overwritten or
-shadowed unless the _overwrite_ parameter is `true`, and will not be merged
-unless the _merge_ parameter is `true`.
-
-In the default mode (0), only properties the supplier owns are copied (prototype
-properties are not copied). The following copying modes are available:
-
-  * `0`: _Default_. Object to object.
-  * `1`: Prototype to prototype.
-  * `2`: Prototype to prototype and object to object.
-  * `3`: Prototype to object.
-  * `4`: Object to prototype.
-
-@method mix
-@param {Function|Object} receiver The object or function to receive the mixed
-  properties.
-@param {Function|Object} supplier The object or function supplying the
-  properties to be mixed.
-@param {Boolean} [overwrite=false] If `true`, properties that already exist
-  on the receiver will be overwritten with properties from the supplier.
-@param {String[]} [whitelist] An array of property names to copy. If
-  specified, only the whitelisted properties will be copied, and all others
-  will be ignored.
-@param {Number} [mode=0] Mix mode to use. See above for available modes.
-@param {Boolean} [merge=false] If `true`, objects and arrays that already
-  exist on the receiver will have the corresponding object/array from the
-  supplier merged into them, rather than being skipped or overwritten. When
-  both _overwrite_ and _merge_ are `true`, _merge_ takes precedence.
-@return {Function|Object|YUI} The receiver, or the YUI instance if the
-  specified receiver is falsy.
-**/
-Y.mix = function(receiver, supplier, overwrite, whitelist, mode, merge) {
-    var alwaysOverwrite, exists, from, i, key, len, to;
-
-    // If no supplier is given, we return the receiver. If no receiver is given,
-    // we return Y. Returning Y doesn't make much sense to me, but it's
-    // grandfathered in for backcompat reasons.
-    if (!receiver || !supplier) {
-        return receiver || Y;
-    }
-
-    if (mode) {
-        // In mode 2 (prototype to prototype and object to object), we recurse
-        // once to do the proto to proto mix. The object to object mix will be
-        // handled later on.
-        if (mode === 2) {
-            Y.mix(receiver.prototype, supplier.prototype, overwrite,
-                    whitelist, 0, merge);
-        }
-
-        // Depending on which mode is specified, we may be copying from or to
-        // the prototypes of the supplier and receiver.
-        from = mode === 1 || mode === 3 ? supplier.prototype : supplier;
-        to   = mode === 1 || mode === 4 ? receiver.prototype : receiver;
-
-        // If either the supplier or receiver doesn't actually have a
-        // prototype property, then we could end up with an undefined `from`
-        // or `to`. If that happens, we abort and return the receiver.
-        if (!from || !to) {
-            return receiver;
-        }
-    } else {
-        from = supplier;
-        to   = receiver;
-    }
-
-    // If `overwrite` is truthy and `merge` is falsy, then we can skip a
-    // property existence check on each iteration and save some time.
-    alwaysOverwrite = overwrite && !merge;
-
-    if (whitelist) {
-        for (i = 0, len = whitelist.length; i < len; ++i) {
-            key = whitelist[i];
-
-            // We call `Object.prototype.hasOwnProperty` instead of calling
-            // `hasOwnProperty` on the object itself, since the object's
-            // `hasOwnProperty` method may have been overridden or removed.
-            // Also, some native objects don't implement a `hasOwnProperty`
-            // method.
-            if (!hasOwn.call(from, key)) {
-                continue;
-            }
-
-            // The `key in to` check here is (sadly) intentional for backwards
-            // compatibility reasons. It prevents undesired shadowing of
-            // prototype members on `to`.
-            exists = alwaysOverwrite ? false : key in to;
-
-            if (merge && exists && isObject(to[key], true)
-                    && isObject(from[key], true)) {
-                // If we're in merge mode, and the key is present on both
-                // objects, and the value on both objects is either an object or
-                // an array (but not a function), then we recurse to merge the
-                // `from` value into the `to` value instead of overwriting it.
-                //
-                // Note: It's intentional that the whitelist isn't passed to the
-                // recursive call here. This is legacy behavior that lots of
-                // code still depends on.
-                Y.mix(to[key], from[key], overwrite, null, 0, merge);
-            } else if (overwrite || !exists) {
-                // We're not in merge mode, so we'll only copy the `from` value
-                // to the `to` value if we're in overwrite mode or if the
-                // current key doesn't exist on the `to` object.
-                to[key] = from[key];
-            }
-        }
-    } else {
-        for (key in from) {
-            // The code duplication here is for runtime performance reasons.
-            // Combining whitelist and non-whitelist operations into a single
-            // loop or breaking the shared logic out into a function both result
-            // in worse performance, and Y.mix is critical enough that the byte
-            // tradeoff is worth it.
-            if (!hasOwn.call(from, key)) {
-                continue;
-            }
-
-            // The `key in to` check here is (sadly) intentional for backwards
-            // compatibility reasons. It prevents undesired shadowing of
-            // prototype members on `to`.
-            exists = alwaysOverwrite ? false : key in to;
-
-            if (merge && exists && isObject(to[key], true)
-                    && isObject(from[key], true)) {
-                Y.mix(to[key], from[key], overwrite, null, 0, merge);
-            } else if (overwrite || !exists) {
-                to[key] = from[key];
-            }
-        }
-
-        // If this is an IE browser with the JScript enumeration bug, force
-        // enumeration of the buggy properties by making a recursive call with
-        // the buggy properties as the whitelist.
-        if (Y.Object._hasEnumBug) {
-            Y.mix(to, from, overwrite, Y.Object._forceEnum, mode, merge);
-        }
-    }
-
-    return receiver;
-};
-/**
- * The YUI module contains the components required for building the YUI
- * seed file.  This includes the script loading mechanism, a simple queue,
- * and the core utilities for the library.
- * @module yui
- * @submodule yui-base
- */
-
-/**
- * Adds utilities to the YUI instance for working with objects.
- *
- * @class Object
- */
-
-var Lang   = Y.Lang,
-    hasOwn = Object.prototype.hasOwnProperty,
-
-    UNDEFINED, // <-- Note the comma. We're still declaring vars.
-
-/**
- * Returns a new object that uses _obj_ as its prototype. This method wraps the
- * native ES5 `Object.create()` method if available, but doesn't currently
- * pass through `Object.create()`'s second argument (properties) in order to
- * ensure compatibility with older browsers.
- *
- * @method ()
- * @param {Object} obj Prototype object.
- * @return {Object} New object using _obj_ as its prototype.
- * @static
- */
-O = Y.Object = Lang._isNative(Object.create) ? function (obj) {
-    // We currently wrap the native Object.create instead of simply aliasing it
-    // to ensure consistency with our fallback shim, which currently doesn't
-    // support Object.create()'s second argument (properties). Once we have a
-    // safe fallback for the properties arg, we can stop wrapping
-    // Object.create().
-    return Object.create(obj);
-} : (function () {
-    // Reusable constructor function for the Object.create() shim.
-    function F() {}
-
-    // The actual shim.
-    return function (obj) {
-        F.prototype = obj;
-        return new F();
-    };
-}()),
-
-/**
- * Property names that IE doesn't enumerate in for..in loops, even when they
- * should be enumerable. When `_hasEnumBug` is `true`, it's necessary to
- * manually enumerate these properties.
- *
- * @property _forceEnum
- * @type String[]
- * @protected
- * @static
- */
-forceEnum = O._forceEnum = [
-    'hasOwnProperty',
-    'isPrototypeOf',
-    'propertyIsEnumerable',
-    'toString',
-    'toLocaleString',
-    'valueOf'
-],
-
-/**
- * `true` if this browser has the JScript enumeration bug that prevents
- * enumeration of the properties named in the `_forceEnum` array, `false`
- * otherwise.
- *
- * See:
- *   - <https://developer.mozilla.org/en/ECMAScript_DontEnum_attribute#JScript_DontEnum_Bug>
- *   - <http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation>
- *
- * @property _hasEnumBug
- * @type Boolean
- * @protected
- * @static
- */
-hasEnumBug = O._hasEnumBug = !{valueOf: 0}.propertyIsEnumerable('valueOf'),
-
-/**
- * `true` if this browser incorrectly considers the `prototype` property of
- * functions to be enumerable. Currently known to affect Opera 11.50 and Android 2.3.x.
- *
- * @property _hasProtoEnumBug
- * @type Boolean
- * @protected
- * @static
- */
-hasProtoEnumBug = O._hasProtoEnumBug = (function () {}).propertyIsEnumerable('prototype'),
-
-/**
- * Returns `true` if _key_ exists on _obj_, `false` if _key_ doesn't exist or
- * exists only on _obj_'s prototype. This is essentially a safer version of
- * `obj.hasOwnProperty()`.
- *
- * @method owns
- * @param {Object} obj Object to test.
- * @param {String} key Property name to look for.
- * @return {Boolean} `true` if _key_ exists on _obj_, `false` otherwise.
- * @static
- */
-owns = O.owns = function (obj, key) {
-    return !!obj && hasOwn.call(obj, key);
-}; // <-- End of var declarations.
-
-/**
- * Alias for `owns()`.
- *
- * @method hasKey
- * @param {Object} obj Object to test.
- * @param {String} key Property name to look for.
- * @return {Boolean} `true` if _key_ exists on _obj_, `false` otherwise.
- * @static
- */
-O.hasKey = owns;
-
-/**
- * Returns an array containing the object's enumerable keys. Does not include
- * prototype keys or non-enumerable keys.
- *
- * Note that keys are returned in enumeration order (that is, in the same order
- * that they would be enumerated by a `for-in` loop), which may not be the same
- * as the order in which they were defined.
- *
- * This method is an alias for the native ES5 `Object.keys()` method if
- * available and non-buggy. The Opera 11.50 and Android 2.3.x versions of
- * `Object.keys()` have an inconsistency as they consider `prototype` to be
- * enumerable, so a non-native shim is used to rectify the difference.
- *
- * @example
- *
- *     Y.Object.keys({a: 'foo', b: 'bar', c: 'baz'});
- *     // => ['a', 'b', 'c']
- *
- * @method keys
- * @param {Object} obj An object.
- * @return {String[]} Array of keys.
- * @static
- */
-O.keys = Lang._isNative(Object.keys) && !hasProtoEnumBug ? Object.keys : function (obj) {
-    if (!Lang.isObject(obj)) {
-        throw new TypeError('Object.keys called on a non-object');
-    }
-
-    var keys = [],
-        i, key, len;
-
-    if (hasProtoEnumBug && typeof obj === 'function') {
-        for (key in obj) {
-            if (owns(obj, key) && key !== 'prototype') {
-                keys.push(key);
-            }
-        }
-    } else {
-        for (key in obj) {
-            if (owns(obj, key)) {
-                keys.push(key);
-            }
-        }
-    }
-
-    if (hasEnumBug) {
-        for (i = 0, len = forceEnum.length; i < len; ++i) {
-            key = forceEnum[i];
-
-            if (owns(obj, key)) {
-                keys.push(key);
-            }
-        }
-    }
-
-    return keys;
-};
-
-/**
- * Returns an array containing the values of the object's enumerable keys.
- *
- * Note that values are returned in enumeration order (that is, in the same
- * order that they would be enumerated by a `for-in` loop), which may not be the
- * same as the order in which they were defined.
- *
- * @example
- *
- *     Y.Object.values({a: 'foo', b: 'bar', c: 'baz'});
- *     // => ['foo', 'bar', 'baz']
- *
- * @method values
- * @param {Object} obj An object.
- * @return {Array} Array of values.
- * @static
- */
-O.values = function (obj) {
-    var keys   = O.keys(obj),
-        i      = 0,
-        len    = keys.length,
-        values = [];
-
-    for (; i < len; ++i) {
-        values.push(obj[keys[i]]);
-    }
-
-    return values;
-};
-
-/**
- * Returns the number of enumerable keys owned by an object.
- *
- * @method size
- * @param {Object} obj An object.
- * @return {Number} The object's size.
- * @static
- */
-O.size = function (obj) {
-    try {
-        return O.keys(obj).length;
-    } catch (ex) {
-        return 0; // Legacy behavior for non-objects.
-    }
-};
-
-/**
- * Returns `true` if the object owns an enumerable property with the specified
- * value.
- *
- * @method hasValue
- * @param {Object} obj An object.
- * @param {any} value The value to search for.
- * @return {Boolean} `true` if _obj_ contains _value_, `false` otherwise.
- * @static
- */
-O.hasValue = function (obj, value) {
-    return Y.Array.indexOf(O.values(obj), value) > -1;
-};
-
-/**
- * Executes a function on each enumerable property in _obj_. The function
- * receives the value, the key, and the object itself as parameters (in that
- * order).
- *
- * By default, only properties owned by _obj_ are enumerated. To include
- * prototype properties, set the _proto_ parameter to `true`.
- *
- * @method each
- * @param {Object} obj Object to enumerate.
- * @param {Function} fn Function to execute on each enumerable property.
- *   @param {mixed} fn.value Value of the current property.
- *   @param {String} fn.key Key of the current property.
- *   @param {Object} fn.obj Object being enumerated.
- * @param {Object} [thisObj] `this` object to use when calling _fn_.
- * @param {Boolean} [proto=false] Include prototype properties.
- * @return {YUI} the YUI instance.
- * @chainable
- * @static
- */
-O.each = function (obj, fn, thisObj, proto) {
-    var key;
-
-    for (key in obj) {
-        if (proto || owns(obj, key)) {
-            fn.call(thisObj || Y, obj[key], key, obj);
-        }
-    }
-
-    return Y;
-};
-
-/**
- * Executes a function on each enumerable property in _obj_, but halts if the
- * function returns a truthy value. The function receives the value, the key,
- * and the object itself as paramters (in that order).
- *
- * By default, only properties owned by _obj_ are enumerated. To include
- * prototype properties, set the _proto_ parameter to `true`.
- *
- * @method some
- * @param {Object} obj Object to enumerate.
- * @param {Function} fn Function to execute on each enumerable property.
- *   @param {mixed} fn.value Value of the current property.
- *   @param {String} fn.key Key of the current property.
- *   @param {Object} fn.obj Object being enumerated.
- * @param {Object} [thisObj] `this` object to use when calling _fn_.
- * @param {Boolean} [proto=false] Include prototype properties.
- * @return {Boolean} `true` if any execution of _fn_ returns a truthy value,
- *   `false` otherwise.
- * @static
- */
-O.some = function (obj, fn, thisObj, proto) {
-    var key;
-
-    for (key in obj) {
-        if (proto || owns(obj, key)) {
-            if (fn.call(thisObj || Y, obj[key], key, obj)) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-};
-
-/**
- * Retrieves the sub value at the provided path,
- * from the value object provided.
- *
- * @method getValue
- * @static
- * @param o The object from which to extract the property value.
- * @param path {Array} A path array, specifying the object traversal path
- * from which to obtain the sub value.
- * @return {Any} The value stored in the path, undefined if not found,
- * undefined if the source is not an object.  Returns the source object
- * if an empty path is provided.
- */
-O.getValue = function(o, path) {
-    if (!Lang.isObject(o)) {
-        return UNDEFINED;
-    }
-
-    var i,
-        p = Y.Array(path),
-        l = p.length;
-
-    for (i = 0; o !== UNDEFINED && i < l; i++) {
-        o = o[p[i]];
-    }
-
-    return o;
-};
-
-/**
- * Sets the sub-attribute value at the provided path on the
- * value object.  Returns the modified value object, or
- * undefined if the path is invalid.
- *
- * @method setValue
- * @static
- * @param o             The object on which to set the sub value.
- * @param path {Array}  A path array, specifying the object traversal path
- *                      at which to set the sub value.
- * @param val {Any}     The new value for the sub-attribute.
- * @return {Object}     The modified object, with the new sub value set, or
- *                      undefined, if the path was invalid.
- */
-O.setValue = function(o, path, val) {
-    var i,
-        p = Y.Array(path),
-        leafIdx = p.length - 1,
-        ref = o;
-
-    if (leafIdx >= 0) {
-        for (i = 0; ref !== UNDEFINED && i < leafIdx; i++) {
-            ref = ref[p[i]];
-        }
-
-        if (ref !== UNDEFINED) {
-            ref[p[i]] = val;
-        } else {
-            return UNDEFINED;
-        }
-    }
-
-    return o;
-};
-
-/**
- * Returns `true` if the object has no enumerable properties of its own.
- *
- * @method isEmpty
- * @param {Object} obj An object.
- * @return {Boolean} `true` if the object is empty.
- * @static
- * @since 3.2.0
- */
-O.isEmpty = function (obj) {
-    return !O.keys(Object(obj)).length;
-};
-/**
- * The YUI module contains the components required for building the YUI seed
- * file.  This includes the script loading mechanism, a simple queue, and the
- * core utilities for the library.
- * @module yui
- * @submodule yui-base
- */
-
-/**
- * YUI user agent detection.
- * Do not fork for a browser if it can be avoided.  Use feature detection when
- * you can.  Use the user agent as a last resort.  For all fields listed
- * as @type float, UA stores a version number for the browser engine,
- * 0 otherwise.  This value may or may not map to the version number of
- * the browser using the engine.  The value is presented as a float so
- * that it can easily be used for boolean evaluation as well as for
- * looking for a particular range of versions.  Because of this,
- * some of the granularity of the version info may be lost.  The fields that
- * are @type string default to null.  The API docs list the values that
- * these fields can have.
- * @class UA
- * @static
- */
-
-/**
-* Static method on `YUI.Env` for parsing a UA string.  Called at instantiation
-* to populate `Y.UA`.
-*
-* @static
-* @method parseUA
-* @param {String} [subUA=navigator.userAgent] UA string to parse
-* @return {Object} The Y.UA object
-*/
-YUI.Env.parseUA = function(subUA) {
-
-    var numberify = function(s) {
-            var c = 0;
-            return parseFloat(s.replace(/\./g, function() {
-                return (c++ === 1) ? '' : '.';
-            }));
-        },
-
-        win = Y.config.win,
-
-        nav = win && win.navigator,
-
-        o = {
-
-        /**
-         * Internet Explorer version number or 0.  Example: 6
-         * @property ie
-         * @type float
-         * @static
-         */
-        ie: 0,
-
-        /**
-         * Opera version number or 0.  Example: 9.2
-         * @property opera
-         * @type float
-         * @static
-         */
-        opera: 0,
-
-        /**
-         * Gecko engine revision number.  Will evaluate to 1 if Gecko
-         * is detected but the revision could not be found. Other browsers
-         * will be 0.  Example: 1.8
-         * <pre>
-         * Firefox 1.0.0.4: 1.7.8   <-- Reports 1.7
-         * Firefox 1.5.0.9: 1.8.0.9 <-- 1.8
-         * Firefox 2.0.0.3: 1.8.1.3 <-- 1.81
-         * Firefox 3.0   <-- 1.9
-         * Firefox 3.5   <-- 1.91
-         * </pre>
-         * @property gecko
-         * @type float
-         * @static
-         */
-        gecko: 0,
-
-        /**
-         * AppleWebKit version.  KHTML browsers that are not WebKit browsers
-         * will evaluate to 1, other browsers 0.  Example: 418.9
-         * <pre>
-         * Safari 1.3.2 (312.6): 312.8.1 <-- Reports 312.8 -- currently the
-         *                                   latest available for Mac OSX 10.3.
-         * Safari 2.0.2:         416     <-- hasOwnProperty introduced
-         * Safari 2.0.4:         418     <-- preventDefault fixed
-         * Safari 2.0.4 (419.3): 418.9.1 <-- One version of Safari may run
-         *                                   different versions of webkit
-         * Safari 2.0.4 (419.3): 419     <-- Tiger installations that have been
-         *                                   updated, but not updated
-         *                                   to the latest patch.
-         * Webkit 212 nightly:   522+    <-- Safari 3.0 precursor (with native
-         * SVG and many major issues fixed).
-         * Safari 3.0.4 (523.12) 523.12  <-- First Tiger release - automatic
-         * update from 2.x via the 10.4.11 OS patch.
-         * Webkit nightly 1/2008:525+    <-- Supports DOMContentLoaded event.
-         *                                   yahoo.com user agent hack removed.
-         * </pre>
-         * http://en.wikipedia.org/wiki/Safari_version_history
-         * @property webkit
-         * @type float
-         * @static
-         */
-        webkit: 0,
-
-        /**
-         * Safari will be detected as webkit, but this property will also
-         * be populated with the Safari version number
-         * @property safari
-         * @type float
-         * @static
-         */
-        safari: 0,
-
-        /**
-         * Chrome will be detected as webkit, but this property will also
-         * be populated with the Chrome version number
-         * @property chrome
-         * @type float
-         * @static
-         */
-        chrome: 0,
-
-        /**
-         * The mobile property will be set to a string containing any relevant
-         * user agent information when a modern mobile browser is detected.
-         * Currently limited to Safari on the iPhone/iPod Touch, Nokia N-series
-         * devices with the WebKit-based browser, and Opera Mini.
-         * @property mobile
-         * @type string
-         * @default null
-         * @static
-         */
-        mobile: null,
-
-        /**
-         * Adobe AIR version number or 0.  Only populated if webkit is detected.
-         * Example: 1.0
-         * @property air
-         * @type float
-         */
-        air: 0,
-        /**
-         * PhantomJS version number or 0.  Only populated if webkit is detected.
-         * Example: 1.0
-         * @property phantomjs
-         * @type float
-         */
-        phantomjs: 0,
-        /**
-         * Detects Apple iPad's OS version
-         * @property ipad
-         * @type float
-         * @static
-         */
-        ipad: 0,
-        /**
-         * Detects Apple iPhone's OS version
-         * @property iphone
-         * @type float
-         * @static
-         */
-        iphone: 0,
-        /**
-         * Detects Apples iPod's OS version
-         * @property ipod
-         * @type float
-         * @static
-         */
-        ipod: 0,
-        /**
-         * General truthy check for iPad, iPhone or iPod
-         * @property ios
-         * @type Boolean
-         * @default null
-         * @static
-         */
-        ios: null,
-        /**
-         * Detects Googles Android OS version
-         * @property android
-         * @type float
-         * @static
-         */
-        android: 0,
-        /**
-         * Detects Kindle Silk
-         * @property silk
-         * @type float
-         * @static
-         */
-        silk: 0,
-        /**
-         * Detects Kindle Silk Acceleration
-         * @property accel
-         * @type Boolean
-         * @static
-         */
-        accel: false,
-        /**
-         * Detects Palms WebOS version
-         * @property webos
-         * @type float
-         * @static
-         */
-        webos: 0,
-
-        /**
-         * Google Caja version number or 0.
-         * @property caja
-         * @type float
-         */
-        caja: nav && nav.cajaVersion,
-
-        /**
-         * Set to true if the page appears to be in SSL
-         * @property secure
-         * @type boolean
-         * @static
-         */
-        secure: false,
-
-        /**
-         * The operating system.  Currently only detecting windows or macintosh
-         * @property os
-         * @type string
-         * @default null
-         * @static
-         */
-        os: null,
-
-        /**
-         * The Nodejs Version
-         * @property nodejs
-         * @type float
-         * @default 0
-         * @static
-         */
-        nodejs: 0,
-        /**
-        * Window8/IE10 Application host environment
-        * @property winjs
-        * @type Boolean
-        * @static
-        */
-        winjs: !!((typeof Windows !== "undefined") && Windows.System),
-        /**
-        * Are touch/msPointer events available on this device
-        * @property touchEnabled
-        * @type Boolean
-        * @static
-        */
-        touchEnabled: false
-    },
-
-    ua = subUA || nav && nav.userAgent,
-
-    loc = win && win.location,
-
-    href = loc && loc.href,
-
-    m;
-
-    /**
-    * The User Agent string that was parsed
-    * @property userAgent
-    * @type String
-    * @static
-    */
-    o.userAgent = ua;
-
-
-    o.secure = href && (href.toLowerCase().indexOf('https') === 0);
-
-    if (ua) {
-
-        if ((/windows|win32/i).test(ua)) {
-            o.os = 'windows';
-        } else if ((/macintosh|mac_powerpc/i).test(ua)) {
-            o.os = 'macintosh';
-        } else if ((/android/i).test(ua)) {
-            o.os = 'android';
-        } else if ((/symbos/i).test(ua)) {
-            o.os = 'symbos';
-        } else if ((/linux/i).test(ua)) {
-            o.os = 'linux';
-        } else if ((/rhino/i).test(ua)) {
-            o.os = 'rhino';
-        }
-
-        // Modern KHTML browsers should qualify as Safari X-Grade
-        if ((/KHTML/).test(ua)) {
-            o.webkit = 1;
-        }
-        if ((/IEMobile|XBLWP7/).test(ua)) {
-            o.mobile = 'windows';
-        }
-        if ((/Fennec/).test(ua)) {
-            o.mobile = 'gecko';
-        }
-        // Modern WebKit browsers are at least X-Grade
-        m = ua.match(/AppleWebKit\/([^\s]*)/);
-        if (m && m[1]) {
-            o.webkit = numberify(m[1]);
-            o.safari = o.webkit;
-
-            if (/PhantomJS/.test(ua)) {
-                m = ua.match(/PhantomJS\/([^\s]*)/);
-                if (m && m[1]) {
-                    o.phantomjs = numberify(m[1]);
-                }
-            }
-
-            // Mobile browser check
-            if (/ Mobile\//.test(ua) || (/iPad|iPod|iPhone/).test(ua)) {
-                o.mobile = 'Apple'; // iPhone or iPod Touch
-
-                m = ua.match(/OS ([^\s]*)/);
-                if (m && m[1]) {
-                    m = numberify(m[1].replace('_', '.'));
-                }
-                o.ios = m;
-                o.os = 'ios';
-                o.ipad = o.ipod = o.iphone = 0;
-
-                m = ua.match(/iPad|iPod|iPhone/);
-                if (m && m[0]) {
-                    o[m[0].toLowerCase()] = o.ios;
-                }
-            } else {
-                m = ua.match(/NokiaN[^\/]*|webOS\/\d\.\d/);
-                if (m) {
-                    // Nokia N-series, webOS, ex: NokiaN95
-                    o.mobile = m[0];
-                }
-                if (/webOS/.test(ua)) {
-                    o.mobile = 'WebOS';
-                    m = ua.match(/webOS\/([^\s]*);/);
-                    if (m && m[1]) {
-                        o.webos = numberify(m[1]);
-                    }
-                }
-                if (/ Android/.test(ua)) {
-                    if (/Mobile/.test(ua)) {
-                        o.mobile = 'Android';
-                    }
-                    m = ua.match(/Android ([^\s]*);/);
-                    if (m && m[1]) {
-                        o.android = numberify(m[1]);
-                    }
-
-                }
-                if (/Silk/.test(ua)) {
-                    m = ua.match(/Silk\/([^\s]*)/);
-                    if (m && m[1]) {
-                        o.silk = numberify(m[1]);
-                    }
-                    if (!o.android) {
-                        o.android = 2.34; //Hack for desktop mode in Kindle
-                        o.os = 'Android';
-                    }
-                    if (/Accelerated=true/.test(ua)) {
-                        o.accel = true;
-                    }
-                }
-            }
-
-            m = ua.match(/OPR\/(\d+\.\d+)/);
-
-            if (m && m[1]) {
-                // Opera 15+ with Blink (pretends to be both Chrome and Safari)
-                o.opera = numberify(m[1]);
-            } else {
-                m = ua.match(/(Chrome|CrMo|CriOS)\/([^\s]*)/);
-
-                if (m && m[1] && m[2]) {
-                    o.chrome = numberify(m[2]); // Chrome
-                    o.safari = 0; //Reset safari back to 0
-                    if (m[1] === 'CrMo') {
-                        o.mobile = 'chrome';
-                    }
-                } else {
-                    m = ua.match(/AdobeAIR\/([^\s]*)/);
-                    if (m) {
-                        o.air = m[0]; // Adobe AIR 1.0 or better
-                    }
-                }
-            }
-        }
-
-        if (!o.webkit) { // not webkit
-// @todo check Opera/8.01 (J2ME/MIDP; Opera Mini/2.0.4509/1316; fi; U; ssr)
-            if (/Opera/.test(ua)) {
-                m = ua.match(/Opera[\s\/]([^\s]*)/);
-                if (m && m[1]) {
-                    o.opera = numberify(m[1]);
-                }
-                m = ua.match(/Version\/([^\s]*)/);
-                if (m && m[1]) {
-                    o.opera = numberify(m[1]); // opera 10+
-                }
-
-                if (/Opera Mobi/.test(ua)) {
-                    o.mobile = 'opera';
-                    m = ua.replace('Opera Mobi', '').match(/Opera ([^\s]*)/);
-                    if (m && m[1]) {
-                        o.opera = numberify(m[1]);
-                    }
-                }
-                m = ua.match(/Opera Mini[^;]*/);
-
-                if (m) {
-                    o.mobile = m[0]; // ex: Opera Mini/2.0.4509/1316
-                }
-            } else { // not opera or webkit
-                m = ua.match(/MSIE ([^;]*)|Trident.*; rv:([0-9.]+)/);
-
-                if (m && (m[1] || m[2])) {
-                    o.ie = numberify(m[1] || m[2]);
-                } else { // not opera, webkit, or ie
-                    m = ua.match(/Gecko\/([^\s]*)/);
-
-                    if (m) {
-                        o.gecko = 1; // Gecko detected, look for revision
-                        m = ua.match(/rv:([^\s\)]*)/);
-                        if (m && m[1]) {
-                            o.gecko = numberify(m[1]);
-                            if (/Mobile|Tablet/.test(ua)) {
-                                o.mobile = "ffos";
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    //Check for known properties to tell if touch events are enabled on this device or if
-    //the number of MSPointer touchpoints on this device is greater than 0.
-    if (win && nav && !(o.chrome && o.chrome < 6)) {
-        o.touchEnabled = (("ontouchstart" in win) || (("msMaxTouchPoints" in nav) && (nav.msMaxTouchPoints > 0)));
-    }
-
-    //It was a parsed UA, do not assign the global value.
-    if (!subUA) {
-
-        if (typeof process === 'object') {
-
-            if (process.versions && process.versions.node) {
-                //NodeJS
-                o.os = process.platform;
-                o.nodejs = numberify(process.versions.node);
-            }
-        }
-
-        YUI.Env.UA = o;
-
-    }
-
-    return o;
-};
-
-
-Y.UA = YUI.Env.UA || YUI.Env.parseUA();
-
-/**
-Performs a simple comparison between two version numbers, accounting for
-standard versioning logic such as the fact that "535.8" is a lower version than
-"535.24", even though a simple numerical comparison would indicate that it's
-greater. Also accounts for cases such as "1.1" vs. "1.1.0", which are
-considered equivalent.
-
-Returns -1 if version _a_ is lower than version _b_, 0 if they're equivalent,
-1 if _a_ is higher than _b_.
-
-Versions may be numbers or strings containing numbers and dots. For example,
-both `535` and `"535.8.10"` are acceptable. A version string containing
-non-numeric characters, like `"535.8.beta"`, may produce unexpected results.
-
-@method compareVersions
-@param {Number|String} a First version number to compare.
-@param {Number|String} b Second version number to compare.
-@return -1 if _a_ is lower than _b_, 0 if they're equivalent, 1 if _a_ is
-    higher than _b_.
-**/
-Y.UA.compareVersions = function (a, b) {
-    var aPart, aParts, bPart, bParts, i, len;
-
-    if (a === b) {
-        return 0;
-    }
-
-    aParts = (a + '').split('.');
-    bParts = (b + '').split('.');
-
-    for (i = 0, len = Math.max(aParts.length, bParts.length); i < len; ++i) {
-        aPart = parseInt(aParts[i], 10);
-        bPart = parseInt(bParts[i], 10);
-
-        /*jshint expr: true*/
-        isNaN(aPart) && (aPart = 0);
-        isNaN(bPart) && (bPart = 0);
-
-        if (aPart < bPart) {
-            return -1;
-        }
-
-        if (aPart > bPart) {
-            return 1;
-        }
-    }
-
-    return 0;
-};
-YUI.Env.aliases = {
-    "anim": ["anim-base","anim-color","anim-curve","anim-easing","anim-node-plugin","anim-scroll","anim-xy"],
-    "anim-shape-transform": ["anim-shape"],
-    "app": ["app-base","app-content","app-transitions","lazy-model-list","model","model-list","model-sync-rest","model-sync-local","router","view","view-node-map"],
-    "attribute": ["attribute-base","attribute-complex"],
-    "attribute-events": ["attribute-observable"],
-    "autocomplete": ["autocomplete-base","autocomplete-sources","autocomplete-list","autocomplete-plugin"],
-    "axes": ["axis-numeric","axis-category","axis-time","axis-stacked"],
-    "axes-base": ["axis-numeric-base","axis-category-base","axis-time-base","axis-stacked-base"],
-    "base": ["base-base","base-pluginhost","base-build"],
-    "cache": ["cache-base","cache-offline","cache-plugin"],
-    "charts": ["charts-base"],
-    "collection": ["array-extras","arraylist","arraylist-add","arraylist-filter","array-invoke"],
-    "color": ["color-base","color-hsl","color-harmony"],
-    "controller": ["router"],
-    "dataschema": ["dataschema-base","dataschema-json","dataschema-xml","dataschema-array","dataschema-text"],
-    "datasource": ["datasource-local","datasource-io","datasource-get","datasource-function","datasource-cache","datasource-jsonschema","datasource-xmlschema","datasource-arrayschema","datasource-textschema","datasource-polling"],
-    "datatable": ["datatable-core","datatable-table","datatable-head","datatable-body","datatable-base","datatable-column-widths","datatable-message","datatable-mutable","datatable-sort","datatable-datasource"],
-    "datatype": ["datatype-date","datatype-number","datatype-xml"],
-    "datatype-date": ["datatype-date-parse","datatype-date-format","datatype-date-math"],
-    "datatype-number": ["datatype-number-parse","datatype-number-format"],
-    "datatype-xml": ["datatype-xml-parse","datatype-xml-format"],
-    "dd": ["dd-ddm-base","dd-ddm","dd-ddm-drop","dd-drag","dd-proxy","dd-constrain","dd-drop","dd-scroll","dd-delegate"],
-    "dom": ["dom-base","dom-screen","dom-style","selector-native","selector"],
-    "editor": ["frame","editor-selection","exec-command","editor-base","editor-para","editor-br","editor-bidi","editor-tab","createlink-base"],
-    "event": ["event-base","event-delegate","event-synthetic","event-mousewheel","event-mouseenter","event-key","event-focus","event-resize","event-hover","event-outside","event-touch","event-move","event-flick","event-valuechange","event-tap"],
-    "event-custom": ["event-custom-base","event-custom-complex"],
-    "event-gestures": ["event-flick","event-move"],
-    "handlebars": ["handlebars-compiler"],
-    "highlight": ["highlight-base","highlight-accentfold"],
-    "history": ["history-base","history-hash","history-html5"],
-    "io": ["io-base","io-xdr","io-form","io-upload-iframe","io-queue"],
-    "json": ["json-parse","json-stringify"],
-    "loader": ["loader-base","loader-rollup","loader-yui3"],
-    "node": ["node-base","node-event-delegate","node-pluginhost","node-screen","node-style"],
-    "pluginhost": ["pluginhost-base","pluginhost-config"],
-    "querystring": ["querystring-parse","querystring-stringify"],
-    "recordset": ["recordset-base","recordset-sort","recordset-filter","recordset-indexer"],
-    "resize": ["resize-base","resize-proxy","resize-constrain"],
-    "slider": ["slider-base","slider-value-range","clickable-rail","range-slider"],
-    "template": ["template-base","template-micro"],
-    "text": ["text-accentfold","text-wordbreak"],
-    "widget": ["widget-base","widget-htmlparser","widget-skin","widget-uievents"]
-};
-
-
-}, '3.16.0', {"use": ["get", "features", "intl-base", "yui-log", "yui-later"]});
-YUI.add('get', function (Y, NAME) {
-
-/*jslint boss:true, expr:true, laxbreak: true */
-
-/**
-Provides dynamic loading of remote JavaScript and CSS resources.
-
-@module get
-@class Get
-@static
-**/
-
-var Lang = Y.Lang,
-
-    CUSTOM_ATTRS, // defined lazily in Y.Get.Transaction._createNode()
-
-    Get, Transaction;
-
-Y.Get = Get = {
-    // -- Public Properties ----------------------------------------------------
-
-    /**
-    Default options for CSS requests. Options specified here will override
-    global defaults for CSS requests.
-
-    See the `options` property for all available options.
-
-    @property cssOptions
-    @type Object
-    @static
-    @since 3.5.0
-    **/
-    cssOptions: {
-        attributes: {
-            rel: 'stylesheet'
-        },
-
-        doc         : Y.config.linkDoc || Y.config.doc,
-        pollInterval: 50
-    },
-
-    /**
-    Default options for JS requests. Options specified here will override global
-    defaults for JS requests.
-
-    See the `options` property for all available options.
-
-    @property jsOptions
-    @type Object
-    @static
-    @since 3.5.0
-    **/
-    jsOptions: {
-        autopurge: true,
-        doc      : Y.config.scriptDoc || Y.config.doc
-    },
-
-    /**
-    Default options to use for all requests.
-
-    Note that while all available options are documented here for ease of
-    discovery, some options (like callback functions) only make sense at the
-    transaction level.
-
-    Callback functions specified via the options object or the `options`
-    parameter of the `css()`, `js()`, or `load()` methods will receive the
-    transaction object as a parameter. See `Y.Get.Transaction` for details on
-    the properties and methods available on transactions.
-
-    @static
-    @since 3.5.0
-    @property {Object} options
-
-    @property {Boolean} [options.async=false] Whether or not to load scripts
-        asynchronously, meaning they're requested in parallel and execution
-        order is not guaranteed. Has no effect on CSS, since CSS is always
-        loaded asynchronously.
-
-    @property {Object} [options.attributes] HTML attribute name/value pairs that
-        should be added to inserted nodes. By default, the `charset` attribute
-        will be set to "utf-8" and nodes will be given an auto-generated `id`
-        attribute, but you can override these with your own values if desired.
-
-    @property {Boolean} [options.autopurge] Whether or not to automatically
-        purge inserted nodes after the purge threshold is reached. This is
-        `true` by default for JavaScript, but `false` for CSS since purging a
-        CSS node will also remove any styling applied by the referenced file.
-
-    @property {Object} [options.context] `this` object to use when calling
-        callback functions. Defaults to the transaction object.
-
-    @property {Mixed} [options.data] Arbitrary data object to pass to "on*"
-        callbacks.
-
-    @property {Document} [options.doc] Document into which nodes should be
-        inserted. By default, the current document is used.
-
-    @property {HTMLElement|String} [options.insertBefore] HTML element or id
-        string of an element before which all generated nodes should be
-        inserted. If not specified, Get will automatically determine the best
-        place to insert nodes for maximum compatibility.
-
-    @property {Function} [options.onEnd] Callback to execute after a transaction
-        is complete, regardless of whether it succeeded or failed.
-
-    @property {Function} [options.onFailure] Callback to execute after a
-        transaction fails, times out, or is aborted.
-
-    @property {Function} [options.onProgress] Callback to execute after each
-        individual request in a transaction either succeeds or fails.
-
-    @property {Function} [options.onSuccess] Callback to execute after a
-        transaction completes successfully with no errors. Note that in browsers
-        that don't support the `error` event on CSS `<link>` nodes, a failed CSS
-        request may still be reported as a success because in these browsers
-        it can be difficult or impossible to distinguish between success and
-        failure for CSS resources.
-
-    @property {Function} [options.onTimeout] Callback to execute after a
-        transaction times out.
-
-    @property {Number} [options.pollInterval=50] Polling interval (in
-        milliseconds) for detecting CSS load completion in browsers that don't
-        support the `load` event on `<link>` nodes. This isn't used for
-        JavaScript.
-
-    @property {Number} [options.purgethreshold=20] Number of nodes to insert
-        before triggering an automatic purge when `autopurge` is `true`.
-
-    @property {Number} [options.timeout] Number of milliseconds to wait before
-        aborting a transaction. When a timeout occurs, the `onTimeout` callback
-        is called, followed by `onFailure` and finally `onEnd`. By default,
-        there is no timeout.
-
-    @property {String} [options.type] Resource type ("css" or "js"). This option
-        is set automatically by the `css()` and `js()` functions and will be
-        ignored there, but may be useful when using the `load()` function. If
-        not specified, the type will be inferred from the URL, defaulting to
-        "js" if the URL doesn't contain a recognizable file extension.
-    **/
-    options: {
-        attributes: {
-            charset: 'utf-8'
-        },
-
-        purgethreshold: 20
-    },
-
-    // -- Protected Properties -------------------------------------------------
-
-    /**
-    Regex that matches a CSS URL. Used to guess the file type when it's not
-    specified.
-
-    @property REGEX_CSS
-    @type RegExp
-    @final
-    @protected
-    @static
-    @since 3.5.0
-    **/
-    REGEX_CSS: /\.css(?:[?;].*)?$/i,
-
-    /**
-    Regex that matches a JS URL. Used to guess the file type when it's not
-    specified.
-
-    @property REGEX_JS
-    @type RegExp
-    @final
-    @protected
-    @static
-    @since 3.5.0
-    **/
-    REGEX_JS : /\.js(?:[?;].*)?$/i,
-
-    /**
-    Contains information about the current environment, such as what script and
-    link injection features it supports.
-
-    This object is created and populated the first time the `_getEnv()` method
-    is called.
-
-    @property _env
-    @type Object
-    @protected
-    @static
-    @since 3.5.0
-    **/
-
-    /**
-    Mapping of document _yuid strings to <head> or <base> node references so we
-    don't have to look the node up each time we want to insert a request node.
-
-    @property _insertCache
-    @type Object
-    @protected
-    @static
-    @since 3.5.0
-    **/
-    _insertCache: {},
-
-    /**
-    Information about the currently pending transaction, if any.
-
-    This is actually an object with two properties: `callback`, containing the
-    optional callback passed to `css()`, `load()`, or `js()`; and `transaction`,
-    containing the actual transaction instance.
-
-    @property _pending
-    @type Object
-    @protected
-    @static
-    @since 3.5.0
-    **/
-    _pending: null,
-
-    /**
-    HTML nodes eligible to be purged next time autopurge is triggered.
-
-    @property _purgeNodes
-    @type HTMLElement[]
-    @protected
-    @static
-    @since 3.5.0
-    **/
-    _purgeNodes: [],
-
-    /**
-    Queued transactions and associated callbacks.
-
-    @property _queue
-    @type Object[]
-    @protected
-    @static
-    @since 3.5.0
-    **/
-    _queue: [],
-
-    // -- Public Methods -------------------------------------------------------
-
-    /**
-    Aborts the specified transaction.
-
-    This will cause the transaction's `onFailure` callback to be called and
-    will prevent any new script and link nodes from being added to the document,
-    but any resources that have already been requested will continue loading
-    (there's no safe way to prevent this, unfortunately).
-
-    *Note:* This method is deprecated as of 3.5.0, and will be removed in a
-    future version of YUI. Use the transaction-level `abort()` method instead.
-
-    @method abort
-    @param {Get.Transaction} transaction Transaction to abort.
-    @deprecated Use the `abort()` method on the transaction instead.
-    @static
-    **/
-    abort: function (transaction) {
-        var i, id, item, len, pending;
-
-
-        if (!transaction.abort) {
-            id          = transaction;
-            pending     = this._pending;
-            transaction = null;
-
-            if (pending && pending.transaction.id === id) {
-                transaction   = pending.transaction;
-                this._pending = null;
-            } else {
-                for (i = 0, len = this._queue.length; i < len; ++i) {
-                    item = this._queue[i].transaction;
-
-                    if (item.id === id) {
-                        transaction = item;
-                        this._queue.splice(i, 1);
-                        break;
-                    }
-                }
-            }
-        }
-
-        transaction && transaction.abort();
-    },
-
-    /**
-    Loads one or more CSS files.
-
-    The _urls_ parameter may be provided as a URL string, a request object,
-    or an array of URL strings and/or request objects.
-
-    A request object is just an object that contains a `url` property and zero
-    or more options that should apply specifically to that request.
-    Request-specific options take priority over transaction-level options and
-    default options.
-
-    URLs may be relative or absolute, and do not have to have the same origin
-    as the current page.
-
-    The `options` parameter may be omitted completely and a callback passed in
-    its place, if desired.
-
-    @example
-
-        // Load a single CSS file and log a message on completion.
-        Y.Get.css('foo.css', function (err) {
-            if (err) {
-            } else {
-            }
-        });
-
-        // Load multiple CSS files and log a message when all have finished
-        // loading.
-        var urls = ['foo.css', 'http://example.com/bar.css', 'baz/quux.css'];
-
-        Y.Get.css(urls, function (err) {
-            if (err) {
-            } else {
-            }
-        });
-
-        // Specify transaction-level options, which will apply to all requests
-        // within the transaction.
-        Y.Get.css(urls, {
-            attributes: {'class': 'my-css'},
-            timeout   : 5000
-        });
-
-        // Specify per-request options, which override transaction-level and
-        // default options.
-        Y.Get.css([
-            {url: 'foo.css', attributes: {id: 'foo'}},
-            {url: 'bar.css', attributes: {id: 'bar', charset: 'iso-8859-1'}}
-        ]);
-
-    @method css
-    @param {String|Object|Array} urls URL string, request object, or array
-        of URLs and/or request objects to load.
-    @param {Object} [options] Options for this transaction. See the
-        `Y.Get.options` property for a complete list of available options.
-    @param {Function} [callback] Callback function to be called on completion.
-        This is a general callback and will be called before any more granular
-        callbacks (`onSuccess`, `onFailure`, etc.) specified in the `options`
-        object.
-
-        @param {Array|null} callback.err Array of errors that occurred during
-            the transaction, or `null` on success.
-        @param {Get.Transaction} callback.transaction Transaction object.
-
-    @return {Get.Transaction} Transaction object.
-    @static
-    **/
-    css: function (urls, options, callback) {
-        return this._load('css', urls, options, callback);
-    },
-
-    /**
-    Loads one or more JavaScript resources.
-
-    The _urls_ parameter may be provided as a URL string, a request object,
-    or an array of URL strings and/or request objects.
-
-    A request object is just an object that contains a `url` property and zero
-    or more options that should apply specifically to that request.
-    Request-specific options take priority over transaction-level options and
-    default options.
-
-    URLs may be relative or absolute, and do not have to have the same origin
-    as the current page.
-
-    The `options` parameter may be omitted completely and a callback passed in
-    its place, if desired.
-
-    Scripts will be executed in the order they're specified unless the `async`
-    option is `true`, in which case they'll be loaded in parallel and executed
-    in whatever order they finish loading.
-
-    @example
-
-        // Load a single JS file and log a message on completion.
-        Y.Get.js('foo.js', function (err) {
-            if (err) {
-            } else {
-            }
-        });
-
-        // Load multiple JS files, execute them in order, and log a message when
-        // all have finished loading.
-        var urls = ['foo.js', 'http://example.com/bar.js', 'baz/quux.js'];
-
-        Y.Get.js(urls, function (err) {
-            if (err) {
-            } else {
-            }
-        });
-
-        // Specify transaction-level options, which will apply to all requests
-        // within the transaction.
-        Y.Get.js(urls, {
-            attributes: {'class': 'my-js'},
-            timeout   : 5000
-        });
-
-        // Specify per-request options, which override transaction-level and
-        // default options.
-        Y.Get.js([
-            {url: 'foo.js', attributes: {id: 'foo'}},
-            {url: 'bar.js', attributes: {id: 'bar', charset: 'iso-8859-1'}}
-        ]);
-
-    @method js
-    @param {String|Object|Array} urls URL string, request object, or array
-        of URLs and/or request objects to load.
-    @param {Object} [options] Options for this transaction. See the
-        `Y.Get.options` property for a complete list of available options.
-    @param {Function} [callback] Callback function to be called on completion.
-        This is a general callback and will be called before any more granular
-        callbacks (`onSuccess`, `onFailure`, etc.) specified in the `options`
-        object.
-
-        @param {Array|null} callback.err Array of errors that occurred during
-            the transaction, or `null` on success.
-        @param {Get.Transaction} callback.transaction Transaction object.
-
-    @return {Get.Transaction} Transaction object.
-    @since 3.5.0
-    @static
-    **/
-    js: function (urls, options, callback) {
-        return this._load('js', urls, options, callback);
-    },
-
-    /**
-    Loads one or more CSS and/or JavaScript resources in the same transaction.
-
-    Use this method when you want to load both CSS and JavaScript in a single
-    transaction and be notified when all requested URLs have finished loading,
-    regardless of type.
-
-    Behavior and options are the same as for the `css()` and `js()` methods. If
-    a resource type isn't specified in per-request options or transaction-level
-    options, Get will guess the file type based on the URL's extension (`.css`
-    or `.js`, with or without a following query string). If the file type can't
-    be guessed from the URL, a warning will be logged and Get will assume the
-    URL is a JavaScript resource.
-
-    @example
-
-        // Load both CSS and JS files in a single transaction, and log a message
-        // when all files have finished loading.
-        Y.Get.load(['foo.css', 'bar.js', 'baz.css'], function (err) {
-            if (err) {
-            } else {
-            }
-        });
-
-    @method load
-    @param {String|Object|Array} urls URL string, request object, or array
-        of URLs and/or request objects to load.
-    @param {Object} [options] Options for this transaction. See the
-        `Y.Get.options` property for a complete list of available options.
-    @param {Function} [callback] Callback function to be called on completion.
-        This is a general callback and will be called before any more granular
-        callbacks (`onSuccess`, `onFailure`, etc.) specified in the `options`
-        object.
-
-        @param {Array|null} err Array of errors that occurred during the
-            transaction, or `null` on success.
-        @param {Get.Transaction} Transaction object.
-
-    @return {Get.Transaction} Transaction object.
-    @since 3.5.0
-    @static
-    **/
-    load: function (urls, options, callback) {
-        return this._load(null, urls, options, callback);
-    },
-
-    // -- Protected Methods ----------------------------------------------------
-
-    /**
-    Triggers an automatic purge if the purge threshold has been reached.
-
-    @method _autoPurge
-    @param {Number} threshold Purge threshold to use, in milliseconds.
-    @protected
-    @since 3.5.0
-    @static
-    **/
-    _autoPurge: function (threshold) {
-        if (threshold && this._purgeNodes.length >= threshold) {
-            this._purge(this._purgeNodes);
-        }
-    },
-
-    /**
-    Populates the `_env` property with information about the current
-    environment.
-
-    @method _getEnv
-    @return {Object} Environment information.
-    @protected
-    @since 3.5.0
-    @static
-    **/
-    _getEnv: function () {
-        var doc = Y.config.doc,
-            ua  = Y.UA;
-
-        // Note: some of these checks require browser sniffs since it's not
-        // feasible to load test files on every pageview just to perform a
-        // feature test. I'm sorry if this makes you sad.
-        return (this._env = {
-
-            // True if this is a browser that supports disabling async mode on
-            // dynamically created script nodes. See
-            // https://developer.mozilla.org/En/HTML/Element/Script#Attributes
-
-            // IE10 doesn't return true for the MDN feature test, so setting it explicitly,
-            // because it is async by default, and allows you to disable async by setting it to false
-            async: (doc && doc.createElement('script').async === true) || (ua.ie >= 10),
-
-            // True if this browser fires an event when a dynamically injected
-            // link node fails to load. This is currently true for Firefox 9+
-            // and WebKit 535.24+
-            cssFail: ua.gecko >= 9 || ua.compareVersions(ua.webkit, 535.24) >= 0,
-
-            // True if this browser fires an event when a dynamically injected
-            // link node finishes loading. This is currently true for IE, Opera,
-            // Firefox 9+, and WebKit 535.24+. Note that IE versions <9 fire the
-            // DOM 0 "onload" event, but not "load". All versions of IE fire
-            // "onload".
-            // davglass: Seems that Chrome on Android needs this to be false.
-            cssLoad: (
-                    (!ua.gecko && !ua.webkit) || ua.gecko >= 9 ||
-                    ua.compareVersions(ua.webkit, 535.24) >= 0
-                ) && !(ua.chrome && ua.chrome <= 18),
-
-            // True if this browser preserves script execution order while
-            // loading scripts in parallel as long as the script node's `async`
-            // attribute is set to false to explicitly disable async execution.
-            preservesScriptOrder: !!(ua.gecko || ua.opera || (ua.ie && ua.ie >= 10))
-        });
-    },
-
-    _getTransaction: function (urls, options) {
-        var requests = [],
-            i, len, req, url;
-
-        if (!Lang.isArray(urls)) {
-            urls = [urls];
-        }
-
-        options = Y.merge(this.options, options);
-
-        // Clone the attributes object so we don't end up modifying it by ref.
-        options.attributes = Y.merge(this.options.attributes,
-                options.attributes);
-
-        for (i = 0, len = urls.length; i < len; ++i) {
-            url = urls[i];
-            req = {attributes: {}};
-
-            // If `url` is a string, we create a URL object for it, then mix in
-            // global options and request-specific options. If it's an object
-            // with a "url" property, we assume it's a request object containing
-            // URL-specific options.
-            if (typeof url === 'string') {
-                req.url = url;
-            } else if (url.url) {
-                // URL-specific options override both global defaults and
-                // request-specific options.
-                Y.mix(req, url, false, null, 0, true);
-                url = url.url; // Make url a string so we can use it later.
-            } else {
-                continue;
-            }
-
-            Y.mix(req, options, false, null, 0, true);
-
-            // If we didn't get an explicit type for this URL either in the
-            // request options or the URL-specific options, try to determine
-            // one from the file extension.
-            if (!req.type) {
-                if (this.REGEX_CSS.test(url)) {
-                    req.type = 'css';
-                } else {
-                    if (!this.REGEX_JS.test(url)) {
-                    }
-
-                    req.type = 'js';
-                }
-            }
-
-            // Mix in type-specific default options, but don't overwrite any
-            // options that have already been set.
-            Y.mix(req, req.type === 'js' ? this.jsOptions : this.cssOptions,
-                false, null, 0, true);
-
-            // Give the node an id attribute if it doesn't already have one.
-            req.attributes.id || (req.attributes.id = Y.guid());
-
-            // Backcompat for <3.5.0 behavior.
-            if (req.win) {
-                req.doc = req.win.document;
-            } else {
-                req.win = req.doc.defaultView || req.doc.parentWindow;
-            }
-
-            if (req.charset) {
-                req.attributes.charset = req.charset;
-            }
-
-            requests.push(req);
-        }
-
-        return new Transaction(requests, options);
-    },
-
-    _load: function (type, urls, options, callback) {
-        var transaction;
-
-        // Allow callback as third param.
-        if (typeof options === 'function') {
-            callback = options;
-            options  = {};
-        }
-
-        options || (options = {});
-        options.type = type;
-
-        options._onFinish = Get._onTransactionFinish;
-
-        if (!this._env) {
-            this._getEnv();
-        }
-
-        transaction = this._getTransaction(urls, options);
-
-        this._queue.push({
-            callback   : callback,
-            transaction: transaction
-        });
-
-        this._next();
-
-        return transaction;
-    },
-
-    _onTransactionFinish : function() {
-        Get._pending = null;
-        Get._next();
-    },
-
-    _next: function () {
-        var item;
-
-        if (this._pending) {
-            return;
-        }
-
-        item = this._queue.shift();
-
-        if (item) {
-            this._pending = item;
-            item.transaction.execute(item.callback);
-        }
-    },
-
-    _purge: function (nodes) {
-        var purgeNodes    = this._purgeNodes,
-            isTransaction = nodes !== purgeNodes,
-            index, node;
-
-        while (node = nodes.pop()) { // assignment
-            // Don't purge nodes that haven't finished loading (or errored out),
-            // since this can hang the transaction.
-            if (!node._yuiget_finished) {
-                continue;
-            }
-
-            node.parentNode && node.parentNode.removeChild(node);
-
-            // If this is a transaction-level purge and this node also exists in
-            // the Get-level _purgeNodes array, we need to remove it from
-            // _purgeNodes to avoid creating a memory leak. The indexOf lookup
-            // sucks, but until we get WeakMaps, this is the least troublesome
-            // way to do this (we can't just hold onto node ids because they may
-            // not be in the same document).
-            if (isTransaction) {
-                index = Y.Array.indexOf(purgeNodes, node);
-
-                if (index > -1) {
-                    purgeNodes.splice(index, 1);
-                }
-            }
-        }
-    }
-};
-
-/**
-Alias for `js()`.
-
-@method script
-@static
-**/
-Get.script = Get.js;
-
-/**
-Represents a Get transaction, which may contain requests for one or more JS or
-CSS files.
-
-This class should not be instantiated manually. Instances will be created and
-returned as needed by Y.Get's `css()`, `js()`, and `load()` methods.
-
-@class Get.Transaction
-@constructor
-@since 3.5.0
-**/
-Get.Transaction = Transaction = function (requests, options) {
-    var self = this;
-
-    self.id       = Transaction._lastId += 1;
-    self.data     = options.data;
-    self.errors   = [];
-    self.nodes    = [];
-    self.options  = options;
-    self.requests = requests;
-
-    self._callbacks = []; // callbacks to call after execution finishes
-    self._queue     = [];
-    self._reqsWaiting   = 0;
-
-    // Deprecated pre-3.5.0 properties.
-    self.tId = self.id; // Use `id` instead.
-    self.win = options.win || Y.config.win;
-};
-
-/**
-Arbitrary data object associated with this transaction.
-
-This object comes from the options passed to `Get.css()`, `Get.js()`, or
-`Get.load()`, and will be `undefined` if no data object was specified.
-
-@property {Object} data
-**/
-
-/**
-Array of errors that have occurred during this transaction, if any. Each error
-object has the following properties:
-`errors.error`: Error message.
-`errors.request`: Request object related to the error.
-
-@since 3.5.0
-@property {Object[]} errors
-**/
-
-/**
-Numeric id for this transaction, unique among all transactions within the same
-YUI sandbox in the current pageview.
-
-@property {Number} id
-@since 3.5.0
-**/
-
-/**
-HTMLElement nodes (native ones, not YUI Node instances) that have been inserted
-during the current transaction.
-
-@property {HTMLElement[]} nodes
-**/
-
-/**
-Options associated with this transaction.
-
-See `Get.options` for the full list of available options.
-
-@property {Object} options
-@since 3.5.0
-**/
-
-/**
-Request objects contained in this transaction. Each request object represents
-one CSS or JS URL that will be (or has been) requested and loaded into the page.
-
-@property {Object} requests
-@since 3.5.0
-**/
-
-/**
-Id of the most recent transaction.
-
-@property _lastId
-@type Number
-@protected
-@static
-**/
-Transaction._lastId = 0;
-
-Transaction.prototype = {
-    // -- Public Properties ----------------------------------------------------
-
-    /**
-    Current state of this transaction. One of "new", "executing", or "done".
-
-    @property _state
-    @type String
-    @protected
-    **/
-    _state: 'new', // "new", "executing", or "done"
-
-    // -- Public Methods -------------------------------------------------------
-
-    /**
-    Aborts this transaction.
-
-    This will cause the transaction's `onFailure` callback to be called and
-    will prevent any new script and link nodes from being added to the document,
-    but any resources that have already been requested will continue loading
-    (there's no safe way to prevent this, unfortunately).
-
-    @method abort
-    @param {String} [msg="Aborted."] Optional message to use in the `errors`
-        array describing why the transaction was aborted.
-    **/
-    abort: function (msg) {
-        this._pending    = null;
-        this._pendingCSS = null;
-        this._pollTimer  = clearTimeout(this._pollTimer);
-        this._queue      = [];
-        this._reqsWaiting    = 0;
-
-        this.errors.push({error: msg || 'Aborted'});
-        this._finish();
-    },
-
-    /**
-    Begins execting the transaction.
-
-    There's usually no reason to call this manually, since Get will call it
-    automatically when other pending transactions have finished. If you really
-    want to execute your transaction before Get does, you can, but be aware that
-    this transaction's scripts may end up executing before the scripts in other
-    pending transactions.
-
-    If the transaction is already executing, the specified callback (if any)
-    will be queued and called after execution finishes. If the transaction has
-    already finished, the callback will be called immediately (the transaction
-    will not be executed again).
-
-    @method execute
-    @param {Function} callback Callback function to execute after all requests
-        in the transaction are complete, or after the transaction is aborted.
-    **/
-    execute: function (callback) {
-        var self     = this,
-            requests = self.requests,
-            state    = self._state,
-            i, len, queue, req;
-
-        if (state === 'done') {
-            callback && callback(self.errors.length ? self.errors : null, self);
-            return;
-        } else {
-            callback && self._callbacks.push(callback);
-
-            if (state === 'executing') {
-                return;
-            }
-        }
-
-        self._state = 'executing';
-        self._queue = queue = [];
-
-        if (self.options.timeout) {
-            self._timeout = setTimeout(function () {
-                self.abort('Timeout');
-            }, self.options.timeout);
-        }
-
-        self._reqsWaiting = requests.length;
-
-        for (i = 0, len = requests.length; i < len; ++i) {
-            req = requests[i];
-
-            if (req.async || req.type === 'css') {
-                // No need to queue CSS or fully async JS.
-                self._insert(req);
-            } else {
-                queue.push(req);
-            }
-        }
-
-        self._next();
-    },
-
-    /**
-    Manually purges any `<script>` or `<link>` nodes this transaction has
-    created.
-
-    Be careful when purging a transaction that contains CSS requests, since
-    removing `<link>` nodes will also remove any styles they applied.
-
-    @method purge
-    **/
-    purge: function () {
-        Get._purge(this.nodes);
-    },
-
-    // -- Protected Methods ----------------------------------------------------
-    _createNode: function (name, attrs, doc) {
-        var node = doc.createElement(name),
-            attr, testEl;
-
-        if (!CUSTOM_ATTRS) {
-            // IE6 and IE7 expect property names rather than attribute names for
-            // certain attributes. Rather than sniffing, we do a quick feature
-            // test the first time _createNode() runs to determine whether we
-            // need to provide a workaround.
-            testEl = doc.createElement('div');
-            testEl.setAttribute('class', 'a');
-
-            CUSTOM_ATTRS = testEl.className === 'a' ? {} : {
-                'for'  : 'htmlFor',
-                'class': 'className'
-            };
-        }
-
-        for (attr in attrs) {
-            if (attrs.hasOwnProperty(attr)) {
-                node.setAttribute(CUSTOM_ATTRS[attr] || attr, attrs[attr]);
-            }
-        }
-
-        return node;
-    },
-
-    _finish: function () {
-        var errors  = this.errors.length ? this.errors : null,
-            options = this.options,
-            thisObj = options.context || this,
-            data, i, len;
-
-        if (this._state === 'done') {
-            return;
-        }
-
-        this._state = 'done';
-
-        for (i = 0, len = this._callbacks.length; i < len; ++i) {
-            this._callbacks[i].call(thisObj, errors, this);
-        }
-
-        data = this._getEventData();
-
-        if (errors) {
-            if (options.onTimeout && errors[errors.length - 1].error === 'Timeout') {
-                options.onTimeout.call(thisObj, data);
-            }
-
-            if (options.onFailure) {
-                options.onFailure.call(thisObj, data);
-            }
-        } else if (options.onSuccess) {
-            options.onSuccess.call(thisObj, data);
-        }
-
-        if (options.onEnd) {
-            options.onEnd.call(thisObj, data);
-        }
-
-        if (options._onFinish) {
-            options._onFinish();
-        }
-    },
-
-    _getEventData: function (req) {
-        if (req) {
-            // This merge is necessary for backcompat. I hate it.
-            return Y.merge(this, {
-                abort  : this.abort, // have to copy these because the prototype isn't preserved
-                purge  : this.purge,
-                request: req,
-                url    : req.url,
-                win    : req.win
-            });
-        } else {
-            return this;
-        }
-    },
-
-    _getInsertBefore: function (req) {
-        var doc = req.doc,
-            el  = req.insertBefore,
-            cache, docStamp;
-
-        if (el) {
-            return typeof el === 'string' ? doc.getElementById(el) : el;
-        }
-
-        cache    = Get._insertCache;
-        docStamp = Y.stamp(doc);
-
-        if ((el = cache[docStamp])) { // assignment
-            return el;
-        }
-
-        // Inserting before a <base> tag apparently works around an IE bug
-        // (according to a comment from pre-3.5.0 Y.Get), but I'm not sure what
-        // bug that is, exactly. Better safe than sorry?
-        if ((el = doc.getElementsByTagName('base')[0])) { // assignment
-            return (cache[docStamp] = el);
-        }
-
-        // Look for a <head> element.
-        el = doc.head || doc.getElementsByTagName('head')[0];
-
-        if (el) {
-            // Create a marker node at the end of <head> to use as an insertion
-            // point. Inserting before this node will ensure that all our CSS
-            // gets inserted in the correct order, to maintain style precedence.
-            el.appendChild(doc.createTextNode(''));
-            return (cache[docStamp] = el.lastChild);
-        }
-
-        // If all else fails, just insert before the first script node on the
-        // page, which is virtually guaranteed to exist.
-        return (cache[docStamp] = doc.getElementsByTagName('script')[0]);
-    },
-
-    _insert: function (req) {
-        var env          = Get._env,
-            insertBefore = this._getInsertBefore(req),
-            isScript     = req.type === 'js',
-            node         = req.node,
-            self         = this,
-            ua           = Y.UA,
-            cssTimeout, nodeType;
-
-        if (!node) {
-            if (isScript) {
-                nodeType = 'script';
-            } else if (!env.cssLoad && ua.gecko) {
-                nodeType = 'style';
-            } else {
-                nodeType = 'link';
-            }
-
-            node = req.node = this._createNode(nodeType, req.attributes,
-                req.doc);
-        }
-
-        function onError() {
-            self._progress('Failed to load ' + req.url, req);
-        }
-
-        function onLoad() {
-            if (cssTimeout) {
-                clearTimeout(cssTimeout);
-            }
-
-            self._progress(null, req);
-        }
-
-        // Deal with script asynchronicity.
-        if (isScript) {
-            node.setAttribute('src', req.url);
-
-            if (req.async) {
-                // Explicitly indicate that we want the browser to execute this
-                // script asynchronously. This is necessary for older browsers
-                // like Firefox <4.
-                node.async = true;
-            } else {
-                if (env.async) {
-                    // This browser treats injected scripts as async by default
-                    // (standard HTML5 behavior) but asynchronous loading isn't
-                    // desired, so tell the browser not to mark this script as
-                    // async.
-                    node.async = false;
-                }
-
-                // If this browser doesn't preserve script execution order based
-                // on insertion order, we'll need to avoid inserting other
-                // scripts until this one finishes loading.
-                if (!env.preservesScriptOrder) {
-                    this._pending = req;
-                }
-            }
-        } else {
-            if (!env.cssLoad && ua.gecko) {
-                // In Firefox <9, we can import the requested URL into a <style>
-                // node and poll for the existence of node.sheet.cssRules. This
-                // gives us a reliable way to determine CSS load completion that
-                // also works for cross-domain stylesheets.
-                //
-                // Props to Zach Leatherman for calling my attention to this
-                // technique.
-                node.innerHTML = (req.attributes.charset ?
-                    '@charset "' + req.attributes.charset + '";' : '') +
-                    '@import "' + req.url + '";';
-            } else {
-                node.setAttribute('href', req.url);
-            }
-        }
-
-        // Inject the node.
-        if (isScript && ua.ie && (ua.ie < 9 || (document.documentMode && document.documentMode < 9))) {
-            // Script on IE < 9, and IE 9+ when in IE 8 or older modes, including quirks mode.
-            node.onreadystatechange = function () {
-                if (/loaded|complete/.test(node.readyState)) {
-                    node.onreadystatechange = null;
-                    onLoad();
-                }
-            };
-        } else if (!isScript && !env.cssLoad) {
-            // CSS on Firefox <9 or WebKit.
-            this._poll(req);
-        } else {
-            // Script or CSS on everything else. Using DOM 0 events because that
-            // evens the playing field with older IEs.
-
-            if (ua.ie >= 10) {
-
-                // We currently need to introduce a timeout for IE10, since it
-                // calls onerror/onload synchronously for 304s - messing up existing
-                // program flow.
-
-                // Remove this block if the following bug gets fixed by GA
-                /*jshint maxlen: 1500 */
-                // https://connect.microsoft.com/IE/feedback/details/763871/dynamically-loaded-scripts-with-304s-responses-interrupt-the-currently-executing-js-thread-onload
-                node.onerror = function() { setTimeout(onError, 0); };
-                node.onload  = function() { setTimeout(onLoad, 0); };
-            } else {
-                node.onerror = onError;
-                node.onload  = onLoad;
-            }
-
-            // If this browser doesn't fire an event when CSS fails to load,
-            // fail after a timeout to avoid blocking the transaction queue.
-            if (!env.cssFail && !isScript) {
-                cssTimeout = setTimeout(onError, req.timeout || 3000);
-            }
-        }
-
-        this.nodes.push(node);
-        insertBefore.parentNode.insertBefore(node, insertBefore);
-    },
-
-    _next: function () {
-        if (this._pending) {
-            return;
-        }
-
-        // If there are requests in the queue, insert the next queued request.
-        // Otherwise, if we're waiting on already-inserted requests to finish,
-        // wait longer. If there are no queued requests and we're not waiting
-        // for anything to load, then we're done!
-        if (this._queue.length) {
-            this._insert(this._queue.shift());
-        } else if (!this._reqsWaiting) {
-            this._finish();
-        }
-    },
-
-    _poll: function (newReq) {
-        var self       = this,
-            pendingCSS = self._pendingCSS,
-            isWebKit   = Y.UA.webkit,
-            i, hasRules, j, nodeHref, req, sheets;
-
-        if (newReq) {
-            pendingCSS || (pendingCSS = self._pendingCSS = []);
-            pendingCSS.push(newReq);
-
-            if (self._pollTimer) {
-                // A poll timeout is already pending, so no need to create a
-                // new one.
-                return;
-            }
-        }
-
-        self._pollTimer = null;
-
-        // Note: in both the WebKit and Gecko hacks below, a CSS URL that 404s
-        // will still be treated as a success. There's no good workaround for
-        // this.
-
-        for (i = 0; i < pendingCSS.length; ++i) {
-            req = pendingCSS[i];
-
-            if (isWebKit) {
-                // Look for a stylesheet matching the pending URL.
-                sheets   = req.doc.styleSheets;
-                j        = sheets.length;
-                nodeHref = req.node.href;
-
-                while (--j >= 0) {
-                    if (sheets[j].href === nodeHref) {
-                        pendingCSS.splice(i, 1);
-                        i -= 1;
-                        self._progress(null, req);
-                        break;
-                    }
-                }
-            } else {
-                // Many thanks to Zach Leatherman for calling my attention to
-                // the @import-based cross-domain technique used here, and to
-                // Oleg Slobodskoi for an earlier same-domain implementation.
-                //
-                // See Zach's blog for more details:
-                // http://www.zachleat.com/web/2010/07/29/load-css-dynamically/
-                try {
-                    // We don't really need to store this value since we never
-                    // use it again, but if we don't store it, Closure Compiler
-                    // assumes the code is useless and removes it.
-                    hasRules = !!req.node.sheet.cssRules;
-
-                    // If we get here, the stylesheet has loaded.
-                    pendingCSS.splice(i, 1);
-                    i -= 1;
-                    self._progress(null, req);
-                } catch (ex) {
-                    // An exception means the stylesheet is still loading.
-                }
-            }
-        }
-
-        if (pendingCSS.length) {
-            self._pollTimer = setTimeout(function () {
-                self._poll.call(self);
-            }, self.options.pollInterval);
-        }
-    },
-
-    _progress: function (err, req) {
-        var options = this.options;
-
-        if (err) {
-            req.error = err;
-
-            this.errors.push({
-                error  : err,
-                request: req
-            });
-
-        }
-
-        req.node._yuiget_finished = req.finished = true;
-
-        if (options.onProgress) {
-            options.onProgress.call(options.context || this,
-                this._getEventData(req));
-        }
-
-        if (req.autopurge) {
-            // Pre-3.5.0 Get always excludes the most recent node from an
-            // autopurge. I find this odd, but I'm keeping that behavior for
-            // the sake of backcompat.
-            Get._autoPurge(this.options.purgethreshold);
-            Get._purgeNodes.push(req.node);
-        }
-
-        if (this._pending === req) {
-            this._pending = null;
-        }
-
-        this._reqsWaiting -= 1;
-
-        this._next();
-    }
-};
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-YUI.add('features', function (Y, NAME) {
-
-var feature_tests = {};
-
-/**
-Contains the core of YUI's feature test architecture.
-@module features
-*/
-
-/**
-* Feature detection
-* @class Features
-* @static
-*/
-
-Y.mix(Y.namespace('Features'), {
-
-    /**
-    * Object hash of all registered feature tests
-    * @property tests
-    * @type Object
-    */
-    tests: feature_tests,
-
-    /**
-    * Add a test to the system
-    *
-    *   ```
-    *   Y.Features.add("load", "1", {});
-    *   ```
-    *
-    * @method add
-    * @param {String} cat The category, right now only 'load' is supported
-    * @param {String} name The number sequence of the test, how it's reported in the URL or config: 1, 2, 3
-    * @param {Object} o Object containing test properties
-    * @param {String} o.name The name of the test
-    * @param {Function} o.test The test function to execute, the only argument to the function is the `Y` instance
-    * @param {String} o.trigger The module that triggers this test.
-    */
-    add: function(cat, name, o) {
-        feature_tests[cat] = feature_tests[cat] || {};
-        feature_tests[cat][name] = o;
-    },
-    /**
-    * Execute all tests of a given category and return the serialized results
-    *
-    *   ```
-    *   caps=1:1;2:1;3:0
-    *   ```
-    * @method all
-    * @param {String} cat The category to execute
-    * @param {Array} args The arguments to pass to the test function
-    * @return {String} A semi-colon separated string of tests and their success/failure: 1:1;2:1;3:0
-    */
-    all: function(cat, args) {
-        var cat_o = feature_tests[cat],
-            // results = {};
-            result = [];
-        if (cat_o) {
-            Y.Object.each(cat_o, function(v, k) {
-                result.push(k + ':' + (Y.Features.test(cat, k, args) ? 1 : 0));
-            });
-        }
-
-        return (result.length) ? result.join(';') : '';
-    },
-    /**
-    * Run a sepecific test and return a Boolean response.
-    *
-    *   ```
-    *   Y.Features.test("load", "1");
-    *   ```
-    *
-    * @method test
-    * @param {String} cat The category of the test to run
-    * @param {String} name The name of the test to run
-    * @param {Array} args The arguments to pass to the test function
-    * @return {Boolean} True or false if the test passed/failed.
-    */
-    test: function(cat, name, args) {
-        args = args || [];
-        var result, ua, test,
-            cat_o = feature_tests[cat],
-            feature = cat_o && cat_o[name];
-
-        if (!feature) {
-        } else {
-
-            result = feature.result;
-
-            if (Y.Lang.isUndefined(result)) {
-
-                ua = feature.ua;
-                if (ua) {
-                    result = (Y.UA[ua]);
-                }
-
-                test = feature.test;
-                if (test && ((!ua) || result)) {
-                    result = test.apply(Y, args);
-                }
-
-                feature.result = result;
-            }
-        }
-
-        return result;
-    }
-});
-
-// Y.Features.add("load", "1", {});
-// Y.Features.test("load", "1");
-// caps=1:1;2:0;3:1;
-
-/* This file is auto-generated by (yogi.js loader --mix --yes) */
-/*jshint maxlen:900, eqeqeq: false */
-var add = Y.Features.add;
-// app-transitions-native
-add('load', '0', {
-    "name": "app-transitions-native",
-    "test": function (Y) {
-    var doc  = Y.config.doc,
-        node = doc ? doc.documentElement : null;
-
-    if (node && node.style) {
-        return ('MozTransition' in node.style || 'WebkitTransition' in node.style || 'transition' in node.style);
-    }
-
-    return false;
-},
-    "trigger": "app-transitions"
-});
-// autocomplete-list-keys
-add('load', '1', {
-    "name": "autocomplete-list-keys",
-    "test": function (Y) {
-    // Only add keyboard support to autocomplete-list if this doesn't appear to
-    // be an iOS or Android-based mobile device.
-    //
-    // There's currently no feasible way to actually detect whether a device has
-    // a hardware keyboard, so this sniff will have to do. It can easily be
-    // overridden by manually loading the autocomplete-list-keys module.
-    //
-    // Worth noting: even though iOS supports bluetooth keyboards, Mobile Safari
-    // doesn't fire the keyboard events used by AutoCompleteList, so there's
-    // no point loading the -keys module even when a bluetooth keyboard may be
-    // available.
-    return !(Y.UA.ios || Y.UA.android);
-},
-    "trigger": "autocomplete-list"
-});
-// dd-gestures
-add('load', '2', {
-    "name": "dd-gestures",
-    "trigger": "dd-drag",
-    "ua": "touchEnabled"
-});
-// dom-style-ie
-add('load', '3', {
-    "name": "dom-style-ie",
-    "test": function (Y) {
-
-    var testFeature = Y.Features.test,
-        addFeature = Y.Features.add,
-        WINDOW = Y.config.win,
-        DOCUMENT = Y.config.doc,
-        DOCUMENT_ELEMENT = 'documentElement',
-        ret = false;
-
-    addFeature('style', 'computedStyle', {
-        test: function() {
-            return WINDOW && 'getComputedStyle' in WINDOW;
-        }
-    });
-
-    addFeature('style', 'opacity', {
-        test: function() {
-            return DOCUMENT && 'opacity' in DOCUMENT[DOCUMENT_ELEMENT].style;
-        }
-    });
-
-    ret =  (!testFeature('style', 'opacity') &&
-            !testFeature('style', 'computedStyle'));
-
-    return ret;
-},
-    "trigger": "dom-style"
-});
-// editor-para-ie
-add('load', '4', {
-    "name": "editor-para-ie",
-    "trigger": "editor-para",
-    "ua": "ie",
-    "when": "instead"
-});
-// event-base-ie
-add('load', '5', {
-    "name": "event-base-ie",
-    "test": function(Y) {
-    var imp = Y.config.doc && Y.config.doc.implementation;
-    return (imp && (!imp.hasFeature('Events', '2.0')));
-},
-    "trigger": "node-base"
-});
-// graphics-canvas
-add('load', '6', {
-    "name": "graphics-canvas",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useCanvas = Y.config.defaultGraphicEngine && Y.config.defaultGraphicEngine == "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    return (!svg || useCanvas) && (canvas && canvas.getContext && canvas.getContext("2d"));
-},
-    "trigger": "graphics"
-});
-// graphics-canvas-default
-add('load', '7', {
-    "name": "graphics-canvas-default",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useCanvas = Y.config.defaultGraphicEngine && Y.config.defaultGraphicEngine == "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    return (!svg || useCanvas) && (canvas && canvas.getContext && canvas.getContext("2d"));
-},
-    "trigger": "graphics"
-});
-// graphics-svg
-add('load', '8', {
-    "name": "graphics-svg",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
-    return svg && (useSVG || !canvas);
-},
-    "trigger": "graphics"
-});
-// graphics-svg-default
-add('load', '9', {
-    "name": "graphics-svg-default",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
-    return svg && (useSVG || !canvas);
-},
-    "trigger": "graphics"
-});
-// graphics-vml
-add('load', '10', {
-    "name": "graphics-vml",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas");
-    return (DOCUMENT && !DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") && (!canvas || !canvas.getContext || !canvas.getContext("2d")));
-},
-    "trigger": "graphics"
-});
-// graphics-vml-default
-add('load', '11', {
-    "name": "graphics-vml-default",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas");
-    return (DOCUMENT && !DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") && (!canvas || !canvas.getContext || !canvas.getContext("2d")));
-},
-    "trigger": "graphics"
-});
-// history-hash-ie
-add('load', '12', {
-    "name": "history-hash-ie",
-    "test": function (Y) {
-    var docMode = Y.config.doc && Y.config.doc.documentMode;
-
-    return Y.UA.ie && (!('onhashchange' in Y.config.win) ||
-            !docMode || docMode < 8);
-},
-    "trigger": "history-hash"
-});
-// io-nodejs
-add('load', '13', {
-    "name": "io-nodejs",
-    "trigger": "io-base",
-    "ua": "nodejs"
-});
-// json-parse-shim
-add('load', '14', {
-    "name": "json-parse-shim",
-    "test": function (Y) {
-    var _JSON = Y.config.global.JSON,
-        Native = Object.prototype.toString.call(_JSON) === '[object JSON]' && _JSON,
-        nativeSupport = Y.config.useNativeJSONParse !== false && !!Native;
-
-    function workingNative( k, v ) {
-        return k === "ok" ? true : v;
-    }
-    
-    // Double check basic functionality.  This is mainly to catch early broken
-    // implementations of the JSON API in Firefox 3.1 beta1 and beta2
-    if ( nativeSupport ) {
-        try {
-            nativeSupport = ( Native.parse( '{"ok":false}', workingNative ) ).ok;
-        }
-        catch ( e ) {
-            nativeSupport = false;
-        }
-    }
-
-    return !nativeSupport;
-},
-    "trigger": "json-parse"
-});
-// json-stringify-shim
-add('load', '15', {
-    "name": "json-stringify-shim",
-    "test": function (Y) {
-    var _JSON = Y.config.global.JSON,
-        Native = Object.prototype.toString.call(_JSON) === '[object JSON]' && _JSON,
-        nativeSupport = Y.config.useNativeJSONStringify !== false && !!Native;
-
-    // Double check basic native functionality.  This is primarily to catch broken
-    // early JSON API implementations in Firefox 3.1 beta1 and beta2.
-    if ( nativeSupport ) {
-        try {
-            nativeSupport = ( '0' === Native.stringify(0) );
-        } catch ( e ) {
-            nativeSupport = false;
-        }
-    }
-
-
-    return !nativeSupport;
-},
-    "trigger": "json-stringify"
-});
-// scrollview-base-ie
-add('load', '16', {
-    "name": "scrollview-base-ie",
-    "trigger": "scrollview-base",
-    "ua": "ie"
-});
-// selector-css2
-add('load', '17', {
-    "name": "selector-css2",
-    "test": function (Y) {
-    var DOCUMENT = Y.config.doc,
-        ret = DOCUMENT && !('querySelectorAll' in DOCUMENT);
-
-    return ret;
-},
-    "trigger": "selector"
-});
-// transition-timer
-add('load', '18', {
-    "name": "transition-timer",
-    "test": function (Y) {
-    var DOCUMENT = Y.config.doc,
-        node = (DOCUMENT) ? DOCUMENT.documentElement: null,
-        ret = true;
-
-    if (node && node.style) {
-        ret = !('MozTransition' in node.style || 'WebkitTransition' in node.style || 'transition' in node.style);
-    }
-
-    return ret;
-},
-    "trigger": "transition"
-});
-// widget-base-ie
-add('load', '19', {
-    "name": "widget-base-ie",
-    "trigger": "widget-base",
-    "ua": "ie"
-});
-// yql-jsonp
-add('load', '20', {
-    "name": "yql-jsonp",
-    "test": function (Y) {
-    /* Only load the JSONP module when not in nodejs or winjs
-    TODO Make the winjs module a CORS module
-    */
-    return (!Y.UA.nodejs && !Y.UA.winjs);
-},
-    "trigger": "yql"
-});
-// yql-nodejs
-add('load', '21', {
-    "name": "yql-nodejs",
-    "trigger": "yql",
-    "ua": "nodejs"
-});
-// yql-winjs
-add('load', '22', {
-    "name": "yql-winjs",
-    "trigger": "yql",
-    "ua": "winjs"
-});
-
-}, '3.16.0', {"requires": ["yui-base"]});
-YUI.add('intl-base', function (Y, NAME) {
-
-/**
- * The Intl utility provides a central location for managing sets of
- * localized resources (strings and formatting patterns).
- *
- * @class Intl
- * @uses EventTarget
- * @static
- */
-
-var SPLIT_REGEX = /[, ]/;
-
-Y.mix(Y.namespace('Intl'), {
-
- /**
-    * Returns the language among those available that
-    * best matches the preferred language list, using the Lookup
-    * algorithm of BCP 47.
-    * If none of the available languages meets the user's preferences,
-    * then "" is returned.
-    * Extended language ranges are not supported.
-    *
-    * @method lookupBestLang
-    * @param {String[] | String} preferredLanguages The list of preferred
-    * languages in descending preference order, represented as BCP 47
-    * language tags. A string array or a comma-separated list.
-    * @param {String[]} availableLanguages The list of languages
-    * that the application supports, represented as BCP 47 language
-    * tags.
-    *
-    * @return {String} The available language that best matches the
-    * preferred language list, or "".
-    * @since 3.1.0
-    */
-    lookupBestLang: function(preferredLanguages, availableLanguages) {
-
-        var i, language, result, index;
-
-        // check whether the list of available languages contains language;
-        // if so return it
-        function scan(language) {
-            var i;
-            for (i = 0; i < availableLanguages.length; i += 1) {
-                if (language.toLowerCase() ===
-                            availableLanguages[i].toLowerCase()) {
-                    return availableLanguages[i];
-                }
-            }
-        }
-
-        if (Y.Lang.isString(preferredLanguages)) {
-            preferredLanguages = preferredLanguages.split(SPLIT_REGEX);
-        }
-
-        for (i = 0; i < preferredLanguages.length; i += 1) {
-            language = preferredLanguages[i];
-            if (!language || language === '*') {
-                continue;
-            }
-            // check the fallback sequence for one language
-            while (language.length > 0) {
-                result = scan(language);
-                if (result) {
-                    return result;
-                } else {
-                    index = language.lastIndexOf('-');
-                    if (index >= 0) {
-                        language = language.substring(0, index);
-                        // one-character subtags get cut along with the
-                        // following subtag
-                        if (index >= 2 && language.charAt(index - 2) === '-') {
-                            language = language.substring(0, index - 2);
-                        }
-                    } else {
-                        // nothing available for this language
-                        break;
-                    }
-                }
-            }
-        }
-
-        return '';
-    }
-});
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-YUI.add('yui-log', function (Y, NAME) {
-
-/**
- * Provides console log capability and exposes a custom event for
- * console implementations. This module is a `core` YUI module,
- * <a href="../classes/YUI.html#method_log">it's documentation is located under the YUI class</a>.
- *
- * @module yui
- * @submodule yui-log
- */
-
-var INSTANCE = Y,
-    LOGEVENT = 'yui:log',
-    UNDEFINED = 'undefined',
-    LEVELS = { debug: 1,
-               info: 2,
-               warn: 4,
-               error: 8 };
-
-/**
- * If the 'debug' config is true, a 'yui:log' event will be
- * dispatched, which the Console widget and anything else
- * can consume.  If the 'useBrowserConsole' config is true, it will
- * write to the browser console if available.  YUI-specific log
- * messages will only be present in the -debug versions of the
- * JS files.  The build system is supposed to remove log statements
- * from the raw and minified versions of the files.
- *
- * @method log
- * @for YUI
- * @param  {String}  msg  The message to log.
- * @param  {String}  cat  The log category for the message.  Default
- *                        categories are "info", "warn", "error", "debug".
- *                        Custom categories can be used as well. (opt).
- * @param  {String}  src  The source of the the message (opt).
- * @param  {boolean} silent If true, the log event won't fire.
- * @return {YUI}      YUI instance.
- */
-INSTANCE.log = function(msg, cat, src, silent) {
-    var bail, excl, incl, m, f, minlevel,
-        Y = INSTANCE,
-        c = Y.config,
-        publisher = (Y.fire) ? Y : YUI.Env.globalEvents;
-    // suppress log message if the config is off or the event stack
-    // or the event call stack contains a consumer of the yui:log event
-    if (c.debug) {
-        // apply source filters
-        src = src || "";
-        if (typeof src !== "undefined") {
-            excl = c.logExclude;
-            incl = c.logInclude;
-            if (incl && !(src in incl)) {
-                bail = 1;
-            } else if (incl && (src in incl)) {
-                bail = !incl[src];
-            } else if (excl && (src in excl)) {
-                bail = excl[src];
-            }
-
-            // Set a default category of info if the category was not defined.
-            if ((typeof cat === 'undefined')) {
-                cat = 'info';
-            }
-
-            // Determine the current minlevel as defined in configuration
-            Y.config.logLevel = Y.config.logLevel || 'debug';
-            minlevel = LEVELS[Y.config.logLevel.toLowerCase()];
-
-            if (cat in LEVELS && LEVELS[cat] < minlevel) {
-                // Skip this message if the we don't meet the defined minlevel
-                bail = 1;
-            }
-        }
-        if (!bail) {
-            if (c.useBrowserConsole) {
-                m = (src) ? src + ': ' + msg : msg;
-                if (Y.Lang.isFunction(c.logFn)) {
-                    c.logFn.call(Y, msg, cat, src);
-                } else if (typeof console !== UNDEFINED && console.log) {
-                    f = (cat && console[cat] && (cat in LEVELS)) ? cat : 'log';
-                    console[f](m);
-                } else if (typeof opera !== UNDEFINED) {
-                    opera.postError(m);
-                }
-            }
-
-            if (publisher && !silent) {
-
-                if (publisher === Y && (!publisher.getEvent(LOGEVENT))) {
-                    publisher.publish(LOGEVENT, {
-                        broadcast: 2
-                    });
-                }
-
-                publisher.fire(LOGEVENT, {
-                    msg: msg,
-                    cat: cat,
-                    src: src
-                });
-            }
-        }
-    }
-
-    return Y;
-};
-
-/**
- * Write a system message.  This message will be preserved in the
- * minified and raw versions of the YUI files, unlike log statements.
- * @method message
- * @for YUI
- * @param  {String}  msg  The message to log.
- * @param  {String}  cat  The log category for the message.  Default
- *                        categories are "info", "warn", "error", "debug".
- *                        Custom categories can be used as well. (opt).
- * @param  {String}  src  The source of the the message (opt).
- * @param  {boolean} silent If true, the log event won't fire.
- * @return {YUI}      YUI instance.
- */
-INSTANCE.message = function() {
-    return INSTANCE.log.apply(INSTANCE, arguments);
-};
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-YUI.add('yui-later', function (Y, NAME) {
-
-/**
- * Provides a setTimeout/setInterval wrapper. This module is a `core` YUI module,
- * <a href="../classes/YUI.html#method_later">it's documentation is located under the YUI class</a>.
- *
- * @module yui
- * @submodule yui-later
- */
-
-var NO_ARGS = [];
-
-/**
- * Executes the supplied function in the context of the supplied
- * object 'when' milliseconds later.  Executes the function a
- * single time unless periodic is set to true.
- * @for YUI
- * @method later
- * @param when {Number} the number of milliseconds to wait until the fn
- * is executed.
- * @param o the context object.
- * @param fn {Function|String} the function to execute or the name of
- * the method in the 'o' object to execute.
- * @param data [Array] data that is provided to the function.  This
- * accepts either a single item or an array.  If an array is provided,
- * the function is executed with one parameter for each array item.
- * If you need to pass a single array parameter, it needs to be wrapped
- * in an array [myarray].
- *
- * Note: native methods in IE may not have the call and apply methods.
- * In this case, it will work, but you are limited to four arguments.
- *
- * @param periodic {boolean} if true, executes continuously at supplied
- * interval until canceled.
- * @return {object} a timer object. Call the cancel() method on this
- * object to stop the timer.
- */
-Y.later = function(when, o, fn, data, periodic) {
-    when = when || 0;
-    data = (!Y.Lang.isUndefined(data)) ? Y.Array(data) : NO_ARGS;
-    o = o || Y.config.win || Y;
-
-    var cancelled = false,
-        method = (o && Y.Lang.isString(fn)) ? o[fn] : fn,
-        wrapper = function() {
-            // IE 8- may execute a setInterval callback one last time
-            // after clearInterval was called, so in order to preserve
-            // the cancel() === no more runny-run, we have to jump through
-            // an extra hoop.
-            if (!cancelled) {
-                if (!method.apply) {
-                    method(data[0], data[1], data[2], data[3]);
-                } else {
-                    method.apply(o, data || NO_ARGS);
-                }
-            }
-        },
-        id = (periodic) ? setInterval(wrapper, when) : setTimeout(wrapper, when);
-
-    return {
-        id: id,
-        interval: periodic,
-        cancel: function() {
-            cancelled = true;
-            if (this.interval) {
-                clearInterval(id);
-            } else {
-                clearTimeout(id);
-            }
-        }
-    };
-};
-
-Y.Lang.later = Y.later;
-
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-YUI.add('yui', function (Y, NAME) {}, '3.16.0', {"use": ["get", "features", "intl-base", "yui-log", "yui-later"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('oop', function (Y, NAME) {
-
-/**
-Adds object inheritance and manipulation utilities to the YUI instance. This
-module is required by most YUI components.
-
-@module oop
-**/
-
-var L            = Y.Lang,
-    A            = Y.Array,
-    OP           = Object.prototype,
-    CLONE_MARKER = '_~yuim~_',
-
-    hasOwn   = OP.hasOwnProperty,
-    toString = OP.toString;
-
-/**
-Calls the specified _action_ method on _o_ if it exists. Otherwise, if _o_ is an
-array, calls the _action_ method on `Y.Array`, or if _o_ is an object, calls the
-_action_ method on `Y.Object`.
-
-If _o_ is an array-like object, it will be coerced to an array.
-
-This is intended to be used with array/object iteration methods that share
-signatures, such as `each()`, `some()`, etc.
-
-@method dispatch
-@param {Object} o Array or object to dispatch to.
-@param {Function} f Iteration callback.
-    @param {Mixed} f.value Value being iterated.
-    @param {Mixed} f.key Current object key or array index.
-    @param {Mixed} f.object Object or array being iterated.
-@param {Object} c `this` object to bind the iteration callback to.
-@param {Boolean} proto If `true`, prototype properties of objects will be
-    iterated.
-@param {String} action Function name to be dispatched on _o_. For example:
-    'some', 'each', etc.
-@private
-@return {Mixed} Returns the value returned by the chosen iteration action, which
-    varies.
-**/
-function dispatch(o, f, c, proto, action) {
-    if (o && o[action] && o !== Y) {
-        return o[action].call(o, f, c);
-    } else {
-        switch (A.test(o)) {
-            case 1:
-                return A[action](o, f, c);
-            case 2:
-                return A[action](Y.Array(o, 0, true), f, c);
-            default:
-                return Y.Object[action](o, f, c, proto);
-        }
-    }
-}
-
-/**
-Augments the _receiver_ with prototype properties from the _supplier_. The
-receiver may be a constructor function or an object. The supplier must be a
-constructor function.
-
-If the _receiver_ is an object, then the _supplier_ constructor will be called
-immediately after _receiver_ is augmented, with _receiver_ as the `this` object.
-
-If the _receiver_ is a constructor function, then all prototype methods of
-_supplier_ that are copied to _receiver_ will be sequestered, and the
-_supplier_ constructor will not be called immediately. The first time any
-sequestered method is called on the _receiver_'s prototype, all sequestered
-methods will be immediately copied to the _receiver_'s prototype, the
-_supplier_'s constructor will be executed, and finally the newly unsequestered
-method that was called will be executed.
-
-This sequestering logic sounds like a bunch of complicated voodoo, but it makes
-it cheap to perform frequent augmentation by ensuring that suppliers'
-constructors are only called if a supplied method is actually used. If none of
-the supplied methods is ever used, then there's no need to take the performance
-hit of calling the _supplier_'s constructor.
-
-@method augment
-@param {Function|Object} receiver Object or function to be augmented.
-@param {Function} supplier Function that supplies the prototype properties with
-  which to augment the _receiver_.
-@param {Boolean} [overwrite=false] If `true`, properties already on the receiver
-  will be overwritten if found on the supplier's prototype.
-@param {String[]} [whitelist] An array of property names. If specified,
-  only the whitelisted prototype properties will be applied to the receiver, and
-  all others will be ignored.
-@param {Array|any} [args] Argument or array of arguments to pass to the
-  supplier's constructor when initializing.
-@return {Function} Augmented object.
-@for YUI
-**/
-Y.augment = function (receiver, supplier, overwrite, whitelist, args) {
-    var rProto    = receiver.prototype,
-        sequester = rProto && supplier,
-        sProto    = supplier.prototype,
-        to        = rProto || receiver,
-
-        copy,
-        newPrototype,
-        replacements,
-        sequestered,
-        unsequester;
-
-    args = args ? Y.Array(args) : [];
-
-    if (sequester) {
-        newPrototype = {};
-        replacements = {};
-        sequestered  = {};
-
-        copy = function (value, key) {
-            if (overwrite || !(key in rProto)) {
-                if (toString.call(value) === '[object Function]') {
-                    sequestered[key] = value;
-
-                    newPrototype[key] = replacements[key] = function () {
-                        return unsequester(this, value, arguments);
-                    };
-                } else {
-                    newPrototype[key] = value;
-                }
-            }
-        };
-
-        unsequester = function (instance, fn, fnArgs) {
-            // Unsequester all sequestered functions.
-            for (var key in sequestered) {
-                if (hasOwn.call(sequestered, key)
-                        && instance[key] === replacements[key]) {
-
-                    instance[key] = sequestered[key];
-                }
-            }
-
-            // Execute the supplier constructor.
-            supplier.apply(instance, args);
-
-            // Finally, execute the original sequestered function.
-            return fn.apply(instance, fnArgs);
-        };
-
-        if (whitelist) {
-            Y.Array.each(whitelist, function (name) {
-                if (name in sProto) {
-                    copy(sProto[name], name);
-                }
-            });
-        } else {
-            Y.Object.each(sProto, copy, null, true);
-        }
-    }
-
-    Y.mix(to, newPrototype || sProto, overwrite, whitelist);
-
-    if (!sequester) {
-        supplier.apply(to, args);
-    }
-
-    return receiver;
-};
-
-/**
- * Copies object properties from the supplier to the receiver. If the target has
- * the property, and the property is an object, the target object will be
- * augmented with the supplier's value.
- *
- * @method aggregate
- * @param {Object} receiver Object to receive the augmentation.
- * @param {Object} supplier Object that supplies the properties with which to
- *     augment the receiver.
- * @param {Boolean} [overwrite=false] If `true`, properties already on the receiver
- *     will be overwritten if found on the supplier.
- * @param {String[]} [whitelist] Whitelist. If supplied, only properties in this
- *     list will be applied to the receiver.
- * @return {Object} Augmented object.
- */
-Y.aggregate = function(r, s, ov, wl) {
-    return Y.mix(r, s, ov, wl, 0, true);
-};
-
-/**
- * Utility to set up the prototype, constructor and superclass properties to
- * support an inheritance strategy that can chain constructors and methods.
- * Static members will not be inherited.
- *
- * @method extend
- * @param {function} r   the object to modify.
- * @param {function} s the object to inherit.
- * @param {object} px prototype properties to add/override.
- * @param {object} sx static properties to add/override.
- * @return {object} the extended object.
- */
-Y.extend = function(r, s, px, sx) {
-    if (!s || !r) {
-        Y.error('extend failed, verify dependencies');
-    }
-
-    var sp = s.prototype, rp = Y.Object(sp);
-    r.prototype = rp;
-
-    rp.constructor = r;
-    r.superclass = sp;
-
-    // assign constructor property
-    if (s != Object && sp.constructor == OP.constructor) {
-        sp.constructor = s;
-    }
-
-    // add prototype overrides
-    if (px) {
-        Y.mix(rp, px, true);
-    }
-
-    // add object overrides
-    if (sx) {
-        Y.mix(r, sx, true);
-    }
-
-    return r;
-};
-
-/**
- * Executes the supplied function for each item in
- * a collection.  Supports arrays, objects, and
- * NodeLists
- * @method each
- * @param {object} o the object to iterate.
- * @param {function} f the function to execute.  This function
- * receives the value, key, and object as parameters.
- * @param {object} c the execution context for the function.
- * @param {boolean} proto if true, prototype properties are
- * iterated on objects.
- * @return {YUI} the YUI instance.
- */
-Y.each = function(o, f, c, proto) {
-    return dispatch(o, f, c, proto, 'each');
-};
-
-/**
- * Executes the supplied function for each item in
- * a collection.  The operation stops if the function
- * returns true. Supports arrays, objects, and
- * NodeLists.
- * @method some
- * @param {object} o the object to iterate.
- * @param {function} f the function to execute.  This function
- * receives the value, key, and object as parameters.
- * @param {object} c the execution context for the function.
- * @param {boolean} proto if true, prototype properties are
- * iterated on objects.
- * @return {boolean} true if the function ever returns true,
- * false otherwise.
- */
-Y.some = function(o, f, c, proto) {
-    return dispatch(o, f, c, proto, 'some');
-};
-
-/**
-Deep object/array copy. Function clones are actually wrappers around the
-original function. Array-like objects are treated as arrays. Primitives are
-returned untouched. Optionally, a function can be provided to handle other data
-types, filter keys, validate values, etc.
-
-**Note:** Cloning a non-trivial object is a reasonably heavy operation, due to
-the need to recursively iterate down non-primitive properties. Clone should be
-used only when a deep clone down to leaf level properties is explicitly
-required. This method will also
-
-In many cases (for example, when trying to isolate objects used as hashes for
-configuration properties), a shallow copy, using `Y.merge()` is normally
-sufficient. If more than one level of isolation is required, `Y.merge()` can be
-used selectively at each level which needs to be isolated from the original
-without going all the way to leaf properties.
-
-@method clone
-@param {object} o what to clone.
-@param {boolean} safe if true, objects will not have prototype items from the
-    source. If false, they will. In this case, the original is initially
-    protected, but the clone is not completely immune from changes to the source
-    object prototype. Also, cloned prototype items that are deleted from the
-    clone will result in the value of the source prototype being exposed. If
-    operating on a non-safe clone, items should be nulled out rather than
-    deleted.
-@param {function} f optional function to apply to each item in a collection; it
-    will be executed prior to applying the value to the new object.
-    Return false to prevent the copy.
-@param {object} c optional execution context for f.
-@param {object} owner Owner object passed when clone is iterating an object.
-    Used to set up context for cloned functions.
-@param {object} cloned hash of previously cloned objects to avoid multiple
-    clones.
-@return {Array|Object} the cloned object.
-**/
-Y.clone = function(o, safe, f, c, owner, cloned) {
-    var o2, marked, stamp;
-
-    // Does not attempt to clone:
-    //
-    // * Non-typeof-object values, "primitive" values don't need cloning.
-    //
-    // * YUI instances, cloning complex object like YUI instances is not
-    //   advised, this is like cloning the world.
-    //
-    // * DOM nodes (#2528250), common host objects like DOM nodes cannot be
-    //   "subclassed" in Firefox and old versions of IE. Trying to use
-    //   `Object.create()` or `Y.extend()` on a DOM node will throw an error in
-    //   these browsers.
-    //
-    // Instad, the passed-in `o` will be return as-is when it matches one of the
-    // above criteria.
-    if (!L.isObject(o) ||
-            Y.instanceOf(o, YUI) ||
-            (o.addEventListener || o.attachEvent)) {
-
-        return o;
-    }
-
-    marked = cloned || {};
-
-    switch (L.type(o)) {
-        case 'date':
-            return new Date(o);
-        case 'regexp':
-            // if we do this we need to set the flags too
-            // return new RegExp(o.source);
-            return o;
-        case 'function':
-            // o2 = Y.bind(o, owner);
-            // break;
-            return o;
-        case 'array':
-            o2 = [];
-            break;
-        default:
-
-            // #2528250 only one clone of a given object should be created.
-            if (o[CLONE_MARKER]) {
-                return marked[o[CLONE_MARKER]];
-            }
-
-            stamp = Y.guid();
-
-            o2 = (safe) ? {} : Y.Object(o);
-
-            o[CLONE_MARKER] = stamp;
-            marked[stamp] = o;
-    }
-
-    Y.each(o, function(v, k) {
-        if ((k || k === 0) && (!f || (f.call(c || this, v, k, this, o) !== false))) {
-            if (k !== CLONE_MARKER) {
-                if (k == 'prototype') {
-                    // skip the prototype
-                // } else if (o[k] === o) {
-                //     this[k] = this;
-                } else {
-                    this[k] =
-                        Y.clone(v, safe, f, c, owner || o, marked);
-                }
-            }
-        }
-    }, o2);
-
-    if (!cloned) {
-        Y.Object.each(marked, function(v, k) {
-            if (v[CLONE_MARKER]) {
-                try {
-                    delete v[CLONE_MARKER];
-                } catch (e) {
-                    v[CLONE_MARKER] = null;
-                }
-            }
-        }, this);
-        marked = null;
-    }
-
-    return o2;
-};
-
-/**
- * Returns a function that will execute the supplied function in the
- * supplied object's context, optionally adding any additional
- * supplied parameters to the beginning of the arguments collection the
- * supplied to the function.
- *
- * @method bind
- * @param {Function|String} f the function to bind, or a function name
- * to execute on the context object.
- * @param {object} c the execution context.
- * @param {any} args* 0..n arguments to include before the arguments the
- * function is executed with.
- * @return {function} the wrapped function.
- */
-Y.bind = function(f, c) {
-    var xargs = arguments.length > 2 ?
-            Y.Array(arguments, 2, true) : null;
-    return function() {
-        var fn = L.isString(f) ? c[f] : f,
-            args = (xargs) ?
-                xargs.concat(Y.Array(arguments, 0, true)) : arguments;
-        return fn.apply(c || fn, args);
-    };
-};
-
-/**
- * Returns a function that will execute the supplied function in the
- * supplied object's context, optionally adding any additional
- * supplied parameters to the end of the arguments the function
- * is executed with.
- *
- * @method rbind
- * @param {Function|String} f the function to bind, or a function name
- * to execute on the context object.
- * @param {object} c the execution context.
- * @param {any} args* 0..n arguments to append to the end of
- * arguments collection supplied to the function.
- * @return {function} the wrapped function.
- */
-Y.rbind = function(f, c) {
-    var xargs = arguments.length > 2 ? Y.Array(arguments, 2, true) : null;
-    return function() {
-        var fn = L.isString(f) ? c[f] : f,
-            args = (xargs) ?
-                Y.Array(arguments, 0, true).concat(xargs) : arguments;
-        return fn.apply(c || fn, args);
-    };
-};
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('attribute-core', function (Y, NAME) {
-
-    /**
-     * The State class maintains state for a collection of named items, with
-     * a varying number of properties defined.
-     *
-     * It avoids the need to create a separate class for the item, and separate instances
-     * of these classes for each item, by storing the state in a 2 level hash table,
-     * improving performance when the number of items is likely to be large.
-     *
-     * @constructor
-     * @class State
-     */
-    Y.State = function() {
-        /**
-         * Hash of attributes
-         * @property data
-         */
-        this.data = {};
-    };
-
-    Y.State.prototype = {
-
-        /**
-         * Adds a property to an item.
-         *
-         * @method add
-         * @param name {String} The name of the item.
-         * @param key {String} The name of the property.
-         * @param val {Any} The value of the property.
-         */
-        add: function(name, key, val) {
-            var item = this.data[name];
-
-            if (!item) {
-                item = this.data[name] = {};
-            }
-
-            item[key] = val;
-        },
-
-        /**
-         * Adds multiple properties to an item.
-         *
-         * @method addAll
-         * @param name {String} The name of the item.
-         * @param obj {Object} A hash of property/value pairs.
-         */
-        addAll: function(name, obj) {
-            var item = this.data[name],
-                key;
-
-            if (!item) {
-                item = this.data[name] = {};
-            }
-
-            for (key in obj) {
-                if (obj.hasOwnProperty(key)) {
-                    item[key] = obj[key];
-                }
-            }
-        },
-
-        /**
-         * Removes a property from an item.
-         *
-         * @method remove
-         * @param name {String} The name of the item.
-         * @param key {String} The property to remove.
-         */
-        remove: function(name, key) {
-            var item = this.data[name];
-
-            if (item) {
-                delete item[key];
-            }
-        },
-
-        /**
-         * Removes multiple properties from an item, or removes the item completely.
-         *
-         * @method removeAll
-         * @param name {String} The name of the item.
-         * @param obj {Object|Array} Collection of properties to delete. If not provided, the entire item is removed.
-         */
-        removeAll: function(name, obj) {
-            var data;
-
-            if (!obj) {
-                data = this.data;
-
-                if (name in data) {
-                    delete data[name];
-                }
-            } else {
-                Y.each(obj, function(value, key) {
-                    this.remove(name, typeof key === 'string' ? key : value);
-                }, this);
-            }
-        },
-
-        /**
-         * For a given item, returns the value of the property requested, or undefined if not found.
-         *
-         * @method get
-         * @param name {String} The name of the item
-         * @param key {String} Optional. The property value to retrieve.
-         * @return {Any} The value of the supplied property.
-         */
-        get: function(name, key) {
-            var item = this.data[name];
-
-            if (item) {
-                return item[key];
-            }
-        },
-
-        /**
-         * For the given item, returns an object with all of the
-         * item's property/value pairs. By default the object returned
-         * is a shallow copy of the stored data, but passing in true
-         * as the second parameter will return a reference to the stored
-         * data.
-         *
-         * @method getAll
-         * @param name {String} The name of the item
-         * @param reference {boolean} true, if you want a reference to the stored
-         * object
-         * @return {Object} An object with property/value pairs for the item.
-         */
-        getAll : function(name, reference) {
-            var item = this.data[name],
-                key, obj;
-
-            if (reference) {
-                obj = item;
-            } else if (item) {
-                obj = {};
-
-                for (key in item) {
-                    if (item.hasOwnProperty(key)) {
-                        obj[key] = item[key];
-                    }
-                }
-            }
-
-            return obj;
-        }
-    };
-    /*For log lines*/
-    /*jshint maxlen:200*/
-
-    /**
-     * The attribute module provides an augmentable Attribute implementation, which
-     * adds configurable attributes and attribute change events to the class being
-     * augmented. It also provides a State class, which is used internally by Attribute,
-     * but can also be used independently to provide a name/property/value data structure to
-     * store state.
-     *
-     * @module attribute
-     */
-
-    /**
-     * The attribute-core submodule provides the lightest level of attribute handling support
-     * without Attribute change events, or lesser used methods such as reset(), modifyAttrs(),
-     * and removeAttr().
-     *
-     * @module attribute
-     * @submodule attribute-core
-     */
-    var O = Y.Object,
-        Lang = Y.Lang,
-
-        DOT = ".",
-
-        // Externally configurable props
-        GETTER = "getter",
-        SETTER = "setter",
-        READ_ONLY = "readOnly",
-        WRITE_ONCE = "writeOnce",
-        INIT_ONLY = "initOnly",
-        VALIDATOR = "validator",
-        VALUE = "value",
-        VALUE_FN = "valueFn",
-        LAZY_ADD = "lazyAdd",
-
-        // Used for internal state management
-        ADDED = "added",
-        BYPASS_PROXY = "_bypassProxy",
-        INIT_VALUE = "initValue",
-        LAZY = "lazy",
-
-        INVALID_VALUE;
-
-    /**
-     * <p>
-     * AttributeCore provides the lightest level of configurable attribute support. It is designed to be
-     * augmented on to a host class, and provides the host with the ability to configure
-     * attributes to store and retrieve state, <strong>but without support for attribute change events</strong>.
-     * </p>
-     * <p>For example, attributes added to the host can be configured:</p>
-     * <ul>
-     *     <li>As read only.</li>
-     *     <li>As write once.</li>
-     *     <li>With a setter function, which can be used to manipulate
-     *     values passed to Attribute's <a href="#method_set">set</a> method, before they are stored.</li>
-     *     <li>With a getter function, which can be used to manipulate stored values,
-     *     before they are returned by Attribute's <a href="#method_get">get</a> method.</li>
-     *     <li>With a validator function, to validate values before they are stored.</li>
-     * </ul>
-     *
-     * <p>See the <a href="#method_addAttr">addAttr</a> method, for the complete set of configuration
-     * options available for attributes.</p>
-     *
-     * <p>Object/Classes based on AttributeCore can augment <a href="AttributeObservable.html">AttributeObservable</a>
-     * (with true for overwrite) and <a href="AttributeExtras.html">AttributeExtras</a> to add attribute event and
-     * additional, less commonly used attribute methods, such as `modifyAttr`, `removeAttr` and `reset`.</p>
-     *
-     * @class AttributeCore
-     * @param attrs {Object} The attributes to add during construction (passed through to <a href="#method_addAttrs">addAttrs</a>).
-     *        These can also be defined on the constructor being augmented with Attribute by defining the ATTRS property on the constructor.
-     * @param values {Object} The initial attribute values to apply (passed through to <a href="#method_addAttrs">addAttrs</a>).
-     *        These are not merged/cloned. The caller is responsible for isolating user provided values if required.
-     * @param lazy {boolean} Whether or not to add attributes lazily (passed through to <a href="#method_addAttrs">addAttrs</a>).
-     */
-    function AttributeCore(attrs, values, lazy) {
-        // HACK: Fix #2531929
-        // Complete hack, to make sure the first clone of a node value in IE doesn't doesn't hurt state - maintains 3.4.1 behavior.
-        // Too late in the release cycle to do anything about the core problem.
-        // The root issue is that cloning a Y.Node instance results in an object which barfs in IE, when you access it's properties (since 3.3.0).
-        this._yuievt = null;
-
-        this._initAttrHost(attrs, values, lazy);
-    }
-
-    /**
-     * <p>The value to return from an attribute setter in order to prevent the set from going through.</p>
-     *
-     * <p>You can return this value from your setter if you wish to combine validator and setter
-     * functionality into a single setter function, which either returns the massaged value to be stored or
-     * AttributeCore.INVALID_VALUE to prevent invalid values from being stored.</p>
-     *
-     * @property INVALID_VALUE
-     * @type Object
-     * @static
-     * @final
-     */
-    AttributeCore.INVALID_VALUE = {};
-    INVALID_VALUE = AttributeCore.INVALID_VALUE;
-
-    /**
-     * The list of properties which can be configured for
-     * each attribute (e.g. setter, getter, writeOnce etc.).
-     *
-     * This property is used internally as a whitelist for faster
-     * Y.mix operations.
-     *
-     * @property _ATTR_CFG
-     * @type Array
-     * @static
-     * @protected
-     */
-    AttributeCore._ATTR_CFG = [SETTER, GETTER, VALIDATOR, VALUE, VALUE_FN, WRITE_ONCE, READ_ONLY, LAZY_ADD, BYPASS_PROXY];
-
-    /**
-     * Utility method to protect an attribute configuration hash, by merging the
-     * entire object and the individual attr config objects.
-     *
-     * @method protectAttrs
-     * @static
-     * @param {Object} attrs A hash of attribute to configuration object pairs.
-     * @return {Object} A protected version of the `attrs` argument.
-     */
-    AttributeCore.protectAttrs = function (attrs) {
-        if (attrs) {
-            attrs = Y.merge(attrs);
-            for (var attr in attrs) {
-                if (attrs.hasOwnProperty(attr)) {
-                    attrs[attr] = Y.merge(attrs[attr]);
-                }
-            }
-        }
-
-        return attrs;
-    };
-
-    AttributeCore.prototype = {
-
-        /**
-         * Constructor logic for attributes. Initializes the host state, and sets up the inital attributes passed to the
-         * constructor.
-         *
-         * @method _initAttrHost
-         * @param attrs {Object} The attributes to add during construction (passed through to <a href="#method_addAttrs">addAttrs</a>).
-         *        These can also be defined on the constructor being augmented with Attribute by defining the ATTRS property on the constructor.
-         * @param values {Object} The initial attribute values to apply (passed through to <a href="#method_addAttrs">addAttrs</a>).
-         *        These are not merged/cloned. The caller is responsible for isolating user provided values if required.
-         * @param lazy {boolean} Whether or not to add attributes lazily (passed through to <a href="#method_addAttrs">addAttrs</a>).
-         * @private
-         */
-        _initAttrHost : function(attrs, values, lazy) {
-            this._state = new Y.State();
-            this._initAttrs(attrs, values, lazy);
-        },
-
-        /**
-         * <p>
-         * Adds an attribute with the provided configuration to the host object.
-         * </p>
-         * <p>
-         * The config argument object supports the following properties:
-         * </p>
-         *
-         * <dl>
-         *    <dt>value &#60;Any&#62;</dt>
-         *    <dd>The initial value to set on the attribute</dd>
-         *
-         *    <dt>valueFn &#60;Function | String&#62;</dt>
-         *    <dd>
-         *    <p>A function, which will return the initial value to set on the attribute. This is useful
-         *    for cases where the attribute configuration is defined statically, but needs to
-         *    reference the host instance ("this") to obtain an initial value. If both the value and valueFn properties are defined,
-         *    the value returned by the valueFn has precedence over the value property, unless it returns undefined, in which
-         *    case the value property is used.</p>
-         *
-         *    <p>valueFn can also be set to a string, representing the name of the instance method to be used to retrieve the value.</p>
-         *    </dd>
-         *
-         *    <dt>readOnly &#60;boolean&#62;</dt>
-         *    <dd>Whether or not the attribute is read only. Attributes having readOnly set to true
-         *        cannot be modified by invoking the set method.</dd>
-         *
-         *    <dt>writeOnce &#60;boolean&#62; or &#60;string&#62;</dt>
-         *    <dd>
-         *        Whether or not the attribute is "write once". Attributes having writeOnce set to true,
-         *        can only have their values set once, be it through the default configuration,
-         *        constructor configuration arguments, or by invoking set.
-         *        <p>The writeOnce attribute can also be set to the string "initOnly",
-         *         in which case the attribute can only be set during initialization
-         *        (when used with Base, this means it can only be set during construction)</p>
-         *    </dd>
-         *
-         *    <dt>setter &#60;Function | String&#62;</dt>
-         *    <dd>
-         *    <p>The setter function used to massage or normalize the value passed to the set method for the attribute.
-         *    The value returned by the setter will be the final stored value. Returning
-         *    <a href="#property_Attribute.INVALID_VALUE">Attribute.INVALID_VALUE</a>, from the setter will prevent
-         *    the value from being stored.
-         *    </p>
-         *
-         *    <p>setter can also be set to a string, representing the name of the instance method to be used as the setter function.</p>
-         *    </dd>
-         *
-         *    <dt>getter &#60;Function | String&#62;</dt>
-         *    <dd>
-         *    <p>
-         *    The getter function used to massage or normalize the value returned by the get method for the attribute.
-         *    The value returned by the getter function is the value which will be returned to the user when they
-         *    invoke get.
-         *    </p>
-         *
-         *    <p>getter can also be set to a string, representing the name of the instance method to be used as the getter function.</p>
-         *    </dd>
-         *
-         *    <dt>validator &#60;Function | String&#62;</dt>
-         *    <dd>
-         *    <p>
-         *    The validator function invoked prior to setting the stored value. Returning
-         *    false from the validator function will prevent the value from being stored.
-         *    </p>
-         *
-         *    <p>validator can also be set to a string, representing the name of the instance method to be used as the validator function.</p>
-         *    </dd>
-         *
-         *    <dt>lazyAdd &#60;boolean&#62;</dt>
-         *    <dd>Whether or not to delay initialization of the attribute until the first call to get/set it.
-         *    This flag can be used to over-ride lazy initialization on a per attribute basis, when adding multiple attributes through
-         *    the <a href="#method_addAttrs">addAttrs</a> method.</dd>
-         *
-         * </dl>
-         *
-         * <p>The setter, getter and validator are invoked with the value and name passed in as the first and second arguments, and with
-         * the context ("this") set to the host object.</p>
-         *
-         * <p>Configuration properties outside of the list mentioned above are considered private properties used internally by attribute,
-         * and are not intended for public use.</p>
-         *
-         * @method addAttr
-         *
-         * @param {String} name The name of the attribute.
-         * @param {Object} config An object with attribute configuration property/value pairs, specifying the configuration for the attribute.
-         *
-         * <p>
-         * <strong>NOTE:</strong> The configuration object is modified when adding an attribute, so if you need
-         * to protect the original values, you will need to merge the object.
-         * </p>
-         *
-         * @param {boolean} lazy (optional) Whether or not to add this attribute lazily (on the first call to get/set).
-         *
-         * @return {Object} A reference to the host object.
-         *
-         * @chainable
-         */
-        addAttr : function(name, config, lazy) {
-
-
-            var host = this, // help compression
-                state = host._state,
-                data = state.data,
-                value,
-                added,
-                hasValue;
-
-            config = config || {};
-
-            if (LAZY_ADD in config) {
-                lazy = config[LAZY_ADD];
-            }
-
-            added = state.get(name, ADDED);
-
-            if (lazy && !added) {
-                state.data[name] = {
-                    lazy : config,
-                    added : true
-                };
-            } else {
-
-
-                if (!added || config.isLazyAdd) {
-
-                    hasValue = (VALUE in config);
-
-
-                    if (hasValue) {
-
-                        // We'll go through set, don't want to set value in config directly
-
-                        // PERF TODO: VALIDATE: See if setting this to undefined is sufficient. We use to delete before.
-                        // In certain code paths/use cases, undefined may not be the same as not present.
-                        // If not, we can set it to some known fixed value (like INVALID_VALUE, say INITIALIZING_VALUE) for performance,
-                        // to avoid a delete which seems to help a lot.
-
-                        value = config.value;
-                        config.value = undefined;
-                    }
-
-                    config.added = true;
-                    config.initializing = true;
-
-                    data[name] = config;
-
-                    if (hasValue) {
-                        // Go through set, so that raw values get normalized/validated
-                        host.set(name, value);
-                    }
-
-                    config.initializing = false;
-                }
-            }
-
-            return host;
-        },
-
-        /**
-         * Checks if the given attribute has been added to the host
-         *
-         * @method attrAdded
-         * @param {String} name The name of the attribute to check.
-         * @return {boolean} true if an attribute with the given name has been added, false if it hasn't.
-         *         This method will return true for lazily added attributes.
-         */
-        attrAdded: function(name) {
-            return !!(this._state.get(name, ADDED));
-        },
-
-        /**
-         * Returns the current value of the attribute. If the attribute
-         * has been configured with a 'getter' function, this method will delegate
-         * to the 'getter' to obtain the value of the attribute.
-         *
-         * @method get
-         *
-         * @param {String} name The name of the attribute. If the value of the attribute is an Object,
-         * dot notation can be used to obtain the value of a property of the object (e.g. <code>get("x.y.z")</code>)
-         *
-         * @return {Any} The value of the attribute
-         */
-        get : function(name) {
-            return this._getAttr(name);
-        },
-
-        /**
-         * Checks whether or not the attribute is one which has been
-         * added lazily and still requires initialization.
-         *
-         * @method _isLazyAttr
-         * @private
-         * @param {String} name The name of the attribute
-         * @return {boolean} true if it's a lazily added attribute, false otherwise.
-         */
-        _isLazyAttr: function(name) {
-            return this._state.get(name, LAZY);
-        },
-
-        /**
-         * Finishes initializing an attribute which has been lazily added.
-         *
-         * @method _addLazyAttr
-         * @private
-         * @param {Object} name The name of the attribute
-         * @param {Object} [lazyCfg] Optional config hash for the attribute. This is added for performance
-         * along the critical path, where the calling method has already obtained lazy config from state.
-         */
-        _addLazyAttr: function(name, lazyCfg) {
-            var state = this._state;
-
-            lazyCfg = lazyCfg || state.get(name, LAZY);
-
-            if (lazyCfg) {
-
-                // PERF TODO: For App's id override, otherwise wouldn't be
-                // needed. It expects to find it in the cfg for it's
-                // addAttr override. Would like to remove, once App override is
-                // removed.
-                state.data[name].lazy = undefined;
-
-                lazyCfg.isLazyAdd = true;
-
-                this.addAttr(name, lazyCfg);
-            }
-        },
-
-        /**
-         * Sets the value of an attribute.
-         *
-         * @method set
-         * @chainable
-         *
-         * @param {String} name The name of the attribute. If the
-         * current value of the attribute is an Object, dot notation can be used
-         * to set the value of a property within the object (e.g. <code>set("x.y.z", 5)</code>).
-         * @param {Any} value The value to set the attribute to.
-         * @param {Object} [opts] Optional data providing the circumstances for the change.
-         * @return {Object} A reference to the host object.
-         */
-        set : function(name, val, opts) {
-            return this._setAttr(name, val, opts);
-        },
-
-        /**
-         * Allows setting of readOnly/writeOnce attributes. See <a href="#method_set">set</a> for argument details.
-         *
-         * @method _set
-         * @protected
-         * @chainable
-         *
-         * @param {String} name The name of the attribute.
-         * @param {Any} val The value to set the attribute to.
-         * @param {Object} [opts] Optional data providing the circumstances for the change.
-         * @return {Object} A reference to the host object.
-         */
-        _set : function(name, val, opts) {
-            return this._setAttr(name, val, opts, true);
-        },
-
-        /**
-         * Provides the common implementation for the public set and protected _set methods.
-         *
-         * See <a href="#method_set">set</a> for argument details.
-         *
-         * @method _setAttr
-         * @protected
-         * @chainable
-         *
-         * @param {String} name The name of the attribute.
-         * @param {Any} value The value to set the attribute to.
-         * @param {Object} [opts] Optional data providing the circumstances for the change.
-         * @param {boolean} force If true, allows the caller to set values for
-         * readOnly or writeOnce attributes which have already been set.
-         *
-         * @return {Object} A reference to the host object.
-         */
-        _setAttr : function(name, val, opts, force)  {
-            var allowSet = true,
-                state = this._state,
-                stateProxy = this._stateProxy,
-                tCfgs = this._tCfgs,
-                cfg,
-                initialSet,
-                strPath,
-                path,
-                currVal,
-                writeOnce,
-                initializing;
-
-            if (name.indexOf(DOT) !== -1) {
-                strPath = name;
-
-                path = name.split(DOT);
-                name = path.shift();
-            }
-
-            // On Demand - Should be rare - handles out of order valueFn, setter, getter references
-            if (tCfgs && tCfgs[name]) {
-                this._addOutOfOrder(name, tCfgs[name]);
-            }
-
-            cfg = state.data[name] || {};
-
-            if (cfg.lazy) {
-                cfg = cfg.lazy;
-                this._addLazyAttr(name, cfg);
-            }
-
-            initialSet = (cfg.value === undefined);
-
-            if (stateProxy && name in stateProxy && !cfg._bypassProxy) {
-                // TODO: Value is always set for proxy. Can we do any better? Maybe take a snapshot as the initial value for the first call to set?
-                initialSet = false;
-            }
-
-            writeOnce = cfg.writeOnce;
-            initializing = cfg.initializing;
-
-            if (!initialSet && !force) {
-
-                if (writeOnce) {
-                    allowSet = false;
-                }
-
-                if (cfg.readOnly) {
-                    allowSet = false;
-                }
-            }
-
-            if (!initializing && !force && writeOnce === INIT_ONLY) {
-                allowSet = false;
-            }
-
-            if (allowSet) {
-                // Don't need currVal if initialSet (might fail in custom getter if it always expects a non-undefined/non-null value)
-                if (!initialSet) {
-                    currVal =  this.get(name);
-                }
-
-                if (path) {
-                   val = O.setValue(Y.clone(currVal), path, val);
-
-                   if (val === undefined) {
-                       allowSet = false;
-                   }
-                }
-
-                if (allowSet) {
-                    if (!this._fireAttrChange || initializing) {
-                        this._setAttrVal(name, strPath, currVal, val, opts, cfg);
-                    } else {
-                        // HACK - no real reason core needs to know about _fireAttrChange, but
-                        // it adds fn hops if we want to break it out. Not sure it's worth it for this critical path
-                        this._fireAttrChange(name, strPath, currVal, val, opts, cfg);
-                    }
-                }
-            }
-
-            return this;
-        },
-
-        /**
-         * Utility method used by get/set to add attributes
-         * encountered out of order when calling addAttrs().
-         *
-         * For example, if:
-         *
-         *     this.addAttrs({
-         *          foo: {
-         *              setter: function() {
-         *                 // make sure this bar is available when foo is added
-         *                 this.get("bar");
-         *              }
-         *          },
-         *          bar: {
-         *              value: ...
-         *          }
-         *     });
-         *
-         * @method _addOutOfOrder
-         * @private
-         * @param name {String} attribute name
-         * @param cfg {Object} attribute configuration
-         */
-        _addOutOfOrder : function(name, cfg) {
-
-            var attrs = {};
-            attrs[name] = cfg;
-
-            delete this._tCfgs[name];
-
-            // TODO: The original code went through addAttrs, so
-            // sticking with it for this pass. Seems like we could
-            // just jump straight to _addAttr() and get some perf
-            // improvement.
-            this._addAttrs(attrs, this._tVals);
-        },
-
-        /**
-         * Provides the common implementation for the public get method,
-         * allowing Attribute hosts to over-ride either method.
-         *
-         * See <a href="#method_get">get</a> for argument details.
-         *
-         * @method _getAttr
-         * @protected
-         * @chainable
-         *
-         * @param {String} name The name of the attribute.
-         * @return {Any} The value of the attribute.
-         */
-        _getAttr : function(name) {
-            var fullName = name,
-                tCfgs = this._tCfgs,
-                path,
-                getter,
-                val,
-                attrCfg;
-
-            if (name.indexOf(DOT) !== -1) {
-                path = name.split(DOT);
-                name = path.shift();
-            }
-
-            // On Demand - Should be rare - handles out of
-            // order valueFn, setter, getter references
-            if (tCfgs && tCfgs[name]) {
-                this._addOutOfOrder(name, tCfgs[name]);
-            }
-
-            attrCfg = this._state.data[name] || {};
-
-            // Lazy Init
-            if (attrCfg.lazy) {
-                attrCfg = attrCfg.lazy;
-                this._addLazyAttr(name, attrCfg);
-            }
-
-            val = this._getStateVal(name, attrCfg);
-
-            getter = attrCfg.getter;
-
-            if (getter && !getter.call) {
-                getter = this[getter];
-            }
-
-            val = (getter) ? getter.call(this, val, fullName) : val;
-            val = (path) ? O.getValue(val, path) : val;
-
-            return val;
-        },
-
-        /**
-         * Gets the stored value for the attribute, from either the
-         * internal state object, or the state proxy if it exits
-         *
-         * @method _getStateVal
-         * @private
-         * @param {String} name The name of the attribute
-         * @param {Object} [cfg] Optional config hash for the attribute. This is added for performance along the critical path,
-         * where the calling method has already obtained the config from state.
-         *
-         * @return {Any} The stored value of the attribute
-         */
-        _getStateVal : function(name, cfg) {
-            var stateProxy = this._stateProxy;
-
-            if (!cfg) {
-                cfg = this._state.getAll(name) || {};
-            }
-
-            return (stateProxy && (name in stateProxy) && !(cfg._bypassProxy)) ? stateProxy[name] : cfg.value;
-        },
-
-        /**
-         * Sets the stored value for the attribute, in either the
-         * internal state object, or the state proxy if it exits
-         *
-         * @method _setStateVal
-         * @private
-         * @param {String} name The name of the attribute
-         * @param {Any} value The value of the attribute
-         */
-        _setStateVal : function(name, value) {
-            var stateProxy = this._stateProxy;
-            if (stateProxy && (name in stateProxy) && !this._state.get(name, BYPASS_PROXY)) {
-                stateProxy[name] = value;
-            } else {
-                this._state.add(name, VALUE, value);
-            }
-        },
-
-        /**
-         * Updates the stored value of the attribute in the privately held State object,
-         * if validation and setter passes.
-         *
-         * @method _setAttrVal
-         * @private
-         * @param {String} attrName The attribute name.
-         * @param {String} subAttrName The sub-attribute name, if setting a sub-attribute property ("x.y.z").
-         * @param {Any} prevVal The currently stored value of the attribute.
-         * @param {Any} newVal The value which is going to be stored.
-         * @param {Object} [opts] Optional data providing the circumstances for the change.
-         * @param {Object} [attrCfg] Optional config hash for the attribute. This is added for performance along the critical path,
-         * where the calling method has already obtained the config from state.
-         *
-         * @return {Boolean} true if the new attribute value was stored, false if not.
-         */
-        _setAttrVal : function(attrName, subAttrName, prevVal, newVal, opts, attrCfg) {
-
-            var host = this,
-                allowSet = true,
-                cfg = attrCfg || this._state.data[attrName] || {},
-                validator = cfg.validator,
-                setter = cfg.setter,
-                initializing = cfg.initializing,
-                prevRawVal = this._getStateVal(attrName, cfg),
-                name = subAttrName || attrName,
-                retVal,
-                valid;
-
-            if (validator) {
-                if (!validator.call) {
-                    // Assume string - trying to keep critical path tight, so avoiding Lang check
-                    validator = this[validator];
-                }
-                if (validator) {
-                    valid = validator.call(host, newVal, name, opts);
-
-                    if (!valid && initializing) {
-                        newVal = cfg.defaultValue;
-                        valid = true; // Assume it's valid, for perf.
-                    }
-                }
-            }
-
-            if (!validator || valid) {
-                if (setter) {
-                    if (!setter.call) {
-                        // Assume string - trying to keep critical path tight, so avoiding Lang check
-                        setter = this[setter];
-                    }
-                    if (setter) {
-                        retVal = setter.call(host, newVal, name, opts);
-
-                        if (retVal === INVALID_VALUE) {
-                            if (initializing) {
-                                newVal = cfg.defaultValue;
-                            } else {
-                                allowSet = false;
-                            }
-                        } else if (retVal !== undefined){
-                            newVal = retVal;
-                        }
-                    }
-                }
-
-                if (allowSet) {
-                    if(!subAttrName && (newVal === prevRawVal) && !Lang.isObject(newVal)) {
-                        allowSet = false;
-                    } else {
-                        // Store value
-                        if (!(INIT_VALUE in cfg)) {
-                            cfg.initValue = newVal;
-                        }
-                        host._setStateVal(attrName, newVal);
-                    }
-                }
-
-            } else {
-                allowSet = false;
-            }
-
-            return allowSet;
-        },
-
-        /**
-         * Sets multiple attribute values.
-         *
-         * @method setAttrs
-         * @param {Object} attrs  An object with attributes name/value pairs.
-         * @param {Object} [opts] Optional data providing the circumstances for the change.
-         * @return {Object} A reference to the host object.
-         * @chainable
-         */
-        setAttrs : function(attrs, opts) {
-            return this._setAttrs(attrs, opts);
-        },
-
-        /**
-         * Implementation behind the public setAttrs method, to set multiple attribute values.
-         *
-         * @method _setAttrs
-         * @protected
-         * @param {Object} attrs  An object with attributes name/value pairs.
-         * @param {Object} [opts] Optional data providing the circumstances for the change
-         * @return {Object} A reference to the host object.
-         * @chainable
-         */
-        _setAttrs : function(attrs, opts) {
-            var attr;
-            for (attr in attrs) {
-                if ( attrs.hasOwnProperty(attr) ) {
-                    this.set(attr, attrs[attr], opts);
-                }
-            }
-            return this;
-        },
-
-        /**
-         * Gets multiple attribute values.
-         *
-         * @method getAttrs
-         * @param {String[]|Boolean} attrs Optional. An array of attribute names. If omitted, all attribute values are
-         * returned. If set to true, all attributes modified from their initial values are returned.
-         * @return {Object} An object with attribute name/value pairs.
-         */
-        getAttrs : function(attrs) {
-            return this._getAttrs(attrs);
-        },
-
-        /**
-         * Implementation behind the public getAttrs method, to get multiple attribute values.
-         *
-         * @method _getAttrs
-         * @protected
-         * @param {String[]|Boolean} attrs Optional. An array of attribute names. If omitted, all attribute values are
-         * returned. If set to true, all attributes modified from their initial values are returned.
-         * @return {Object} An object with attribute name/value pairs.
-         */
-        _getAttrs : function(attrs) {
-            var obj = {},
-                attr, i, len,
-                modifiedOnly = (attrs === true);
-
-            // TODO - figure out how to get all "added"
-            if (!attrs || modifiedOnly) {
-                attrs = O.keys(this._state.data);
-            }
-
-            for (i = 0, len = attrs.length; i < len; i++) {
-                attr = attrs[i];
-
-                if (!modifiedOnly || this._getStateVal(attr) != this._state.get(attr, INIT_VALUE)) {
-                    // Go through get, to honor cloning/normalization
-                    obj[attr] = this.get(attr);
-                }
-            }
-
-            return obj;
-        },
-
-        /**
-         * Configures a group of attributes, and sets initial values.
-         *
-         * <p>
-         * <strong>NOTE:</strong> This method does not isolate the configuration object by merging/cloning.
-         * The caller is responsible for merging/cloning the configuration object if required.
-         * </p>
-         *
-         * @method addAttrs
-         * @chainable
-         *
-         * @param {Object} cfgs An object with attribute name/configuration pairs.
-         * @param {Object} values An object with attribute name/value pairs, defining the initial values to apply.
-         * Values defined in the cfgs argument will be over-written by values in this argument unless defined as read only.
-         * @param {boolean} lazy Whether or not to delay the intialization of these attributes until the first call to get/set.
-         * Individual attributes can over-ride this behavior by defining a lazyAdd configuration property in their configuration.
-         * See <a href="#method_addAttr">addAttr</a>.
-         *
-         * @return {Object} A reference to the host object.
-         */
-        addAttrs : function(cfgs, values, lazy) {
-            if (cfgs) {
-                this._tCfgs = cfgs;
-                this._tVals = (values) ? this._normAttrVals(values) : null;
-                this._addAttrs(cfgs, this._tVals, lazy);
-                this._tCfgs = this._tVals = null;
-            }
-
-            return this;
-        },
-
-        /**
-         * Implementation behind the public addAttrs method.
-         *
-         * This method is invoked directly by get if it encounters a scenario
-         * in which an attribute's valueFn attempts to obtain the
-         * value an attribute in the same group of attributes, which has not yet
-         * been added (on demand initialization).
-         *
-         * @method _addAttrs
-         * @private
-         * @param {Object} cfgs An object with attribute name/configuration pairs.
-         * @param {Object} values An object with attribute name/value pairs, defining the initial values to apply.
-         * Values defined in the cfgs argument will be over-written by values in this argument unless defined as read only.
-         * @param {boolean} lazy Whether or not to delay the intialization of these attributes until the first call to get/set.
-         * Individual attributes can over-ride this behavior by defining a lazyAdd configuration property in their configuration.
-         * See <a href="#method_addAttr">addAttr</a>.
-         */
-        _addAttrs : function(cfgs, values, lazy) {
-            var tCfgs = this._tCfgs,
-                tVals = this._tVals,
-                attr,
-                attrCfg,
-                value;
-
-            for (attr in cfgs) {
-                if (cfgs.hasOwnProperty(attr)) {
-
-                    // Not Merging. Caller is responsible for isolating configs
-                    attrCfg = cfgs[attr];
-                    attrCfg.defaultValue = attrCfg.value;
-
-                    // Handle simple, complex and user values, accounting for read-only
-                    value = this._getAttrInitVal(attr, attrCfg, tVals);
-
-                    if (value !== undefined) {
-                        attrCfg.value = value;
-                    }
-
-                    if (tCfgs[attr]) {
-                        tCfgs[attr] = undefined;
-                    }
-
-                    this.addAttr(attr, attrCfg, lazy);
-                }
-            }
-        },
-
-        /**
-         * Utility method to protect an attribute configuration
-         * hash, by merging the entire object and the individual
-         * attr config objects.
-         *
-         * @method _protectAttrs
-         * @protected
-         * @param {Object} attrs A hash of attribute to configuration object pairs.
-         * @return {Object} A protected version of the attrs argument.
-         * @deprecated Use `AttributeCore.protectAttrs()` or
-         *   `Attribute.protectAttrs()` which are the same static utility method.
-         */
-        _protectAttrs : AttributeCore.protectAttrs,
-
-        /**
-         * Utility method to normalize attribute values. The base implementation
-         * simply merges the hash to protect the original.
-         *
-         * @method _normAttrVals
-         * @param {Object} valueHash An object with attribute name/value pairs
-         *
-         * @return {Object} An object literal with 2 properties - "simple" and "complex",
-         * containing simple and complex attribute values respectively keyed
-         * by the top level attribute name, or null, if valueHash is falsey.
-         *
-         * @private
-         */
-        _normAttrVals : function(valueHash) {
-            var vals,
-                subvals,
-                path,
-                attr,
-                v, k;
-
-            if (!valueHash) {
-                return null;
-            }
-
-            vals = {};
-
-            for (k in valueHash) {
-                if (valueHash.hasOwnProperty(k)) {
-                    if (k.indexOf(DOT) !== -1) {
-                        path = k.split(DOT);
-                        attr = path.shift();
-
-                        subvals = subvals || {};
-
-                        v = subvals[attr] = subvals[attr] || [];
-                        v[v.length] = {
-                            path : path,
-                            value: valueHash[k]
-                        };
-                    } else {
-                        vals[k] = valueHash[k];
-                    }
-                }
-            }
-
-            return { simple:vals, complex:subvals };
-        },
-
-        /**
-         * Returns the initial value of the given attribute from
-         * either the default configuration provided, or the
-         * over-ridden value if it exists in the set of initValues
-         * provided and the attribute is not read-only.
-         *
-         * @param {String} attr The name of the attribute
-         * @param {Object} cfg The attribute configuration object
-         * @param {Object} initValues The object with simple and complex attribute name/value pairs returned from _normAttrVals
-         *
-         * @return {Any} The initial value of the attribute.
-         *
-         * @method _getAttrInitVal
-         * @private
-         */
-        _getAttrInitVal : function(attr, cfg, initValues) {
-            var val = cfg.value,
-                valFn = cfg.valueFn,
-                tmpVal,
-                initValSet = false,
-                readOnly = cfg.readOnly,
-                simple,
-                complex,
-                i,
-                l,
-                path,
-                subval,
-                subvals;
-
-            if (!readOnly && initValues) {
-                // Simple Attributes
-                simple = initValues.simple;
-                if (simple && simple.hasOwnProperty(attr)) {
-                    val = simple[attr];
-                    initValSet = true;
-                }
-            }
-
-            if (valFn && !initValSet) {
-                if (!valFn.call) {
-                    valFn = this[valFn];
-                }
-                if (valFn) {
-                    tmpVal = valFn.call(this, attr);
-                    val = tmpVal;
-                }
-            }
-
-            if (!readOnly && initValues) {
-
-                // Complex Attributes (complex values applied, after simple, in case both are set)
-                complex = initValues.complex;
-
-                if (complex && complex.hasOwnProperty(attr) && (val !== undefined) && (val !== null)) {
-                    subvals = complex[attr];
-                    for (i = 0, l = subvals.length; i < l; ++i) {
-                        path = subvals[i].path;
-                        subval = subvals[i].value;
-                        O.setValue(val, path, subval);
-                    }
-                }
-            }
-
-            return val;
-        },
-
-        /**
-         * Utility method to set up initial attributes defined during construction,
-         * either through the constructor.ATTRS property, or explicitly passed in.
-         *
-         * @method _initAttrs
-         * @protected
-         * @param attrs {Object} The attributes to add during construction (passed through to <a href="#method_addAttrs">addAttrs</a>).
-         *        These can also be defined on the constructor being augmented with Attribute by defining the ATTRS property on the constructor.
-         * @param values {Object} The initial attribute values to apply (passed through to <a href="#method_addAttrs">addAttrs</a>).
-         *        These are not merged/cloned. The caller is responsible for isolating user provided values if required.
-         * @param lazy {boolean} Whether or not to add attributes lazily (passed through to <a href="#method_addAttrs">addAttrs</a>).
-         */
-        _initAttrs : function(attrs, values, lazy) {
-            // ATTRS support for Node, which is not Base based
-            attrs = attrs || this.constructor.ATTRS;
-
-            var Base = Y.Base,
-                BaseCore = Y.BaseCore,
-                baseInst = (Base && Y.instanceOf(this, Base)),
-                baseCoreInst = (!baseInst && BaseCore && Y.instanceOf(this, BaseCore));
-
-            if (attrs && !baseInst && !baseCoreInst) {
-                this.addAttrs(Y.AttributeCore.protectAttrs(attrs), values, lazy);
-            }
-        }
-    };
-
-    Y.AttributeCore = AttributeCore;
-
-
-}, '3.16.0', {"requires": ["oop"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-custom-base', function (Y, NAME) {
-
-/**
- * Custom event engine, DOM event listener abstraction layer, synthetic DOM
- * events.
- * @module event-custom
- */
-
-Y.Env.evt = {
-    handles: {},
-    plugins: {}
-};
-
-/**
- * Custom event engine, DOM event listener abstraction layer, synthetic DOM
- * events.
- * @module event-custom
- * @submodule event-custom-base
- */
-
-/**
- * Allows for the insertion of methods that are executed before or after
- * a specified method
- * @class Do
- * @static
- */
-
-var DO_BEFORE = 0,
-    DO_AFTER = 1,
-
-DO = {
-
-    /**
-     * Cache of objects touched by the utility
-     * @property objs
-     * @static
-     * @deprecated Since 3.6.0. The `_yuiaop` property on the AOP'd object
-     * replaces the role of this property, but is considered to be private, and
-     * is only mentioned to provide a migration path.
-     *
-     * If you have a use case which warrants migration to the _yuiaop property,
-     * please file a ticket to let us know what it's used for and we can see if
-     * we need to expose hooks for that functionality more formally.
-     */
-    objs: null,
-
-    /**
-     * <p>Execute the supplied method before the specified function.  Wrapping
-     * function may optionally return an instance of the following classes to
-     * further alter runtime behavior:</p>
-     * <dl>
-     *     <dt></code>Y.Do.Halt(message, returnValue)</code></dt>
-     *         <dd>Immediatly stop execution and return
-     *         <code>returnValue</code>.  No other wrapping functions will be
-     *         executed.</dd>
-     *     <dt></code>Y.Do.AlterArgs(message, newArgArray)</code></dt>
-     *         <dd>Replace the arguments that the original function will be
-     *         called with.</dd>
-     *     <dt></code>Y.Do.Prevent(message)</code></dt>
-     *         <dd>Don't execute the wrapped function.  Other before phase
-     *         wrappers will be executed.</dd>
-     * </dl>
-     *
-     * @method before
-     * @param fn {Function} the function to execute
-     * @param obj the object hosting the method to displace
-     * @param sFn {string} the name of the method to displace
-     * @param c The execution context for fn
-     * @param arg* {mixed} 0..n additional arguments to supply to the subscriber
-     * when the event fires.
-     * @return {EventHandle} handle for the subscription
-     * @static
-     */
-    before: function(fn, obj, sFn, c) {
-        var f = fn, a;
-        if (c) {
-            a = [fn, c].concat(Y.Array(arguments, 4, true));
-            f = Y.rbind.apply(Y, a);
-        }
-
-        return this._inject(DO_BEFORE, f, obj, sFn);
-    },
-
-    /**
-     * <p>Execute the supplied method after the specified function.  Wrapping
-     * function may optionally return an instance of the following classes to
-     * further alter runtime behavior:</p>
-     * <dl>
-     *     <dt></code>Y.Do.Halt(message, returnValue)</code></dt>
-     *         <dd>Immediatly stop execution and return
-     *         <code>returnValue</code>.  No other wrapping functions will be
-     *         executed.</dd>
-     *     <dt></code>Y.Do.AlterReturn(message, returnValue)</code></dt>
-     *         <dd>Return <code>returnValue</code> instead of the wrapped
-     *         method's original return value.  This can be further altered by
-     *         other after phase wrappers.</dd>
-     * </dl>
-     *
-     * <p>The static properties <code>Y.Do.originalRetVal</code> and
-     * <code>Y.Do.currentRetVal</code> will be populated for reference.</p>
-     *
-     * @method after
-     * @param fn {Function} the function to execute
-     * @param obj the object hosting the method to displace
-     * @param sFn {string} the name of the method to displace
-     * @param c The execution context for fn
-     * @param arg* {mixed} 0..n additional arguments to supply to the subscriber
-     * @return {EventHandle} handle for the subscription
-     * @static
-     */
-    after: function(fn, obj, sFn, c) {
-        var f = fn, a;
-        if (c) {
-            a = [fn, c].concat(Y.Array(arguments, 4, true));
-            f = Y.rbind.apply(Y, a);
-        }
-
-        return this._inject(DO_AFTER, f, obj, sFn);
-    },
-
-    /**
-     * Execute the supplied method before or after the specified function.
-     * Used by <code>before</code> and <code>after</code>.
-     *
-     * @method _inject
-     * @param when {string} before or after
-     * @param fn {Function} the function to execute
-     * @param obj the object hosting the method to displace
-     * @param sFn {string} the name of the method to displace
-     * @param c The execution context for fn
-     * @return {EventHandle} handle for the subscription
-     * @private
-     * @static
-     */
-    _inject: function(when, fn, obj, sFn) {
-        // object id
-        var id = Y.stamp(obj), o, sid;
-
-        if (!obj._yuiaop) {
-            // create a map entry for the obj if it doesn't exist, to hold overridden methods
-            obj._yuiaop = {};
-        }
-
-        o = obj._yuiaop;
-
-        if (!o[sFn]) {
-            // create a map entry for the method if it doesn't exist
-            o[sFn] = new Y.Do.Method(obj, sFn);
-
-            // re-route the method to our wrapper
-            obj[sFn] = function() {
-                return o[sFn].exec.apply(o[sFn], arguments);
-            };
-        }
-
-        // subscriber id
-        sid = id + Y.stamp(fn) + sFn;
-
-        // register the callback
-        o[sFn].register(sid, fn, when);
-
-        return new Y.EventHandle(o[sFn], sid);
-    },
-
-    /**
-     * Detach a before or after subscription.
-     *
-     * @method detach
-     * @param handle {EventHandle} the subscription handle
-     * @static
-     */
-    detach: function(handle) {
-        if (handle.detach) {
-            handle.detach();
-        }
-    }
-};
-
-Y.Do = DO;
-
-//////////////////////////////////////////////////////////////////////////
-
-/**
- * Contains the return value from the wrapped method, accessible
- * by 'after' event listeners.
- *
- * @property originalRetVal
- * @static
- * @since 3.2.0
- */
-
-/**
- * Contains the current state of the return value, consumable by
- * 'after' event listeners, and updated if an after subscriber
- * changes the return value generated by the wrapped function.
- *
- * @property currentRetVal
- * @static
- * @since 3.2.0
- */
-
-//////////////////////////////////////////////////////////////////////////
-
-/**
- * Wrapper for a displaced method with aop enabled
- * @class Do.Method
- * @constructor
- * @param obj The object to operate on
- * @param sFn The name of the method to displace
- */
-DO.Method = function(obj, sFn) {
-    this.obj = obj;
-    this.methodName = sFn;
-    this.method = obj[sFn];
-    this.before = {};
-    this.after = {};
-};
-
-/**
- * Register a aop subscriber
- * @method register
- * @param sid {string} the subscriber id
- * @param fn {Function} the function to execute
- * @param when {string} when to execute the function
- */
-DO.Method.prototype.register = function (sid, fn, when) {
-    if (when) {
-        this.after[sid] = fn;
-    } else {
-        this.before[sid] = fn;
-    }
-};
-
-/**
- * Unregister a aop subscriber
- * @method delete
- * @param sid {string} the subscriber id
- * @param fn {Function} the function to execute
- * @param when {string} when to execute the function
- */
-DO.Method.prototype._delete = function (sid) {
-    delete this.before[sid];
-    delete this.after[sid];
-};
-
-/**
- * <p>Execute the wrapped method.  All arguments are passed into the wrapping
- * functions.  If any of the before wrappers return an instance of
- * <code>Y.Do.Halt</code> or <code>Y.Do.Prevent</code>, neither the wrapped
- * function nor any after phase subscribers will be executed.</p>
- *
- * <p>The return value will be the return value of the wrapped function or one
- * provided by a wrapper function via an instance of <code>Y.Do.Halt</code> or
- * <code>Y.Do.AlterReturn</code>.
- *
- * @method exec
- * @param arg* {any} Arguments are passed to the wrapping and wrapped functions
- * @return {any} Return value of wrapped function unless overwritten (see above)
- */
-DO.Method.prototype.exec = function () {
-
-    var args = Y.Array(arguments, 0, true),
-        i, ret, newRet,
-        bf = this.before,
-        af = this.after,
-        prevented = false;
-
-    // execute before
-    for (i in bf) {
-        if (bf.hasOwnProperty(i)) {
-            ret = bf[i].apply(this.obj, args);
-            if (ret) {
-                switch (ret.constructor) {
-                    case DO.Halt:
-                        return ret.retVal;
-                    case DO.AlterArgs:
-                        args = ret.newArgs;
-                        break;
-                    case DO.Prevent:
-                        prevented = true;
-                        break;
-                    default:
-                }
-            }
-        }
-    }
-
-    // execute method
-    if (!prevented) {
-        ret = this.method.apply(this.obj, args);
-    }
-
-    DO.originalRetVal = ret;
-    DO.currentRetVal = ret;
-
-    // execute after methods.
-    for (i in af) {
-        if (af.hasOwnProperty(i)) {
-            newRet = af[i].apply(this.obj, args);
-            // Stop processing if a Halt object is returned
-            if (newRet && newRet.constructor === DO.Halt) {
-                return newRet.retVal;
-            // Check for a new return value
-            } else if (newRet && newRet.constructor === DO.AlterReturn) {
-                ret = newRet.newRetVal;
-                // Update the static retval state
-                DO.currentRetVal = ret;
-            }
-        }
-    }
-
-    return ret;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-/**
- * Return an AlterArgs object when you want to change the arguments that
- * were passed into the function.  Useful for Do.before subscribers.  An
- * example would be a service that scrubs out illegal characters prior to
- * executing the core business logic.
- * @class Do.AlterArgs
- * @constructor
- * @param msg {String} (optional) Explanation of the altered return value
- * @param newArgs {Array} Call parameters to be used for the original method
- *                        instead of the arguments originally passed in.
- */
-DO.AlterArgs = function(msg, newArgs) {
-    this.msg = msg;
-    this.newArgs = newArgs;
-};
-
-/**
- * Return an AlterReturn object when you want to change the result returned
- * from the core method to the caller.  Useful for Do.after subscribers.
- * @class Do.AlterReturn
- * @constructor
- * @param msg {String} (optional) Explanation of the altered return value
- * @param newRetVal {any} Return value passed to code that invoked the wrapped
- *                      function.
- */
-DO.AlterReturn = function(msg, newRetVal) {
-    this.msg = msg;
-    this.newRetVal = newRetVal;
-};
-
-/**
- * Return a Halt object when you want to terminate the execution
- * of all subsequent subscribers as well as the wrapped method
- * if it has not exectued yet.  Useful for Do.before subscribers.
- * @class Do.Halt
- * @constructor
- * @param msg {String} (optional) Explanation of why the termination was done
- * @param retVal {any} Return value passed to code that invoked the wrapped
- *                      function.
- */
-DO.Halt = function(msg, retVal) {
-    this.msg = msg;
-    this.retVal = retVal;
-};
-
-/**
- * Return a Prevent object when you want to prevent the wrapped function
- * from executing, but want the remaining listeners to execute.  Useful
- * for Do.before subscribers.
- * @class Do.Prevent
- * @constructor
- * @param msg {String} (optional) Explanation of why the termination was done
- */
-DO.Prevent = function(msg) {
-    this.msg = msg;
-};
-
-/**
- * Return an Error object when you want to terminate the execution
- * of all subsequent method calls.
- * @class Do.Error
- * @constructor
- * @param msg {String} (optional) Explanation of the altered return value
- * @param retVal {any} Return value passed to code that invoked the wrapped
- *                      function.
- * @deprecated use Y.Do.Halt or Y.Do.Prevent
- */
-DO.Error = DO.Halt;
-
-
-//////////////////////////////////////////////////////////////////////////
-
-/**
- * Custom event engine, DOM event listener abstraction layer, synthetic DOM
- * events.
- * @module event-custom
- * @submodule event-custom-base
- */
-
-
-// var onsubscribeType = "_event:onsub",
-var YArray = Y.Array,
-
-    AFTER = 'after',
-    CONFIGS = [
-        'broadcast',
-        'monitored',
-        'bubbles',
-        'context',
-        'contextFn',
-        'currentTarget',
-        'defaultFn',
-        'defaultTargetOnly',
-        'details',
-        'emitFacade',
-        'fireOnce',
-        'async',
-        'host',
-        'preventable',
-        'preventedFn',
-        'queuable',
-        'silent',
-        'stoppedFn',
-        'target',
-        'type'
-    ],
-
-    CONFIGS_HASH = YArray.hash(CONFIGS),
-
-    nativeSlice = Array.prototype.slice,
-
-    YUI3_SIGNATURE = 9,
-    YUI_LOG = 'yui:log',
-
-    mixConfigs = function(r, s, ov) {
-        var p;
-
-        for (p in s) {
-            if (CONFIGS_HASH[p] && (ov || !(p in r))) {
-                r[p] = s[p];
-            }
-        }
-
-        return r;
-    };
-
-/**
- * The CustomEvent class lets you define events for your application
- * that can be subscribed to by one or more independent component.
- *
- * @param {String} type The type of event, which is passed to the callback
- * when the event fires.
- * @param {object} defaults configuration object.
- * @class CustomEvent
- * @constructor
- */
-
- /**
- * The type of event, returned to subscribers when the event fires
- * @property type
- * @type string
- */
-
-/**
- * By default all custom events are logged in the debug build, set silent
- * to true to disable debug outpu for this event.
- * @property silent
- * @type boolean
- */
-
-Y.CustomEvent = function(type, defaults) {
-
-    this._kds = Y.CustomEvent.keepDeprecatedSubs;
-
-    this.id = Y.guid();
-
-    this.type = type;
-    this.silent = this.logSystem = (type === YUI_LOG);
-
-    if (this._kds) {
-        /**
-         * The subscribers to this event
-         * @property subscribers
-         * @type Subscriber {}
-         * @deprecated
-         */
-
-        /**
-         * 'After' subscribers
-         * @property afters
-         * @type Subscriber {}
-         * @deprecated
-         */
-        this.subscribers = {};
-        this.afters = {};
-    }
-
-    if (defaults) {
-        mixConfigs(this, defaults, true);
-    }
-};
-
-/**
- * Static flag to enable population of the <a href="#property_subscribers">`subscribers`</a>
- * and  <a href="#property_subscribers">`afters`</a> properties held on a `CustomEvent` instance.
- *
- * These properties were changed to private properties (`_subscribers` and `_afters`), and
- * converted from objects to arrays for performance reasons.
- *
- * Setting this property to true will populate the deprecated `subscribers` and `afters`
- * properties for people who may be using them (which is expected to be rare). There will
- * be a performance hit, compared to the new array based implementation.
- *
- * If you are using these deprecated properties for a use case which the public API
- * does not support, please file an enhancement request, and we can provide an alternate
- * public implementation which doesn't have the performance cost required to maintiain the
- * properties as objects.
- *
- * @property keepDeprecatedSubs
- * @static
- * @for CustomEvent
- * @type boolean
- * @default false
- * @deprecated
- */
-Y.CustomEvent.keepDeprecatedSubs = false;
-
-Y.CustomEvent.mixConfigs = mixConfigs;
-
-Y.CustomEvent.prototype = {
-
-    constructor: Y.CustomEvent,
-
-    /**
-     * Monitor when an event is attached or detached.
-     *
-     * @property monitored
-     * @type boolean
-     */
-
-    /**
-     * If 0, this event does not broadcast.  If 1, the YUI instance is notified
-     * every time this event fires.  If 2, the YUI instance and the YUI global
-     * (if event is enabled on the global) are notified every time this event
-     * fires.
-     * @property broadcast
-     * @type int
-     */
-
-    /**
-     * Specifies whether this event should be queued when the host is actively
-     * processing an event.  This will effect exectution order of the callbacks
-     * for the various events.
-     * @property queuable
-     * @type boolean
-     * @default false
-     */
-
-    /**
-     * This event has fired if true
-     *
-     * @property fired
-     * @type boolean
-     * @default false;
-     */
-
-    /**
-     * An array containing the arguments the custom event
-     * was last fired with.
-     * @property firedWith
-     * @type Array
-     */
-
-    /**
-     * This event should only fire one time if true, and if
-     * it has fired, any new subscribers should be notified
-     * immediately.
-     *
-     * @property fireOnce
-     * @type boolean
-     * @default false;
-     */
-
-    /**
-     * fireOnce listeners will fire syncronously unless async
-     * is set to true
-     * @property async
-     * @type boolean
-     * @default false
-     */
-
-    /**
-     * Flag for stopPropagation that is modified during fire()
-     * 1 means to stop propagation to bubble targets.  2 means
-     * to also stop additional subscribers on this target.
-     * @property stopped
-     * @type int
-     */
-
-    /**
-     * Flag for preventDefault that is modified during fire().
-     * if it is not 0, the default behavior for this event
-     * @property prevented
-     * @type int
-     */
-
-    /**
-     * Specifies the host for this custom event.  This is used
-     * to enable event bubbling
-     * @property host
-     * @type EventTarget
-     */
-
-    /**
-     * The default function to execute after event listeners
-     * have fire, but only if the default action was not
-     * prevented.
-     * @property defaultFn
-     * @type Function
-     */
-
-    /**
-     * Flag for the default function to execute only if the
-     * firing event is the current target. This happens only
-     * when using custom event delegation and setting the
-     * flag to `true` mimics the behavior of event delegation
-     * in the DOM.
-     *
-     * @property defaultTargetOnly
-     * @type Boolean
-     * @default false
-     */
-
-    /**
-     * The function to execute if a subscriber calls
-     * stopPropagation or stopImmediatePropagation
-     * @property stoppedFn
-     * @type Function
-     */
-
-    /**
-     * The function to execute if a subscriber calls
-     * preventDefault
-     * @property preventedFn
-     * @type Function
-     */
-
-    /**
-     * The subscribers to this event
-     * @property _subscribers
-     * @type Subscriber []
-     * @private
-     */
-
-    /**
-     * 'After' subscribers
-     * @property _afters
-     * @type Subscriber []
-     * @private
-     */
-
-    /**
-     * If set to true, the custom event will deliver an EventFacade object
-     * that is similar to a DOM event object.
-     * @property emitFacade
-     * @type boolean
-     * @default false
-     */
-
-    /**
-     * Supports multiple options for listener signatures in order to
-     * port YUI 2 apps.
-     * @property signature
-     * @type int
-     * @default 9
-     */
-    signature : YUI3_SIGNATURE,
-
-    /**
-     * The context the the event will fire from by default.  Defaults to the YUI
-     * instance.
-     * @property context
-     * @type object
-     */
-    context : Y,
-
-    /**
-     * Specifies whether or not this event's default function
-     * can be cancelled by a subscriber by executing preventDefault()
-     * on the event facade
-     * @property preventable
-     * @type boolean
-     * @default true
-     */
-    preventable : true,
-
-    /**
-     * Specifies whether or not a subscriber can stop the event propagation
-     * via stopPropagation(), stopImmediatePropagation(), or halt()
-     *
-     * Events can only bubble if emitFacade is true.
-     *
-     * @property bubbles
-     * @type boolean
-     * @default true
-     */
-    bubbles : true,
-
-    /**
-     * Returns the number of subscribers for this event as the sum of the on()
-     * subscribers and after() subscribers.
-     *
-     * @method hasSubs
-     * @return Number
-     */
-    hasSubs: function(when) {
-        var s = 0,
-            a = 0,
-            subs = this._subscribers,
-            afters = this._afters,
-            sib = this.sibling;
-
-        if (subs) {
-            s = subs.length;
-        }
-
-        if (afters) {
-            a = afters.length;
-        }
-
-        if (sib) {
-            subs = sib._subscribers;
-            afters = sib._afters;
-
-            if (subs) {
-                s += subs.length;
-            }
-
-            if (afters) {
-                a += afters.length;
-            }
-        }
-
-        if (when) {
-            return (when === 'after') ? a : s;
-        }
-
-        return (s + a);
-    },
-
-    /**
-     * Monitor the event state for the subscribed event.  The first parameter
-     * is what should be monitored, the rest are the normal parameters when
-     * subscribing to an event.
-     * @method monitor
-     * @param what {string} what to monitor ('detach', 'attach', 'publish').
-     * @return {EventHandle} return value from the monitor event subscription.
-     */
-    monitor: function(what) {
-        this.monitored = true;
-        var type = this.id + '|' + this.type + '_' + what,
-            args = nativeSlice.call(arguments, 0);
-        args[0] = type;
-        return this.host.on.apply(this.host, args);
-    },
-
-    /**
-     * Get all of the subscribers to this event and any sibling event
-     * @method getSubs
-     * @return {Array} first item is the on subscribers, second the after.
-     */
-    getSubs: function() {
-
-        var sibling = this.sibling,
-            subs = this._subscribers,
-            afters = this._afters,
-            siblingSubs,
-            siblingAfters;
-
-        if (sibling) {
-            siblingSubs = sibling._subscribers;
-            siblingAfters = sibling._afters;
-        }
-
-        if (siblingSubs) {
-            if (subs) {
-                subs = subs.concat(siblingSubs);
-            } else {
-                subs = siblingSubs.concat();
-            }
-        } else {
-            if (subs) {
-                subs = subs.concat();
-            } else {
-                subs = [];
-            }
-        }
-
-        if (siblingAfters) {
-            if (afters) {
-                afters = afters.concat(siblingAfters);
-            } else {
-                afters = siblingAfters.concat();
-            }
-        } else {
-            if (afters) {
-                afters = afters.concat();
-            } else {
-                afters = [];
-            }
-        }
-
-        return [subs, afters];
-    },
-
-    /**
-     * Apply configuration properties.  Only applies the CONFIG whitelist
-     * @method applyConfig
-     * @param o hash of properties to apply.
-     * @param force {boolean} if true, properties that exist on the event
-     * will be overwritten.
-     */
-    applyConfig: function(o, force) {
-        mixConfigs(this, o, force);
-    },
-
-    /**
-     * Create the Subscription for subscribing function, context, and bound
-     * arguments.  If this is a fireOnce event, the subscriber is immediately
-     * notified.
-     *
-     * @method _on
-     * @param fn {Function} Subscription callback
-     * @param [context] {Object} Override `this` in the callback
-     * @param [args] {Array} bound arguments that will be passed to the callback after the arguments generated by fire()
-     * @param [when] {String} "after" to slot into after subscribers
-     * @return {EventHandle}
-     * @protected
-     */
-    _on: function(fn, context, args, when) {
-
-
-        var s = new Y.Subscriber(fn, context, args, when),
-            firedWith;
-
-        if (this.fireOnce && this.fired) {
-
-            firedWith = this.firedWith;
-
-            // It's a little ugly for this to know about facades,
-            // but given the current breakup, not much choice without
-            // moving a whole lot of stuff around.
-            if (this.emitFacade && this._addFacadeToArgs) {
-                this._addFacadeToArgs(firedWith);
-            }
-
-            if (this.async) {
-                setTimeout(Y.bind(this._notify, this, s, firedWith), 0);
-            } else {
-                this._notify(s, firedWith);
-            }
-        }
-
-        if (when === AFTER) {
-            if (!this._afters) {
-                this._afters = [];
-            }
-            this._afters.push(s);
-        } else {
-            if (!this._subscribers) {
-                this._subscribers = [];
-            }
-            this._subscribers.push(s);
-        }
-
-        if (this._kds) {
-            if (when === AFTER) {
-                this.afters[s.id] = s;
-            } else {
-                this.subscribers[s.id] = s;
-            }
-        }
-
-        return new Y.EventHandle(this, s);
-    },
-
-    /**
-     * Listen for this event
-     * @method subscribe
-     * @param {Function} fn The function to execute.
-     * @return {EventHandle} Unsubscribe handle.
-     * @deprecated use on.
-     */
-    subscribe: function(fn, context) {
-        var a = (arguments.length > 2) ? nativeSlice.call(arguments, 2) : null;
-        return this._on(fn, context, a, true);
-    },
-
-    /**
-     * Listen for this event
-     * @method on
-     * @param {Function} fn The function to execute.
-     * @param {object} context optional execution context.
-     * @param {mixed} arg* 0..n additional arguments to supply to the subscriber
-     * when the event fires.
-     * @return {EventHandle} An object with a detach method to detch the handler(s).
-     */
-    on: function(fn, context) {
-        var a = (arguments.length > 2) ? nativeSlice.call(arguments, 2) : null;
-
-        if (this.monitored && this.host) {
-            this.host._monitor('attach', this, {
-                args: arguments
-            });
-        }
-        return this._on(fn, context, a, true);
-    },
-
-    /**
-     * Listen for this event after the normal subscribers have been notified and
-     * the default behavior has been applied.  If a normal subscriber prevents the
-     * default behavior, it also prevents after listeners from firing.
-     * @method after
-     * @param {Function} fn The function to execute.
-     * @param {object} context optional execution context.
-     * @param {mixed} arg* 0..n additional arguments to supply to the subscriber
-     * when the event fires.
-     * @return {EventHandle} handle Unsubscribe handle.
-     */
-    after: function(fn, context) {
-        var a = (arguments.length > 2) ? nativeSlice.call(arguments, 2) : null;
-        return this._on(fn, context, a, AFTER);
-    },
-
-    /**
-     * Detach listeners.
-     * @method detach
-     * @param {Function} fn  The subscribed function to remove, if not supplied
-     *                       all will be removed.
-     * @param {Object}   context The context object passed to subscribe.
-     * @return {Number} returns the number of subscribers unsubscribed.
-     */
-    detach: function(fn, context) {
-        // unsubscribe handle
-        if (fn && fn.detach) {
-            return fn.detach();
-        }
-
-        var i, s,
-            found = 0,
-            subs = this._subscribers,
-            afters = this._afters;
-
-        if (subs) {
-            for (i = subs.length; i >= 0; i--) {
-                s = subs[i];
-                if (s && (!fn || fn === s.fn)) {
-                    this._delete(s, subs, i);
-                    found++;
-                }
-            }
-        }
-
-        if (afters) {
-            for (i = afters.length; i >= 0; i--) {
-                s = afters[i];
-                if (s && (!fn || fn === s.fn)) {
-                    this._delete(s, afters, i);
-                    found++;
-                }
-            }
-        }
-
-        return found;
-    },
-
-    /**
-     * Detach listeners.
-     * @method unsubscribe
-     * @param {Function} fn  The subscribed function to remove, if not supplied
-     *                       all will be removed.
-     * @param {Object}   context The context object passed to subscribe.
-     * @return {int|undefined} returns the number of subscribers unsubscribed.
-     * @deprecated use detach.
-     */
-    unsubscribe: function() {
-        return this.detach.apply(this, arguments);
-    },
-
-    /**
-     * Notify a single subscriber
-     * @method _notify
-     * @param {Subscriber} s the subscriber.
-     * @param {Array} args the arguments array to apply to the listener.
-     * @protected
-     */
-    _notify: function(s, args, ef) {
-
-
-        var ret;
-
-        ret = s.notify(args, this);
-
-        if (false === ret || this.stopped > 1) {
-            return false;
-        }
-
-        return true;
-    },
-
-    /**
-     * Logger abstraction to centralize the application of the silent flag
-     * @method log
-     * @param {string} msg message to log.
-     * @param {string} cat log category.
-     */
-    log: function(msg, cat) {
-    },
-
-    /**
-     * Notifies the subscribers.  The callback functions will be executed
-     * from the context specified when the event was created, and with the
-     * following parameters:
-     *   <ul>
-     *   <li>The type of event</li>
-     *   <li>All of the arguments fire() was executed with as an array</li>
-     *   <li>The custom object (if any) that was passed into the subscribe()
-     *       method</li>
-     *   </ul>
-     * @method fire
-     * @param {Object*} arguments an arbitrary set of parameters to pass to
-     *                            the handler.
-     * @return {boolean} false if one of the subscribers returned false,
-     *                   true otherwise.
-     *
-     */
-    fire: function() {
-
-        // push is the fastest way to go from arguments to arrays
-        // for most browsers currently
-        // http://jsperf.com/push-vs-concat-vs-slice/2
-
-        var args = [];
-        args.push.apply(args, arguments);
-
-        return this._fire(args);
-    },
-
-    /**
-     * Private internal implementation for `fire`, which is can be used directly by
-     * `EventTarget` and other event module classes which have already converted from
-     * an `arguments` list to an array, to avoid the repeated overhead.
-     *
-     * @method _fire
-     * @private
-     * @param {Array} args The array of arguments passed to be passed to handlers.
-     * @return {boolean} false if one of the subscribers returned false, true otherwise.
-     */
-    _fire: function(args) {
-
-        if (this.fireOnce && this.fired) {
-            return true;
-        } else {
-
-            // this doesn't happen if the event isn't published
-            // this.host._monitor('fire', this.type, args);
-
-            this.fired = true;
-
-            if (this.fireOnce) {
-                this.firedWith = args;
-            }
-
-            if (this.emitFacade) {
-                return this.fireComplex(args);
-            } else {
-                return this.fireSimple(args);
-            }
-        }
-    },
-
-    /**
-     * Set up for notifying subscribers of non-emitFacade events.
-     *
-     * @method fireSimple
-     * @param args {Array} Arguments passed to fire()
-     * @return Boolean false if a subscriber returned false
-     * @protected
-     */
-    fireSimple: function(args) {
-        this.stopped = 0;
-        this.prevented = 0;
-        if (this.hasSubs()) {
-            var subs = this.getSubs();
-            this._procSubs(subs[0], args);
-            this._procSubs(subs[1], args);
-        }
-        if (this.broadcast) {
-            this._broadcast(args);
-        }
-        return this.stopped ? false : true;
-    },
-
-    // Requires the event-custom-complex module for full funcitonality.
-    fireComplex: function(args) {
-        args[0] = args[0] || {};
-        return this.fireSimple(args);
-    },
-
-    /**
-     * Notifies a list of subscribers.
-     *
-     * @method _procSubs
-     * @param subs {Array} List of subscribers
-     * @param args {Array} Arguments passed to fire()
-     * @param ef {}
-     * @return Boolean false if a subscriber returns false or stops the event
-     *              propagation via e.stopPropagation(),
-     *              e.stopImmediatePropagation(), or e.halt()
-     * @private
-     */
-    _procSubs: function(subs, args, ef) {
-        var s, i, l;
-
-        for (i = 0, l = subs.length; i < l; i++) {
-            s = subs[i];
-            if (s && s.fn) {
-                if (false === this._notify(s, args, ef)) {
-                    this.stopped = 2;
-                }
-                if (this.stopped === 2) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    },
-
-    /**
-     * Notifies the YUI instance if the event is configured with broadcast = 1,
-     * and both the YUI instance and Y.Global if configured with broadcast = 2.
-     *
-     * @method _broadcast
-     * @param args {Array} Arguments sent to fire()
-     * @private
-     */
-    _broadcast: function(args) {
-        if (!this.stopped && this.broadcast) {
-
-            var a = args.concat();
-            a.unshift(this.type);
-
-            if (this.host !== Y) {
-                Y.fire.apply(Y, a);
-            }
-
-            if (this.broadcast === 2) {
-                Y.Global.fire.apply(Y.Global, a);
-            }
-        }
-    },
-
-    /**
-     * Removes all listeners
-     * @method unsubscribeAll
-     * @return {Number} The number of listeners unsubscribed.
-     * @deprecated use detachAll.
-     */
-    unsubscribeAll: function() {
-        return this.detachAll.apply(this, arguments);
-    },
-
-    /**
-     * Removes all listeners
-     * @method detachAll
-     * @return {Number} The number of listeners unsubscribed.
-     */
-    detachAll: function() {
-        return this.detach();
-    },
-
-    /**
-     * Deletes the subscriber from the internal store of on() and after()
-     * subscribers.
-     *
-     * @method _delete
-     * @param s subscriber object.
-     * @param subs (optional) on or after subscriber array
-     * @param index (optional) The index found.
-     * @private
-     */
-    _delete: function(s, subs, i) {
-        var when = s._when;
-
-        if (!subs) {
-            subs = (when === AFTER) ? this._afters : this._subscribers;
-        }
-
-        if (subs) {
-            i = YArray.indexOf(subs, s, 0);
-
-            if (s && subs[i] === s) {
-                subs.splice(i, 1);
-            }
-        }
-
-        if (this._kds) {
-            if (when === AFTER) {
-                delete this.afters[s.id];
-            } else {
-                delete this.subscribers[s.id];
-            }
-        }
-
-        if (this.monitored && this.host) {
-            this.host._monitor('detach', this, {
-                ce: this,
-                sub: s
-            });
-        }
-
-        if (s) {
-            s.deleted = true;
-        }
-    }
-};
-/**
- * Stores the subscriber information to be used when the event fires.
- * @param {Function} fn       The wrapped function to execute.
- * @param {Object}   context  The value of the keyword 'this' in the listener.
- * @param {Array} args*       0..n additional arguments to supply the listener.
- *
- * @class Subscriber
- * @constructor
- */
-Y.Subscriber = function(fn, context, args, when) {
-
-    /**
-     * The callback that will be execute when the event fires
-     * This is wrapped by Y.rbind if obj was supplied.
-     * @property fn
-     * @type Function
-     */
-    this.fn = fn;
-
-    /**
-     * Optional 'this' keyword for the listener
-     * @property context
-     * @type Object
-     */
-    this.context = context;
-
-    /**
-     * Unique subscriber id
-     * @property id
-     * @type String
-     */
-    this.id = Y.guid();
-
-    /**
-     * Additional arguments to propagate to the subscriber
-     * @property args
-     * @type Array
-     */
-    this.args = args;
-
-    this._when = when;
-
-    /**
-     * Custom events for a given fire transaction.
-     * @property events
-     * @type {EventTarget}
-     */
-    // this.events = null;
-
-    /**
-     * This listener only reacts to the event once
-     * @property once
-     */
-    // this.once = false;
-
-};
-
-Y.Subscriber.prototype = {
-    constructor: Y.Subscriber,
-
-    _notify: function(c, args, ce) {
-        if (this.deleted && !this.postponed) {
-            if (this.postponed) {
-                delete this.fn;
-                delete this.context;
-            } else {
-                delete this.postponed;
-                return null;
-            }
-        }
-        var a = this.args, ret;
-        switch (ce.signature) {
-            case 0:
-                ret = this.fn.call(c, ce.type, args, c);
-                break;
-            case 1:
-                ret = this.fn.call(c, args[0] || null, c);
-                break;
-            default:
-                if (a || args) {
-                    args = args || [];
-                    a = (a) ? args.concat(a) : args;
-                    ret = this.fn.apply(c, a);
-                } else {
-                    ret = this.fn.call(c);
-                }
-        }
-
-        if (this.once) {
-            ce._delete(this);
-        }
-
-        return ret;
-    },
-
-    /**
-     * Executes the subscriber.
-     * @method notify
-     * @param args {Array} Arguments array for the subscriber.
-     * @param ce {CustomEvent} The custom event that sent the notification.
-     */
-    notify: function(args, ce) {
-        var c = this.context,
-            ret = true;
-
-        if (!c) {
-            c = (ce.contextFn) ? ce.contextFn() : ce.context;
-        }
-
-        // only catch errors if we will not re-throw them.
-        if (Y.config && Y.config.throwFail) {
-            ret = this._notify(c, args, ce);
-        } else {
-            try {
-                ret = this._notify(c, args, ce);
-            } catch (e) {
-                Y.error(this + ' failed: ' + e.message, e);
-            }
-        }
-
-        return ret;
-    },
-
-    /**
-     * Returns true if the fn and obj match this objects properties.
-     * Used by the unsubscribe method to match the right subscriber.
-     *
-     * @method contains
-     * @param {Function} fn the function to execute.
-     * @param {Object} context optional 'this' keyword for the listener.
-     * @return {boolean} true if the supplied arguments match this
-     *                   subscriber's signature.
-     */
-    contains: function(fn, context) {
-        if (context) {
-            return ((this.fn === fn) && this.context === context);
-        } else {
-            return (this.fn === fn);
-        }
-    },
-
-    valueOf : function() {
-        return this.id;
-    }
-
-};
-/**
- * Return value from all subscribe operations
- * @class EventHandle
- * @constructor
- * @param {CustomEvent} evt the custom event.
- * @param {Subscriber} sub the subscriber.
- */
-Y.EventHandle = function(evt, sub) {
-
-    /**
-     * The custom event
-     *
-     * @property evt
-     * @type CustomEvent
-     */
-    this.evt = evt;
-
-    /**
-     * The subscriber object
-     *
-     * @property sub
-     * @type Subscriber
-     */
-    this.sub = sub;
-};
-
-Y.EventHandle.prototype = {
-    batch: function(f, c) {
-        f.call(c || this, this);
-        if (Y.Lang.isArray(this.evt)) {
-            Y.Array.each(this.evt, function(h) {
-                h.batch.call(c || h, f);
-            });
-        }
-    },
-
-    /**
-     * Detaches this subscriber
-     * @method detach
-     * @return {Number} the number of detached listeners
-     */
-    detach: function() {
-        var evt = this.evt, detached = 0, i;
-        if (evt) {
-            if (Y.Lang.isArray(evt)) {
-                for (i = 0; i < evt.length; i++) {
-                    detached += evt[i].detach();
-                }
-            } else {
-                evt._delete(this.sub);
-                detached = 1;
-            }
-
-        }
-
-        return detached;
-    },
-
-    /**
-     * Monitor the event state for the subscribed event.  The first parameter
-     * is what should be monitored, the rest are the normal parameters when
-     * subscribing to an event.
-     * @method monitor
-     * @param what {string} what to monitor ('attach', 'detach', 'publish').
-     * @return {EventHandle} return value from the monitor event subscription.
-     */
-    monitor: function(what) {
-        return this.evt.monitor.apply(this.evt, arguments);
-    }
-};
-
-/**
- * Custom event engine, DOM event listener abstraction layer, synthetic DOM
- * events.
- * @module event-custom
- * @submodule event-custom-base
- */
-
-/**
- * EventTarget provides the implementation for any object to
- * publish, subscribe and fire to custom events, and also
- * alows other EventTargets to target the object with events
- * sourced from the other object.
- * EventTarget is designed to be used with Y.augment to wrap
- * EventCustom in an interface that allows events to be listened to
- * and fired by name.  This makes it possible for implementing code to
- * subscribe to an event that either has not been created yet, or will
- * not be created at all.
- * @class EventTarget
- * @param opts a configuration object
- * @config emitFacade {boolean} if true, all events will emit event
- * facade payloads by default (default false)
- * @config prefix {String} the prefix to apply to non-prefixed event names
- */
-
-var L = Y.Lang,
-    PREFIX_DELIMITER = ':',
-    CATEGORY_DELIMITER = '|',
-    AFTER_PREFIX = '~AFTER~',
-    WILD_TYPE_RE = /(.*?)(:)(.*?)/,
-
-    _wildType = Y.cached(function(type) {
-        return type.replace(WILD_TYPE_RE, "*$2$3");
-    }),
-
-    /**
-     * If the instance has a prefix attribute and the
-     * event type is not prefixed, the instance prefix is
-     * applied to the supplied type.
-     * @method _getType
-     * @private
-     */
-    _getType = function(type, pre) {
-
-        if (!pre || !type || type.indexOf(PREFIX_DELIMITER) > -1) {
-            return type;
-        }
-
-        return pre + PREFIX_DELIMITER + type;
-    },
-
-    /**
-     * Returns an array with the detach key (if provided),
-     * and the prefixed event name from _getType
-     * Y.on('detachcategory| menu:click', fn)
-     * @method _parseType
-     * @private
-     */
-    _parseType = Y.cached(function(type, pre) {
-
-        var t = type, detachcategory, after, i;
-
-        if (!L.isString(t)) {
-            return t;
-        }
-
-        i = t.indexOf(AFTER_PREFIX);
-
-        if (i > -1) {
-            after = true;
-            t = t.substr(AFTER_PREFIX.length);
-        }
-
-        i = t.indexOf(CATEGORY_DELIMITER);
-
-        if (i > -1) {
-            detachcategory = t.substr(0, (i));
-            t = t.substr(i+1);
-            if (t === '*') {
-                t = null;
-            }
-        }
-
-        // detach category, full type with instance prefix, is this an after listener, short type
-        return [detachcategory, (pre) ? _getType(t, pre) : t, after, t];
-    }),
-
-    ET = function(opts) {
-
-        var etState = this._yuievt,
-            etConfig;
-
-        if (!etState) {
-            etState = this._yuievt = {
-                events: {},    // PERF: Not much point instantiating lazily. We're bound to have events
-                targets: null, // PERF: Instantiate lazily, if user actually adds target,
-                config: {
-                    host: this,
-                    context: this
-                },
-                chain: Y.config.chain
-            };
-        }
-
-        etConfig = etState.config;
-
-        if (opts) {
-            mixConfigs(etConfig, opts, true);
-
-            if (opts.chain !== undefined) {
-                etState.chain = opts.chain;
-            }
-
-            if (opts.prefix) {
-                etConfig.prefix = opts.prefix;
-            }
-        }
-    };
-
-ET.prototype = {
-
-    constructor: ET,
-
-    /**
-     * Listen to a custom event hosted by this object one time.
-     * This is the equivalent to <code>on</code> except the
-     * listener is immediatelly detached when it is executed.
-     * @method once
-     * @param {String} type The name of the event
-     * @param {Function} fn The callback to execute in response to the event
-     * @param {Object} [context] Override `this` object in callback
-     * @param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-     * @return {EventHandle} A subscription handle capable of detaching the
-     *                       subscription
-     */
-    once: function() {
-        var handle = this.on.apply(this, arguments);
-        handle.batch(function(hand) {
-            if (hand.sub) {
-                hand.sub.once = true;
-            }
-        });
-        return handle;
-    },
-
-    /**
-     * Listen to a custom event hosted by this object one time.
-     * This is the equivalent to <code>after</code> except the
-     * listener is immediatelly detached when it is executed.
-     * @method onceAfter
-     * @param {String} type The name of the event
-     * @param {Function} fn The callback to execute in response to the event
-     * @param {Object} [context] Override `this` object in callback
-     * @param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-     * @return {EventHandle} A subscription handle capable of detaching that
-     *                       subscription
-     */
-    onceAfter: function() {
-        var handle = this.after.apply(this, arguments);
-        handle.batch(function(hand) {
-            if (hand.sub) {
-                hand.sub.once = true;
-            }
-        });
-        return handle;
-    },
-
-    /**
-     * Takes the type parameter passed to 'on' and parses out the
-     * various pieces that could be included in the type.  If the
-     * event type is passed without a prefix, it will be expanded
-     * to include the prefix one is supplied or the event target
-     * is configured with a default prefix.
-     * @method parseType
-     * @param {String} type the type
-     * @param {String} [pre] The prefix. Defaults to this._yuievt.config.prefix
-     * @since 3.3.0
-     * @return {Array} an array containing:
-     *  * the detach category, if supplied,
-     *  * the prefixed event type,
-     *  * whether or not this is an after listener,
-     *  * the supplied event type
-     */
-    parseType: function(type, pre) {
-        return _parseType(type, pre || this._yuievt.config.prefix);
-    },
-
-    /**
-     * Subscribe a callback function to a custom event fired by this object or
-     * from an object that bubbles its events to this object.
-     *
-     * Callback functions for events published with `emitFacade = true` will
-     * receive an `EventFacade` as the first argument (typically named "e").
-     * These callbacks can then call `e.preventDefault()` to disable the
-     * behavior published to that event's `defaultFn`.  See the `EventFacade`
-     * API for all available properties and methods. Subscribers to
-     * non-`emitFacade` events will receive the arguments passed to `fire()`
-     * after the event name.
-     *
-     * To subscribe to multiple events at once, pass an object as the first
-     * argument, where the key:value pairs correspond to the eventName:callback,
-     * or pass an array of event names as the first argument to subscribe to
-     * all listed events with the same callback.
-     *
-     * Returning `false` from a callback is supported as an alternative to
-     * calling `e.preventDefault(); e.stopPropagation();`.  However, it is
-     * recommended to use the event methods whenever possible.
-     *
-     * @method on
-     * @param {String} type The name of the event
-     * @param {Function} fn The callback to execute in response to the event
-     * @param {Object} [context] Override `this` object in callback
-     * @param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-     * @return {EventHandle} A subscription handle capable of detaching that
-     *                       subscription
-     */
-    on: function(type, fn, context) {
-
-        var yuievt = this._yuievt,
-            parts = _parseType(type, yuievt.config.prefix), f, c, args, ret, ce,
-            detachcategory, handle, store = Y.Env.evt.handles, after, adapt, shorttype,
-            Node = Y.Node, n, domevent, isArr;
-
-        // full name, args, detachcategory, after
-        this._monitor('attach', parts[1], {
-            args: arguments,
-            category: parts[0],
-            after: parts[2]
-        });
-
-        if (L.isObject(type)) {
-
-            if (L.isFunction(type)) {
-                return Y.Do.before.apply(Y.Do, arguments);
-            }
-
-            f = fn;
-            c = context;
-            args = nativeSlice.call(arguments, 0);
-            ret = [];
-
-            if (L.isArray(type)) {
-                isArr = true;
-            }
-
-            after = type._after;
-            delete type._after;
-
-            Y.each(type, function(v, k) {
-
-                if (L.isObject(v)) {
-                    f = v.fn || ((L.isFunction(v)) ? v : f);
-                    c = v.context || c;
-                }
-
-                var nv = (after) ? AFTER_PREFIX : '';
-
-                args[0] = nv + ((isArr) ? v : k);
-                args[1] = f;
-                args[2] = c;
-
-                ret.push(this.on.apply(this, args));
-
-            }, this);
-
-            return (yuievt.chain) ? this : new Y.EventHandle(ret);
-        }
-
-        detachcategory = parts[0];
-        after = parts[2];
-        shorttype = parts[3];
-
-        // extra redirection so we catch adaptor events too.  take a look at this.
-        if (Node && Y.instanceOf(this, Node) && (shorttype in Node.DOM_EVENTS)) {
-            args = nativeSlice.call(arguments, 0);
-            args.splice(2, 0, Node.getDOMNode(this));
-            return Y.on.apply(Y, args);
-        }
-
-        type = parts[1];
-
-        if (Y.instanceOf(this, YUI)) {
-
-            adapt = Y.Env.evt.plugins[type];
-            args  = nativeSlice.call(arguments, 0);
-            args[0] = shorttype;
-
-            if (Node) {
-                n = args[2];
-
-                if (Y.instanceOf(n, Y.NodeList)) {
-                    n = Y.NodeList.getDOMNodes(n);
-                } else if (Y.instanceOf(n, Node)) {
-                    n = Node.getDOMNode(n);
-                }
-
-                domevent = (shorttype in Node.DOM_EVENTS);
-
-                // Captures both DOM events and event plugins.
-                if (domevent) {
-                    args[2] = n;
-                }
-            }
-
-            // check for the existance of an event adaptor
-            if (adapt) {
-                handle = adapt.on.apply(Y, args);
-            } else if ((!type) || domevent) {
-                handle = Y.Event._attach(args);
-            }
-
-        }
-
-        if (!handle) {
-            ce = yuievt.events[type] || this.publish(type);
-            handle = ce._on(fn, context, (arguments.length > 3) ? nativeSlice.call(arguments, 3) : null, (after) ? 'after' : true);
-
-            // TODO: More robust regex, accounting for category
-            if (type.indexOf("*:") !== -1) {
-                this._hasSiblings = true;
-            }
-        }
-
-        if (detachcategory) {
-            store[detachcategory] = store[detachcategory] || {};
-            store[detachcategory][type] = store[detachcategory][type] || [];
-            store[detachcategory][type].push(handle);
-        }
-
-        return (yuievt.chain) ? this : handle;
-
-    },
-
-    /**
-     * subscribe to an event
-     * @method subscribe
-     * @deprecated use on
-     */
-    subscribe: function() {
-        return this.on.apply(this, arguments);
-    },
-
-    /**
-     * Detach one or more listeners the from the specified event
-     * @method detach
-     * @param type {string|Object}   Either the handle to the subscriber or the
-     *                        type of event.  If the type
-     *                        is not specified, it will attempt to remove
-     *                        the listener from all hosted events.
-     * @param fn   {Function} The subscribed function to unsubscribe, if not
-     *                          supplied, all subscribers will be removed.
-     * @param context  {Object}   The custom object passed to subscribe.  This is
-     *                        optional, but if supplied will be used to
-     *                        disambiguate multiple listeners that are the same
-     *                        (e.g., you subscribe many object using a function
-     *                        that lives on the prototype)
-     * @return {EventTarget} the host
-     */
-    detach: function(type, fn, context) {
-
-        var evts = this._yuievt.events,
-            i,
-            Node = Y.Node,
-            isNode = Node && (Y.instanceOf(this, Node));
-
-        // detachAll disabled on the Y instance.
-        if (!type && (this !== Y)) {
-            for (i in evts) {
-                if (evts.hasOwnProperty(i)) {
-                    evts[i].detach(fn, context);
-                }
-            }
-            if (isNode) {
-                Y.Event.purgeElement(Node.getDOMNode(this));
-            }
-
-            return this;
-        }
-
-        var parts = _parseType(type, this._yuievt.config.prefix),
-        detachcategory = L.isArray(parts) ? parts[0] : null,
-        shorttype = (parts) ? parts[3] : null,
-        adapt, store = Y.Env.evt.handles, detachhost, cat, args,
-        ce,
-
-        keyDetacher = function(lcat, ltype, host) {
-            var handles = lcat[ltype], ce, i;
-            if (handles) {
-                for (i = handles.length - 1; i >= 0; --i) {
-                    ce = handles[i].evt;
-                    if (ce.host === host || ce.el === host) {
-                        handles[i].detach();
-                    }
-                }
-            }
-        };
-
-        if (detachcategory) {
-
-            cat = store[detachcategory];
-            type = parts[1];
-            detachhost = (isNode) ? Y.Node.getDOMNode(this) : this;
-
-            if (cat) {
-                if (type) {
-                    keyDetacher(cat, type, detachhost);
-                } else {
-                    for (i in cat) {
-                        if (cat.hasOwnProperty(i)) {
-                            keyDetacher(cat, i, detachhost);
-                        }
-                    }
-                }
-
-                return this;
-            }
-
-        // If this is an event handle, use it to detach
-        } else if (L.isObject(type) && type.detach) {
-            type.detach();
-            return this;
-        // extra redirection so we catch adaptor events too.  take a look at this.
-        } else if (isNode && ((!shorttype) || (shorttype in Node.DOM_EVENTS))) {
-            args = nativeSlice.call(arguments, 0);
-            args[2] = Node.getDOMNode(this);
-            Y.detach.apply(Y, args);
-            return this;
-        }
-
-        adapt = Y.Env.evt.plugins[shorttype];
-
-        // The YUI instance handles DOM events and adaptors
-        if (Y.instanceOf(this, YUI)) {
-            args = nativeSlice.call(arguments, 0);
-            // use the adaptor specific detach code if
-            if (adapt && adapt.detach) {
-                adapt.detach.apply(Y, args);
-                return this;
-            // DOM event fork
-            } else if (!type || (!adapt && Node && (type in Node.DOM_EVENTS))) {
-                args[0] = type;
-                Y.Event.detach.apply(Y.Event, args);
-                return this;
-            }
-        }
-
-        // ce = evts[type];
-        ce = evts[parts[1]];
-        if (ce) {
-            ce.detach(fn, context);
-        }
-
-        return this;
-    },
-
-    /**
-     * detach a listener
-     * @method unsubscribe
-     * @deprecated use detach
-     */
-    unsubscribe: function() {
-        return this.detach.apply(this, arguments);
-    },
-
-    /**
-     * Removes all listeners from the specified event.  If the event type
-     * is not specified, all listeners from all hosted custom events will
-     * be removed.
-     * @method detachAll
-     * @param type {String}   The type, or name of the event
-     */
-    detachAll: function(type) {
-        return this.detach(type);
-    },
-
-    /**
-     * Removes all listeners from the specified event.  If the event type
-     * is not specified, all listeners from all hosted custom events will
-     * be removed.
-     * @method unsubscribeAll
-     * @param type {String}   The type, or name of the event
-     * @deprecated use detachAll
-     */
-    unsubscribeAll: function() {
-        return this.detachAll.apply(this, arguments);
-    },
-
-    /**
-     * Creates a new custom event of the specified type.  If a custom event
-     * by that name already exists, it will not be re-created.  In either
-     * case the custom event is returned.
-     *
-     * @method publish
-     *
-     * @param type {String} the type, or name of the event
-     * @param opts {object} optional config params.  Valid properties are:
-     *
-     *  <ul>
-     *    <li>
-     *   'broadcast': whether or not the YUI instance and YUI global are notified when the event is fired (false)
-     *    </li>
-     *    <li>
-     *   'bubbles': whether or not this event bubbles (true)
-     *              Events can only bubble if emitFacade is true.
-     *    </li>
-     *    <li>
-     *   'context': the default execution context for the listeners (this)
-     *    </li>
-     *    <li>
-     *   'defaultFn': the default function to execute when this event fires if preventDefault was not called
-     *    </li>
-     *    <li>
-     *   'emitFacade': whether or not this event emits a facade (false)
-     *    </li>
-     *    <li>
-     *   'prefix': the prefix for this targets events, e.g., 'menu' in 'menu:click'
-     *    </li>
-     *    <li>
-     *   'fireOnce': if an event is configured to fire once, new subscribers after
-     *   the fire will be notified immediately.
-     *    </li>
-     *    <li>
-     *   'async': fireOnce event listeners will fire synchronously if the event has already
-     *    fired unless async is true.
-     *    </li>
-     *    <li>
-     *   'preventable': whether or not preventDefault() has an effect (true)
-     *    </li>
-     *    <li>
-     *   'preventedFn': a function that is executed when preventDefault is called
-     *    </li>
-     *    <li>
-     *   'queuable': whether or not this event can be queued during bubbling (false)
-     *    </li>
-     *    <li>
-     *   'silent': if silent is true, debug messages are not provided for this event.
-     *    </li>
-     *    <li>
-     *   'stoppedFn': a function that is executed when stopPropagation is called
-     *    </li>
-     *
-     *    <li>
-     *   'monitored': specifies whether or not this event should send notifications about
-     *   when the event has been attached, detached, or published.
-     *    </li>
-     *    <li>
-     *   'type': the event type (valid option if not provided as the first parameter to publish)
-     *    </li>
-     *  </ul>
-     *
-     *  @return {CustomEvent} the custom event
-     *
-     */
-    publish: function(type, opts) {
-
-        var ret,
-            etState = this._yuievt,
-            etConfig = etState.config,
-            pre = etConfig.prefix;
-
-        if (typeof type === "string")  {
-            if (pre) {
-                type = _getType(type, pre);
-            }
-            ret = this._publish(type, etConfig, opts);
-        } else {
-            ret = {};
-
-            Y.each(type, function(v, k) {
-                if (pre) {
-                    k = _getType(k, pre);
-                }
-                ret[k] = this._publish(k, etConfig, v || opts);
-            }, this);
-
-        }
-
-        return ret;
-    },
-
-    /**
-     * Returns the fully qualified type, given a short type string.
-     * That is, returns "foo:bar" when given "bar" if "foo" is the configured prefix.
-     *
-     * NOTE: This method, unlike _getType, does no checking of the value passed in, and
-     * is designed to be used with the low level _publish() method, for critical path
-     * implementations which need to fast-track publish for performance reasons.
-     *
-     * @method _getFullType
-     * @private
-     * @param {String} type The short type to prefix
-     * @return {String} The prefixed type, if a prefix is set, otherwise the type passed in
-     */
-    _getFullType : function(type) {
-
-        var pre = this._yuievt.config.prefix;
-
-        if (pre) {
-            return pre + PREFIX_DELIMITER + type;
-        } else {
-            return type;
-        }
-    },
-
-    /**
-     * The low level event publish implementation. It expects all the massaging to have been done
-     * outside of this method. e.g. the `type` to `fullType` conversion. It's designed to be a fast
-     * path publish, which can be used by critical code paths to improve performance.
-     *
-     * @method _publish
-     * @private
-     * @param {String} fullType The prefixed type of the event to publish.
-     * @param {Object} etOpts The EventTarget specific configuration to mix into the published event.
-     * @param {Object} ceOpts The publish specific configuration to mix into the published event.
-     * @return {CustomEvent} The published event. If called without `etOpts` or `ceOpts`, this will
-     * be the default `CustomEvent` instance, and can be configured independently.
-     */
-    _publish : function(fullType, etOpts, ceOpts) {
-
-        var ce,
-            etState = this._yuievt,
-            etConfig = etState.config,
-            host = etConfig.host,
-            context = etConfig.context,
-            events = etState.events;
-
-        ce = events[fullType];
-
-        // PERF: Hate to pull the check out of monitor, but trying to keep critical path tight.
-        if ((etConfig.monitored && !ce) || (ce && ce.monitored)) {
-            this._monitor('publish', fullType, {
-                args: arguments
-            });
-        }
-
-        if (!ce) {
-            // Publish event
-            ce = events[fullType] = new Y.CustomEvent(fullType, etOpts);
-
-            if (!etOpts) {
-                ce.host = host;
-                ce.context = context;
-            }
-        }
-
-        if (ceOpts) {
-            mixConfigs(ce, ceOpts, true);
-        }
-
-        return ce;
-    },
-
-    /**
-     * This is the entry point for the event monitoring system.
-     * You can monitor 'attach', 'detach', 'fire', and 'publish'.
-     * When configured, these events generate an event.  click ->
-     * click_attach, click_detach, click_publish -- these can
-     * be subscribed to like other events to monitor the event
-     * system.  Inividual published events can have monitoring
-     * turned on or off (publish can't be turned off before it
-     * it published) by setting the events 'monitor' config.
-     *
-     * @method _monitor
-     * @param what {String} 'attach', 'detach', 'fire', or 'publish'
-     * @param eventType {String|CustomEvent} The prefixed name of the event being monitored, or the CustomEvent object.
-     * @param o {Object} Information about the event interaction, such as
-     *                  fire() args, subscription category, publish config
-     * @private
-     */
-    _monitor: function(what, eventType, o) {
-        var monitorevt, ce, type;
-
-        if (eventType) {
-            if (typeof eventType === "string") {
-                type = eventType;
-                ce = this.getEvent(eventType, true);
-            } else {
-                ce = eventType;
-                type = eventType.type;
-            }
-
-            if ((this._yuievt.config.monitored && (!ce || ce.monitored)) || (ce && ce.monitored)) {
-                monitorevt = type + '_' + what;
-                o.monitored = what;
-                this.fire.call(this, monitorevt, o);
-            }
-        }
-    },
-
-    /**
-     * Fire a custom event by name.  The callback functions will be executed
-     * from the context specified when the event was created, and with the
-     * following parameters.
-     *
-     * The first argument is the event type, and any additional arguments are
-     * passed to the listeners as parameters.  If the first of these is an
-     * object literal, and the event is configured to emit an event facade,
-     * that object is mixed into the event facade and the facade is provided
-     * in place of the original object.
-     *
-     * If the custom event object hasn't been created, then the event hasn't
-     * been published and it has no subscribers.  For performance sake, we
-     * immediate exit in this case.  This means the event won't bubble, so
-     * if the intention is that a bubble target be notified, the event must
-     * be published on this object first.
-     *
-     * @method fire
-     * @param type {String|Object} The type of the event, or an object that contains
-     * a 'type' property.
-     * @param arguments {Object*} an arbitrary set of parameters to pass to
-     * the handler.  If the first of these is an object literal and the event is
-     * configured to emit an event facade, the event facade will replace that
-     * parameter after the properties the object literal contains are copied to
-     * the event facade.
-     * @return {Boolean} True if the whole lifecycle of the event went through,
-     * false if at any point the event propagation was halted.
-     */
-    fire: function(type) {
-
-        var typeIncluded = (typeof type === "string"),
-            argCount = arguments.length,
-            t = type,
-            yuievt = this._yuievt,
-            etConfig = yuievt.config,
-            pre = etConfig.prefix,
-            ret,
-            ce,
-            ce2,
-            args;
-
-        if (typeIncluded && argCount <= 3) {
-
-            // PERF: Try to avoid slice/iteration for the common signatures
-
-            // Most common
-            if (argCount === 2) {
-                args = [arguments[1]]; // fire("foo", {})
-            } else if (argCount === 3) {
-                args = [arguments[1], arguments[2]]; // fire("foo", {}, opts)
-            } else {
-                args = []; // fire("foo")
-            }
-
-        } else {
-            args = nativeSlice.call(arguments, ((typeIncluded) ? 1 : 0));
-        }
-
-        if (!typeIncluded) {
-            t = (type && type.type);
-        }
-
-        if (pre) {
-            t = _getType(t, pre);
-        }
-
-        ce = yuievt.events[t];
-
-        if (this._hasSiblings) {
-            ce2 = this.getSibling(t, ce);
-
-            if (ce2 && !ce) {
-                ce = this.publish(t);
-            }
-        }
-
-        // PERF: trying to avoid function call, since this is a critical path
-        if ((etConfig.monitored && (!ce || ce.monitored)) || (ce && ce.monitored)) {
-            this._monitor('fire', (ce || t), {
-                args: args
-            });
-        }
-
-        // this event has not been published or subscribed to
-        if (!ce) {
-            if (yuievt.hasTargets) {
-                return this.bubble({ type: t }, args, this);
-            }
-
-            // otherwise there is nothing to be done
-            ret = true;
-        } else {
-
-            if (ce2) {
-                ce.sibling = ce2;
-            }
-
-            ret = ce._fire(args);
-        }
-
-        return (yuievt.chain) ? this : ret;
-    },
-
-    getSibling: function(type, ce) {
-        var ce2;
-
-        // delegate to *:type events if there are subscribers
-        if (type.indexOf(PREFIX_DELIMITER) > -1) {
-            type = _wildType(type);
-            ce2 = this.getEvent(type, true);
-            if (ce2) {
-                ce2.applyConfig(ce);
-                ce2.bubbles = false;
-                ce2.broadcast = 0;
-            }
-        }
-
-        return ce2;
-    },
-
-    /**
-     * Returns the custom event of the provided type has been created, a
-     * falsy value otherwise
-     * @method getEvent
-     * @param type {String} the type, or name of the event
-     * @param prefixed {String} if true, the type is prefixed already
-     * @return {CustomEvent} the custom event or null
-     */
-    getEvent: function(type, prefixed) {
-        var pre, e;
-
-        if (!prefixed) {
-            pre = this._yuievt.config.prefix;
-            type = (pre) ? _getType(type, pre) : type;
-        }
-        e = this._yuievt.events;
-        return e[type] || null;
-    },
-
-    /**
-     * Subscribe to a custom event hosted by this object.  The
-     * supplied callback will execute after any listeners add
-     * via the subscribe method, and after the default function,
-     * if configured for the event, has executed.
-     *
-     * @method after
-     * @param {String} type The name of the event
-     * @param {Function} fn The callback to execute in response to the event
-     * @param {Object} [context] Override `this` object in callback
-     * @param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-     * @return {EventHandle} A subscription handle capable of detaching the
-     *                       subscription
-     */
-    after: function(type, fn) {
-
-        var a = nativeSlice.call(arguments, 0);
-
-        switch (L.type(type)) {
-            case 'function':
-                return Y.Do.after.apply(Y.Do, arguments);
-            case 'array':
-            //     YArray.each(a[0], function(v) {
-            //         v = AFTER_PREFIX + v;
-            //     });
-            //     break;
-            case 'object':
-                a[0]._after = true;
-                break;
-            default:
-                a[0] = AFTER_PREFIX + type;
-        }
-
-        return this.on.apply(this, a);
-
-    },
-
-    /**
-     * Executes the callback before a DOM event, custom event
-     * or method.  If the first argument is a function, it
-     * is assumed the target is a method.  For DOM and custom
-     * events, this is an alias for Y.on.
-     *
-     * For DOM and custom events:
-     * type, callback, context, 0-n arguments
-     *
-     * For methods:
-     * callback, object (method host), methodName, context, 0-n arguments
-     *
-     * @method before
-     * @return detach handle
-     */
-    before: function() {
-        return this.on.apply(this, arguments);
-    }
-
-};
-
-Y.EventTarget = ET;
-
-// make Y an event target
-Y.mix(Y, ET.prototype);
-ET.call(Y, { bubbles: false });
-
-YUI.Env.globalEvents = YUI.Env.globalEvents || new ET();
-
-/**
- * Hosts YUI page level events.  This is where events bubble to
- * when the broadcast config is set to 2.  This property is
- * only available if the custom event module is loaded.
- * @property Global
- * @type EventTarget
- * @for YUI
- */
-Y.Global = YUI.Env.globalEvents;
-
-// @TODO implement a global namespace function on Y.Global?
-
-/**
-`Y.on()` can do many things:
-
-<ul>
-    <li>Subscribe to custom events `publish`ed and `fire`d from Y</li>
-    <li>Subscribe to custom events `publish`ed with `broadcast` 1 or 2 and
-        `fire`d from any object in the YUI instance sandbox</li>
-    <li>Subscribe to DOM events</li>
-    <li>Subscribe to the execution of a method on any object, effectively
-    treating that method as an event</li>
-</ul>
-
-For custom event subscriptions, pass the custom event name as the first argument
-and callback as the second. The `this` object in the callback will be `Y` unless
-an override is passed as the third argument.
-
-    Y.on('io:complete', function () {
-        Y.MyApp.updateStatus('Transaction complete');
-    });
-
-To subscribe to DOM events, pass the name of a DOM event as the first argument
-and a CSS selector string as the third argument after the callback function.
-Alternately, the third argument can be a `Node`, `NodeList`, `HTMLElement`,
-array, or simply omitted (the default is the `window` object).
-
-    Y.on('click', function (e) {
-        e.preventDefault();
-
-        // proceed with ajax form submission
-        var url = this.get('action');
-        ...
-    }, '#my-form');
-
-The `this` object in DOM event callbacks will be the `Node` targeted by the CSS
-selector or other identifier.
-
-`on()` subscribers for DOM events or custom events `publish`ed with a
-`defaultFn` can prevent the default behavior with `e.preventDefault()` from the
-event object passed as the first parameter to the subscription callback.
-
-To subscribe to the execution of an object method, pass arguments corresponding to the call signature for
-<a href="../classes/Do.html#methods_before">`Y.Do.before(...)`</a>.
-
-NOTE: The formal parameter list below is for events, not for function
-injection.  See `Y.Do.before` for that signature.
-
-@method on
-@param {String} type DOM or custom event name
-@param {Function} fn The callback to execute in response to the event
-@param {Object} [context] Override `this` object in callback
-@param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-@return {EventHandle} A subscription handle capable of detaching the
-                      subscription
-@see Do.before
-@for YUI
-**/
-
-/**
-Listen for an event one time.  Equivalent to `on()`, except that
-the listener is immediately detached when executed.
-
-See the <a href="#methods_on">`on()` method</a> for additional subscription
-options.
-
-@see on
-@method once
-@param {String} type DOM or custom event name
-@param {Function} fn The callback to execute in response to the event
-@param {Object} [context] Override `this` object in callback
-@param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-@return {EventHandle} A subscription handle capable of detaching the
-                      subscription
-@for YUI
-**/
-
-/**
-Listen for an event one time.  Equivalent to `once()`, except, like `after()`,
-the subscription callback executes after all `on()` subscribers and the event's
-`defaultFn` (if configured) have executed.  Like `after()` if any `on()` phase
-subscriber calls `e.preventDefault()`, neither the `defaultFn` nor the `after()`
-subscribers will execute.
-
-The listener is immediately detached when executed.
-
-See the <a href="#methods_on">`on()` method</a> for additional subscription
-options.
-
-@see once
-@method onceAfter
-@param {String} type The custom event name
-@param {Function} fn The callback to execute in response to the event
-@param {Object} [context] Override `this` object in callback
-@param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-@return {EventHandle} A subscription handle capable of detaching the
-                      subscription
-@for YUI
-**/
-
-/**
-Like `on()`, this method creates a subscription to a custom event or to the
-execution of a method on an object.
-
-For events, `after()` subscribers are executed after the event's
-`defaultFn` unless `e.preventDefault()` was called from an `on()` subscriber.
-
-See the <a href="#methods_on">`on()` method</a> for additional subscription
-options.
-
-NOTE: The subscription signature shown is for events, not for function
-injection.  See <a href="../classes/Do.html#methods_after">`Y.Do.after`</a>
-for that signature.
-
-@see on
-@see Do.after
-@method after
-@param {String} type The custom event name
-@param {Function} fn The callback to execute in response to the event
-@param {Object} [context] Override `this` object in callback
-@param {Any} [args*] 0..n additional arguments to supply to the subscriber
-@return {EventHandle} A subscription handle capable of detaching the
-                      subscription
-@for YUI
-**/
-
-
-}, '3.16.0', {"requires": ["oop"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-custom-complex', function (Y, NAME) {
-
-
-/**
- * Adds event facades, preventable default behavior, and bubbling.
- * events.
- * @module event-custom
- * @submodule event-custom-complex
- */
-
-var FACADE,
-    FACADE_KEYS,
-    YObject = Y.Object,
-    key,
-    EMPTY = {},
-    CEProto = Y.CustomEvent.prototype,
-    ETProto = Y.EventTarget.prototype,
-
-    mixFacadeProps = function(facade, payload) {
-        var p;
-
-        for (p in payload) {
-            if (!(FACADE_KEYS.hasOwnProperty(p))) {
-                facade[p] = payload[p];
-            }
-        }
-    };
-
-/**
- * Wraps and protects a custom event for use when emitFacade is set to true.
- * Requires the event-custom-complex module
- * @class EventFacade
- * @param e {Event} the custom event
- * @param currentTarget {HTMLElement} the element the listener was attached to
- */
-
-Y.EventFacade = function(e, currentTarget) {
-
-    if (!e) {
-        e = EMPTY;
-    }
-
-    this._event = e;
-
-    /**
-     * The arguments passed to fire
-     * @property details
-     * @type Array
-     */
-    this.details = e.details;
-
-    /**
-     * The event type, this can be overridden by the fire() payload
-     * @property type
-     * @type string
-     */
-    this.type = e.type;
-
-    /**
-     * The real event type
-     * @property _type
-     * @type string
-     * @private
-     */
-    this._type = e.type;
-
-    //////////////////////////////////////////////////////
-
-    /**
-     * Node reference for the targeted eventtarget
-     * @property target
-     * @type Node
-     */
-    this.target = e.target;
-
-    /**
-     * Node reference for the element that the listener was attached to.
-     * @property currentTarget
-     * @type Node
-     */
-    this.currentTarget = currentTarget;
-
-    /**
-     * Node reference to the relatedTarget
-     * @property relatedTarget
-     * @type Node
-     */
-    this.relatedTarget = e.relatedTarget;
-
-};
-
-Y.mix(Y.EventFacade.prototype, {
-
-    /**
-     * Stops the propagation to the next bubble target
-     * @method stopPropagation
-     */
-    stopPropagation: function() {
-        this._event.stopPropagation();
-        this.stopped = 1;
-    },
-
-    /**
-     * Stops the propagation to the next bubble target and
-     * prevents any additional listeners from being exectued
-     * on the current target.
-     * @method stopImmediatePropagation
-     */
-    stopImmediatePropagation: function() {
-        this._event.stopImmediatePropagation();
-        this.stopped = 2;
-    },
-
-    /**
-     * Prevents the event's default behavior
-     * @method preventDefault
-     */
-    preventDefault: function() {
-        this._event.preventDefault();
-        this.prevented = 1;
-    },
-
-    /**
-     * Stops the event propagation and prevents the default
-     * event behavior.
-     * @method halt
-     * @param immediate {boolean} if true additional listeners
-     * on the current target will not be executed
-     */
-    halt: function(immediate) {
-        this._event.halt(immediate);
-        this.prevented = 1;
-        this.stopped = (immediate) ? 2 : 1;
-    }
-
-});
-
-CEProto.fireComplex = function(args) {
-
-    var es,
-        ef,
-        q,
-        queue,
-        ce,
-        ret = true,
-        events,
-        subs,
-        ons,
-        afters,
-        afterQueue,
-        postponed,
-        prevented,
-        preventedFn,
-        defaultFn,
-        self = this,
-        host = self.host || self,
-        next,
-        oldbubble,
-        stack = self.stack,
-        yuievt = host._yuievt,
-        hasPotentialSubscribers;
-
-    if (stack) {
-
-        // queue this event if the current item in the queue bubbles
-        if (self.queuable && self.type !== stack.next.type) {
-
-            if (!stack.queue) {
-                stack.queue = [];
-            }
-            stack.queue.push([self, args]);
-
-            return true;
-        }
-    }
-
-    hasPotentialSubscribers = self.hasSubs() || yuievt.hasTargets || self.broadcast;
-
-    self.target = self.target || host;
-    self.currentTarget = host;
-
-    self.details = args.concat();
-
-    if (hasPotentialSubscribers) {
-
-        es = stack || {
-
-           id: self.id, // id of the first event in the stack
-           next: self,
-           silent: self.silent,
-           stopped: 0,
-           prevented: 0,
-           bubbling: null,
-           type: self.type,
-           // defaultFnQueue: new Y.Queue(),
-           defaultTargetOnly: self.defaultTargetOnly
-
-        };
-
-        subs = self.getSubs();
-        ons = subs[0];
-        afters = subs[1];
-
-        self.stopped = (self.type !== es.type) ? 0 : es.stopped;
-        self.prevented = (self.type !== es.type) ? 0 : es.prevented;
-
-        if (self.stoppedFn) {
-            // PERF TODO: Can we replace with callback, like preventedFn. Look into history
-            events = new Y.EventTarget({
-                fireOnce: true,
-                context: host
-            });
-            self.events = events;
-            events.on('stopped', self.stoppedFn);
-        }
-
-
-        self._facade = null; // kill facade to eliminate stale properties
-
-        ef = self._createFacade(args);
-
-        if (ons) {
-            self._procSubs(ons, args, ef);
-        }
-
-        // bubble if this is hosted in an event target and propagation has not been stopped
-        if (self.bubbles && host.bubble && !self.stopped) {
-            oldbubble = es.bubbling;
-
-            es.bubbling = self.type;
-
-            if (es.type !== self.type) {
-                es.stopped = 0;
-                es.prevented = 0;
-            }
-
-            ret = host.bubble(self, args, null, es);
-
-            self.stopped = Math.max(self.stopped, es.stopped);
-            self.prevented = Math.max(self.prevented, es.prevented);
-
-            es.bubbling = oldbubble;
-        }
-
-        prevented = self.prevented;
-
-        if (prevented) {
-            preventedFn = self.preventedFn;
-            if (preventedFn) {
-                preventedFn.apply(host, args);
-            }
-        } else {
-            defaultFn = self.defaultFn;
-
-            if (defaultFn && ((!self.defaultTargetOnly && !es.defaultTargetOnly) || host === ef.target)) {
-                defaultFn.apply(host, args);
-            }
-        }
-
-        // broadcast listeners are fired as discreet events on the
-        // YUI instance and potentially the YUI global.
-        if (self.broadcast) {
-            self._broadcast(args);
-        }
-
-        if (afters && !self.prevented && self.stopped < 2) {
-
-            // Queue the after
-            afterQueue = es.afterQueue;
-
-            if (es.id === self.id || self.type !== yuievt.bubbling) {
-
-                self._procSubs(afters, args, ef);
-
-                if (afterQueue) {
-                    while ((next = afterQueue.last())) {
-                        next();
-                    }
-                }
-            } else {
-                postponed = afters;
-
-                if (es.execDefaultCnt) {
-                    postponed = Y.merge(postponed);
-
-                    Y.each(postponed, function(s) {
-                        s.postponed = true;
-                    });
-                }
-
-                if (!afterQueue) {
-                    es.afterQueue = new Y.Queue();
-                }
-
-                es.afterQueue.add(function() {
-                    self._procSubs(postponed, args, ef);
-                });
-            }
-
-        }
-
-        self.target = null;
-
-        if (es.id === self.id) {
-
-            queue = es.queue;
-
-            if (queue) {
-                while (queue.length) {
-                    q = queue.pop();
-                    ce = q[0];
-                    // set up stack to allow the next item to be processed
-                    es.next = ce;
-                    ce._fire(q[1]);
-                }
-            }
-
-            self.stack = null;
-        }
-
-        ret = !(self.stopped);
-
-        if (self.type !== yuievt.bubbling) {
-            es.stopped = 0;
-            es.prevented = 0;
-            self.stopped = 0;
-            self.prevented = 0;
-        }
-
-    } else {
-        defaultFn = self.defaultFn;
-
-        if(defaultFn) {
-            ef = self._createFacade(args);
-
-            if ((!self.defaultTargetOnly) || (host === ef.target)) {
-                defaultFn.apply(host, args);
-            }
-        }
-    }
-
-    // Kill the cached facade to free up memory.
-    // Otherwise we have the facade from the last fire, sitting around forever.
-    self._facade = null;
-
-    return ret;
-};
-
-/**
- * @method _hasPotentialSubscribers
- * @for CustomEvent
- * @private
- * @return {boolean} Whether the event has potential subscribers or not
- */
-CEProto._hasPotentialSubscribers = function() {
-    return this.hasSubs() || this.host._yuievt.hasTargets || this.broadcast;
-};
-
-/**
- * Internal utility method to create a new facade instance and
- * insert it into the fire argument list, accounting for any payload
- * merging which needs to happen.
- *
- * This used to be called `_getFacade`, but the name seemed inappropriate
- * when it was used without a need for the return value.
- *
- * @method _createFacade
- * @private
- * @param fireArgs {Array} The arguments passed to "fire", which need to be
- * shifted (and potentially merged) when the facade is added.
- * @return {EventFacade} The event facade created.
- */
-
-// TODO: Remove (private) _getFacade alias, once synthetic.js is updated.
-CEProto._createFacade = CEProto._getFacade = function(fireArgs) {
-
-    var userArgs = this.details,
-        firstArg = userArgs && userArgs[0],
-        firstArgIsObj = (firstArg && (typeof firstArg === "object")),
-        ef = this._facade;
-
-    if (!ef) {
-        ef = new Y.EventFacade(this, this.currentTarget);
-    }
-
-    if (firstArgIsObj) {
-        // protect the event facade properties
-        mixFacadeProps(ef, firstArg);
-
-        // Allow the event type to be faked http://yuilibrary.com/projects/yui3/ticket/2528376
-        if (firstArg.type) {
-            ef.type = firstArg.type;
-        }
-
-        if (fireArgs) {
-            fireArgs[0] = ef;
-        }
-    } else {
-        if (fireArgs) {
-            fireArgs.unshift(ef);
-        }
-    }
-
-    // update the details field with the arguments
-    ef.details = this.details;
-
-    // use the original target when the event bubbled to this target
-    ef.target = this.originalTarget || this.target;
-
-    ef.currentTarget = this.currentTarget;
-    ef.stopped = 0;
-    ef.prevented = 0;
-
-    this._facade = ef;
-
-    return this._facade;
-};
-
-/**
- * Utility method to manipulate the args array passed in, to add the event facade,
- * if it's not already the first arg.
- *
- * @method _addFacadeToArgs
- * @private
- * @param {Array} The arguments to manipulate
- */
-CEProto._addFacadeToArgs = function(args) {
-    var e = args[0];
-
-    // Trying not to use instanceof, just to avoid potential cross Y edge case issues.
-    if (!(e && e.halt && e.stopImmediatePropagation && e.stopPropagation && e._event)) {
-        this._createFacade(args);
-    }
-};
-
-/**
- * Stop propagation to bubble targets
- * @for CustomEvent
- * @method stopPropagation
- */
-CEProto.stopPropagation = function() {
-    this.stopped = 1;
-    if (this.stack) {
-        this.stack.stopped = 1;
-    }
-    if (this.events) {
-        this.events.fire('stopped', this);
-    }
-};
-
-/**
- * Stops propagation to bubble targets, and prevents any remaining
- * subscribers on the current target from executing.
- * @method stopImmediatePropagation
- */
-CEProto.stopImmediatePropagation = function() {
-    this.stopped = 2;
-    if (this.stack) {
-        this.stack.stopped = 2;
-    }
-    if (this.events) {
-        this.events.fire('stopped', this);
-    }
-};
-
-/**
- * Prevents the execution of this event's defaultFn
- * @method preventDefault
- */
-CEProto.preventDefault = function() {
-    if (this.preventable) {
-        this.prevented = 1;
-        if (this.stack) {
-            this.stack.prevented = 1;
-        }
-    }
-};
-
-/**
- * Stops the event propagation and prevents the default
- * event behavior.
- * @method halt
- * @param immediate {boolean} if true additional listeners
- * on the current target will not be executed
- */
-CEProto.halt = function(immediate) {
-    if (immediate) {
-        this.stopImmediatePropagation();
-    } else {
-        this.stopPropagation();
-    }
-    this.preventDefault();
-};
-
-/**
- * Registers another EventTarget as a bubble target.  Bubble order
- * is determined by the order registered.  Multiple targets can
- * be specified.
- *
- * Events can only bubble if emitFacade is true.
- *
- * Included in the event-custom-complex submodule.
- *
- * @method addTarget
- * @chainable
- * @param o {EventTarget} the target to add
- * @for EventTarget
- */
-ETProto.addTarget = function(o) {
-    var etState = this._yuievt;
-
-    if (!etState.targets) {
-        etState.targets = {};
-    }
-
-    etState.targets[Y.stamp(o)] = o;
-    etState.hasTargets = true;
-
-    return this;
-};
-
-/**
- * Returns an array of bubble targets for this object.
- * @method getTargets
- * @return EventTarget[]
- */
-ETProto.getTargets = function() {
-    var targets = this._yuievt.targets;
-    return targets ? YObject.values(targets) : [];
-};
-
-/**
- * Removes a bubble target
- * @method removeTarget
- * @chainable
- * @param o {EventTarget} the target to remove
- * @for EventTarget
- */
-ETProto.removeTarget = function(o) {
-    var targets = this._yuievt.targets;
-
-    if (targets) {
-        delete targets[Y.stamp(o, true)];
-
-        if (YObject.size(targets) === 0) {
-            this._yuievt.hasTargets = false;
-        }
-    }
-
-    return this;
-};
-
-/**
- * Propagate an event.  Requires the event-custom-complex module.
- * @method bubble
- * @param evt {CustomEvent} the custom event to propagate
- * @return {boolean} the aggregated return value from Event.Custom.fire
- * @for EventTarget
- */
-ETProto.bubble = function(evt, args, target, es) {
-
-    var targs = this._yuievt.targets,
-        ret = true,
-        t,
-        ce,
-        i,
-        bc,
-        ce2,
-        type = evt && evt.type,
-        originalTarget = target || (evt && evt.target) || this,
-        oldbubble;
-
-    if (!evt || ((!evt.stopped) && targs)) {
-
-        for (i in targs) {
-            if (targs.hasOwnProperty(i)) {
-
-                t = targs[i];
-
-                ce = t._yuievt.events[type];
-
-                if (t._hasSiblings) {
-                    ce2 = t.getSibling(type, ce);
-                }
-
-                if (ce2 && !ce) {
-                    ce = t.publish(type);
-                }
-
-                oldbubble = t._yuievt.bubbling;
-                t._yuievt.bubbling = type;
-
-                // if this event was not published on the bubble target,
-                // continue propagating the event.
-                if (!ce) {
-                    if (t._yuievt.hasTargets) {
-                        t.bubble(evt, args, originalTarget, es);
-                    }
-                } else {
-
-                    if (ce2) {
-                        ce.sibling = ce2;
-                    }
-
-                    // set the original target to that the target payload on the facade is correct.
-                    ce.target = originalTarget;
-                    ce.originalTarget = originalTarget;
-                    ce.currentTarget = t;
-                    bc = ce.broadcast;
-                    ce.broadcast = false;
-
-                    // default publish may not have emitFacade true -- that
-                    // shouldn't be what the implementer meant to do
-                    ce.emitFacade = true;
-
-                    ce.stack = es;
-
-                    // TODO: See what's getting in the way of changing this to use
-                    // the more performant ce._fire(args || evt.details || []).
-
-                    // Something in Widget Parent/Child tests is not happy if we
-                    // change it - maybe evt.details related?
-                    ret = ret && ce.fire.apply(ce, args || evt.details || []);
-
-                    ce.broadcast = bc;
-                    ce.originalTarget = null;
-
-                    // stopPropagation() was called
-                    if (ce.stopped) {
-                        break;
-                    }
-                }
-
-                t._yuievt.bubbling = oldbubble;
-            }
-        }
-    }
-
-    return ret;
-};
-
-/**
- * @method _hasPotentialSubscribers
- * @for EventTarget
- * @private
- * @param {String} fullType The fully prefixed type name
- * @return {boolean} Whether the event has potential subscribers or not
- */
-ETProto._hasPotentialSubscribers = function(fullType) {
-
-    var etState = this._yuievt,
-        e = etState.events[fullType];
-
-    if (e) {
-        return e.hasSubs() || etState.hasTargets  || e.broadcast;
-    } else {
-        return false;
-    }
-};
-
-FACADE = new Y.EventFacade();
-FACADE_KEYS = {};
-
-// Flatten whitelist
-for (key in FACADE) {
-    FACADE_KEYS[key] = true;
-}
-
-
-}, '3.16.0', {"requires": ["event-custom-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('attribute-observable', function (Y, NAME) {
-
-    /*For log lines*/
-    /*jshint maxlen:200*/
-
-
-    /**
-     * The attribute module provides an augmentable Attribute implementation, which
-     * adds configurable attributes and attribute change events to the class being
-     * augmented. It also provides a State class, which is used internally by Attribute,
-     * but can also be used independently to provide a name/property/value data structure to
-     * store state.
-     *
-     * @module attribute
-     */
-
-    /**
-     * The `attribute-observable` submodule provides augmentable attribute change event support
-     * for AttributeCore based implementations.
-     *
-     * @module attribute
-     * @submodule attribute-observable
-     */
-    var EventTarget = Y.EventTarget,
-
-        CHANGE = "Change",
-        BROADCAST = "broadcast";
-
-    /**
-     * Provides an augmentable implementation of attribute change events for
-     * AttributeCore.
-     *
-     * @class AttributeObservable
-     * @extensionfor AttributeCore
-     * @uses EventTarget
-     */
-    function AttributeObservable() {
-        // Perf tweak - avoid creating event literals if not required.
-        this._ATTR_E_FACADE = {};
-
-        EventTarget.call(this, {emitFacade:true});
-    }
-
-    AttributeObservable._ATTR_CFG = [BROADCAST];
-
-    AttributeObservable.prototype = {
-
-        /**
-         * Sets the value of an attribute.
-         *
-         * @method set
-         * @chainable
-         *
-         * @param {String} name The name of the attribute. If the
-         * current value of the attribute is an Object, dot notation can be used
-         * to set the value of a property within the object (e.g. <code>set("x.y.z", 5)</code>).
-         *
-         * @param {Any} value The value to set the attribute to.
-         *
-         * @param {Object} opts (Optional) Optional event data to be mixed into
-         * the event facade passed to subscribers of the attribute's change event. This
-         * can be used as a flexible way to identify the source of a call to set, allowing
-         * the developer to distinguish between set called internally by the host, vs.
-         * set called externally by the application developer.
-         *
-         * @return {Object} A reference to the host object.
-         */
-        set : function(name, val, opts) {
-            return this._setAttr(name, val, opts);
-        },
-
-        /**
-         * Allows setting of readOnly/writeOnce attributes. See <a href="#method_set">set</a> for argument details.
-         *
-         * @method _set
-         * @protected
-         * @chainable
-         *
-         * @param {String} name The name of the attribute.
-         * @param {Any} val The value to set the attribute to.
-         * @param {Object} opts (Optional) Optional event data to be mixed into
-         * the event facade passed to subscribers of the attribute's change event.
-         * @return {Object} A reference to the host object.
-         */
-        _set : function(name, val, opts) {
-            return this._setAttr(name, val, opts, true);
-        },
-
-        /**
-         * Sets multiple attribute values.
-         *
-         * @method setAttrs
-         * @param {Object} attrs  An object with attributes name/value pairs.
-         * @param {Object} opts  Properties to mix into the event payload. These are shared and mixed into each set
-         * @return {Object} A reference to the host object.
-         * @chainable
-         */
-        setAttrs : function(attrs, opts) {
-            return this._setAttrs(attrs, opts);
-        },
-
-        /**
-         * Implementation behind the public setAttrs method, to set multiple attribute values.
-         *
-         * @method _setAttrs
-         * @protected
-         * @param {Object} attrs  An object with attributes name/value pairs.
-         * @param {Object} opts  Properties to mix into the event payload. These are shared and mixed into each set
-         * @return {Object} A reference to the host object.
-         * @chainable
-         */
-        _setAttrs : function(attrs, opts) {
-            var attr;
-            for (attr in attrs) {
-                if ( attrs.hasOwnProperty(attr) ) {
-                    this.set(attr, attrs[attr], opts);
-                }
-            }
-            return this;
-        },
-
-        /**
-         * Utility method to help setup the event payload and fire the attribute change event.
-         *
-         * @method _fireAttrChange
-         * @private
-         * @param {String} attrName The name of the attribute
-         * @param {String} subAttrName The full path of the property being changed,
-         * if this is a sub-attribute value being change. Otherwise null.
-         * @param {Any} currVal The current value of the attribute
-         * @param {Any} newVal The new value of the attribute
-         * @param {Object} opts Any additional event data to mix into the attribute change event's event facade.
-         * @param {Object} [cfg] The attribute config stored in State, if already available.
-         */
-        _fireAttrChange : function(attrName, subAttrName, currVal, newVal, opts, cfg) {
-            var host = this,
-                eventName = this._getFullType(attrName + CHANGE),
-                state = host._state,
-                facade,
-                broadcast,
-                e;
-
-            if (!cfg) {
-                cfg = state.data[attrName] || {};
-            }
-
-            if (!cfg.published) {
-
-                // PERF: Using lower level _publish() for
-                // critical path performance
-                e = host._publish(eventName);
-
-                e.emitFacade = true;
-                e.defaultTargetOnly = true;
-                e.defaultFn = host._defAttrChangeFn;
-
-                broadcast = cfg.broadcast;
-                if (broadcast !== undefined) {
-                    e.broadcast = broadcast;
-                }
-
-                cfg.published = true;
-            }
-
-            if (opts) {
-                facade = Y.merge(opts);
-                facade._attrOpts = opts;
-            } else {
-                facade = host._ATTR_E_FACADE;
-            }
-
-            // Not using the single object signature for fire({type:..., newVal:...}), since
-            // we don't want to override type. Changed to the fire(type, {newVal:...}) signature.
-
-            facade.attrName = attrName;
-            facade.subAttrName = subAttrName;
-            facade.prevVal = currVal;
-            facade.newVal = newVal;
-
-            if (host._hasPotentialSubscribers(eventName)) {
-                host.fire(eventName, facade);
-            } else {
-                this._setAttrVal(attrName, subAttrName, currVal, newVal, opts, cfg);
-            }
-        },
-
-        /**
-         * Default function for attribute change events.
-         *
-         * @private
-         * @method _defAttrChangeFn
-         * @param {EventFacade} e The event object for attribute change events.
-         * @param {boolean} eventFastPath Whether or not we're using this as a fast path in the case of no listeners or not
-         */
-        _defAttrChangeFn : function(e, eventFastPath) {
-
-            var opts = e._attrOpts;
-            if (opts) {
-                delete e._attrOpts;
-            }
-
-            if (!this._setAttrVal(e.attrName, e.subAttrName, e.prevVal, e.newVal, opts)) {
-
-
-                if (!eventFastPath) {
-                    // Prevent "after" listeners from being invoked since nothing changed.
-                    e.stopImmediatePropagation();
-                }
-
-            } else {
-                if (!eventFastPath) {
-                    e.newVal = this.get(e.attrName);
-                }
-            }
-        }
-    };
-
-    // Basic prototype augment - no lazy constructor invocation.
-    Y.mix(AttributeObservable, EventTarget, false, null, 1);
-
-    Y.AttributeObservable = AttributeObservable;
-
-    /**
-    The `AttributeEvents` class extension was deprecated in YUI 3.8.0 and is now
-    an alias for the `AttributeObservable` class extension. Use that class
-    extnesion instead. This alias will be removed in a future version of YUI.
-
-    @class AttributeEvents
-    @uses EventTarget
-    @deprecated Use `AttributeObservable` instead.
-    @see AttributeObservable
-    **/
-    Y.AttributeEvents = AttributeObservable;
-
-
-}, '3.16.0', {"requires": ["event-custom"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('attribute-extras', function (Y, NAME) {
-
-    /**
-     * The attribute module provides an augmentable Attribute implementation, which
-     * adds configurable attributes and attribute change events to the class being
-     * augmented. It also provides a State class, which is used internally by Attribute,
-     * but can also be used independently to provide a name/property/value data structure to
-     * store state.
-     *
-     * @module attribute
-     */
-
-    /**
-     * The attribute-extras submodule provides less commonly used attribute methods, and can
-     * be augmented/mixed into an implemention which used attribute-core.
-     *
-     * @module attribute
-     * @submodule attribute-extras
-     */
-    var BROADCAST = "broadcast",
-        PUBLISHED = "published",
-        INIT_VALUE = "initValue",
-
-        MODIFIABLE = {
-            readOnly:1,
-            writeOnce:1,
-            getter:1,
-            broadcast:1
-        };
-
-    /**
-     * A augmentable implementation for AttributeCore, providing less frequently used
-     * methods for Attribute management such as modifyAttrs(), removeAttr and reset()
-     *
-     * @class AttributeExtras
-     * @extensionfor AttributeCore
-     */
-    function AttributeExtras() {}
-
-    AttributeExtras.prototype = {
-
-        /**
-         * Updates the configuration of an attribute which has already been added.
-         * <p>
-         * The properties which can be modified through this interface are limited
-         * to the following subset of attributes, which can be safely modified
-         * after a value has already been set on the attribute: readOnly, writeOnce,
-         * broadcast and getter.
-         * </p>
-         * @method modifyAttr
-         * @param {String} name The name of the attribute whose configuration is to be updated.
-         * @param {Object} config An object with configuration property/value pairs, specifying the configuration properties to modify.
-         */
-        modifyAttr: function(name, config) {
-            var host = this, // help compression
-                prop, state;
-
-            if (host.attrAdded(name)) {
-
-                if (host._isLazyAttr(name)) {
-                    host._addLazyAttr(name);
-                }
-
-                state = host._state;
-                for (prop in config) {
-                    if (MODIFIABLE[prop] && config.hasOwnProperty(prop)) {
-                        state.add(name, prop, config[prop]);
-
-                        // If we reconfigured broadcast, need to republish
-                        if (prop === BROADCAST) {
-                            state.remove(name, PUBLISHED);
-                        }
-                    }
-                }
-            }
-            /*jshint maxlen:200*/
-            /*jshint maxlen:150 */
-        },
-
-        /**
-         * Removes an attribute from the host object
-         *
-         * @method removeAttr
-         * @param {String} name The name of the attribute to be removed.
-         */
-        removeAttr: function(name) {
-            this._state.removeAll(name);
-        },
-
-        /**
-         * Resets the attribute (or all attributes) to its initial value, as long as
-         * the attribute is not readOnly, or writeOnce.
-         *
-         * @method reset
-         * @param {String} name Optional. The name of the attribute to reset.  If omitted, all attributes are reset.
-         * @return {Object} A reference to the host object.
-         * @chainable
-         */
-        reset : function(name) {
-            var host = this;  // help compression
-
-            if (name) {
-                if (host._isLazyAttr(name)) {
-                    host._addLazyAttr(name);
-                }
-                host.set(name, host._state.get(name, INIT_VALUE));
-            } else {
-                Y.Object.each(host._state.data, function(v, n) {
-                    host.reset(n);
-                });
-            }
-            return host;
-        },
-
-        /**
-         * Returns an object with the configuration properties (and value)
-         * for the given attribute. If attrName is not provided, returns the
-         * configuration properties for all attributes.
-         *
-         * @method _getAttrCfg
-         * @protected
-         * @param {String} name Optional. The attribute name. If not provided, the method will return the configuration for all attributes.
-         * @return {Object} The configuration properties for the given attribute, or all attributes.
-         */
-        _getAttrCfg : function(name) {
-            var o,
-                state = this._state;
-
-            if (name) {
-                o = state.getAll(name) || {};
-            } else {
-                o = {};
-                Y.each(state.data, function(v, n) {
-                    o[n] = state.getAll(n);
-                });
-            }
-
-            return o;
-        }
-    };
-
-    Y.AttributeExtras = AttributeExtras;
-
-
-}, '3.16.0', {"requires": ["oop"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('attribute-base', function (Y, NAME) {
-
-    /**
-     * The attribute module provides an augmentable Attribute implementation, which
-     * adds configurable attributes and attribute change events to the class being
-     * augmented. It also provides a State class, which is used internally by Attribute,
-     * but can also be used independently to provide a name/property/value data structure to
-     * store state.
-     *
-     * @module attribute
-     */
-
-    /**
-     * The attribute-base submodule provides core attribute handling support, with everything
-     * aside from complex attribute handling in the provider's constructor.
-     *
-     * @module attribute
-     * @submodule attribute-base
-     */
-
-    /**
-     * <p>
-     * Attribute provides configurable attribute support along with attribute change events. It is designed to be
-     * augmented on to a host class, and provides the host with the ability to configure attributes to store and retrieve state,
-     * along with attribute change events.
-     * </p>
-     * <p>For example, attributes added to the host can be configured:</p>
-     * <ul>
-     *     <li>As read only.</li>
-     *     <li>As write once.</li>
-     *     <li>With a setter function, which can be used to manipulate
-     *     values passed to Attribute's <a href="#method_set">set</a> method, before they are stored.</li>
-     *     <li>With a getter function, which can be used to manipulate stored values,
-     *     before they are returned by Attribute's <a href="#method_get">get</a> method.</li>
-     *     <li>With a validator function, to validate values before they are stored.</li>
-     * </ul>
-     *
-     * <p>See the <a href="#method_addAttr">addAttr</a> method, for the complete set of configuration
-     * options available for attributes.</p>
-     *
-     * <p><strong>NOTE:</strong> Most implementations will be better off extending the <a href="Base.html">Base</a> class,
-     * instead of augmenting Attribute directly. Base augments Attribute and will handle the initial configuration
-     * of attributes for derived classes, accounting for values passed into the constructor.</p>
-     *
-     * @class Attribute
-     * @param attrs {Object} The attributes to add during construction (passed through to <a href="#method_addAttrs">addAttrs</a>).
-     *        These can also be defined on the constructor being augmented with Attribute by defining the ATTRS property on the constructor.
-     * @param values {Object} The initial attribute values to apply (passed through to <a href="#method_addAttrs">addAttrs</a>).
-     *        These are not merged/cloned. The caller is responsible for isolating user provided values if required.
-     * @param lazy {boolean} Whether or not to add attributes lazily (passed through to <a href="#method_addAttrs">addAttrs</a>).
-     * @uses AttributeCore
-     * @uses AttributeObservable
-     * @uses EventTarget
-     * @uses AttributeExtras
-     */
-    function Attribute() {
-        Y.AttributeCore.apply(this, arguments);
-        Y.AttributeObservable.apply(this, arguments);
-        Y.AttributeExtras.apply(this, arguments);
-    }
-
-    Y.mix(Attribute, Y.AttributeCore, false, null, 1);
-    Y.mix(Attribute, Y.AttributeExtras, false, null, 1);
-
-    // Needs to be `true`, to overwrite methods from AttributeCore
-    Y.mix(Attribute, Y.AttributeObservable, true, null, 1);
-
-    /**
-     * <p>The value to return from an attribute setter in order to prevent the set from going through.</p>
-     *
-     * <p>You can return this value from your setter if you wish to combine validator and setter
-     * functionality into a single setter function, which either returns the massaged value to be stored or
-     * AttributeCore.INVALID_VALUE to prevent invalid values from being stored.</p>
-     *
-     * @property INVALID_VALUE
-     * @type Object
-     * @static
-     * @final
-     */
-    Attribute.INVALID_VALUE = Y.AttributeCore.INVALID_VALUE;
-
-    /**
-     * The list of properties which can be configured for
-     * each attribute (e.g. setter, getter, writeOnce etc.).
-     *
-     * This property is used internally as a whitelist for faster
-     * Y.mix operations.
-     *
-     * @property _ATTR_CFG
-     * @type Array
-     * @static
-     * @protected
-     */
-    Attribute._ATTR_CFG = Y.AttributeCore._ATTR_CFG.concat(Y.AttributeObservable._ATTR_CFG);
-
-    /**
-     * Utility method to protect an attribute configuration hash, by merging the
-     * entire object and the individual attr config objects.
-     *
-     * @method protectAttrs
-     * @static
-     * @param {Object} attrs A hash of attribute to configuration object pairs.
-     * @return {Object} A protected version of the `attrs` argument.
-     */
-    Attribute.protectAttrs = Y.AttributeCore.protectAttrs;
-
-    Y.Attribute = Attribute;
-
-
-}, '3.16.0', {"requires": ["attribute-core", "attribute-observable", "attribute-extras"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('attribute-complex', function (Y, NAME) {
-
-    /**
-     * Adds support for attribute providers to handle complex attributes in the constructor
-     *
-     * @module attribute
-     * @submodule attribute-complex
-     * @for Attribute
-     * @deprecated AttributeComplex's overrides are now part of AttributeCore.
-     */
-
-    var Attribute = Y.Attribute;
-
-    Attribute.Complex = function() {};
-    Attribute.Complex.prototype = {
-
-        /**
-         * Utility method to split out simple attribute name/value pairs ("x")
-         * from complex attribute name/value pairs ("x.y.z"), so that complex
-         * attributes can be keyed by the top level attribute name.
-         *
-         * @method _normAttrVals
-         * @param {Object} valueHash An object with attribute name/value pairs
-         *
-         * @return {Object} An object literal with 2 properties - "simple" and "complex",
-         * containing simple and complex attribute values respectively keyed
-         * by the top level attribute name, or null, if valueHash is falsey.
-         *
-         * @private
-         */
-        _normAttrVals : Attribute.prototype._normAttrVals,
-
-        /**
-         * Returns the initial value of the given attribute from
-         * either the default configuration provided, or the
-         * over-ridden value if it exists in the set of initValues
-         * provided and the attribute is not read-only.
-         *
-         * @param {String} attr The name of the attribute
-         * @param {Object} cfg The attribute configuration object
-         * @param {Object} initValues The object with simple and complex attribute name/value pairs returned from _normAttrVals
-         *
-         * @return {Any} The initial value of the attribute.
-         *
-         * @method _getAttrInitVal
-         * @private
-         */
-        _getAttrInitVal : Attribute.prototype._getAttrInitVal
-
-    };
-
-    // Consistency with the rest of the Attribute addons for now.
-    Y.AttributeComplex = Attribute.Complex;
-
-
-}, '3.16.0', {"requires": ["attribute-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('base-core', function (Y, NAME) {
-
-    /**
-     * The base module provides the Base class, which objects requiring attribute and custom event support can extend.
-     * The module also provides two ways to reuse code - It augments Base with the Plugin.Host interface which provides
-     * plugin support and also provides the BaseCore.build method which provides a way to build custom classes using extensions.
-     *
-     * @module base
-     */
-
-    /**
-     * <p>The base-core module provides the BaseCore class, the lightest version of Base,
-     * which provides Base's basic lifecycle management and ATTRS construction support,
-     * but doesn't fire init/destroy or attribute change events.</p>
-     *
-     * <p>It mixes in AttributeCore, which is the lightest version of Attribute</p>
-     *
-     * @module base
-     * @submodule base-core
-     */
-    var O = Y.Object,
-        L = Y.Lang,
-        DOT = ".",
-        INITIALIZED = "initialized",
-        DESTROYED = "destroyed",
-        INITIALIZER = "initializer",
-        VALUE = "value",
-        OBJECT_CONSTRUCTOR = Object.prototype.constructor,
-        DEEP = "deep",
-        SHALLOW = "shallow",
-        DESTRUCTOR = "destructor",
-
-        AttributeCore = Y.AttributeCore,
-
-        _wlmix = function(r, s, wlhash) {
-            var p;
-            for (p in s) {
-                if(wlhash[p]) {
-                    r[p] = s[p];
-                }
-            }
-            return r;
-        };
-
-    /**
-     * The BaseCore class, is the lightest version of Base, and provides Base's
-     * basic lifecycle management and ATTRS construction support, but doesn't
-     * fire init/destroy or attribute change events.
-     *
-     * BaseCore also handles the chaining of initializer and destructor methods across
-     * the hierarchy as part of object construction and destruction. Additionally, attributes
-     * configured through the static <a href="#property_BaseCore.ATTRS">ATTRS</a>
-     * property for each class in the hierarchy will be initialized by BaseCore.
-     *
-     * Classes which require attribute support, but don't intend to use/expose attribute
-     * change events can extend BaseCore instead of Base for optimal kweight and
-     * runtime performance.
-     *
-     * **3.11.0 BACK COMPAT NOTE FOR COMPONENT DEVELOPERS**
-     *
-     * Prior to version 3.11.0, ATTRS would get added a class at a time. That is:
-     *
-     * <pre>
-     *    for each (class in the hierarchy) {
-     *       Call the class Extension constructors.
-     *
-     *       Add the class ATTRS.
-     *
-     *       Call the class initializer
-     *       Call the class Extension initializers.
-     *    }
-     * </pre>
-     *
-     * As of 3.11.0, ATTRS from all classes in the hierarchy are added in one `addAttrs` call
-     * before **any** initializers are called. That is, the flow becomes:
-     *
-     * <pre>
-     *    for each (class in the hierarchy) {
-     *       Call the class Extension constructors.
-     *    }
-     *
-     *    Add ATTRS for all classes
-     *
-     *    for each (class in the hierarchy) {
-     *       Call the class initializer.
-     *       Call the class Extension initializers.
-     *    }
-     * </pre>
-     *
-     * Adding all ATTRS at once fixes subtle edge-case issues with subclass ATTRS overriding
-     * superclass `setter`, `getter` or `valueFn` definitions and being unable to get/set attributes
-     * defined by the subclass. It also leaves us with a cleaner order of operation flow moving
-     * forward.
-     *
-     * However, it may require component developers to upgrade their components, for the following
-     * scenarios:
-     *
-     * 1. It impacts components which may have `setter`, `getter` or `valueFn` code which
-     * expects a superclass' initializer to have run.
-     *
-     * This is expected to be rare, but to support it, Base now supports a `_preAddAttrs()`, method
-     * hook (same signature as `addAttrs`). Components can implement this method on their prototype
-     * for edge cases which do require finer control over the order in which attributes are added
-     * (see widget-htmlparser for example).
-     *
-     * 2. Extension developers may need to move code from Extension constructors to `initializer`s
-     *
-     * Older extensions, which were written before `initializer` support was added, had a lot of
-     * initialization code in their constructors. For example, code which acccessed superclass
-     * attributes. With the new flow this code would not be able to see attributes. The recommendation
-     * is to move this initialization code to an `initializer` on the Extension, which was the
-     * recommendation for anything created after `initializer` support for Extensions was added.
-     *
-     * @class BaseCore
-     * @constructor
-     * @uses AttributeCore
-     * @param {Object} cfg Object with configuration property name/value pairs.
-     * The object can be used to provide initial values for the objects published
-     * attributes.
-     */
-    function BaseCore(cfg) {
-        if (!this._BaseInvoked) {
-            this._BaseInvoked = true;
-
-            this._initBase(cfg);
-        }
-    }
-
-    /**
-     * The list of properties which can be configured for each attribute
-     * (e.g. setter, getter, writeOnce, readOnly etc.)
-     *
-     * @property _ATTR_CFG
-     * @type Array
-     * @static
-     * @private
-     */
-    BaseCore._ATTR_CFG = AttributeCore._ATTR_CFG.concat("cloneDefaultValue");
-
-    /**
-     * The array of non-attribute configuration properties supported by this class.
-     *
-     * For example `BaseCore` defines a "plugins" configuration property which
-     * should not be set up as an attribute. This property is primarily required so
-     * that when <a href="#property__allowAdHocAttrs">`_allowAdHocAttrs`</a> is enabled by a class,
-     * non-attribute configuration properties don't get added as ad-hoc attributes.
-     *
-     * @property _NON_ATTRS_CFG
-     * @type Array
-     * @static
-     * @private
-     */
-    BaseCore._NON_ATTRS_CFG = ["plugins"];
-
-    /**
-     * This property controls whether or not instances of this class should
-     * allow users to add ad-hoc attributes through the constructor configuration
-     * hash.
-     *
-     * AdHoc attributes are attributes which are not defined by the class, and are
-     * not handled by the MyClass._NON_ATTRS_CFG
-     *
-     * @property _allowAdHocAttrs
-     * @type boolean
-     * @default undefined (false)
-     * @protected
-     */
-
-    /**
-     * The string to be used to identify instances of this class.
-     *
-     * Classes extending BaseCore, should define their own
-     * static NAME property, which should be camelCase by
-     * convention (e.g. MyClass.NAME = "myClass";).
-     *
-     * @property NAME
-     * @type String
-     * @static
-     */
-    BaseCore.NAME = "baseCore";
-
-    /**
-     * The default set of attributes which will be available for instances of this class, and
-     * their configuration. In addition to the configuration properties listed by
-     * AttributeCore's <a href="AttributeCore.html#method_addAttr">addAttr</a> method,
-     * the attribute can also be configured with a "cloneDefaultValue" property, which
-     * defines how the statically defined value field should be protected
-     * ("shallow", "deep" and false are supported values).
-     *
-     * By default if the value is an object literal or an array it will be "shallow"
-     * cloned, to protect the default value.
-     *
-     * @property ATTRS
-     * @type Object
-     * @static
-     */
-    BaseCore.ATTRS = {
-        /**
-         * Flag indicating whether or not this object
-         * has been through the init lifecycle phase.
-         *
-         * @attribute initialized
-         * @readonly
-         * @default false
-         * @type boolean
-         */
-        initialized: {
-            readOnly:true,
-            value:false
-        },
-
-        /**
-         * Flag indicating whether or not this object
-         * has been through the destroy lifecycle phase.
-         *
-         * @attribute destroyed
-         * @readonly
-         * @default false
-         * @type boolean
-         */
-        destroyed: {
-            readOnly:true,
-            value:false
-        }
-    };
-
-    /**
-    Provides a way to safely modify a `Y.BaseCore` subclass' static `ATTRS`
-    after the class has been defined or created.
-
-    BaseCore-based classes cache information about the class hierarchy in order
-    to efficiently create instances. This cache includes includes the aggregated
-    `ATTRS` configs. If the static `ATTRS` configs need to be modified after the
-    class has been defined or create, then use this method which will make sure
-    to clear any cached data before making any modifications.
-
-    @method modifyAttrs
-    @param {Function} [ctor] The constructor function whose `ATTRS` should be
-        modified. If a `ctor` function is not specified, then `this` is assumed
-        to be the constructor which hosts the `ATTRS`.
-    @param {Object} configs The collection of `ATTRS` configs to mix with the
-        existing attribute configurations.
-    @static
-    @since 3.10.0
-    **/
-    BaseCore.modifyAttrs = function (ctor, configs) {
-        // When called without a constructor, assume `this` is the constructor.
-        if (typeof ctor !== 'function') {
-            configs = ctor;
-            ctor    = this;
-        }
-
-        var attrs, attr, name;
-
-        // Eagerly create the `ATTRS` object if it doesn't already exist.
-        attrs = ctor.ATTRS || (ctor.ATTRS = {});
-
-        if (configs) {
-            // Clear cache because it has ATTRS aggregation data which is about
-            // to be modified.
-            ctor._CACHED_CLASS_DATA = null;
-
-            for (name in configs) {
-                if (configs.hasOwnProperty(name)) {
-                    attr = attrs[name] || (attrs[name] = {});
-                    Y.mix(attr, configs[name], true);
-                }
-            }
-        }
-    };
-
-    BaseCore.prototype = {
-
-        /**
-         * Internal construction logic for BaseCore.
-         *
-         * @method _initBase
-         * @param {Object} config The constructor configuration object
-         * @private
-         */
-        _initBase : function(config) {
-
-            Y.stamp(this);
-
-            this._initAttribute(config);
-
-            // If Plugin.Host has been augmented [ through base-pluginhost ], setup it's
-            // initial state, but don't initialize Plugins yet. That's done after initialization.
-            var PluginHost = Y.Plugin && Y.Plugin.Host;
-            if (this._initPlugins && PluginHost) {
-                PluginHost.call(this);
-            }
-
-            if (this._lazyAddAttrs !== false) { this._lazyAddAttrs = true; }
-
-            /**
-             * The string used to identify the class of this object.
-             *
-             * @deprecated Use this.constructor.NAME
-             * @property name
-             * @type String
-             */
-            this.name = this.constructor.NAME;
-
-            this.init.apply(this, arguments);
-        },
-
-        /**
-         * Initializes AttributeCore
-         *
-         * @method _initAttribute
-         * @private
-         */
-        _initAttribute: function() {
-            AttributeCore.call(this);
-        },
-
-        /**
-         * Init lifecycle method, invoked during construction. Sets up attributes
-         * and invokes initializers for the class hierarchy.
-         *
-         * @method init
-         * @chainable
-         * @param {Object} cfg Object with configuration property name/value pairs
-         * @return {BaseCore} A reference to this object
-         */
-        init: function(cfg) {
-
-            this._baseInit(cfg);
-
-            return this;
-        },
-
-        /**
-         * Internal initialization implementation for BaseCore
-         *
-         * @method _baseInit
-         * @private
-         */
-        _baseInit: function(cfg) {
-            this._initHierarchy(cfg);
-
-            if (this._initPlugins) {
-                // Need to initPlugins manually, to handle constructor parsing, static Plug parsing
-                this._initPlugins(cfg);
-            }
-            this._set(INITIALIZED, true);
-        },
-
-        /**
-         * Destroy lifecycle method. Invokes destructors for the class hierarchy.
-         *
-         * @method destroy
-         * @return {BaseCore} A reference to this object
-         * @chainable
-         */
-        destroy: function() {
-            this._baseDestroy();
-            return this;
-        },
-
-        /**
-         * Internal destroy implementation for BaseCore
-         *
-         * @method _baseDestroy
-         * @private
-         */
-        _baseDestroy : function() {
-            if (this._destroyPlugins) {
-                this._destroyPlugins();
-            }
-            this._destroyHierarchy();
-            this._set(DESTROYED, true);
-        },
-
-        /**
-         * Returns the class hierarchy for this object, with BaseCore being the last class in the array.
-         *
-         * @method _getClasses
-         * @protected
-         * @return {Function[]} An array of classes (constructor functions), making up the class hierarchy for this object.
-         * This value is cached the first time the method, or _getAttrCfgs, is invoked. Subsequent invocations return the
-         * cached value.
-         */
-        _getClasses : function() {
-            if (!this._classes) {
-                this._initHierarchyData();
-            }
-            return this._classes;
-        },
-
-        /**
-         * Returns an aggregated set of attribute configurations, by traversing
-         * the class hierarchy.
-         *
-         * @method _getAttrCfgs
-         * @protected
-         * @return {Object} The hash of attribute configurations, aggregated across classes in the hierarchy
-         * This value is cached the first time the method, or _getClasses, is invoked. Subsequent invocations return
-         * the cached value.
-         */
-        _getAttrCfgs : function() {
-            if (!this._attrs) {
-                this._initHierarchyData();
-            }
-            return this._attrs;
-        },
-
-        /**
-         * A helper method used to isolate the attrs config for this instance to pass to `addAttrs`,
-         * from the static cached ATTRS for the class.
-         *
-         * @method _getInstanceAttrCfgs
-         * @private
-         *
-         * @param {Object} allCfgs The set of all attribute configurations for this instance.
-         * Attributes will be removed from this set, if they belong to the filtered class, so
-         * that by the time all classes are processed, allCfgs will be empty.
-         *
-         * @return {Object} The set of attributes to be added for this instance, suitable
-         * for passing through to `addAttrs`.
-         */
-        _getInstanceAttrCfgs : function(allCfgs) {
-
-            var cfgs = {},
-                cfg,
-                val,
-                subAttr,
-                subAttrs,
-                subAttrPath,
-                attr,
-                attrCfg,
-                allSubAttrs = allCfgs._subAttrs,
-                attrCfgProperties = this._attrCfgHash();
-
-            for (attr in allCfgs) {
-
-                if (allCfgs.hasOwnProperty(attr) && attr !== "_subAttrs") {
-
-                    attrCfg = allCfgs[attr];
-
-                    // Need to isolate from allCfgs, because we're going to set values etc.
-                    cfg = cfgs[attr] = _wlmix({}, attrCfg, attrCfgProperties);
-
-                    val = cfg.value;
-
-                    if (val && (typeof val === "object")) {
-                        this._cloneDefaultValue(attr, cfg);
-                    }
-
-                    if (allSubAttrs && allSubAttrs.hasOwnProperty(attr)) {
-                        subAttrs = allCfgs._subAttrs[attr];
-
-                        for (subAttrPath in subAttrs) {
-                            subAttr = subAttrs[subAttrPath];
-
-                            if (subAttr.path) {
-                                O.setValue(cfg.value, subAttr.path, subAttr.value);
-                            }
-                        }
-                    }
-                }
-            }
-
-            return cfgs;
-        },
-
-        /**
-         * @method _filterAdHocAttrs
-         * @private
-         *
-         * @param {Object} allAttrs The set of all attribute configurations for this instance.
-         * Attributes will be removed from this set, if they belong to the filtered class, so
-         * that by the time all classes are processed, allCfgs will be empty.
-         * @param {Object} userVals The config object passed in by the user, from which adhoc attrs are to be filtered.
-         * @return {Object} The set of adhoc attributes passed in, in the form
-         * of an object with attribute name/configuration pairs.
-         */
-        _filterAdHocAttrs : function(allAttrs, userVals) {
-            var adHocs,
-                nonAttrs = this._nonAttrs,
-                attr;
-
-            if (userVals) {
-                adHocs = {};
-                for (attr in userVals) {
-                    if (!allAttrs[attr] && !nonAttrs[attr] && userVals.hasOwnProperty(attr)) {
-                        adHocs[attr] = {
-                            value:userVals[attr]
-                        };
-                    }
-                }
-            }
-
-            return adHocs;
-        },
-
-        /**
-         * A helper method used by _getClasses and _getAttrCfgs, which determines both
-         * the array of classes and aggregate set of attribute configurations
-         * across the class hierarchy for the instance.
-         *
-         * @method _initHierarchyData
-         * @private
-         */
-        _initHierarchyData : function() {
-
-            var ctor = this.constructor,
-                cachedClassData = ctor._CACHED_CLASS_DATA,
-                c,
-                i,
-                l,
-                attrCfg,
-                attrCfgHash,
-                needsAttrCfgHash = !ctor._ATTR_CFG_HASH,
-                nonAttrsCfg,
-                nonAttrs = {},
-                classes = [],
-                attrs = [];
-
-            // Start with `this` instance's constructor.
-            c = ctor;
-
-            if (!cachedClassData) {
-
-                while (c) {
-                    // Add to classes
-                    classes[classes.length] = c;
-
-                    // Add to attributes
-                    if (c.ATTRS) {
-                        attrs[attrs.length] = c.ATTRS;
-                    }
-
-                    // Aggregate ATTR cfg whitelist.
-                    if (needsAttrCfgHash) {
-                        attrCfg     = c._ATTR_CFG;
-                        attrCfgHash = attrCfgHash || {};
-
-                        if (attrCfg) {
-                            for (i = 0, l = attrCfg.length; i < l; i += 1) {
-                                attrCfgHash[attrCfg[i]] = true;
-                            }
-                        }
-                    }
-
-                    // Commenting out the if. We always aggregate, since we don't
-                    // know if we'll be needing this on the instance or not.
-                    // if (this._allowAdHocAttrs) {
-                        nonAttrsCfg = c._NON_ATTRS_CFG;
-                        if (nonAttrsCfg) {
-                            for (i = 0, l = nonAttrsCfg.length; i < l; i++) {
-                                nonAttrs[nonAttrsCfg[i]] = true;
-                            }
-                        }
-                    //}
-
-                    c = c.superclass ? c.superclass.constructor : null;
-                }
-
-                // Cache computed `_ATTR_CFG_HASH` on the constructor.
-                if (needsAttrCfgHash) {
-                    ctor._ATTR_CFG_HASH = attrCfgHash;
-                }
-
-                cachedClassData = ctor._CACHED_CLASS_DATA = {
-                    classes : classes,
-                    nonAttrs : nonAttrs,
-                    attrs : this._aggregateAttrs(attrs)
-                };
-
-            }
-
-            this._classes = cachedClassData.classes;
-            this._attrs = cachedClassData.attrs;
-            this._nonAttrs = cachedClassData.nonAttrs;
-        },
-
-        /**
-         * Utility method to define the attribute hash used to filter/whitelist property mixes for
-         * this class for iteration performance reasons.
-         *
-         * @method _attrCfgHash
-         * @private
-         */
-        _attrCfgHash: function() {
-            return this.constructor._ATTR_CFG_HASH;
-        },
-
-        /**
-         * This method assumes that the value has already been checked to be an object.
-         * Since it's on a critical path, we don't want to re-do the check.
-         *
-         * @method _cloneDefaultValue
-         * @param {Object} cfg
-         * @private
-         */
-        _cloneDefaultValue : function(attr, cfg) {
-
-            var val = cfg.value,
-                clone = cfg.cloneDefaultValue;
-
-            if (clone === DEEP || clone === true) {
-                cfg.value = Y.clone(val);
-            } else if (clone === SHALLOW) {
-                cfg.value = Y.merge(val);
-            } else if ((clone === undefined && (OBJECT_CONSTRUCTOR === val.constructor || L.isArray(val)))) {
-                cfg.value = Y.clone(val);
-            }
-            // else if (clone === false), don't clone the static default value.
-            // It's intended to be used by reference.
-        },
-
-        /**
-         * A helper method, used by _initHierarchyData to aggregate
-         * attribute configuration across the instances class hierarchy.
-         *
-         * The method will protect the attribute configuration value to protect the statically defined
-         * default value in ATTRS if required (if the value is an object literal, array or the
-         * attribute configuration has cloneDefaultValue set to shallow or deep).
-         *
-         * @method _aggregateAttrs
-         * @private
-         * @param {Array} allAttrs An array of ATTRS definitions across classes in the hierarchy
-         * (subclass first, Base last)
-         * @return {Object} The aggregate set of ATTRS definitions for the instance
-         */
-        _aggregateAttrs : function(allAttrs) {
-
-            var attr,
-                attrs,
-                subAttrsHash,
-                cfg,
-                path,
-                i,
-                cfgPropsHash = this._attrCfgHash(),
-                aggAttr,
-                aggAttrs = {};
-
-            if (allAttrs) {
-                for (i = allAttrs.length-1; i >= 0; --i) {
-
-                    attrs = allAttrs[i];
-
-                    for (attr in attrs) {
-                        if (attrs.hasOwnProperty(attr)) {
-
-                            // PERF TODO: Do we need to merge here, since we're merging later in getInstanceAttrCfgs
-                            // Should we move this down to only merge if we hit the path or valueFn ifs below?
-                            cfg = _wlmix({}, attrs[attr], cfgPropsHash);
-
-                            path = null;
-                            if (attr.indexOf(DOT) !== -1) {
-                                path = attr.split(DOT);
-                                attr = path.shift();
-                            }
-
-                            aggAttr = aggAttrs[attr];
-
-                            if (path && aggAttr && aggAttr.value) {
-
-                                subAttrsHash = aggAttrs._subAttrs;
-
-                                if (!subAttrsHash) {
-                                    subAttrsHash = aggAttrs._subAttrs = {};
-                                }
-
-                                if (!subAttrsHash[attr]) {
-                                    subAttrsHash[attr] = {};
-                                }
-
-                                subAttrsHash[attr][path.join(DOT)] = {
-                                    value: cfg.value,
-                                    path : path
-                                };
-
-                            } else if (!path) {
-
-                                if (!aggAttr) {
-                                    aggAttrs[attr] = cfg;
-                                } else {
-                                    if (aggAttr.valueFn && VALUE in cfg) {
-                                        aggAttr.valueFn = null;
-                                    }
-
-                                    // Mix into existing config.
-                                    _wlmix(aggAttr, cfg, cfgPropsHash);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return aggAttrs;
-        },
-
-        /**
-         * Initializes the class hierarchy for the instance, which includes
-         * initializing attributes for each class defined in the class's
-         * static <a href="#property_BaseCore.ATTRS">ATTRS</a> property and
-         * invoking the initializer method on the prototype of each class in the hierarchy.
-         *
-         * @method _initHierarchy
-         * @param {Object} userVals Object with configuration property name/value pairs
-         * @private
-         */
-        _initHierarchy : function(userVals) {
-
-            var lazy = this._lazyAddAttrs,
-                constr,
-                constrProto,
-                i,
-                l,
-                ci,
-                ei,
-                el,
-                ext,
-                extProto,
-                exts,
-                instanceAttrs,
-                initializers = [],
-                classes = this._getClasses(),
-                attrCfgs = this._getAttrCfgs(),
-                cl = classes.length - 1;
-
-            // Constructors
-            for (ci = cl; ci >= 0; ci--) {
-
-                constr = classes[ci];
-                constrProto = constr.prototype;
-                exts = constr._yuibuild && constr._yuibuild.exts;
-
-                // Using INITIALIZER in hasOwnProperty check, for performance reasons (helps IE6 avoid GC thresholds when
-                // referencing string literals). Not using it in apply, again, for performance "." is faster.
-
-                if (constrProto.hasOwnProperty(INITIALIZER)) {
-                    // Store initializer while we're here and looping
-                    initializers[initializers.length] = constrProto.initializer;
-                }
-
-                if (exts) {
-                    for (ei = 0, el = exts.length; ei < el; ei++) {
-
-                        ext = exts[ei];
-
-                        // Ext Constructor
-                        ext.apply(this, arguments);
-
-                        extProto = ext.prototype;
-                        if (extProto.hasOwnProperty(INITIALIZER)) {
-                            // Store initializer while we're here and looping
-                            initializers[initializers.length] = extProto.initializer;
-                        }
-                    }
-                }
-            }
-
-            // ATTRS
-            instanceAttrs = this._getInstanceAttrCfgs(attrCfgs);
-
-            if (this._preAddAttrs) {
-                this._preAddAttrs(instanceAttrs, userVals, lazy);
-            }
-
-            if (this._allowAdHocAttrs) {
-                this.addAttrs(this._filterAdHocAttrs(attrCfgs, userVals), userVals, lazy);
-            }
-
-            this.addAttrs(instanceAttrs, userVals, lazy);
-
-            // Initializers
-            for (i = 0, l = initializers.length; i < l; i++) {
-                initializers[i].apply(this, arguments);
-            }
-        },
-
-        /**
-         * Destroys the class hierarchy for this instance by invoking
-         * the destructor method on the prototype of each class in the hierarchy.
-         *
-         * @method _destroyHierarchy
-         * @private
-         */
-        _destroyHierarchy : function() {
-            var constr,
-                constrProto,
-                ci, cl, ei, el, exts, extProto,
-                classes = this._getClasses();
-
-            for (ci = 0, cl = classes.length; ci < cl; ci++) {
-                constr = classes[ci];
-                constrProto = constr.prototype;
-                exts = constr._yuibuild && constr._yuibuild.exts;
-
-                if (exts) {
-                    for (ei = 0, el = exts.length; ei < el; ei++) {
-                        extProto = exts[ei].prototype;
-                        if (extProto.hasOwnProperty(DESTRUCTOR)) {
-                            extProto.destructor.apply(this, arguments);
-                        }
-                    }
-                }
-
-                if (constrProto.hasOwnProperty(DESTRUCTOR)) {
-                    constrProto.destructor.apply(this, arguments);
-                }
-            }
-        },
-
-        /**
-         * Default toString implementation. Provides the constructor NAME
-         * and the instance guid, if set.
-         *
-         * @method toString
-         * @return {String} String representation for this object
-         */
-        toString: function() {
-            return this.name + "[" + Y.stamp(this, true) + "]";
-        }
-    };
-
-    // Straightup augment, no wrapper functions
-    Y.mix(BaseCore, AttributeCore, false, null, 1);
-
-    // Fix constructor
-    BaseCore.prototype.constructor = BaseCore;
-
-    Y.BaseCore = BaseCore;
-
-
-}, '3.16.0', {"requires": ["attribute-core"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('base-observable', function (Y, NAME) {
-
-    /**
-    The `base-observable` submodule adds observability to Base's lifecycle and
-    attributes, and also make it an `EventTarget`.
-
-    @module base
-    @submodule base-observable
-    **/
-    var L = Y.Lang,
-
-        DESTROY = "destroy",
-        INIT = "init",
-
-        BUBBLETARGETS = "bubbleTargets",
-        _BUBBLETARGETS = "_bubbleTargets",
-
-        AttributeObservable = Y.AttributeObservable,
-        BaseCore            = Y.BaseCore;
-
-    /**
-    Provides an augmentable implementation of lifecycle and attribute events for
-    `BaseCore`.
-
-    @class BaseObservable
-    @extensionfor BaseCore
-    @uses AttributeObservable
-    @uses EventTarget
-    @since 3.8.0
-    **/
-    function BaseObservable() {}
-
-    BaseObservable._ATTR_CFG      = AttributeObservable._ATTR_CFG.concat();
-    BaseObservable._NON_ATTRS_CFG = ["on", "after", "bubbleTargets"];
-
-    BaseObservable.prototype = {
-
-        /**
-         * Initializes Attribute
-         *
-         * @method _initAttribute
-         * @private
-         */
-        _initAttribute: function() {
-            BaseCore.prototype._initAttribute.apply(this, arguments);
-            AttributeObservable.call(this);
-
-            this._eventPrefix = this.constructor.EVENT_PREFIX || this.constructor.NAME;
-            this._yuievt.config.prefix = this._eventPrefix;
-        },
-
-        /**
-         * Init lifecycle method, invoked during construction.
-         * Fires the init event prior to setting up attributes and
-         * invoking initializers for the class hierarchy.
-         *
-         * @method init
-         * @chainable
-         * @param {Object} config Object with configuration property name/value pairs
-         * @return {Base} A reference to this object
-         */
-        init: function(config) {
-
-            /**
-             * <p>
-             * Lifecycle event for the init phase, fired prior to initialization.
-             * Invoking the preventDefault() method on the event object provided
-             * to subscribers will prevent initialization from occuring.
-             * </p>
-             * <p>
-             * Subscribers to the "after" momemt of this event, will be notified
-             * after initialization of the object is complete (and therefore
-             * cannot prevent initialization).
-             * </p>
-             *
-             * @event init
-             * @preventable _defInitFn
-             * @param {EventFacade} e Event object, with a cfg property which
-             * refers to the configuration object passed to the constructor.
-             */
-
-            // PERF: Using lower level _publish() for
-            // critical path performance
-
-            var type = this._getFullType(INIT),
-                e = this._publish(type);
-
-            e.emitFacade = true;
-            e.fireOnce = true;
-            e.defaultTargetOnly = true;
-            e.defaultFn = this._defInitFn;
-
-            this._preInitEventCfg(config);
-
-            if (e._hasPotentialSubscribers()) {
-                this.fire(type, {cfg: config});
-            } else {
-
-                this._baseInit(config);
-
-                // HACK. Major hack actually. But really fast for no-listeners.
-                // Since it's fireOnce, subscribers may come along later, so since we're
-                // bypassing the event stack the first time, we need to tell the published
-                // event that it's been "fired". Could extract it into a CE method?
-                e.fired = true;
-                e.firedWith = [{cfg:config}];
-            }
-
-            return this;
-        },
-
-        /**
-         * Handles the special on, after and target properties which allow the user to
-         * easily configure on and after listeners as well as bubble targets during
-         * construction, prior to init.
-         *
-         * @private
-         * @method _preInitEventCfg
-         * @param {Object} config The user configuration object
-         */
-        _preInitEventCfg : function(config) {
-            if (config) {
-                if (config.on) {
-                    this.on(config.on);
-                }
-                if (config.after) {
-                    this.after(config.after);
-                }
-            }
-
-            var i, l, target,
-                userTargets = (config && BUBBLETARGETS in config);
-
-            if (userTargets || _BUBBLETARGETS in this) {
-                target = userTargets ? (config && config.bubbleTargets) : this._bubbleTargets;
-
-                if (L.isArray(target)) {
-                    for (i = 0, l = target.length; i < l; i++) {
-                        this.addTarget(target[i]);
-                    }
-                } else if (target) {
-                    this.addTarget(target);
-                }
-            }
-        },
-
-        /**
-         * <p>
-         * Destroy lifecycle method. Fires the destroy
-         * event, prior to invoking destructors for the
-         * class hierarchy.
-         * </p>
-         * <p>
-         * Subscribers to the destroy
-         * event can invoke preventDefault on the event object, to prevent destruction
-         * from proceeding.
-         * </p>
-         * @method destroy
-         * @return {Base} A reference to this object
-         * @chainable
-         */
-        destroy: function() {
-
-            /**
-             * <p>
-             * Lifecycle event for the destroy phase,
-             * fired prior to destruction. Invoking the preventDefault
-             * method on the event object provided to subscribers will
-             * prevent destruction from proceeding.
-             * </p>
-             * <p>
-             * Subscribers to the "after" moment of this event, will be notified
-             * after destruction is complete (and as a result cannot prevent
-             * destruction).
-             * </p>
-             * @event destroy
-             * @preventable _defDestroyFn
-             * @param {EventFacade} e Event object
-             */
-            this.publish(DESTROY, {
-                fireOnce:true,
-                defaultTargetOnly:true,
-                defaultFn: this._defDestroyFn
-            });
-            this.fire(DESTROY);
-
-            this.detachAll();
-            return this;
-        },
-
-        /**
-         * Default init event handler
-         *
-         * @method _defInitFn
-         * @param {EventFacade} e Event object, with a cfg property which
-         * refers to the configuration object passed to the constructor.
-         * @protected
-         */
-        _defInitFn : function(e) {
-            this._baseInit(e.cfg);
-        },
-
-        /**
-         * Default destroy event handler
-         *
-         * @method _defDestroyFn
-         * @param {EventFacade} e Event object
-         * @protected
-         */
-        _defDestroyFn : function(e) {
-            this._baseDestroy(e.cfg);
-        }
-    };
-
-    Y.mix(BaseObservable, AttributeObservable, false, null, 1);
-
-    Y.BaseObservable = BaseObservable;
-
-
-}, '3.16.0', {"requires": ["attribute-observable", "base-core"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('base-base', function (Y, NAME) {
-
-    /**
-     * The base module provides the Base class, which objects requiring attribute and custom event support can extend.
-     * The module also provides two ways to reuse code - It augments Base with the Plugin.Host interface which provides
-     * plugin support and also provides the BaseCore.build method which provides a way to build custom classes using extensions.
-     *
-     * @module base
-     */
-
-    /**
-     * The base-base submodule provides the Base class without the Plugin support, provided by Plugin.Host,
-     * and without the extension support provided by BaseCore.build.
-     *
-     * @module base
-     * @submodule base-base
-     */
-
-    var AttributeCore   = Y.AttributeCore,
-        AttributeExtras = Y.AttributeExtras,
-        BaseCore        = Y.BaseCore,
-        BaseObservable  = Y.BaseObservable;
-
-    /**
-     * <p>
-     * A base class which objects requiring attributes and custom event support can
-     * extend. Base also handles the chaining of initializer and destructor methods across
-     * the hierarchy as part of object construction and destruction. Additionally, attributes configured
-     * through the static <a href="#property_ATTRS">ATTRS</a> property for each class
-     * in the hierarchy will be initialized by Base.
-     * </p>
-     *
-     * <p>
-     * **NOTE:** Prior to version 3.11.0, ATTRS would get added a class at a time. That is,
-     * Base would loop through each class in the hierarchy, and add the class' ATTRS, and
-     * then call it's initializer, and move on to the subclass' ATTRS and initializer. As of
-     * 3.11.0, ATTRS from all classes in the hierarchy are added in one `addAttrs` call before
-     * any initializers are called. This fixes subtle edge-case issues with subclass ATTRS overriding
-     * superclass `setter`, `getter` or `valueFn` definitions and being unable to get/set attributes
-     * defined by the subclass. This order of operation change may impact `setter`, `getter` or `valueFn`
-     * code which expects a superclass' initializer to have run. This is expected to be rare, but to support
-     * it, Base supports a `_preAddAttrs()`, method hook (same signature as `addAttrs`). Components can
-     * implement this method on their prototype for edge cases which do require finer control over
-     * the order in which attributes are added (see widget-htmlparser).
-     * </p>
-     *
-     * <p>
-     * The static <a href="#property_NAME">NAME</a> property of each class extending
-     * from Base will be used as the identifier for the class, and is used by Base to prefix
-     * all events fired by instances of that class.
-     * </p>
-     *
-     * @class Base
-     * @constructor
-     * @uses BaseCore
-     * @uses BaseObservable
-     * @uses AttributeCore
-     * @uses AttributeObservable
-     * @uses AttributeExtras
-     * @uses EventTarget
-     *
-     * @param {Object} config Object with configuration property name/value pairs. The object can be
-     * used to provide default values for the objects published attributes.
-     *
-     * <p>
-     * The config object can also contain the following non-attribute properties, providing a convenient
-     * way to configure events listeners and plugins for the instance, as part of the constructor call:
-     * </p>
-     *
-     * <dl>
-     *   <dt>on</dt>
-     *   <dd>An event name to listener function map, to register event listeners for the "on" moment of the event.
-     *       A constructor convenience property for the <a href="Base.html#method_on">on</a> method.</dd>
-     *   <dt>after</dt>
-     *   <dd>An event name to listener function map, to register event listeners for the "after" moment of the event.
-     *       A constructor convenience property for the <a href="Base.html#method_after">after</a> method.</dd>
-     *   <dt>bubbleTargets</dt>
-     *   <dd>An object, or array of objects, to register as bubble targets for bubbled events fired by this instance.
-     *       A constructor convenience property for the <a href="EventTarget.html#method_addTarget">addTarget</a> method.</dd>
-     *   <dt>plugins</dt>
-     *   <dd>A plugin, or array of plugins to be plugged into the instance (see PluginHost's plug method for signature details).
-     *       A constructor convenience property for the <a href="Plugin.Host.html#method_plug">plug</a> method.</dd>
-     * </dl>
-     */
-    function Base() {
-        BaseCore.apply(this, arguments);
-        BaseObservable.apply(this, arguments);
-        AttributeExtras.apply(this, arguments);
-    }
-
-    /**
-     * The list of properties which can be configured for
-     * each attribute (e.g. setter, getter, writeOnce, readOnly etc.)
-     *
-     * @property _ATTR_CFG
-     * @type Array
-     * @static
-     * @private
-     */
-    Base._ATTR_CFG = BaseCore._ATTR_CFG.concat(BaseObservable._ATTR_CFG);
-
-    /**
-     * The array of non-attribute configuration properties supported by this class.
-     *
-     * `Base` supports "on", "after", "plugins" and "bubbleTargets" properties,
-     * which are not set up as attributes.
-     *
-     * This property is primarily required so that when
-     * <a href="#property__allowAdHocAttrs">`_allowAdHocAttrs`</a> is enabled by
-     * a class, non-attribute configurations don't get added as ad-hoc attributes.
-     *
-     * @property _NON_ATTRS_CFG
-     * @type Array
-     * @static
-     * @private
-     */
-    Base._NON_ATTRS_CFG = BaseCore._NON_ATTRS_CFG.concat(BaseObservable._NON_ATTRS_CFG);
-
-    /**
-     * <p>
-     * The string to be used to identify instances of
-     * this class, for example in prefixing events.
-     * </p>
-     * <p>
-     * Classes extending Base, should define their own
-     * static NAME property, which should be camelCase by
-     * convention (e.g. MyClass.NAME = "myClass";).
-     * </p>
-     * @property NAME
-     * @type String
-     * @static
-     */
-    Base.NAME = 'base';
-
-    /**
-     * The default set of attributes which will be available for instances of this class, and
-     * their configuration. In addition to the configuration properties listed by
-     * Attribute's <a href="Attribute.html#method_addAttr">addAttr</a> method, the attribute
-     * can also be configured with a "cloneDefaultValue" property, which defines how the statically
-     * defined value field should be protected ("shallow", "deep" and false are supported values).
-     *
-     * By default if the value is an object literal or an array it will be "shallow" cloned, to
-     * protect the default value.
-     *
-     * @property ATTRS
-     * @type Object
-     * @static
-     */
-    Base.ATTRS = AttributeCore.protectAttrs(BaseCore.ATTRS);
-
-    /**
-    Provides a way to safely modify a `Y.Base` subclass' static `ATTRS` after
-    the class has been defined or created.
-
-    Base-based classes cache information about the class hierarchy in order to
-    efficiently create instances. This cache includes includes the aggregated
-    `ATTRS` configs. If the static `ATTRS` configs need to be modified after the
-    class has been defined or create, then use this method which will make sure
-    to clear any cached data before making any modifications.
-
-    @method modifyAttrs
-    @param {Function} [ctor] The constructor function whose `ATTRS` should be
-        modified. If a `ctor` function is not specified, then `this` is assumed
-        to be the constructor which hosts the `ATTRS`.
-    @param {Object} configs The collection of `ATTRS` configs to mix with the
-        existing attribute configurations.
-    @static
-    @since 3.10.0
-    **/
-    Base.modifyAttrs = BaseCore.modifyAttrs;
-
-    Y.mix(Base, BaseCore, false, null, 1);
-    Y.mix(Base, AttributeExtras, false, null, 1);
-
-    // Needs to be `true`, to overwrite methods from `BaseCore`.
-    Y.mix(Base, BaseObservable, true, null, 1);
-
-    // Fix constructor
-    Base.prototype.constructor = Base;
-
-    Y.Base = Base;
-
-
-}, '3.16.0', {"requires": ["attribute-base", "base-core", "base-observable"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('pluginhost-base', function (Y, NAME) {
-
-    /**
-     * Provides the augmentable PluginHost interface, which can be added to any class.
-     * @module pluginhost
-     */
-
-    /**
-     * Provides the augmentable PluginHost interface, which can be added to any class.
-     * @module pluginhost-base
-     */
-
-    /**
-     * <p>
-     * An augmentable class, which provides the augmented class with the ability to host plugins.
-     * It adds <a href="#method_plug">plug</a> and <a href="#method_unplug">unplug</a> methods to the augmented class, which can
-     * be used to add or remove plugins from instances of the class.
-     * </p>
-     *
-     * <p>Plugins can also be added through the constructor configuration object passed to the host class' constructor using
-     * the "plugins" property. Supported values for the "plugins" property are those defined by the <a href="#method_plug">plug</a> method.
-     *
-     * For example the following code would add the AnimPlugin and IOPlugin to Overlay (the plugin host):
-     * <xmp>
-     * var o = new Overlay({plugins: [ AnimPlugin, {fn:IOPlugin, cfg:{section:"header"}}]});
-     * </xmp>
-     * </p>
-     * <p>
-     * Plug.Host's protected <a href="#method_initPlugins">_initPlugins</a> and <a href="#method_destroyPlugins">_destroyPlugins</a>
-     * methods should be invoked by the host class at the appropriate point in the host's lifecyle.
-     * </p>
-     *
-     * @class Plugin.Host
-     */
-
-    var L = Y.Lang;
-
-    function PluginHost() {
-        this._plugins = {};
-    }
-
-    PluginHost.prototype = {
-
-        /**
-         * Adds a plugin to the host object. This will instantiate the
-         * plugin and attach it to the configured namespace on the host object.
-         *
-         * @method plug
-         * @chainable
-         * @param P {Function | Object |Array} Accepts the plugin class, or an
-         * object with a "fn" property specifying the plugin class and
-         * a "cfg" property specifying the configuration for the Plugin.
-         * <p>
-         * Additionally an Array can also be passed in, with the above function or
-         * object values, allowing the user to add multiple plugins in a single call.
-         * </p>
-         * @param config (Optional) If the first argument is the plugin class, the second argument
-         * can be the configuration for the plugin.
-         * @return {Base} A reference to the host object
-         */
-        plug: function(Plugin, config) {
-            var i, ln, ns;
-
-            if (L.isArray(Plugin)) {
-                for (i = 0, ln = Plugin.length; i < ln; i++) {
-                    this.plug(Plugin[i]);
-                }
-            } else {
-                if (Plugin && !L.isFunction(Plugin)) {
-                    config = Plugin.cfg;
-                    Plugin = Plugin.fn;
-                }
-
-                // Plugin should be fn by now
-                if (Plugin && Plugin.NS) {
-                    ns = Plugin.NS;
-
-                    config = config || {};
-                    config.host = this;
-
-                    if (this.hasPlugin(ns)) {
-                        // Update config
-                        if (this[ns].setAttrs) {
-                            this[ns].setAttrs(config);
-                        }
-                    } else {
-                        // Create new instance
-                        this[ns] = new Plugin(config);
-                        this._plugins[ns] = Plugin;
-                    }
-                }
-            }
-            return this;
-        },
-
-        /**
-         * Removes a plugin from the host object. This will destroy the
-         * plugin instance and delete the namespace from the host object.
-         *
-         * @method unplug
-         * @param {String | Function} plugin The namespace of the plugin, or the plugin class with the static NS namespace property defined. If not provided,
-         * all registered plugins are unplugged.
-         * @return {Base} A reference to the host object
-         * @chainable
-         */
-        unplug: function(plugin) {
-            var ns = plugin,
-                plugins = this._plugins;
-
-            if (plugin) {
-                if (L.isFunction(plugin)) {
-                    ns = plugin.NS;
-                    if (ns && (!plugins[ns] || plugins[ns] !== plugin)) {
-                        ns = null;
-                    }
-                }
-
-                if (ns) {
-                    if (this[ns]) {
-                        if (this[ns].destroy) {
-                            this[ns].destroy();
-                        }
-                        delete this[ns];
-                    }
-                    if (plugins[ns]) {
-                        delete plugins[ns];
-                    }
-                }
-            } else {
-                for (ns in this._plugins) {
-                    if (this._plugins.hasOwnProperty(ns)) {
-                        this.unplug(ns);
-                    }
-                }
-            }
-            return this;
-        },
-
-        /**
-         * Determines if a plugin has plugged into this host.
-         *
-         * @method hasPlugin
-         * @param {String} ns The plugin's namespace
-         * @return {Plugin} Returns a truthy value (the plugin instance) if present, or undefined if not.
-         */
-        hasPlugin : function(ns) {
-            return (this._plugins[ns] && this[ns]);
-        },
-
-        /**
-         * Initializes static plugins registered on the host (using the
-         * Base.plug static method) and any plugins passed to the
-         * instance through the "plugins" configuration property.
-         *
-         * @method _initPlugins
-         * @param {Object} config The configuration object with property name/value pairs.
-         * @private
-         */
-
-        _initPlugins: function(config) {
-            this._plugins = this._plugins || {};
-
-            if (this._initConfigPlugins) {
-                this._initConfigPlugins(config);
-            }
-        },
-
-        /**
-         * Unplugs and destroys all plugins on the host
-         * @method _destroyPlugins
-         * @private
-         */
-        _destroyPlugins: function() {
-            this.unplug();
-        }
-    };
-
-    Y.namespace("Plugin").Host = PluginHost;
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('pluginhost-config', function (Y, NAME) {
-
-    /**
-     * Adds pluginhost constructor configuration and static configuration support
-     * @submodule pluginhost-config
-     */
-
-    var PluginHost = Y.Plugin.Host,
-        L = Y.Lang;
-
-    /**
-     * A protected initialization method, used by the host class to initialize
-     * plugin configurations passed the constructor, through the config object.
-     *
-     * Host objects should invoke this method at the appropriate time in their
-     * construction lifecycle.
-     *
-     * @method _initConfigPlugins
-     * @param {Object} config The configuration object passed to the constructor
-     * @protected
-     * @for Plugin.Host
-     */
-    PluginHost.prototype._initConfigPlugins = function(config) {
-
-        // Class Configuration
-        var classes = (this._getClasses) ? this._getClasses() : [this.constructor],
-            plug = [],
-            unplug = {},
-            constructor, i, classPlug, classUnplug, pluginClassName;
-
-        // TODO: Room for optimization. Can we apply statically/unplug in same pass?
-        for (i = classes.length - 1; i >= 0; i--) {
-            constructor = classes[i];
-
-            classUnplug = constructor._UNPLUG;
-            if (classUnplug) {
-                // subclasses over-write
-                Y.mix(unplug, classUnplug, true);
-            }
-
-            classPlug = constructor._PLUG;
-            if (classPlug) {
-                // subclasses over-write
-                Y.mix(plug, classPlug, true);
-            }
-        }
-
-        for (pluginClassName in plug) {
-            if (plug.hasOwnProperty(pluginClassName)) {
-                if (!unplug[pluginClassName]) {
-                    this.plug(plug[pluginClassName]);
-                }
-            }
-        }
-
-        // User Configuration
-        if (config && config.plugins) {
-            this.plug(config.plugins);
-        }
-    };
-
-    /**
-     * Registers plugins to be instantiated at the class level (plugins
-     * which should be plugged into every instance of the class by default).
-     *
-     * @method plug
-     * @static
-     *
-     * @param {Function} hostClass The host class on which to register the plugins
-     * @param {Function | Array} plugin Either the plugin class, an array of plugin classes or an array of objects (with fn and cfg properties defined)
-     * @param {Object} config (Optional) If plugin is the plugin class, the configuration for the plugin
-     * @for Plugin.Host
-     */
-    PluginHost.plug = function(hostClass, plugin, config) {
-        // Cannot plug into Base, since Plugins derive from Base [ will cause infinite recurrsion ]
-        var p, i, l, name;
-
-        if (hostClass !== Y.Base) {
-            hostClass._PLUG = hostClass._PLUG || {};
-
-            if (!L.isArray(plugin)) {
-                if (config) {
-                    plugin = {fn:plugin, cfg:config};
-                }
-                plugin = [plugin];
-            }
-
-            for (i = 0, l = plugin.length; i < l;i++) {
-                p = plugin[i];
-                name = p.NAME || p.fn.NAME;
-                hostClass._PLUG[name] = p;
-            }
-        }
-    };
-
-    /**
-     * Unregisters any class level plugins which have been registered by the host class, or any
-     * other class in the hierarchy.
-     *
-     * @method unplug
-     * @static
-     *
-     * @param {Function} hostClass The host class from which to unregister the plugins
-     * @param {Function | Array} plugin The plugin class, or an array of plugin classes
-     * @for Plugin.Host
-     */
-    PluginHost.unplug = function(hostClass, plugin) {
-        var p, i, l, name;
-
-        if (hostClass !== Y.Base) {
-            hostClass._UNPLUG = hostClass._UNPLUG || {};
-
-            if (!L.isArray(plugin)) {
-                plugin = [plugin];
-            }
-
-            for (i = 0, l = plugin.length; i < l; i++) {
-                p = plugin[i];
-                name = p.NAME;
-                if (!hostClass._PLUG[name]) {
-                    hostClass._UNPLUG[name] = p;
-                } else {
-                    delete hostClass._PLUG[name];
-                }
-            }
-        }
-    };
-
-
-}, '3.16.0', {"requires": ["pluginhost-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('base-pluginhost', function (Y, NAME) {
-
-    /**
-     * The base-pluginhost submodule adds Plugin support to Base, by augmenting Base with
-     * Plugin.Host and setting up static (class level) Base.plug and Base.unplug methods.
-     *
-     * @module base
-     * @submodule base-pluginhost
-     * @for Base
-     */
-
-    var Base = Y.Base,
-        PluginHost = Y.Plugin.Host;
-
-    Y.mix(Base, PluginHost, false, null, 1);
-
-    /**
-     * Alias for <a href="Plugin.Host.html#method_Plugin.Host.plug">Plugin.Host.plug</a>. See aliased
-     * method for argument and return value details.
-     *
-     * @method plug
-     * @static
-     */
-    Base.plug = PluginHost.plug;
-
-    /**
-     * Alias for <a href="Plugin.Host.html#method_Plugin.Host.unplug">Plugin.Host.unplug</a>. See the
-     * aliased method for argument and return value details.
-     *
-     * @method unplug
-     * @static
-     */
-    Base.unplug = PluginHost.unplug;
-
-
-}, '3.16.0', {"requires": ["base-base", "pluginhost"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('classnamemanager', function (Y, NAME) {
-
-/**
-* Contains a singleton (ClassNameManager) that enables easy creation and caching of
-* prefixed class names.
-* @module classnamemanager
-*/
-
-/**
- * A singleton class providing:
- *
- * <ul>
- *    <li>Easy creation of prefixed class names</li>
- *    <li>Caching of previously created class names for improved performance.</li>
- * </ul>
- *
- * @class ClassNameManager
- * @static
- */
-
-// String constants
-var CLASS_NAME_PREFIX = 'classNamePrefix',
-	CLASS_NAME_DELIMITER = 'classNameDelimiter',
-    CONFIG = Y.config;
-
-// Global config
-
-/**
- * Configuration property indicating the prefix for all CSS class names in this YUI instance.
- *
- * @property classNamePrefix
- * @type {String}
- * @default "yui"
- * @static
- */
-CONFIG[CLASS_NAME_PREFIX] = CONFIG[CLASS_NAME_PREFIX] || 'yui3';
-
-/**
- * Configuration property indicating the delimiter used to compose all CSS class names in
- * this YUI instance.
- *
- * @property classNameDelimiter
- * @type {String}
- * @default "-"
- * @static
- */
-CONFIG[CLASS_NAME_DELIMITER] = CONFIG[CLASS_NAME_DELIMITER] || '-';
-
-Y.ClassNameManager = function () {
-
-	var sPrefix    = CONFIG[CLASS_NAME_PREFIX],
-		sDelimiter = CONFIG[CLASS_NAME_DELIMITER];
-
-	return {
-
-		/**
-		 * Returns a class name prefixed with the value of the
-		 * <code>Y.config.classNamePrefix</code> attribute + the provided strings.
-		 * Uses the <code>Y.config.classNameDelimiter</code> attribute to delimit the
-		 * provided strings. E.g. Y.ClassNameManager.getClassName('foo','bar'); // yui-foo-bar
-		 *
-		 * @method getClassName
-		 * @param {String} [classnameSection*] one or more classname sections to be joined
-		 * @param {Boolean} skipPrefix If set to true, the classname will not be prefixed with the default Y.config.classNameDelimiter value.
-		 */
-		getClassName: Y.cached(function () {
-
-            var args = Y.Array(arguments);
-
-            if (args[args.length-1] !== true) {
-                args.unshift(sPrefix);
-            } else {
-                args.pop();
-            }
-
-			return args.join(sDelimiter);
-		})
-
-	};
-
-}();
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-base', function (Y, NAME) {
-
-/*
- * DOM event listener abstraction layer
- * @module event
- * @submodule event-base
- */
-
-/**
- * The domready event fires at the moment the browser's DOM is
- * usable. In most cases, this is before images are fully
- * downloaded, allowing you to provide a more responsive user
- * interface.
- *
- * In YUI 3, domready subscribers will be notified immediately if
- * that moment has already passed when the subscription is created.
- *
- * One exception is if the yui.js file is dynamically injected into
- * the page.  If this is done, you must tell the YUI instance that
- * you did this in order for DOMReady (and window load events) to
- * fire normally.  That configuration option is 'injected' -- set
- * it to true if the yui.js script is not included inline.
- *
- * This method is part of the 'event-ready' module, which is a
- * submodule of 'event'.
- *
- * @event domready
- * @for YUI
- */
-Y.publish('domready', {
-    fireOnce: true,
-    async: true
-});
-
-if (YUI.Env.DOMReady) {
-    Y.fire('domready');
-} else {
-    Y.Do.before(function() { Y.fire('domready'); }, YUI.Env, '_ready');
-}
-
-/**
- * Custom event engine, DOM event listener abstraction layer, synthetic DOM
- * events.
- * @module event
- * @submodule event-base
- */
-
-/**
- * Wraps a DOM event, properties requiring browser abstraction are
- * fixed here.  Provids a security layer when required.
- * @class DOMEventFacade
- * @param ev {Event} the DOM event
- * @param currentTarget {HTMLElement} the element the listener was attached to
- * @param wrapper {CustomEvent} the custom event wrapper for this DOM event
- */
-
-    var ua = Y.UA,
-
-    EMPTY = {},
-
-    /**
-     * webkit key remapping required for Safari < 3.1
-     * @property webkitKeymap
-     * @private
-     */
-    webkitKeymap = {
-        63232: 38, // up
-        63233: 40, // down
-        63234: 37, // left
-        63235: 39, // right
-        63276: 33, // page up
-        63277: 34, // page down
-        25:     9, // SHIFT-TAB (Safari provides a different key code in
-                   // this case, even though the shiftKey modifier is set)
-        63272: 46, // delete
-        63273: 36, // home
-        63275: 35  // end
-    },
-
-    /**
-     * Returns a wrapped node.  Intended to be used on event targets,
-     * so it will return the node's parent if the target is a text
-     * node.
-     *
-     * If accessing a property of the node throws an error, this is
-     * probably the anonymous div wrapper Gecko adds inside text
-     * nodes.  This likely will only occur when attempting to access
-     * the relatedTarget.  In this case, we now return null because
-     * the anonymous div is completely useless and we do not know
-     * what the related target was because we can't even get to
-     * the element's parent node.
-     *
-     * @method resolve
-     * @private
-     */
-    resolve = function(n) {
-        if (!n) {
-            return n;
-        }
-        try {
-            if (n && 3 == n.nodeType) {
-                n = n.parentNode;
-            }
-        } catch(e) {
-            return null;
-        }
-
-        return Y.one(n);
-    },
-
-    DOMEventFacade = function(ev, currentTarget, wrapper) {
-        this._event = ev;
-        this._currentTarget = currentTarget;
-        this._wrapper = wrapper || EMPTY;
-
-        // if not lazy init
-        this.init();
-    };
-
-Y.extend(DOMEventFacade, Object, {
-
-    init: function() {
-
-        var e = this._event,
-            overrides = this._wrapper.overrides,
-            x = e.pageX,
-            y = e.pageY,
-            c,
-            currentTarget = this._currentTarget;
-
-        this.altKey   = e.altKey;
-        this.ctrlKey  = e.ctrlKey;
-        this.metaKey  = e.metaKey;
-        this.shiftKey = e.shiftKey;
-        this.type     = (overrides && overrides.type) || e.type;
-        this.clientX  = e.clientX;
-        this.clientY  = e.clientY;
-
-        this.pageX = x;
-        this.pageY = y;
-
-        // charCode is unknown in keyup, keydown. keyCode is unknown in keypress.
-        // FF 3.6 - 8+? pass 0 for keyCode in keypress events.
-        // Webkit, FF 3.6-8+?, and IE9+? pass 0 for charCode in keydown, keyup.
-        // Webkit and IE9+? duplicate charCode in keyCode.
-        // Opera never sets charCode, always keyCode (though with the charCode).
-        // IE6-8 don't set charCode or which.
-        // All browsers other than IE6-8 set which=keyCode in keydown, keyup, and
-        // which=charCode in keypress.
-        //
-        // Moral of the story: (e.which || e.keyCode) will always return the
-        // known code for that key event phase. e.keyCode is often different in
-        // keypress from keydown and keyup.
-        c = e.keyCode || e.charCode;
-
-        if (ua.webkit && (c in webkitKeymap)) {
-            c = webkitKeymap[c];
-        }
-
-        this.keyCode = c;
-        this.charCode = c;
-        // Fill in e.which for IE - implementers should always use this over
-        // e.keyCode or e.charCode.
-        this.which = e.which || e.charCode || c;
-        // this.button = e.button;
-        this.button = this.which;
-
-        this.target = resolve(e.target);
-        this.currentTarget = resolve(currentTarget);
-        this.relatedTarget = resolve(e.relatedTarget);
-
-        if (e.type == "mousewheel" || e.type == "DOMMouseScroll") {
-            this.wheelDelta = (e.detail) ? (e.detail * -1) : Math.round(e.wheelDelta / 80) || ((e.wheelDelta < 0) ? -1 : 1);
-        }
-
-        if (this._touch) {
-            this._touch(e, currentTarget, this._wrapper);
-        }
-    },
-
-    stopPropagation: function() {
-        this._event.stopPropagation();
-        this._wrapper.stopped = 1;
-        this.stopped = 1;
-    },
-
-    stopImmediatePropagation: function() {
-        var e = this._event;
-        if (e.stopImmediatePropagation) {
-            e.stopImmediatePropagation();
-        } else {
-            this.stopPropagation();
-        }
-        this._wrapper.stopped = 2;
-        this.stopped = 2;
-    },
-
-    preventDefault: function(returnValue) {
-        var e = this._event;
-        e.preventDefault();
-        if (returnValue) {
-            e.returnValue = returnValue;
-        }
-        this._wrapper.prevented = 1;
-        this.prevented = 1;
-    },
-
-    halt: function(immediate) {
-        if (immediate) {
-            this.stopImmediatePropagation();
-        } else {
-            this.stopPropagation();
-        }
-
-        this.preventDefault();
-    }
-
-});
-
-DOMEventFacade.resolve = resolve;
-Y.DOM2EventFacade = DOMEventFacade;
-Y.DOMEventFacade = DOMEventFacade;
-
-    /**
-     * The native event
-     * @property _event
-     * @type {DOMEvent}
-     * @private
-     */
-
-    /**
-    The name of the event (e.g. "click")
-
-    @property type
-    @type {String}
-    **/
-
-    /**
-    `true` if the "alt" or "option" key is pressed.
-
-    @property altKey
-    @type {Boolean}
-    **/
-
-    /**
-    `true` if the shift key is pressed.
-
-    @property shiftKey
-    @type {Boolean}
-    **/
-
-    /**
-    `true` if the "Windows" key on a Windows keyboard, "command" key on an
-    Apple keyboard, or "meta" key on other keyboards is pressed.
-
-    @property metaKey
-    @type {Boolean}
-    **/
-
-    /**
-    `true` if the "Ctrl" or "control" key is pressed.
-
-    @property ctrlKey
-    @type {Boolean}
-    **/
-
-    /**
-     * The X location of the event on the page (including scroll)
-     * @property pageX
-     * @type {Number}
-     */
-
-    /**
-     * The Y location of the event on the page (including scroll)
-     * @property pageY
-     * @type {Number}
-     */
-
-    /**
-     * The X location of the event in the viewport
-     * @property clientX
-     * @type {Number}
-     */
-
-    /**
-     * The Y location of the event in the viewport
-     * @property clientY
-     * @type {Number}
-     */
-
-    /**
-     * The keyCode for key events.  Uses charCode if keyCode is not available
-     * @property keyCode
-     * @type {Number}
-     */
-
-    /**
-     * The charCode for key events.  Same as keyCode
-     * @property charCode
-     * @type {Number}
-     */
-
-    /**
-     * The button that was pushed. 1 for left click, 2 for middle click, 3 for
-     * right click.  This is only reliably populated on `mouseup` events.
-     * @property button
-     * @type {Number}
-     */
-
-    /**
-     * The button that was pushed.  Same as button.
-     * @property which
-     * @type {Number}
-     */
-
-    /**
-     * Node reference for the targeted element
-     * @property target
-     * @type {Node}
-     */
-
-    /**
-     * Node reference for the element that the listener was attached to.
-     * @property currentTarget
-     * @type {Node}
-     */
-
-    /**
-     * Node reference to the relatedTarget
-     * @property relatedTarget
-     * @type {Node}
-     */
-
-    /**
-     * Number representing the direction and velocity of the movement of the mousewheel.
-     * Negative is down, the higher the number, the faster.  Applies to the mousewheel event.
-     * @property wheelDelta
-     * @type {Number}
-     */
-
-    /**
-     * Stops the propagation to the next bubble target
-     * @method stopPropagation
-     */
-
-    /**
-     * Stops the propagation to the next bubble target and
-     * prevents any additional listeners from being exectued
-     * on the current target.
-     * @method stopImmediatePropagation
-     */
-
-    /**
-     * Prevents the event's default behavior
-     * @method preventDefault
-     * @param returnValue {string} sets the returnValue of the event to this value
-     * (rather than the default false value).  This can be used to add a customized
-     * confirmation query to the beforeunload event).
-     */
-
-    /**
-     * Stops the event propagation and prevents the default
-     * event behavior.
-     * @method halt
-     * @param immediate {boolean} if true additional listeners
-     * on the current target will not be executed
-     */
-(function() {
-
-/**
- * The event utility provides functions to add and remove event listeners,
- * event cleansing.  It also tries to automatically remove listeners it
- * registers during the unload event.
- * @module event
- * @main event
- * @submodule event-base
- */
-
-/**
- * The event utility provides functions to add and remove event listeners,
- * event cleansing.  It also tries to automatically remove listeners it
- * registers during the unload event.
- *
- * @class Event
- * @static
- */
-
-Y.Env.evt.dom_wrappers = {};
-Y.Env.evt.dom_map = {};
-
-var _eventenv = Y.Env.evt,
-    config = Y.config,
-    win = config.win,
-    add = YUI.Env.add,
-    remove = YUI.Env.remove,
-
-    onLoad = function() {
-        YUI.Env.windowLoaded = true;
-        Y.Event._load();
-        remove(win, "load", onLoad);
-    },
-
-    onUnload = function() {
-        Y.Event._unload();
-    },
-
-    EVENT_READY = 'domready',
-
-    COMPAT_ARG = '~yui|2|compat~',
-
-    shouldIterate = function(o) {
-        try {
-            // TODO: See if there's a more performant way to return true early on this, for the common case
-            return (o && typeof o !== "string" && Y.Lang.isNumber(o.length) && !o.tagName && !Y.DOM.isWindow(o));
-        } catch(ex) {
-            return false;
-        }
-    },
-
-    // aliases to support DOM event subscription clean up when the last
-    // subscriber is detached. deleteAndClean overrides the DOM event's wrapper
-    // CustomEvent _delete method.
-    _ceProtoDelete = Y.CustomEvent.prototype._delete,
-    _deleteAndClean = function(s) {
-        var ret = _ceProtoDelete.apply(this, arguments);
-
-        if (!this.hasSubs()) {
-            Y.Event._clean(this);
-        }
-
-        return ret;
-    },
-
-Event = function() {
-
-    /**
-     * True after the onload event has fired
-     * @property _loadComplete
-     * @type boolean
-     * @static
-     * @private
-     */
-    var _loadComplete =  false,
-
-    /**
-     * The number of times to poll after window.onload.  This number is
-     * increased if additional late-bound handlers are requested after
-     * the page load.
-     * @property _retryCount
-     * @static
-     * @private
-     */
-    _retryCount = 0,
-
-    /**
-     * onAvailable listeners
-     * @property _avail
-     * @static
-     * @private
-     */
-    _avail = [],
-
-    /**
-     * Custom event wrappers for DOM events.  Key is
-     * 'event:' + Element uid stamp + event type
-     * @property _wrappers
-     * @type CustomEvent
-     * @static
-     * @private
-     */
-    _wrappers = _eventenv.dom_wrappers,
-
-    _windowLoadKey = null,
-
-    /**
-     * Custom event wrapper map DOM events.  Key is
-     * Element uid stamp.  Each item is a hash of custom event
-     * wrappers as provided in the _wrappers collection.  This
-     * provides the infrastructure for getListeners.
-     * @property _el_events
-     * @static
-     * @private
-     */
-    _el_events = _eventenv.dom_map;
-
-    return {
-
-        /**
-         * The number of times we should look for elements that are not
-         * in the DOM at the time the event is requested after the document
-         * has been loaded.  The default is 1000@amp;40 ms, so it will poll
-         * for 40 seconds or until all outstanding handlers are bound
-         * (whichever comes first).
-         * @property POLL_RETRYS
-         * @type int
-         * @static
-         * @final
-         */
-        POLL_RETRYS: 1000,
-
-        /**
-         * The poll interval in milliseconds
-         * @property POLL_INTERVAL
-         * @type int
-         * @static
-         * @final
-         */
-        POLL_INTERVAL: 40,
-
-        /**
-         * addListener/removeListener can throw errors in unexpected scenarios.
-         * These errors are suppressed, the method returns false, and this property
-         * is set
-         * @property lastError
-         * @static
-         * @type Error
-         */
-        lastError: null,
-
-
-        /**
-         * poll handle
-         * @property _interval
-         * @static
-         * @private
-         */
-        _interval: null,
-
-        /**
-         * document readystate poll handle
-         * @property _dri
-         * @static
-         * @private
-         */
-         _dri: null,
-
-        /**
-         * True when the document is initially usable
-         * @property DOMReady
-         * @type boolean
-         * @static
-         */
-        DOMReady: false,
-
-        /**
-         * @method startInterval
-         * @static
-         * @private
-         */
-        startInterval: function() {
-            if (!Event._interval) {
-Event._interval = setInterval(Event._poll, Event.POLL_INTERVAL);
-            }
-        },
-
-        /**
-         * Executes the supplied callback when the item with the supplied
-         * id is found.  This is meant to be used to execute behavior as
-         * soon as possible as the page loads.  If you use this after the
-         * initial page load it will poll for a fixed time for the element.
-         * The number of times it will poll and the frequency are
-         * configurable.  By default it will poll for 10 seconds.
-         *
-         * <p>The callback is executed with a single parameter:
-         * the custom object parameter, if provided.</p>
-         *
-         * @method onAvailable
-         *
-         * @param {string||string[]}   id the id of the element, or an array
-         * of ids to look for.
-         * @param {function} fn what to execute when the element is found.
-         * @param {object}   p_obj an optional object to be passed back as
-         *                   a parameter to fn.
-         * @param {boolean|object}  p_override If set to true, fn will execute
-         *                   in the context of p_obj, if set to an object it
-         *                   will execute in the context of that object
-         * @param checkContent {boolean} check child node readiness (onContentReady)
-         * @static
-         * @deprecated Use Y.on("available")
-         */
-        // @TODO fix arguments
-        onAvailable: function(id, fn, p_obj, p_override, checkContent, compat) {
-
-            var a = Y.Array(id), i, availHandle;
-
-            for (i=0; i<a.length; i=i+1) {
-                _avail.push({
-                    id:         a[i],
-                    fn:         fn,
-                    obj:        p_obj,
-                    override:   p_override,
-                    checkReady: checkContent,
-                    compat:     compat
-                });
-            }
-            _retryCount = this.POLL_RETRYS;
-
-            // We want the first test to be immediate, but async
-            setTimeout(Event._poll, 0);
-
-            availHandle = new Y.EventHandle({
-
-                _delete: function() {
-                    // set by the event system for lazy DOM listeners
-                    if (availHandle.handle) {
-                        availHandle.handle.detach();
-                        return;
-                    }
-
-                    var i, j;
-
-                    // otherwise try to remove the onAvailable listener(s)
-                    for (i = 0; i < a.length; i++) {
-                        for (j = 0; j < _avail.length; j++) {
-                            if (a[i] === _avail[j].id) {
-                                _avail.splice(j, 1);
-                            }
-                        }
-                    }
-                }
-
-            });
-
-            return availHandle;
-        },
-
-        /**
-         * Works the same way as onAvailable, but additionally checks the
-         * state of sibling elements to determine if the content of the
-         * available element is safe to modify.
-         *
-         * <p>The callback is executed with a single parameter:
-         * the custom object parameter, if provided.</p>
-         *
-         * @method onContentReady
-         *
-         * @param {string}   id the id of the element to look for.
-         * @param {function} fn what to execute when the element is ready.
-         * @param {object}   obj an optional object to be passed back as
-         *                   a parameter to fn.
-         * @param {boolean|object}  override If set to true, fn will execute
-         *                   in the context of p_obj.  If an object, fn will
-         *                   exectute in the context of that object
-         *
-         * @static
-         * @deprecated Use Y.on("contentready")
-         */
-        // @TODO fix arguments
-        onContentReady: function(id, fn, obj, override, compat) {
-            return Event.onAvailable(id, fn, obj, override, true, compat);
-        },
-
-        /**
-         * Adds an event listener
-         *
-         * @method attach
-         *
-         * @param {String}   type     The type of event to append
-         * @param {Function} fn        The method the event invokes
-         * @param {String|HTMLElement|Array|NodeList} el An id, an element
-         *  reference, or a collection of ids and/or elements to assign the
-         *  listener to.
-         * @param {Object}   context optional context object
-         * @param {Boolean|object}  args 0..n arguments to pass to the callback
-         * @return {EventHandle} an object to that can be used to detach the listener
-         *
-         * @static
-         */
-
-        attach: function(type, fn, el, context) {
-            return Event._attach(Y.Array(arguments, 0, true));
-        },
-
-        _createWrapper: function (el, type, capture, compat, facade) {
-
-            var cewrapper,
-                ek  = Y.stamp(el),
-                key = 'event:' + ek + type;
-
-            if (false === facade) {
-                key += 'native';
-            }
-            if (capture) {
-                key += 'capture';
-            }
-
-
-            cewrapper = _wrappers[key];
-
-
-            if (!cewrapper) {
-                // create CE wrapper
-                cewrapper = Y.publish(key, {
-                    silent: true,
-                    bubbles: false,
-                    emitFacade:false,
-                    contextFn: function() {
-                        if (compat) {
-                            return cewrapper.el;
-                        } else {
-                            cewrapper.nodeRef = cewrapper.nodeRef || Y.one(cewrapper.el);
-                            return cewrapper.nodeRef;
-                        }
-                    }
-                });
-
-                cewrapper.overrides = {};
-
-                // for later removeListener calls
-                cewrapper.el = el;
-                cewrapper.key = key;
-                cewrapper.domkey = ek;
-                cewrapper.type = type;
-                cewrapper.fn = function(e) {
-                    cewrapper.fire(Event.getEvent(e, el, (compat || (false === facade))));
-                };
-                cewrapper.capture = capture;
-
-                if (el == win && type == "load") {
-                    // window load happens once
-                    cewrapper.fireOnce = true;
-                    _windowLoadKey = key;
-                }
-                cewrapper._delete = _deleteAndClean;
-
-                _wrappers[key] = cewrapper;
-                _el_events[ek] = _el_events[ek] || {};
-                _el_events[ek][key] = cewrapper;
-
-                add(el, type, cewrapper.fn, capture);
-            }
-
-            return cewrapper;
-
-        },
-
-        _attach: function(args, conf) {
-
-            var compat,
-                handles, oEl, cewrapper, context,
-                fireNow = false, ret,
-                type = args[0],
-                fn = args[1],
-                el = args[2] || win,
-                facade = conf && conf.facade,
-                capture = conf && conf.capture,
-                overrides = conf && conf.overrides;
-
-            if (args[args.length-1] === COMPAT_ARG) {
-                compat = true;
-            }
-
-            if (!fn || !fn.call) {
-                return false;
-            }
-
-            // The el argument can be an array of elements or element ids.
-            if (shouldIterate(el)) {
-
-                handles=[];
-
-                Y.each(el, function(v, k) {
-                    args[2] = v;
-                    handles.push(Event._attach(args.slice(), conf));
-                });
-
-                // return (handles.length === 1) ? handles[0] : handles;
-                return new Y.EventHandle(handles);
-
-            // If the el argument is a string, we assume it is
-            // actually the id of the element.  If the page is loaded
-            // we convert el to the actual element, otherwise we
-            // defer attaching the event until the element is
-            // ready
-            } else if (Y.Lang.isString(el)) {
-
-                // oEl = (compat) ? Y.DOM.byId(el) : Y.Selector.query(el);
-
-                if (compat) {
-                    oEl = Y.DOM.byId(el);
-                } else {
-
-                    oEl = Y.Selector.query(el);
-
-                    switch (oEl.length) {
-                        case 0:
-                            oEl = null;
-                            break;
-                        case 1:
-                            oEl = oEl[0];
-                            break;
-                        default:
-                            args[2] = oEl;
-                            return Event._attach(args, conf);
-                    }
-                }
-
-                if (oEl) {
-
-                    el = oEl;
-
-                // Not found = defer adding the event until the element is available
-                } else {
-
-                    ret = Event.onAvailable(el, function() {
-
-                        ret.handle = Event._attach(args, conf);
-
-                    }, Event, true, false, compat);
-
-                    return ret;
-
-                }
-            }
-
-            // Element should be an html element or node
-            if (!el) {
-                return false;
-            }
-
-            if (Y.Node && Y.instanceOf(el, Y.Node)) {
-                el = Y.Node.getDOMNode(el);
-            }
-
-            cewrapper = Event._createWrapper(el, type, capture, compat, facade);
-            if (overrides) {
-                Y.mix(cewrapper.overrides, overrides);
-            }
-
-            if (el == win && type == "load") {
-
-                // if the load is complete, fire immediately.
-                // all subscribers, including the current one
-                // will be notified.
-                if (YUI.Env.windowLoaded) {
-                    fireNow = true;
-                }
-            }
-
-            if (compat) {
-                args.pop();
-            }
-
-            context = args[3];
-
-            // set context to the Node if not specified
-            // ret = cewrapper.on.apply(cewrapper, trimmedArgs);
-            ret = cewrapper._on(fn, context, (args.length > 4) ? args.slice(4) : null);
-
-            if (fireNow) {
-                cewrapper.fire();
-            }
-
-            return ret;
-
-        },
-
-        /**
-         * Removes an event listener.  Supports the signature the event was bound
-         * with, but the preferred way to remove listeners is using the handle
-         * that is returned when using Y.on
-         *
-         * @method detach
-         *
-         * @param {String} type the type of event to remove.
-         * @param {Function} fn the method the event invokes.  If fn is
-         * undefined, then all event handlers for the type of event are
-         * removed.
-         * @param {String|HTMLElement|Array|NodeList|EventHandle} el An
-         * event handle, an id, an element reference, or a collection
-         * of ids and/or elements to remove the listener from.
-         * @return {boolean} true if the unbind was successful, false otherwise.
-         * @static
-         */
-        detach: function(type, fn, el, obj) {
-
-            var args=Y.Array(arguments, 0, true), compat, l, ok, i,
-                id, ce;
-
-            if (args[args.length-1] === COMPAT_ARG) {
-                compat = true;
-                // args.pop();
-            }
-
-            if (type && type.detach) {
-                return type.detach();
-            }
-
-            // The el argument can be a string
-            if (typeof el == "string") {
-
-                // el = (compat) ? Y.DOM.byId(el) : Y.all(el);
-                if (compat) {
-                    el = Y.DOM.byId(el);
-                } else {
-                    el = Y.Selector.query(el);
-                    l = el.length;
-                    if (l < 1) {
-                        el = null;
-                    } else if (l == 1) {
-                        el = el[0];
-                    }
-                }
-                // return Event.detach.apply(Event, args);
-            }
-
-            if (!el) {
-                return false;
-            }
-
-            if (el.detach) {
-                args.splice(2, 1);
-                return el.detach.apply(el, args);
-            // The el argument can be an array of elements or element ids.
-            } else if (shouldIterate(el)) {
-                ok = true;
-                for (i=0, l=el.length; i<l; ++i) {
-                    args[2] = el[i];
-                    ok = ( Y.Event.detach.apply(Y.Event, args) && ok );
-                }
-
-                return ok;
-            }
-
-            if (!type || !fn || !fn.call) {
-                return Event.purgeElement(el, false, type);
-            }
-
-            id = 'event:' + Y.stamp(el) + type;
-            ce = _wrappers[id];
-
-            if (ce) {
-                return ce.detach(fn);
-            } else {
-                return false;
-            }
-
-        },
-
-        /**
-         * Finds the event in the window object, the caller's arguments, or
-         * in the arguments of another method in the callstack.  This is
-         * executed automatically for events registered through the event
-         * manager, so the implementer should not normally need to execute
-         * this function at all.
-         * @method getEvent
-         * @param {Event} e the event parameter from the handler
-         * @param {HTMLElement} el the element the listener was attached to
-         * @return {Event} the event
-         * @static
-         */
-        getEvent: function(e, el, noFacade) {
-            var ev = e || win.event;
-
-            return (noFacade) ? ev :
-                new Y.DOMEventFacade(ev, el, _wrappers['event:' + Y.stamp(el) + e.type]);
-        },
-
-        /**
-         * Generates an unique ID for the element if it does not already
-         * have one.
-         * @method generateId
-         * @param el the element to create the id for
-         * @return {string} the resulting id of the element
-         * @static
-         */
-        generateId: function(el) {
-            return Y.DOM.generateID(el);
-        },
-
-        /**
-         * We want to be able to use getElementsByTagName as a collection
-         * to attach a group of events to.  Unfortunately, different
-         * browsers return different types of collections.  This function
-         * tests to determine if the object is array-like.  It will also
-         * fail if the object is an array, but is empty.
-         * @method _isValidCollection
-         * @param o the object to test
-         * @return {boolean} true if the object is array-like and populated
-         * @deprecated was not meant to be used directly
-         * @static
-         * @private
-         */
-        _isValidCollection: shouldIterate,
-
-        /**
-         * hook up any deferred listeners
-         * @method _load
-         * @static
-         * @private
-         */
-        _load: function(e) {
-            if (!_loadComplete) {
-                _loadComplete = true;
-
-                // Just in case DOMReady did not go off for some reason
-                // E._ready();
-                if (Y.fire) {
-                    Y.fire(EVENT_READY);
-                }
-
-                // Available elements may not have been detected before the
-                // window load event fires. Try to find them now so that the
-                // the user is more likely to get the onAvailable notifications
-                // before the window load notification
-                Event._poll();
-            }
-        },
-
-        /**
-         * Polling function that runs before the onload event fires,
-         * attempting to attach to DOM Nodes as soon as they are
-         * available
-         * @method _poll
-         * @static
-         * @private
-         */
-        _poll: function() {
-            if (Event.locked) {
-                return;
-            }
-
-            if (Y.UA.ie && !YUI.Env.DOMReady) {
-                // Hold off if DOMReady has not fired and check current
-                // readyState to protect against the IE operation aborted
-                // issue.
-                Event.startInterval();
-                return;
-            }
-
-            Event.locked = true;
-
-            // keep trying until after the page is loaded.  We need to
-            // check the page load state prior to trying to bind the
-            // elements so that we can be certain all elements have been
-            // tested appropriately
-            var i, len, item, el, notAvail, executeItem,
-                tryAgain = !_loadComplete;
-
-            if (!tryAgain) {
-                tryAgain = (_retryCount > 0);
-            }
-
-            // onAvailable
-            notAvail = [];
-
-            executeItem = function (el, item) {
-                var context, ov = item.override;
-                try {
-                    if (item.compat) {
-                        if (item.override) {
-                            if (ov === true) {
-                                context = item.obj;
-                            } else {
-                                context = ov;
-                            }
-                        } else {
-                            context = el;
-                        }
-                        item.fn.call(context, item.obj);
-                    } else {
-                        context = item.obj || Y.one(el);
-                        item.fn.apply(context, (Y.Lang.isArray(ov)) ? ov : []);
-                    }
-                } catch (e) {
-                }
-            };
-
-            // onAvailable
-            for (i=0,len=_avail.length; i<len; ++i) {
-                item = _avail[i];
-                if (item && !item.checkReady) {
-
-                    // el = (item.compat) ? Y.DOM.byId(item.id) : Y.one(item.id);
-                    el = (item.compat) ? Y.DOM.byId(item.id) : Y.Selector.query(item.id, null, true);
-
-                    if (el) {
-                        executeItem(el, item);
-                        _avail[i] = null;
-                    } else {
-                        notAvail.push(item);
-                    }
-                }
-            }
-
-            // onContentReady
-            for (i=0,len=_avail.length; i<len; ++i) {
-                item = _avail[i];
-                if (item && item.checkReady) {
-
-                    // el = (item.compat) ? Y.DOM.byId(item.id) : Y.one(item.id);
-                    el = (item.compat) ? Y.DOM.byId(item.id) : Y.Selector.query(item.id, null, true);
-
-                    if (el) {
-                        // The element is available, but not necessarily ready
-                        // @todo should we test parentNode.nextSibling?
-                        if (_loadComplete || (el.get && el.get('nextSibling')) || el.nextSibling) {
-                            executeItem(el, item);
-                            _avail[i] = null;
-                        }
-                    } else {
-                        notAvail.push(item);
-                    }
-                }
-            }
-
-            _retryCount = (notAvail.length === 0) ? 0 : _retryCount - 1;
-
-            if (tryAgain) {
-                // we may need to strip the nulled out items here
-                Event.startInterval();
-            } else {
-                clearInterval(Event._interval);
-                Event._interval = null;
-            }
-
-            Event.locked = false;
-
-            return;
-
-        },
-
-        /**
-         * Removes all listeners attached to the given element via addListener.
-         * Optionally, the node's children can also be purged.
-         * Optionally, you can specify a specific type of event to remove.
-         * @method purgeElement
-         * @param {HTMLElement} el the element to purge
-         * @param {boolean} recurse recursively purge this element's children
-         * as well.  Use with caution.
-         * @param {string} type optional type of listener to purge. If
-         * left out, all listeners will be removed
-         * @static
-         */
-        purgeElement: function(el, recurse, type) {
-            // var oEl = (Y.Lang.isString(el)) ? Y.one(el) : el,
-            var oEl = (Y.Lang.isString(el)) ?  Y.Selector.query(el, null, true) : el,
-                lis = Event.getListeners(oEl, type), i, len, children, child;
-
-            if (recurse && oEl) {
-                lis = lis || [];
-                children = Y.Selector.query('*', oEl);
-                len = children.length;
-                for (i = 0; i < len; ++i) {
-                    child = Event.getListeners(children[i], type);
-                    if (child) {
-                        lis = lis.concat(child);
-                    }
-                }
-            }
-
-            if (lis) {
-                for (i = 0, len = lis.length; i < len; ++i) {
-                    lis[i].detachAll();
-                }
-            }
-
-        },
-
-        /**
-         * Removes all object references and the DOM proxy subscription for
-         * a given event for a DOM node.
-         *
-         * @method _clean
-         * @param wrapper {CustomEvent} Custom event proxy for the DOM
-         *                  subscription
-         * @private
-         * @static
-         * @since 3.4.0
-         */
-        _clean: function (wrapper) {
-            var key    = wrapper.key,
-                domkey = wrapper.domkey;
-
-            remove(wrapper.el, wrapper.type, wrapper.fn, wrapper.capture);
-            delete _wrappers[key];
-            delete Y._yuievt.events[key];
-            if (_el_events[domkey]) {
-                delete _el_events[domkey][key];
-                if (!Y.Object.size(_el_events[domkey])) {
-                    delete _el_events[domkey];
-                }
-            }
-        },
-
-        /**
-         * Returns all listeners attached to the given element via addListener.
-         * Optionally, you can specify a specific type of event to return.
-         * @method getListeners
-         * @param el {HTMLElement|string} the element or element id to inspect
-         * @param type {string} optional type of listener to return. If
-         * left out, all listeners will be returned
-         * @return {CustomEvent} the custom event wrapper for the DOM event(s)
-         * @static
-         */
-        getListeners: function(el, type) {
-            var ek = Y.stamp(el, true), evts = _el_events[ek],
-                results=[] , key = (type) ? 'event:' + ek + type : null,
-                adapters = _eventenv.plugins;
-
-            if (!evts) {
-                return null;
-            }
-
-            if (key) {
-                // look for synthetic events
-                if (adapters[type] && adapters[type].eventDef) {
-                    key += '_synth';
-                }
-
-                if (evts[key]) {
-                    results.push(evts[key]);
-                }
-
-                // get native events as well
-                key += 'native';
-                if (evts[key]) {
-                    results.push(evts[key]);
-                }
-
-            } else {
-                Y.each(evts, function(v, k) {
-                    results.push(v);
-                });
-            }
-
-            return (results.length) ? results : null;
-        },
-
-        /**
-         * Removes all listeners registered by pe.event.  Called
-         * automatically during the unload event.
-         * @method _unload
-         * @static
-         * @private
-         */
-        _unload: function(e) {
-            Y.each(_wrappers, function(v, k) {
-                if (v.type == 'unload') {
-                    v.fire(e);
-                }
-                v.detachAll();
-            });
-            remove(win, "unload", onUnload);
-        },
-
-        /**
-         * Adds a DOM event directly without the caching, cleanup, context adj, etc
-         *
-         * @method nativeAdd
-         * @param {HTMLElement} el      the element to bind the handler to
-         * @param {string}      type   the type of event handler
-         * @param {function}    fn      the callback to invoke
-         * @param {Boolean}      capture capture or bubble phase
-         * @static
-         * @private
-         */
-        nativeAdd: add,
-
-        /**
-         * Basic remove listener
-         *
-         * @method nativeRemove
-         * @param {HTMLElement} el      the element to bind the handler to
-         * @param {string}      type   the type of event handler
-         * @param {function}    fn      the callback to invoke
-         * @param {Boolean}      capture capture or bubble phase
-         * @static
-         * @private
-         */
-        nativeRemove: remove
-    };
-
-}();
-
-Y.Event = Event;
-
-if (config.injected || YUI.Env.windowLoaded) {
-    onLoad();
-} else {
-    add(win, "load", onLoad);
-}
-
-// Process onAvailable/onContentReady items when when the DOM is ready in IE
-if (Y.UA.ie) {
-    Y.on(EVENT_READY, Event._poll);
-
-    // In IE6 and below, detach event handlers when the page is unloaded in
-    // order to try and prevent cross-page memory leaks. This isn't done in
-    // other browsers because a) it's not necessary, and b) it breaks the
-    // back/forward cache.
-    if (Y.UA.ie < 7) {
-        try {
-            add(win, "unload", onUnload);
-        } catch(e) {
-        }
-    }
-}
-
-Event.Custom = Y.CustomEvent;
-Event.Subscriber = Y.Subscriber;
-Event.Target = Y.EventTarget;
-Event.Handle = Y.EventHandle;
-Event.Facade = Y.EventFacade;
-
-Event._poll();
-
-}());
-
-/**
- * DOM event listener abstraction layer
- * @module event
- * @submodule event-base
- */
-
-/**
- * Executes the callback as soon as the specified element
- * is detected in the DOM.  This function expects a selector
- * string for the element(s) to detect.  If you already have
- * an element reference, you don't need this event.
- * @event available
- * @param type {string} 'available'
- * @param fn {function} the callback function to execute.
- * @param el {string} an selector for the element(s) to attach
- * @param context optional argument that specifies what 'this' refers to.
- * @param args* 0..n additional arguments to pass on to the callback function.
- * These arguments will be added after the event object.
- * @return {EventHandle} the detach handle
- * @for YUI
- */
-Y.Env.evt.plugins.available = {
-    on: function(type, fn, id, o) {
-        var a = arguments.length > 4 ?  Y.Array(arguments, 4, true) : null;
-        return Y.Event.onAvailable.call(Y.Event, id, fn, o, a);
-    }
-};
-
-/**
- * Executes the callback as soon as the specified element
- * is detected in the DOM with a nextSibling property
- * (indicating that the element's children are available).
- * This function expects a selector
- * string for the element(s) to detect.  If you already have
- * an element reference, you don't need this event.
- * @event contentready
- * @param type {string} 'contentready'
- * @param fn {function} the callback function to execute.
- * @param el {string} an selector for the element(s) to attach.
- * @param context optional argument that specifies what 'this' refers to.
- * @param args* 0..n additional arguments to pass on to the callback function.
- * These arguments will be added after the event object.
- * @return {EventHandle} the detach handle
- * @for YUI
- */
-Y.Env.evt.plugins.contentready = {
-    on: function(type, fn, id, o) {
-        var a = arguments.length > 4 ? Y.Array(arguments, 4, true) : null;
-        return Y.Event.onContentReady.call(Y.Event, id, fn, o, a);
-    }
-};
-
-
-}, '3.16.0', {"requires": ["event-custom-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('features', function (Y, NAME) {
-
-var feature_tests = {};
-
-/**
-Contains the core of YUI's feature test architecture.
-@module features
-*/
-
-/**
-* Feature detection
-* @class Features
-* @static
-*/
-
-Y.mix(Y.namespace('Features'), {
-
-    /**
-    * Object hash of all registered feature tests
-    * @property tests
-    * @type Object
-    */
-    tests: feature_tests,
-
-    /**
-    * Add a test to the system
-    *
-    *   ```
-    *   Y.Features.add("load", "1", {});
-    *   ```
-    *
-    * @method add
-    * @param {String} cat The category, right now only 'load' is supported
-    * @param {String} name The number sequence of the test, how it's reported in the URL or config: 1, 2, 3
-    * @param {Object} o Object containing test properties
-    * @param {String} o.name The name of the test
-    * @param {Function} o.test The test function to execute, the only argument to the function is the `Y` instance
-    * @param {String} o.trigger The module that triggers this test.
-    */
-    add: function(cat, name, o) {
-        feature_tests[cat] = feature_tests[cat] || {};
-        feature_tests[cat][name] = o;
-    },
-    /**
-    * Execute all tests of a given category and return the serialized results
-    *
-    *   ```
-    *   caps=1:1;2:1;3:0
-    *   ```
-    * @method all
-    * @param {String} cat The category to execute
-    * @param {Array} args The arguments to pass to the test function
-    * @return {String} A semi-colon separated string of tests and their success/failure: 1:1;2:1;3:0
-    */
-    all: function(cat, args) {
-        var cat_o = feature_tests[cat],
-            // results = {};
-            result = [];
-        if (cat_o) {
-            Y.Object.each(cat_o, function(v, k) {
-                result.push(k + ':' + (Y.Features.test(cat, k, args) ? 1 : 0));
-            });
-        }
-
-        return (result.length) ? result.join(';') : '';
-    },
-    /**
-    * Run a sepecific test and return a Boolean response.
-    *
-    *   ```
-    *   Y.Features.test("load", "1");
-    *   ```
-    *
-    * @method test
-    * @param {String} cat The category of the test to run
-    * @param {String} name The name of the test to run
-    * @param {Array} args The arguments to pass to the test function
-    * @return {Boolean} True or false if the test passed/failed.
-    */
-    test: function(cat, name, args) {
-        args = args || [];
-        var result, ua, test,
-            cat_o = feature_tests[cat],
-            feature = cat_o && cat_o[name];
-
-        if (!feature) {
-        } else {
-
-            result = feature.result;
-
-            if (Y.Lang.isUndefined(result)) {
-
-                ua = feature.ua;
-                if (ua) {
-                    result = (Y.UA[ua]);
-                }
-
-                test = feature.test;
-                if (test && ((!ua) || result)) {
-                    result = test.apply(Y, args);
-                }
-
-                feature.result = result;
-            }
-        }
-
-        return result;
-    }
-});
-
-// Y.Features.add("load", "1", {});
-// Y.Features.test("load", "1");
-// caps=1:1;2:0;3:1;
-
-/* This file is auto-generated by (yogi.js loader --mix --yes) */
-/*jshint maxlen:900, eqeqeq: false */
-var add = Y.Features.add;
-// app-transitions-native
-add('load', '0', {
-    "name": "app-transitions-native",
-    "test": function (Y) {
-    var doc  = Y.config.doc,
-        node = doc ? doc.documentElement : null;
-
-    if (node && node.style) {
-        return ('MozTransition' in node.style || 'WebkitTransition' in node.style || 'transition' in node.style);
-    }
-
-    return false;
-},
-    "trigger": "app-transitions"
-});
-// autocomplete-list-keys
-add('load', '1', {
-    "name": "autocomplete-list-keys",
-    "test": function (Y) {
-    // Only add keyboard support to autocomplete-list if this doesn't appear to
-    // be an iOS or Android-based mobile device.
-    //
-    // There's currently no feasible way to actually detect whether a device has
-    // a hardware keyboard, so this sniff will have to do. It can easily be
-    // overridden by manually loading the autocomplete-list-keys module.
-    //
-    // Worth noting: even though iOS supports bluetooth keyboards, Mobile Safari
-    // doesn't fire the keyboard events used by AutoCompleteList, so there's
-    // no point loading the -keys module even when a bluetooth keyboard may be
-    // available.
-    return !(Y.UA.ios || Y.UA.android);
-},
-    "trigger": "autocomplete-list"
-});
-// dd-gestures
-add('load', '2', {
-    "name": "dd-gestures",
-    "trigger": "dd-drag",
-    "ua": "touchEnabled"
-});
-// dom-style-ie
-add('load', '3', {
-    "name": "dom-style-ie",
-    "test": function (Y) {
-
-    var testFeature = Y.Features.test,
-        addFeature = Y.Features.add,
-        WINDOW = Y.config.win,
-        DOCUMENT = Y.config.doc,
-        DOCUMENT_ELEMENT = 'documentElement',
-        ret = false;
-
-    addFeature('style', 'computedStyle', {
-        test: function() {
-            return WINDOW && 'getComputedStyle' in WINDOW;
-        }
-    });
-
-    addFeature('style', 'opacity', {
-        test: function() {
-            return DOCUMENT && 'opacity' in DOCUMENT[DOCUMENT_ELEMENT].style;
-        }
-    });
-
-    ret =  (!testFeature('style', 'opacity') &&
-            !testFeature('style', 'computedStyle'));
-
-    return ret;
-},
-    "trigger": "dom-style"
-});
-// editor-para-ie
-add('load', '4', {
-    "name": "editor-para-ie",
-    "trigger": "editor-para",
-    "ua": "ie",
-    "when": "instead"
-});
-// event-base-ie
-add('load', '5', {
-    "name": "event-base-ie",
-    "test": function(Y) {
-    var imp = Y.config.doc && Y.config.doc.implementation;
-    return (imp && (!imp.hasFeature('Events', '2.0')));
-},
-    "trigger": "node-base"
-});
-// graphics-canvas
-add('load', '6', {
-    "name": "graphics-canvas",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useCanvas = Y.config.defaultGraphicEngine && Y.config.defaultGraphicEngine == "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    return (!svg || useCanvas) && (canvas && canvas.getContext && canvas.getContext("2d"));
-},
-    "trigger": "graphics"
-});
-// graphics-canvas-default
-add('load', '7', {
-    "name": "graphics-canvas-default",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useCanvas = Y.config.defaultGraphicEngine && Y.config.defaultGraphicEngine == "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    return (!svg || useCanvas) && (canvas && canvas.getContext && canvas.getContext("2d"));
-},
-    "trigger": "graphics"
-});
-// graphics-svg
-add('load', '8', {
-    "name": "graphics-svg",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
-    return svg && (useSVG || !canvas);
-},
-    "trigger": "graphics"
-});
-// graphics-svg-default
-add('load', '9', {
-    "name": "graphics-svg-default",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
-    return svg && (useSVG || !canvas);
-},
-    "trigger": "graphics"
-});
-// graphics-vml
-add('load', '10', {
-    "name": "graphics-vml",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas");
-    return (DOCUMENT && !DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") && (!canvas || !canvas.getContext || !canvas.getContext("2d")));
-},
-    "trigger": "graphics"
-});
-// graphics-vml-default
-add('load', '11', {
-    "name": "graphics-vml-default",
-    "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas");
-    return (DOCUMENT && !DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") && (!canvas || !canvas.getContext || !canvas.getContext("2d")));
-},
-    "trigger": "graphics"
-});
-// history-hash-ie
-add('load', '12', {
-    "name": "history-hash-ie",
-    "test": function (Y) {
-    var docMode = Y.config.doc && Y.config.doc.documentMode;
-
-    return Y.UA.ie && (!('onhashchange' in Y.config.win) ||
-            !docMode || docMode < 8);
-},
-    "trigger": "history-hash"
-});
-// io-nodejs
-add('load', '13', {
-    "name": "io-nodejs",
-    "trigger": "io-base",
-    "ua": "nodejs"
-});
-// json-parse-shim
-add('load', '14', {
-    "name": "json-parse-shim",
-    "test": function (Y) {
-    var _JSON = Y.config.global.JSON,
-        Native = Object.prototype.toString.call(_JSON) === '[object JSON]' && _JSON,
-        nativeSupport = Y.config.useNativeJSONParse !== false && !!Native;
-
-    function workingNative( k, v ) {
-        return k === "ok" ? true : v;
-    }
-    
-    // Double check basic functionality.  This is mainly to catch early broken
-    // implementations of the JSON API in Firefox 3.1 beta1 and beta2
-    if ( nativeSupport ) {
-        try {
-            nativeSupport = ( Native.parse( '{"ok":false}', workingNative ) ).ok;
-        }
-        catch ( e ) {
-            nativeSupport = false;
-        }
-    }
-
-    return !nativeSupport;
-},
-    "trigger": "json-parse"
-});
-// json-stringify-shim
-add('load', '15', {
-    "name": "json-stringify-shim",
-    "test": function (Y) {
-    var _JSON = Y.config.global.JSON,
-        Native = Object.prototype.toString.call(_JSON) === '[object JSON]' && _JSON,
-        nativeSupport = Y.config.useNativeJSONStringify !== false && !!Native;
-
-    // Double check basic native functionality.  This is primarily to catch broken
-    // early JSON API implementations in Firefox 3.1 beta1 and beta2.
-    if ( nativeSupport ) {
-        try {
-            nativeSupport = ( '0' === Native.stringify(0) );
-        } catch ( e ) {
-            nativeSupport = false;
-        }
-    }
-
-
-    return !nativeSupport;
-},
-    "trigger": "json-stringify"
-});
-// scrollview-base-ie
-add('load', '16', {
-    "name": "scrollview-base-ie",
-    "trigger": "scrollview-base",
-    "ua": "ie"
-});
-// selector-css2
-add('load', '17', {
-    "name": "selector-css2",
-    "test": function (Y) {
-    var DOCUMENT = Y.config.doc,
-        ret = DOCUMENT && !('querySelectorAll' in DOCUMENT);
-
-    return ret;
-},
-    "trigger": "selector"
-});
-// transition-timer
-add('load', '18', {
-    "name": "transition-timer",
-    "test": function (Y) {
-    var DOCUMENT = Y.config.doc,
-        node = (DOCUMENT) ? DOCUMENT.documentElement: null,
-        ret = true;
-
-    if (node && node.style) {
-        ret = !('MozTransition' in node.style || 'WebkitTransition' in node.style || 'transition' in node.style);
-    }
-
-    return ret;
-},
-    "trigger": "transition"
-});
-// widget-base-ie
-add('load', '19', {
-    "name": "widget-base-ie",
-    "trigger": "widget-base",
-    "ua": "ie"
-});
-// yql-jsonp
-add('load', '20', {
-    "name": "yql-jsonp",
-    "test": function (Y) {
-    /* Only load the JSONP module when not in nodejs or winjs
-    TODO Make the winjs module a CORS module
-    */
-    return (!Y.UA.nodejs && !Y.UA.winjs);
-},
-    "trigger": "yql"
-});
-// yql-nodejs
-add('load', '21', {
-    "name": "yql-nodejs",
-    "trigger": "yql",
-    "ua": "nodejs"
-});
-// yql-winjs
-add('load', '22', {
-    "name": "yql-winjs",
-    "trigger": "yql",
-    "ua": "winjs"
-});
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('dom-core', function (Y, NAME) {
-
-var NODE_TYPE = 'nodeType',
-    OWNER_DOCUMENT = 'ownerDocument',
-    DOCUMENT_ELEMENT = 'documentElement',
-    DEFAULT_VIEW = 'defaultView',
-    PARENT_WINDOW = 'parentWindow',
-    TAG_NAME = 'tagName',
-    PARENT_NODE = 'parentNode',
-    PREVIOUS_SIBLING = 'previousSibling',
-    NEXT_SIBLING = 'nextSibling',
-    CONTAINS = 'contains',
-    COMPARE_DOCUMENT_POSITION = 'compareDocumentPosition',
-    EMPTY_ARRAY = [],
-
-    // IE < 8 throws on node.contains(textNode)
-    supportsContainsTextNode = (function() {
-        var node = Y.config.doc.createElement('div'),
-            textNode = node.appendChild(Y.config.doc.createTextNode('')),
-            result = false;
-
-        try {
-            result = node.contains(textNode);
-        } catch(e) {}
-
-        return result;
-    })(),
-
-/**
- * The DOM utility provides a cross-browser abtraction layer
- * normalizing DOM tasks, and adds extra helper functionality
- * for other common tasks.
- * @module dom
- * @main dom
- * @submodule dom-base
- * @for DOM
- *
- */
-
-/**
- * Provides DOM helper methods.
- * @class DOM
- *
- */
-
-Y_DOM = {
-    /**
-     * Returns the HTMLElement with the given ID (Wrapper for document.getElementById).
-     * @method byId
-     * @param {String} id the id attribute
-     * @param {Object} doc optional The document to search. Defaults to current document
-     * @return {HTMLElement | null} The HTMLElement with the id, or null if none found.
-     */
-    byId: function(id, doc) {
-        // handle dupe IDs and IE name collision
-        return Y_DOM.allById(id, doc)[0] || null;
-    },
-
-    getId: function(node) {
-        var id;
-        // HTMLElement returned from FORM when INPUT name === "id"
-        // IE < 8: HTMLCollection returned when INPUT id === "id"
-        // via both getAttribute and form.id
-        if (node.id && !node.id.tagName && !node.id.item) {
-            id = node.id;
-        } else if (node.attributes && node.attributes.id) {
-            id = node.attributes.id.value;
-        }
-
-        return id;
-    },
-
-    setId: function(node, id) {
-        if (node.setAttribute) {
-            node.setAttribute('id', id);
-        } else {
-            node.id = id;
-        }
-    },
-
-    /*
-     * Finds the ancestor of the element.
-     * @method ancestor
-     * @param {HTMLElement} element The html element.
-     * @param {Function} fn optional An optional boolean test to apply.
-     * The optional function is passed the current DOM node being tested as its only argument.
-     * If no function is given, the parentNode is returned.
-     * @param {Boolean} testSelf optional Whether or not to include the element in the scan
-     * @return {HTMLElement | null} The matching DOM node or null if none found.
-     */
-    ancestor: function(element, fn, testSelf, stopFn) {
-        var ret = null;
-        if (testSelf) {
-            ret = (!fn || fn(element)) ? element : null;
-
-        }
-        return ret || Y_DOM.elementByAxis(element, PARENT_NODE, fn, null, stopFn);
-    },
-
-    /*
-     * Finds the ancestors of the element.
-     * @method ancestors
-     * @param {HTMLElement} element The html element.
-     * @param {Function} fn optional An optional boolean test to apply.
-     * The optional function is passed the current DOM node being tested as its only argument.
-     * If no function is given, all ancestors are returned.
-     * @param {Boolean} testSelf optional Whether or not to include the element in the scan
-     * @return {Array} An array containing all matching DOM nodes.
-     */
-    ancestors: function(element, fn, testSelf, stopFn) {
-        var ancestor = element,
-            ret = [];
-
-        while ((ancestor = Y_DOM.ancestor(ancestor, fn, testSelf, stopFn))) {
-            testSelf = false;
-            if (ancestor) {
-                ret.unshift(ancestor);
-
-                if (stopFn && stopFn(ancestor)) {
-                    return ret;
-                }
-            }
-        }
-
-        return ret;
-    },
-
-    /**
-     * Searches the element by the given axis for the first matching element.
-     * @method elementByAxis
-     * @param {HTMLElement} element The html element.
-     * @param {String} axis The axis to search (parentNode, nextSibling, previousSibling).
-     * @param {Function} [fn] An optional boolean test to apply.
-     * @param {Boolean} [all] Whether text nodes as well as element nodes should be returned, or
-     * just element nodes will be returned(default)
-     * The optional function is passed the current HTMLElement being tested as its only argument.
-     * If no function is given, the first element is returned.
-     * @return {HTMLElement | null} The matching element or null if none found.
-     */
-    elementByAxis: function(element, axis, fn, all, stopAt) {
-        while (element && (element = element[axis])) { // NOTE: assignment
-                if ( (all || element[TAG_NAME]) && (!fn || fn(element)) ) {
-                    return element;
-                }
-
-                if (stopAt && stopAt(element)) {
-                    return null;
-                }
-        }
-        return null;
-    },
-
-    /**
-     * Determines whether or not one HTMLElement is or contains another HTMLElement.
-     * @method contains
-     * @param {HTMLElement} element The containing html element.
-     * @param {HTMLElement} needle The html element that may be contained.
-     * @return {Boolean} Whether or not the element is or contains the needle.
-     */
-    contains: function(element, needle) {
-        var ret = false;
-
-        if ( !needle || !element || !needle[NODE_TYPE] || !element[NODE_TYPE]) {
-            ret = false;
-        } else if (element[CONTAINS] &&
-                // IE < 8 throws on node.contains(textNode) so fall back to brute.
-                // Falling back for other nodeTypes as well.
-                (needle[NODE_TYPE] === 1 || supportsContainsTextNode)) {
-                ret = element[CONTAINS](needle);
-        } else if (element[COMPARE_DOCUMENT_POSITION]) {
-            // Match contains behavior (node.contains(node) === true).
-            // Needed for Firefox < 4.
-            if (element === needle || !!(element[COMPARE_DOCUMENT_POSITION](needle) & 16)) {
-                ret = true;
-            }
-        } else {
-            ret = Y_DOM._bruteContains(element, needle);
-        }
-
-        return ret;
-    },
-
-    /**
-     * Determines whether or not the HTMLElement is part of the document.
-     * @method inDoc
-     * @param {HTMLElement} element The containing html element.
-     * @param {HTMLElement} doc optional The document to check.
-     * @return {Boolean} Whether or not the element is attached to the document.
-     */
-    inDoc: function(element, doc) {
-        var ret = false,
-            rootNode;
-
-        if (element && element.nodeType) {
-            (doc) || (doc = element[OWNER_DOCUMENT]);
-
-            rootNode = doc[DOCUMENT_ELEMENT];
-
-            // contains only works with HTML_ELEMENT
-            if (rootNode && rootNode.contains && element.tagName) {
-                ret = rootNode.contains(element);
-            } else {
-                ret = Y_DOM.contains(rootNode, element);
-            }
-        }
-
-        return ret;
-
-    },
-
-   allById: function(id, root) {
-        root = root || Y.config.doc;
-        var nodes = [],
-            ret = [],
-            i,
-            node;
-
-        if (root.querySelectorAll) {
-            ret = root.querySelectorAll('[id="' + id + '"]');
-        } else if (root.all) {
-            nodes = root.all(id);
-
-            if (nodes) {
-                // root.all may return HTMLElement or HTMLCollection.
-                // some elements are also HTMLCollection (FORM, SELECT).
-                if (nodes.nodeName) {
-                    if (nodes.id === id) { // avoid false positive on name
-                        ret.push(nodes);
-                        nodes = EMPTY_ARRAY; // done, no need to filter
-                    } else { //  prep for filtering
-                        nodes = [nodes];
-                    }
-                }
-
-                if (nodes.length) {
-                    // filter out matches on node.name
-                    // and element.id as reference to element with id === 'id'
-                    for (i = 0; node = nodes[i++];) {
-                        if (node.id === id  ||
-                                (node.attributes && node.attributes.id &&
-                                node.attributes.id.value === id)) {
-                            ret.push(node);
-                        }
-                    }
-                }
-            }
-        } else {
-            ret = [Y_DOM._getDoc(root).getElementById(id)];
-        }
-
-        return ret;
-   },
-
-
-    isWindow: function(obj) {
-        return !!(obj && obj.scrollTo && obj.document);
-    },
-
-    _removeChildNodes: function(node) {
-        while (node.firstChild) {
-            node.removeChild(node.firstChild);
-        }
-    },
-
-    siblings: function(node, fn) {
-        var nodes = [],
-            sibling = node;
-
-        while ((sibling = sibling[PREVIOUS_SIBLING])) {
-            if (sibling[TAG_NAME] && (!fn || fn(sibling))) {
-                nodes.unshift(sibling);
-            }
-        }
-
-        sibling = node;
-        while ((sibling = sibling[NEXT_SIBLING])) {
-            if (sibling[TAG_NAME] && (!fn || fn(sibling))) {
-                nodes.push(sibling);
-            }
-        }
-
-        return nodes;
-    },
-
-    /**
-     * Brute force version of contains.
-     * Used for browsers without contains support for non-HTMLElement Nodes (textNodes, etc).
-     * @method _bruteContains
-     * @private
-     * @param {HTMLElement} element The containing html element.
-     * @param {HTMLElement} needle The html element that may be contained.
-     * @return {Boolean} Whether or not the element is or contains the needle.
-     */
-    _bruteContains: function(element, needle) {
-        while (needle) {
-            if (element === needle) {
-                return true;
-            }
-            needle = needle.parentNode;
-        }
-        return false;
-    },
-
-// TODO: move to Lang?
-    /**
-     * Memoizes dynamic regular expressions to boost runtime performance.
-     * @method _getRegExp
-     * @private
-     * @param {String} str The string to convert to a regular expression.
-     * @param {String} flags optional An optinal string of flags.
-     * @return {RegExp} An instance of RegExp
-     */
-    _getRegExp: function(str, flags) {
-        flags = flags || '';
-        Y_DOM._regexCache = Y_DOM._regexCache || {};
-        if (!Y_DOM._regexCache[str + flags]) {
-            Y_DOM._regexCache[str + flags] = new RegExp(str, flags);
-        }
-        return Y_DOM._regexCache[str + flags];
-    },
-
-// TODO: make getDoc/Win true privates?
-    /**
-     * returns the appropriate document.
-     * @method _getDoc
-     * @private
-     * @param {HTMLElement} element optional Target element.
-     * @return {Object} The document for the given element or the default document.
-     */
-    _getDoc: function(element) {
-        var doc = Y.config.doc;
-        if (element) {
-            doc = (element[NODE_TYPE] === 9) ? element : // element === document
-                element[OWNER_DOCUMENT] || // element === DOM node
-                element.document || // element === window
-                Y.config.doc; // default
-        }
-
-        return doc;
-    },
-
-    /**
-     * returns the appropriate window.
-     * @method _getWin
-     * @private
-     * @param {HTMLElement} element optional Target element.
-     * @return {Object} The window for the given element or the default window.
-     */
-    _getWin: function(element) {
-        var doc = Y_DOM._getDoc(element);
-        return doc[DEFAULT_VIEW] || doc[PARENT_WINDOW] || Y.config.win;
-    },
-
-    _batch: function(nodes, fn, arg1, arg2, arg3, etc) {
-        fn = (typeof fn === 'string') ? Y_DOM[fn] : fn;
-        var result,
-            i = 0,
-            node,
-            ret;
-
-        if (fn && nodes) {
-            while ((node = nodes[i++])) {
-                result = result = fn.call(Y_DOM, node, arg1, arg2, arg3, etc);
-                if (typeof result !== 'undefined') {
-                    (ret) || (ret = []);
-                    ret.push(result);
-                }
-            }
-        }
-
-        return (typeof ret !== 'undefined') ? ret : nodes;
-    },
-
-    generateID: function(el) {
-        var id = el.id;
-
-        if (!id) {
-            id = Y.stamp(el);
-            el.id = id;
-        }
-
-        return id;
-    }
-};
-
-
-Y.DOM = Y_DOM;
-
-
-}, '3.16.0', {"requires": ["oop", "features"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('dom-base', function (Y, NAME) {
-
-/**
-* @for DOM
-* @module dom
-*/
-var documentElement = Y.config.doc.documentElement,
-    Y_DOM = Y.DOM,
-    TAG_NAME = 'tagName',
-    OWNER_DOCUMENT = 'ownerDocument',
-    EMPTY_STRING = '',
-    addFeature = Y.Features.add,
-    testFeature = Y.Features.test;
-
-Y.mix(Y_DOM, {
-    /**
-     * Returns the text content of the HTMLElement.
-     * @method getText
-     * @param {HTMLElement} element The html element.
-     * @return {String} The text content of the element (includes text of any descending elements).
-     */
-    getText: (documentElement.textContent !== undefined) ?
-        function(element) {
-            var ret = '';
-            if (element) {
-                ret = element.textContent;
-            }
-            return ret || '';
-        } : function(element) {
-            var ret = '';
-            if (element) {
-                ret = element.innerText || element.nodeValue; // might be a textNode
-            }
-            return ret || '';
-        },
-
-    /**
-     * Sets the text content of the HTMLElement.
-     * @method setText
-     * @param {HTMLElement} element The html element.
-     * @param {String} content The content to add.
-     */
-    setText: (documentElement.textContent !== undefined) ?
-        function(element, content) {
-            if (element) {
-                element.textContent = content;
-            }
-        } : function(element, content) {
-            if ('innerText' in element) {
-                element.innerText = content;
-            } else if ('nodeValue' in element) {
-                element.nodeValue = content;
-            }
-    },
-
-    CUSTOM_ATTRIBUTES: (!documentElement.hasAttribute) ? { // IE < 8
-        'for': 'htmlFor',
-        'class': 'className'
-    } : { // w3c
-        'htmlFor': 'for',
-        'className': 'class'
-    },
-
-    /**
-     * Provides a normalized attribute interface.
-     * @method setAttribute
-     * @param {HTMLElement} el The target element for the attribute.
-     * @param {String} attr The attribute to set.
-     * @param {String} val The value of the attribute.
-     */
-    setAttribute: function(el, attr, val, ieAttr) {
-        if (el && attr && el.setAttribute) {
-            attr = Y_DOM.CUSTOM_ATTRIBUTES[attr] || attr;
-            el.setAttribute(attr, val, ieAttr);
-        }
-    },
-
-
-    /**
-     * Provides a normalized attribute interface.
-     * @method getAttribute
-     * @param {HTMLElement} el The target element for the attribute.
-     * @param {String} attr The attribute to get.
-     * @return {String} The current value of the attribute.
-     */
-    getAttribute: function(el, attr, ieAttr) {
-        ieAttr = (ieAttr !== undefined) ? ieAttr : 2;
-        var ret = '';
-        if (el && attr && el.getAttribute) {
-            attr = Y_DOM.CUSTOM_ATTRIBUTES[attr] || attr;
-            // BUTTON value issue for IE < 8
-            ret = (el.tagName === "BUTTON" && attr === 'value') ? Y_DOM.getValue(el) : el.getAttribute(attr, ieAttr);
-
-            if (ret === null) {
-                ret = ''; // per DOM spec
-            }
-        }
-        return ret;
-    },
-
-    VALUE_SETTERS: {},
-
-    VALUE_GETTERS: {},
-
-    getValue: function(node) {
-        var ret = '', // TODO: return null?
-            getter;
-
-        if (node && node[TAG_NAME]) {
-            getter = Y_DOM.VALUE_GETTERS[node[TAG_NAME].toLowerCase()];
-
-            if (getter) {
-                ret = getter(node);
-            } else {
-                ret = node.value;
-            }
-        }
-
-        // workaround for IE8 JSON stringify bug
-        // which converts empty string values to null
-        if (ret === EMPTY_STRING) {
-            ret = EMPTY_STRING; // for real
-        }
-
-        return (typeof ret === 'string') ? ret : '';
-    },
-
-    setValue: function(node, val) {
-        var setter;
-
-        if (node && node[TAG_NAME]) {
-            setter = Y_DOM.VALUE_SETTERS[node[TAG_NAME].toLowerCase()];
-            val = (val === null) ? '' : val;
-            if (setter) {
-                setter(node, val);
-            } else {
-                node.value = val;
-            }
-        }
-    },
-
-    creators: {}
-});
-
-addFeature('value-set', 'select', {
-    test: function() {
-        var node = Y.config.doc.createElement('select');
-        node.innerHTML = '<option>1</option><option>2</option>';
-        node.value = '2';
-        return (node.value && node.value === '2');
-    }
-});
-
-if (!testFeature('value-set', 'select')) {
-    Y_DOM.VALUE_SETTERS.select = function(node, val) {
-        for (var i = 0, options = node.getElementsByTagName('option'), option;
-                option = options[i++];) {
-            if (Y_DOM.getValue(option) === val) {
-                option.selected = true;
-                //Y_DOM.setAttribute(option, 'selected', 'selected');
-                break;
-            }
-        }
-    };
-}
-
-Y.mix(Y_DOM.VALUE_GETTERS, {
-    button: function(node) {
-        return (node.attributes && node.attributes.value) ? node.attributes.value.value : '';
-    }
-});
-
-Y.mix(Y_DOM.VALUE_SETTERS, {
-    // IE: node.value changes the button text, which should be handled via innerHTML
-    button: function(node, val) {
-        var attr = node.attributes.value;
-        if (!attr) {
-            attr = node[OWNER_DOCUMENT].createAttribute('value');
-            node.setAttributeNode(attr);
-        }
-
-        attr.value = val;
-    }
-});
-
-
-Y.mix(Y_DOM.VALUE_GETTERS, {
-    option: function(node) {
-        var attrs = node.attributes;
-        return (attrs.value && attrs.value.specified) ? node.value : node.text;
-    },
-
-    select: function(node) {
-        var val = node.value,
-            options = node.options;
-
-        if (options && options.length) {
-            // TODO: implement multipe select
-            if (node.multiple) {
-            } else if (node.selectedIndex > -1) {
-                val = Y_DOM.getValue(options[node.selectedIndex]);
-            }
-        }
-
-        return val;
-    }
-});
-var addClass, hasClass, removeClass;
-
-Y.mix(Y.DOM, {
-    /**
-     * Determines whether a DOM element has the given className.
-     * @method hasClass
-     * @for DOM
-     * @param {HTMLElement} element The DOM element.
-     * @param {String} className the class name to search for
-     * @return {Boolean} Whether or not the element has the given class.
-     */
-    hasClass: function(node, className) {
-        var re = Y.DOM._getRegExp('(?:^|\\s+)' + className + '(?:\\s+|$)');
-        return re.test(node.className);
-    },
-
-    /**
-     * Adds a class name to a given DOM element.
-     * @method addClass
-     * @for DOM
-     * @param {HTMLElement} element The DOM element.
-     * @param {String} className the class name to add to the class attribute
-     */
-    addClass: function(node, className) {
-        if (!Y.DOM.hasClass(node, className)) { // skip if already present
-            node.className = Y.Lang.trim([node.className, className].join(' '));
-        }
-    },
-
-    /**
-     * Removes a class name from a given element.
-     * @method removeClass
-     * @for DOM
-     * @param {HTMLElement} element The DOM element.
-     * @param {String} className the class name to remove from the class attribute
-     */
-    removeClass: function(node, className) {
-        if (className && hasClass(node, className)) {
-            node.className = Y.Lang.trim(node.className.replace(Y.DOM._getRegExp('(?:^|\\s+)' +
-                            className + '(?:\\s+|$)'), ' '));
-
-            if ( hasClass(node, className) ) { // in case of multiple adjacent
-                removeClass(node, className);
-            }
-        }
-    },
-
-    /**
-     * Replace a class with another class for a given element.
-     * If no oldClassName is present, the newClassName is simply added.
-     * @method replaceClass
-     * @for DOM
-     * @param {HTMLElement} element The DOM element
-     * @param {String} oldClassName the class name to be replaced
-     * @param {String} newClassName the class name that will be replacing the old class name
-     */
-    replaceClass: function(node, oldC, newC) {
-        removeClass(node, oldC); // remove first in case oldC === newC
-        addClass(node, newC);
-    },
-
-    /**
-     * If the className exists on the node it is removed, if it doesn't exist it is added.
-     * @method toggleClass
-     * @for DOM
-     * @param {HTMLElement} element The DOM element
-     * @param {String} className the class name to be toggled
-     * @param {Boolean} addClass optional boolean to indicate whether class
-     * should be added or removed regardless of current state
-     */
-    toggleClass: function(node, className, force) {
-        var add = (force !== undefined) ? force :
-                !(hasClass(node, className));
-
-        if (add) {
-            addClass(node, className);
-        } else {
-            removeClass(node, className);
-        }
-    }
-});
-
-hasClass = Y.DOM.hasClass;
-removeClass = Y.DOM.removeClass;
-addClass = Y.DOM.addClass;
-
-var re_tag = /<([a-z]+)/i,
-
-    Y_DOM = Y.DOM,
-
-    addFeature = Y.Features.add,
-    testFeature = Y.Features.test,
-
-    creators = {},
-
-    createFromDIV = function(html, tag) {
-        var div = Y.config.doc.createElement('div'),
-            ret = true;
-
-        div.innerHTML = html;
-        if (!div.firstChild || div.firstChild.tagName !== tag.toUpperCase()) {
-            ret = false;
-        }
-
-        return ret;
-    },
-
-    re_tbody = /(?:\/(?:thead|tfoot|tbody|caption|col|colgroup)>)+\s*<tbody/,
-
-    TABLE_OPEN = '<table>',
-    TABLE_CLOSE = '</table>', 
-    
-    selectedIndex;
-
-Y.mix(Y.DOM, {
-    _fragClones: {},
-
-    _create: function(html, doc, tag) {
-        tag = tag || 'div';
-
-        var frag = Y_DOM._fragClones[tag];
-        if (frag) {
-            frag = frag.cloneNode(false);
-        } else {
-            frag = Y_DOM._fragClones[tag] = doc.createElement(tag);
-        }
-        frag.innerHTML = html;
-        return frag;
-    },
-
-    _children: function(node, tag) {
-            var i = 0,
-            children = node.children,
-            childNodes,
-            hasComments,
-            child;
-
-        if (children && children.tags) { // use tags filter when possible
-            if (tag) {
-                children = node.children.tags(tag);
-            } else { // IE leaks comments into children
-                hasComments = children.tags('!').length;
-            }
-        }
-
-        if (!children || (!children.tags && tag) || hasComments) {
-            childNodes = children || node.childNodes;
-            children = [];
-            while ((child = childNodes[i++])) {
-                if (child.nodeType === 1) {
-                    if (!tag || tag === child.tagName) {
-                        children.push(child);
-                    }
-                }
-            }
-        }
-
-        return children || [];
-    },
-
-    /**
-     * Creates a new dom node using the provided markup string.
-     * @method create
-     * @param {String} html The markup used to create the element
-     * @param {HTMLDocument} doc An optional document context
-     * @return {HTMLElement|DocumentFragment} returns a single HTMLElement
-     * when creating one node, and a documentFragment when creating
-     * multiple nodes.
-     */
-    create: function(html, doc) {
-        if (typeof html === 'string') {
-            html = Y.Lang.trim(html); // match IE which trims whitespace from innerHTML
-
-        }
-
-        doc = doc || Y.config.doc;
-        var m = re_tag.exec(html),
-            create = Y_DOM._create,
-            custom = creators,
-            ret = null,
-            creator, tag, node, nodes;
-
-        if (html != undefined) { // not undefined or null
-            if (m && m[1]) {
-                creator = custom[m[1].toLowerCase()];
-                if (typeof creator === 'function') {
-                    create = creator;
-                } else {
-                    tag = creator;
-                }
-            }
-            
-            node = create(html, doc, tag);
-            nodes = node.childNodes;
-
-            if (nodes.length === 1) { // return single node, breaking parentNode ref from "fragment"
-                ret = node.removeChild(nodes[0]);
-            } else if (nodes[0] && nodes[0].className === 'yui3-big-dummy') { // using dummy node to preserve some attributes (e.g. OPTION not selected)
-                selectedIndex = node.selectedIndex;
-                
-                if (nodes.length === 2) {
-                    ret = nodes[0].nextSibling;
-                } else {
-                    node.removeChild(nodes[0]);
-                    ret = Y_DOM._nl2frag(nodes, doc);
-                }
-            } else { // return multiple nodes as a fragment
-                 ret = Y_DOM._nl2frag(nodes, doc);
-            }
-
-        }
-
-        return ret;
-    },
-
-    _nl2frag: function(nodes, doc) {
-        var ret = null,
-            i, len;
-
-        if (nodes && (nodes.push || nodes.item) && nodes[0]) {
-            doc = doc || nodes[0].ownerDocument;
-            ret = doc.createDocumentFragment();
-
-            if (nodes.item) { // convert live list to static array
-                nodes = Y.Array(nodes, 0, true);
-            }
-
-            for (i = 0, len = nodes.length; i < len; i++) {
-                ret.appendChild(nodes[i]);
-            }
-        } // else inline with log for minification
-        return ret;
-    },
-
-    /**
-     * Inserts content in a node at the given location
-     * @method addHTML
-     * @param {HTMLElement} node The node to insert into
-     * @param {HTMLElement | Array | HTMLCollection} content The content to be inserted
-     * @param {HTMLElement} where Where to insert the content
-     * If no "where" is given, content is appended to the node
-     * Possible values for "where"
-     * <dl>
-     * <dt>HTMLElement</dt>
-     * <dd>The element to insert before</dd>
-     * <dt>"replace"</dt>
-     * <dd>Replaces the existing HTML</dd>
-     * <dt>"before"</dt>
-     * <dd>Inserts before the existing HTML</dd>
-     * <dt>"before"</dt>
-     * <dd>Inserts content before the node</dd>
-     * <dt>"after"</dt>
-     * <dd>Inserts content after the node</dd>
-     * </dl>
-     */
-    addHTML: function(node, content, where) {
-        var nodeParent = node.parentNode,
-            i = 0,
-            item,
-            ret = content,
-            newNode;
-
-
-        if (content != undefined) { // not null or undefined (maybe 0)
-            if (content.nodeType) { // DOM node, just add it
-                newNode = content;
-            } else if (typeof content == 'string' || typeof content == 'number') {
-                ret = newNode = Y_DOM.create(content);
-            } else if (content[0] && content[0].nodeType) { // array or collection
-                newNode = Y.config.doc.createDocumentFragment();
-                while ((item = content[i++])) {
-                    newNode.appendChild(item); // append to fragment for insertion
-                }
-            }
-        }
-
-        if (where) {
-            if (newNode && where.parentNode) { // insert regardless of relationship to node
-                where.parentNode.insertBefore(newNode, where);
-            } else {
-                switch (where) {
-                    case 'replace':
-                        while (node.firstChild) {
-                            node.removeChild(node.firstChild);
-                        }
-                        if (newNode) { // allow empty content to clear node
-                            node.appendChild(newNode);
-                        }
-                        break;
-                    case 'before':
-                        if (newNode) {
-                            nodeParent.insertBefore(newNode, node);
-                        }
-                        break;
-                    case 'after':
-                        if (newNode) {
-                            if (node.nextSibling) { // IE errors if refNode is null
-                                nodeParent.insertBefore(newNode, node.nextSibling);
-                            } else {
-                                nodeParent.appendChild(newNode);
-                            }
-                        }
-                        break;
-                    default:
-                        if (newNode) {
-                            node.appendChild(newNode);
-                        }
-                }
-            }
-        } else if (newNode) {
-            node.appendChild(newNode);
-        }
-
-        // `select` elements are the only elements with `selectedIndex`.
-        // Don't grab the dummy `option` element's `selectedIndex`.
-        if (node.nodeName == "SELECT" && selectedIndex > 0) {
-            node.selectedIndex = selectedIndex - 1;
-        }
-        
-        return ret;
-    },
-
-    wrap: function(node, html) {
-        var parent = (html && html.nodeType) ? html : Y.DOM.create(html),
-            nodes = parent.getElementsByTagName('*');
-
-        if (nodes.length) {
-            parent = nodes[nodes.length - 1];
-        }
-
-        if (node.parentNode) {
-            node.parentNode.replaceChild(parent, node);
-        }
-        parent.appendChild(node);
-    },
-
-    unwrap: function(node) {
-        var parent = node.parentNode,
-            lastChild = parent.lastChild,
-            next = node,
-            grandparent;
-
-        if (parent) {
-            grandparent = parent.parentNode;
-            if (grandparent) {
-                node = parent.firstChild;
-                while (node !== lastChild) {
-                    next = node.nextSibling;
-                    grandparent.insertBefore(node, parent);
-                    node = next;
-                }
-                grandparent.replaceChild(lastChild, parent);
-            } else {
-                parent.removeChild(node);
-            }
-        }
-    }
-});
-
-addFeature('innerhtml', 'table', {
-    test: function() {
-        var node = Y.config.doc.createElement('table');
-        try {
-            node.innerHTML = '<tbody></tbody>';
-        } catch(e) {
-            return false;
-        }
-        return (node.firstChild && node.firstChild.nodeName === 'TBODY');
-    }
-});
-
-addFeature('innerhtml-div', 'tr', {
-    test: function() {
-        return createFromDIV('<tr></tr>', 'tr');
-    }
-});
-
-addFeature('innerhtml-div', 'script', {
-    test: function() {
-        return createFromDIV('<script></script>', 'script');
-    }
-});
-
-if (!testFeature('innerhtml', 'table')) {
-    // TODO: thead/tfoot with nested tbody
-        // IE adds TBODY when creating TABLE elements (which may share this impl)
-    creators.tbody = function(html, doc) {
-        var frag = Y_DOM.create(TABLE_OPEN + html + TABLE_CLOSE, doc),
-            tb = Y.DOM._children(frag, 'tbody')[0];
-
-        if (frag.children.length > 1 && tb && !re_tbody.test(html)) {
-            tb.parentNode.removeChild(tb); // strip extraneous tbody
-        }
-        return frag;
-    };
-}
-
-if (!testFeature('innerhtml-div', 'script')) {
-    creators.script = function(html, doc) {
-        var frag = doc.createElement('div');
-
-        frag.innerHTML = '-' + html;
-        frag.removeChild(frag.firstChild);
-        return frag;
-    };
-
-    creators.link = creators.style = creators.script;
-}
-
-if (!testFeature('innerhtml-div', 'tr')) {
-    Y.mix(creators, {
-        option: function(html, doc) {
-            return Y_DOM.create('<select><option class="yui3-big-dummy" selected></option>' + html + '</select>', doc);
-        },
-
-        tr: function(html, doc) {
-            return Y_DOM.create('<tbody>' + html + '</tbody>', doc);
-        },
-
-        td: function(html, doc) {
-            return Y_DOM.create('<tr>' + html + '</tr>', doc);
-        },
-
-        col: function(html, doc) {
-            return Y_DOM.create('<colgroup>' + html + '</colgroup>', doc);
-        },
-
-        tbody: 'table'
-    });
-
-    Y.mix(creators, {
-        legend: 'fieldset',
-        th: creators.td,
-        thead: creators.tbody,
-        tfoot: creators.tbody,
-        caption: creators.tbody,
-        colgroup: creators.tbody,
-        optgroup: creators.option
-    });
-}
-
-Y_DOM.creators = creators;
-Y.mix(Y.DOM, {
-    /**
-     * Sets the width of the element to the given size, regardless
-     * of box model, border, padding, etc.
-     * @method setWidth
-     * @param {HTMLElement} element The DOM element.
-     * @param {String|Number} size The pixel height to size to
-     */
-
-    setWidth: function(node, size) {
-        Y.DOM._setSize(node, 'width', size);
-    },
-
-    /**
-     * Sets the height of the element to the given size, regardless
-     * of box model, border, padding, etc.
-     * @method setHeight
-     * @param {HTMLElement} element The DOM element.
-     * @param {String|Number} size The pixel height to size to
-     */
-
-    setHeight: function(node, size) {
-        Y.DOM._setSize(node, 'height', size);
-    },
-
-    _setSize: function(node, prop, val) {
-        val = (val > 0) ? val : 0;
-        var size = 0;
-
-        node.style[prop] = val + 'px';
-        size = (prop === 'height') ? node.offsetHeight : node.offsetWidth;
-
-        if (size > val) {
-            val = val - (size - val);
-
-            if (val < 0) {
-                val = 0;
-            }
-
-            node.style[prop] = val + 'px';
-        }
-    }
-});
-
-
-}, '3.16.0', {"requires": ["dom-core"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('selector-native', function (Y, NAME) {
-
-(function(Y) {
-/**
- * The selector-native module provides support for native querySelector
- * @module dom
- * @submodule selector-native
- * @for Selector
- */
-
-/**
- * Provides support for using CSS selectors to query the DOM
- * @class Selector
- * @static
- * @for Selector
- */
-
-Y.namespace('Selector'); // allow native module to standalone
-
-var COMPARE_DOCUMENT_POSITION = 'compareDocumentPosition',
-    OWNER_DOCUMENT = 'ownerDocument';
-
-var Selector = {
-    _types: {
-        esc: {
-            token: '\uE000',
-            re: /\\[:\[\]\(\)#\.\'\>+~"]/gi
-        },
-
-        attr: {
-            token: '\uE001',
-            re: /(\[[^\]]*\])/g
-        },
-
-        pseudo: {
-            token: '\uE002',
-            re: /(\([^\)]*\))/g
-        }
-    },
-
-    /**
-     *  Use the native version of `querySelectorAll`, if it exists.
-     *
-     * @property useNative
-     * @default true
-     * @static
-     */
-    useNative: true,
-
-    _escapeId: function(id) {
-        if (id) {
-            id = id.replace(/([:\[\]\(\)#\.'<>+~"])/g,'\\$1');
-        }
-        return id;
-    },
-
-    _compare: ('sourceIndex' in Y.config.doc.documentElement) ?
-        function(nodeA, nodeB) {
-            var a = nodeA.sourceIndex,
-                b = nodeB.sourceIndex;
-
-            if (a === b) {
-                return 0;
-            } else if (a > b) {
-                return 1;
-            }
-
-            return -1;
-
-        } : (Y.config.doc.documentElement[COMPARE_DOCUMENT_POSITION] ?
-        function(nodeA, nodeB) {
-            if (nodeA[COMPARE_DOCUMENT_POSITION](nodeB) & 4) {
-                return -1;
-            } else {
-                return 1;
-            }
-        } :
-        function(nodeA, nodeB) {
-            var rangeA, rangeB, compare;
-            if (nodeA && nodeB) {
-                rangeA = nodeA[OWNER_DOCUMENT].createRange();
-                rangeA.setStart(nodeA, 0);
-                rangeB = nodeB[OWNER_DOCUMENT].createRange();
-                rangeB.setStart(nodeB, 0);
-                compare = rangeA.compareBoundaryPoints(1, rangeB); // 1 === Range.START_TO_END
-            }
-
-            return compare;
-
-    }),
-
-    _sort: function(nodes) {
-        if (nodes) {
-            nodes = Y.Array(nodes, 0, true);
-            if (nodes.sort) {
-                nodes.sort(Selector._compare);
-            }
-        }
-
-        return nodes;
-    },
-
-    _deDupe: function(nodes) {
-        var ret = [],
-            i, node;
-
-        for (i = 0; (node = nodes[i++]);) {
-            if (!node._found) {
-                ret[ret.length] = node;
-                node._found = true;
-            }
-        }
-
-        for (i = 0; (node = ret[i++]);) {
-            node._found = null;
-            node.removeAttribute('_found');
-        }
-
-        return ret;
-    },
-
-    /**
-     * Retrieves a set of nodes based on a given CSS selector.
-     * @method query
-     *
-     * @param {String} selector A CSS selector.
-     * @param {HTMLElement} root optional A node to start the query from. Defaults to `Y.config.doc`.
-     * @param {Boolean} firstOnly optional Whether or not to return only the first match.
-     * @return {HTMLElement[]} The array of nodes that matched the given selector.
-     * @static
-     */
-    query: function(selector, root, firstOnly, skipNative) {
-        root = root || Y.config.doc;
-        var ret = [],
-            useNative = (Y.Selector.useNative && Y.config.doc.querySelector && !skipNative),
-            queries = [[selector, root]],
-            query,
-            result,
-            i,
-            fn = (useNative) ? Y.Selector._nativeQuery : Y.Selector._bruteQuery;
-
-        if (selector && fn) {
-            // split group into seperate queries
-            if (!skipNative && // already done if skipping
-                    (!useNative || root.tagName)) { // split native when element scoping is needed
-                queries = Selector._splitQueries(selector, root);
-            }
-
-            for (i = 0; (query = queries[i++]);) {
-                result = fn(query[0], query[1], firstOnly);
-                if (!firstOnly) { // coerce DOM Collection to Array
-                    result = Y.Array(result, 0, true);
-                }
-                if (result) {
-                    ret = ret.concat(result);
-                }
-            }
-
-            if (queries.length > 1) { // remove dupes and sort by doc order
-                ret = Selector._sort(Selector._deDupe(ret));
-            }
-        }
-
-        return (firstOnly) ? (ret[0] || null) : ret;
-
-    },
-
-    _replaceSelector: function(selector) {
-        var esc = Y.Selector._parse('esc', selector), // pull escaped colon, brackets, etc.
-            attrs,
-            pseudos;
-
-        // first replace escaped chars, which could be present in attrs or pseudos
-        selector = Y.Selector._replace('esc', selector);
-
-        // then replace pseudos before attrs to avoid replacing :not([foo])
-        pseudos = Y.Selector._parse('pseudo', selector);
-        selector = Selector._replace('pseudo', selector);
-
-        attrs = Y.Selector._parse('attr', selector);
-        selector = Y.Selector._replace('attr', selector);
-
-        return {
-            esc: esc,
-            attrs: attrs,
-            pseudos: pseudos,
-            selector: selector
-        };
-    },
-
-    _restoreSelector: function(replaced) {
-        var selector = replaced.selector;
-        selector = Y.Selector._restore('attr', selector, replaced.attrs);
-        selector = Y.Selector._restore('pseudo', selector, replaced.pseudos);
-        selector = Y.Selector._restore('esc', selector, replaced.esc);
-        return selector;
-    },
-
-    _replaceCommas: function(selector) {
-        var replaced = Y.Selector._replaceSelector(selector),
-            selector = replaced.selector;
-
-        if (selector) {
-            selector = selector.replace(/,/g, '\uE007');
-            replaced.selector = selector;
-            selector = Y.Selector._restoreSelector(replaced);
-        }
-        return selector;
-    },
-
-    // allows element scoped queries to begin with combinator
-    // e.g. query('> p', document.body) === query('body > p')
-    _splitQueries: function(selector, node) {
-        if (selector.indexOf(',') > -1) {
-            selector = Y.Selector._replaceCommas(selector);
-        }
-
-        var groups = selector.split('\uE007'), // split on replaced comma token
-            queries = [],
-            prefix = '',
-            id,
-            i,
-            len;
-
-        if (node) {
-            // enforce for element scoping
-            if (node.nodeType === 1) { // Elements only
-                id = Y.Selector._escapeId(Y.DOM.getId(node));
-
-                if (!id) {
-                    id = Y.guid();
-                    Y.DOM.setId(node, id);
-                }
-
-                prefix = '[id="' + id + '"] ';
-            }
-
-            for (i = 0, len = groups.length; i < len; ++i) {
-                selector =  prefix + groups[i];
-                queries.push([selector, node]);
-            }
-        }
-
-        return queries;
-    },
-
-    _nativeQuery: function(selector, root, one) {
-        if (
-            (Y.UA.webkit || Y.UA.opera) &&          // webkit (chrome, safari) and Opera
-            selector.indexOf(':checked') > -1 &&    // fail to pick up "selected"  with ":checked"
-            (Y.Selector.pseudos && Y.Selector.pseudos.checked)
-        ) {
-            return Y.Selector.query(selector, root, one, true); // redo with skipNative true to try brute query
-        }
-        try {
-            return root['querySelector' + (one ? '' : 'All')](selector);
-        } catch(e) { // fallback to brute if available
-            return Y.Selector.query(selector, root, one, true); // redo with skipNative true
-        }
-    },
-
-    /**
-     * Filters out nodes that do not match the given CSS selector.
-     * @method filter
-     *
-     * @param {HTMLElement[]} nodes An array of nodes.
-     * @param {String} selector A CSS selector to test each node against.
-     * @return {HTMLElement[]} The nodes that matched the given CSS selector.
-     * @static
-     */
-    filter: function(nodes, selector) {
-        var ret = [],
-            i, node;
-
-        if (nodes && selector) {
-            for (i = 0; (node = nodes[i++]);) {
-                if (Y.Selector.test(node, selector)) {
-                    ret[ret.length] = node;
-                }
-            }
-        } else {
-        }
-
-        return ret;
-    },
-
-    /**
-     * Determines whether or not the given node matches the given CSS selector.
-     * @method test
-     * 
-     * @param {HTMLElement} node A node to test.
-     * @param {String} selector A CSS selector to test the node against.
-     * @param {HTMLElement} root optional A node to start the query from. Defaults to the parent document of the node.
-     * @return {Boolean} Whether or not the given node matched the given CSS selector.
-     * @static
-     */
-    test: function(node, selector, root) {
-        var ret = false,
-            useFrag = false,
-            groups,
-            parent,
-            item,
-            items,
-            frag,
-            id,
-            i, j, group;
-
-        if (node && node.tagName) { // only test HTMLElements
-
-            if (typeof selector == 'function') { // test with function
-                ret = selector.call(node, node);
-            } else { // test with query
-                // we need a root if off-doc
-                groups = selector.split(',');
-                if (!root && !Y.DOM.inDoc(node)) {
-                    parent = node.parentNode;
-                    if (parent) {
-                        root = parent;
-                    } else { // only use frag when no parent to query
-                        frag = node[OWNER_DOCUMENT].createDocumentFragment();
-                        frag.appendChild(node);
-                        root = frag;
-                        useFrag = true;
-                    }
-                }
-                root = root || node[OWNER_DOCUMENT];
-
-                id = Y.Selector._escapeId(Y.DOM.getId(node));
-                if (!id) {
-                    id = Y.guid();
-                    Y.DOM.setId(node, id);
-                }
-
-                for (i = 0; (group = groups[i++]);) { // TODO: off-dom test
-                    group += '[id="' + id + '"]';
-                    items = Y.Selector.query(group, root);
-
-                    for (j = 0; item = items[j++];) {
-                        if (item === node) {
-                            ret = true;
-                            break;
-                        }
-                    }
-                    if (ret) {
-                        break;
-                    }
-                }
-
-                if (useFrag) { // cleanup
-                    frag.removeChild(node);
-                }
-            };
-        }
-
-        return ret;
-    },
-
-    /**
-     * A convenience method to emulate Y.Node's aNode.ancestor(selector).
-     * @method ancestor
-     *
-     * @param {HTMLElement} node A node to start the query from.
-     * @param {String} selector A CSS selector to test the node against.
-     * @param {Boolean} testSelf optional Whether or not to include the node in the scan.
-     * @return {HTMLElement} The ancestor node matching the selector, or null.
-     * @static
-     */
-    ancestor: function (node, selector, testSelf) {
-        return Y.DOM.ancestor(node, function(n) {
-            return Y.Selector.test(n, selector);
-        }, testSelf);
-    },
-
-    _parse: function(name, selector) {
-        return selector.match(Y.Selector._types[name].re);
-    },
-
-    _replace: function(name, selector) {
-        var o = Y.Selector._types[name];
-        return selector.replace(o.re, o.token);
-    },
-
-    _restore: function(name, selector, items) {
-        if (items) {
-            var token = Y.Selector._types[name].token,
-                i, len;
-            for (i = 0, len = items.length; i < len; ++i) {
-                selector = selector.replace(token, items[i]);
-            }
-        }
-        return selector;
-    }
-};
-
-Y.mix(Y.Selector, Selector, true);
-
-})(Y);
-
-
-}, '3.16.0', {"requires": ["dom-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('selector', function (Y, NAME) {
-
-
-
-}, '3.16.0', {"requires": ["selector-native"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-core', function (Y, NAME) {
-
-/**
- * The Node Utility provides a DOM-like interface for interacting with DOM nodes.
- * @module node
- * @main node
- * @submodule node-core
- */
-
-/**
- * The Node class provides a wrapper for manipulating DOM Nodes.
- * Node properties can be accessed via the set/get methods.
- * Use `Y.one()` to retrieve Node instances.
- *
- * <strong>NOTE:</strong> Node properties are accessed using
- * the <code>set</code> and <code>get</code> methods.
- *
- * @class Node
- * @constructor
- * @param {HTMLElement} node the DOM node to be mapped to the Node instance.
- * @uses EventTarget
- */
-
-// "globals"
-var DOT = '.',
-    NODE_NAME = 'nodeName',
-    NODE_TYPE = 'nodeType',
-    OWNER_DOCUMENT = 'ownerDocument',
-    TAG_NAME = 'tagName',
-    UID = '_yuid',
-    EMPTY_OBJ = {},
-
-    _slice = Array.prototype.slice,
-
-    Y_DOM = Y.DOM,
-
-    Y_Node = function(node) {
-        if (!this.getDOMNode) { // support optional "new"
-            return new Y_Node(node);
-        }
-
-        if (typeof node == 'string') {
-            node = Y_Node._fromString(node);
-            if (!node) {
-                return null; // NOTE: return
-            }
-        }
-
-        var uid = (node.nodeType !== 9) ? node.uniqueID : node[UID];
-
-        if (uid && Y_Node._instances[uid] && Y_Node._instances[uid]._node !== node) {
-            node[UID] = null; // unset existing uid to prevent collision (via clone or hack)
-        }
-
-        uid = uid || Y.stamp(node);
-        if (!uid) { // stamp failed; likely IE non-HTMLElement
-            uid = Y.guid();
-        }
-
-        this[UID] = uid;
-
-        /**
-         * The underlying DOM node bound to the Y.Node instance
-         * @property _node
-         * @type HTMLElement
-         * @private
-         */
-        this._node = node;
-
-        this._stateProxy = node; // when augmented with Attribute
-
-        if (this._initPlugins) { // when augmented with Plugin.Host
-            this._initPlugins();
-        }
-    },
-
-    // used with previous/next/ancestor tests
-    _wrapFn = function(fn) {
-        var ret = null;
-        if (fn) {
-            ret = (typeof fn == 'string') ?
-            function(n) {
-                return Y.Selector.test(n, fn);
-            } :
-            function(n) {
-                return fn(Y.one(n));
-            };
-        }
-
-        return ret;
-    };
-// end "globals"
-
-Y_Node.ATTRS = {};
-Y_Node.DOM_EVENTS = {};
-
-Y_Node._fromString = function(node) {
-    if (node) {
-        if (node.indexOf('doc') === 0) { // doc OR document
-            node = Y.config.doc;
-        } else if (node.indexOf('win') === 0) { // win OR window
-            node = Y.config.win;
-        } else {
-            node = Y.Selector.query(node, null, true);
-        }
-    }
-
-    return node || null;
-};
-
-/**
- * The name of the component
- * @static
- * @type String
- * @property NAME
- */
-Y_Node.NAME = 'node';
-
-/*
- * The pattern used to identify ARIA attributes
- */
-Y_Node.re_aria = /^(?:role$|aria-)/;
-
-Y_Node.SHOW_TRANSITION = 'fadeIn';
-Y_Node.HIDE_TRANSITION = 'fadeOut';
-
-/**
- * A list of Node instances that have been created
- * @private
- * @type Object
- * @property _instances
- * @static
- *
- */
-Y_Node._instances = {};
-
-/**
- * Retrieves the DOM node bound to a Node instance
- * @method getDOMNode
- * @static
- *
- * @param {Node|HTMLElement} node The Node instance or an HTMLElement
- * @return {HTMLElement} The DOM node bound to the Node instance.  If a DOM node is passed
- * as the node argument, it is simply returned.
- */
-Y_Node.getDOMNode = function(node) {
-    if (node) {
-        return (node.nodeType) ? node : node._node || null;
-    }
-    return null;
-};
-
-/**
- * Checks Node return values and wraps DOM Nodes as Y.Node instances
- * and DOM Collections / Arrays as Y.NodeList instances.
- * Other return values just pass thru.  If undefined is returned (e.g. no return)
- * then the Node instance is returned for chainability.
- * @method scrubVal
- * @static
- *
- * @param {HTMLElement|HTMLElement[]|Node} node The Node instance or an HTMLElement
- * @return {Node | NodeList | Any} Depends on what is returned from the DOM node.
- */
-Y_Node.scrubVal = function(val, node) {
-    if (val) { // only truthy values are risky
-         if (typeof val == 'object' || typeof val == 'function') { // safari nodeList === function
-            if (NODE_TYPE in val || Y_DOM.isWindow(val)) {// node || window
-                val = Y.one(val);
-            } else if ((val.item && !val._nodes) || // dom collection or Node instance
-                    (val[0] && val[0][NODE_TYPE])) { // array of DOM Nodes
-                val = Y.all(val);
-            }
-        }
-    } else if (typeof val === 'undefined') {
-        val = node; // for chaining
-    } else if (val === null) {
-        val = null; // IE: DOM null not the same as null
-    }
-
-    return val;
-};
-
-/**
- * Adds methods to the Y.Node prototype, routing through scrubVal.
- * @method addMethod
- * @static
- *
- * @param {String} name The name of the method to add
- * @param {Function} fn The function that becomes the method
- * @param {Object} context An optional context to call the method with
- * (defaults to the Node instance)
- * @return {any} Depends on what is returned from the DOM node.
- */
-Y_Node.addMethod = function(name, fn, context) {
-    if (name && fn && typeof fn == 'function') {
-        Y_Node.prototype[name] = function() {
-            var args = _slice.call(arguments),
-                node = this,
-                ret;
-
-            if (args[0] && args[0]._node) {
-                args[0] = args[0]._node;
-            }
-
-            if (args[1] && args[1]._node) {
-                args[1] = args[1]._node;
-            }
-            args.unshift(node._node);
-
-            ret = fn.apply(context || node, args);
-
-            if (ret) { // scrub truthy
-                ret = Y_Node.scrubVal(ret, node);
-            }
-
-            (typeof ret != 'undefined') || (ret = node);
-            return ret;
-        };
-    } else {
-    }
-};
-
-/**
- * Imports utility methods to be added as Y.Node methods.
- * @method importMethod
- * @static
- *
- * @param {Object} host The object that contains the method to import.
- * @param {String} name The name of the method to import
- * @param {String} altName An optional name to use in place of the host name
- * @param {Object} context An optional context to call the method with
- */
-Y_Node.importMethod = function(host, name, altName) {
-    if (typeof name == 'string') {
-        altName = altName || name;
-        Y_Node.addMethod(altName, host[name], host);
-    } else {
-        Y.Array.each(name, function(n) {
-            Y_Node.importMethod(host, n);
-        });
-    }
-};
-
-/**
- * Retrieves a NodeList based on the given CSS selector.
- * @method all
- *
- * @param {string} selector The CSS selector to test against.
- * @return {NodeList} A NodeList instance for the matching HTMLCollection/Array.
- * @for YUI
- */
-
-/**
- * Returns a single Node instance bound to the node or the
- * first element matching the given selector. Returns null if no match found.
- * <strong>Note:</strong> For chaining purposes you may want to
- * use <code>Y.all</code>, which returns a NodeList when no match is found.
- * @method one
- * @param {String | HTMLElement} node a node or Selector
- * @return {Node | null} a Node instance or null if no match found.
- * @for YUI
- */
-
-/**
- * Returns a single Node instance bound to the node or the
- * first element matching the given selector. Returns null if no match found.
- * <strong>Note:</strong> For chaining purposes you may want to
- * use <code>Y.all</code>, which returns a NodeList when no match is found.
- * @method one
- * @static
- * @param {String | HTMLElement} node a node or Selector
- * @return {Node | null} a Node instance or null if no match found.
- * @for Node
- */
-Y_Node.one = function(node) {
-    var instance = null,
-        cachedNode,
-        uid;
-
-    if (node) {
-        if (typeof node == 'string') {
-            node = Y_Node._fromString(node);
-            if (!node) {
-                return null; // NOTE: return
-            }
-        } else if (node.getDOMNode) {
-            return node; // NOTE: return
-        }
-
-        if (node.nodeType || Y.DOM.isWindow(node)) { // avoid bad input (numbers, boolean, etc)
-            uid = (node.uniqueID && node.nodeType !== 9) ? node.uniqueID : node._yuid;
-            instance = Y_Node._instances[uid]; // reuse exising instances
-            cachedNode = instance ? instance._node : null;
-            if (!instance || (cachedNode && node !== cachedNode)) { // new Node when nodes don't match
-                instance = new Y_Node(node);
-                if (node.nodeType != 11) { // dont cache document fragment
-                    Y_Node._instances[instance[UID]] = instance; // cache node
-                }
-            }
-        }
-    }
-
-    return instance;
-};
-
-/**
- * The default setter for DOM properties
- * Called with instance context (this === the Node instance)
- * @method DEFAULT_SETTER
- * @static
- * @param {String} name The attribute/property being set
- * @param {any} val The value to be set
- * @return {any} The value
- */
-Y_Node.DEFAULT_SETTER = function(name, val) {
-    var node = this._stateProxy,
-        strPath;
-
-    if (name.indexOf(DOT) > -1) {
-        strPath = name;
-        name = name.split(DOT);
-        // only allow when defined on node
-        Y.Object.setValue(node, name, val);
-    } else if (typeof node[name] != 'undefined') { // pass thru DOM properties
-        node[name] = val;
-    }
-
-    return val;
-};
-
-/**
- * The default getter for DOM properties
- * Called with instance context (this === the Node instance)
- * @method DEFAULT_GETTER
- * @static
- * @param {String} name The attribute/property to look up
- * @return {any} The current value
- */
-Y_Node.DEFAULT_GETTER = function(name) {
-    var node = this._stateProxy,
-        val;
-
-    if (name.indexOf && name.indexOf(DOT) > -1) {
-        val = Y.Object.getValue(node, name.split(DOT));
-    } else if (typeof node[name] != 'undefined') { // pass thru from DOM
-        val = node[name];
-    }
-
-    return val;
-};
-
-Y.mix(Y_Node.prototype, {
-    DATA_PREFIX: 'data-',
-
-    /**
-     * The method called when outputting Node instances as strings
-     * @method toString
-     * @return {String} A string representation of the Node instance
-     */
-    toString: function() {
-        var str = this[UID] + ': not bound to a node',
-            node = this._node,
-            attrs, id, className;
-
-        if (node) {
-            attrs = node.attributes;
-            id = (attrs && attrs.id) ? node.getAttribute('id') : null;
-            className = (attrs && attrs.className) ? node.getAttribute('className') : null;
-            str = node[NODE_NAME];
-
-            if (id) {
-                str += '#' + id;
-            }
-
-            if (className) {
-                str += '.' + className.replace(' ', '.');
-            }
-
-            // TODO: add yuid?
-            str += ' ' + this[UID];
-        }
-        return str;
-    },
-
-    /**
-     * Returns an attribute value on the Node instance.
-     * Unless pre-configured (via `Node.ATTRS`), get hands
-     * off to the underlying DOM node.  Only valid
-     * attributes/properties for the node will be queried.
-     * @method get
-     * @param {String} attr The attribute
-     * @return {any} The current value of the attribute
-     */
-    get: function(attr) {
-        var val;
-
-        if (this._getAttr) { // use Attribute imple
-            val = this._getAttr(attr);
-        } else {
-            val = this._get(attr);
-        }
-
-        if (val) {
-            val = Y_Node.scrubVal(val, this);
-        } else if (val === null) {
-            val = null; // IE: DOM null is not true null (even though they ===)
-        }
-        return val;
-    },
-
-    /**
-     * Helper method for get.
-     * @method _get
-     * @private
-     * @param {String} attr The attribute
-     * @return {any} The current value of the attribute
-     */
-    _get: function(attr) {
-        var attrConfig = Y_Node.ATTRS[attr],
-            val;
-
-        if (attrConfig && attrConfig.getter) {
-            val = attrConfig.getter.call(this);
-        } else if (Y_Node.re_aria.test(attr)) {
-            val = this._node.getAttribute(attr, 2);
-        } else {
-            val = Y_Node.DEFAULT_GETTER.apply(this, arguments);
-        }
-
-        return val;
-    },
-
-    /**
-     * Sets an attribute on the Node instance.
-     * Unless pre-configured (via Node.ATTRS), set hands
-     * off to the underlying DOM node.  Only valid
-     * attributes/properties for the node will be set.
-     * To set custom attributes use setAttribute.
-     * @method set
-     * @param {String} attr The attribute to be set.
-     * @param {any} val The value to set the attribute to.
-     * @chainable
-     */
-    set: function(attr, val) {
-        var attrConfig = Y_Node.ATTRS[attr];
-
-        if (this._setAttr) { // use Attribute imple
-            this._setAttr.apply(this, arguments);
-        } else { // use setters inline
-            if (attrConfig && attrConfig.setter) {
-                attrConfig.setter.call(this, val, attr);
-            } else if (Y_Node.re_aria.test(attr)) { // special case Aria
-                this._node.setAttribute(attr, val);
-            } else {
-                Y_Node.DEFAULT_SETTER.apply(this, arguments);
-            }
-        }
-
-        return this;
-    },
-
-    /**
-     * Sets multiple attributes.
-     * @method setAttrs
-     * @param {Object} attrMap an object of name/value pairs to set
-     * @chainable
-     */
-    setAttrs: function(attrMap) {
-        if (this._setAttrs) { // use Attribute imple
-            this._setAttrs(attrMap);
-        } else { // use setters inline
-            Y.Object.each(attrMap, function(v, n) {
-                this.set(n, v);
-            }, this);
-        }
-
-        return this;
-    },
-
-    /**
-     * Returns an object containing the values for the requested attributes.
-     * @method getAttrs
-     * @param {Array} attrs an array of attributes to get values
-     * @return {Object} An object with attribute name/value pairs.
-     */
-    getAttrs: function(attrs) {
-        var ret = {};
-        if (this._getAttrs) { // use Attribute imple
-            this._getAttrs(attrs);
-        } else { // use setters inline
-            Y.Array.each(attrs, function(v, n) {
-                ret[v] = this.get(v);
-            }, this);
-        }
-
-        return ret;
-    },
-
-    /**
-     * Compares nodes to determine if they match.
-     * Node instances can be compared to each other and/or HTMLElements.
-     * @method compareTo
-     * @param {HTMLElement | Node} refNode The reference node to compare to the node.
-     * @return {Boolean} True if the nodes match, false if they do not.
-     */
-    compareTo: function(refNode) {
-        var node = this._node;
-
-        if (refNode && refNode._node) {
-            refNode = refNode._node;
-        }
-        return node === refNode;
-    },
-
-    /**
-     * Determines whether the node is appended to the document.
-     * @method inDoc
-     * @param {Node|HTMLElement} doc optional An optional document to check against.
-     * Defaults to current document.
-     * @return {Boolean} Whether or not this node is appended to the document.
-     */
-    inDoc: function(doc) {
-        var node = this._node;
-
-        if (node) {
-            doc = (doc) ? doc._node || doc : node[OWNER_DOCUMENT];
-            if (doc.documentElement) {
-                return Y_DOM.contains(doc.documentElement, node);
-            }
-        }
-
-        return false;
-    },
-
-    getById: function(id) {
-        var node = this._node,
-            ret = Y_DOM.byId(id, node[OWNER_DOCUMENT]);
-        if (ret && Y_DOM.contains(node, ret)) {
-            ret = Y.one(ret);
-        } else {
-            ret = null;
-        }
-        return ret;
-    },
-
-   /**
-     * Returns the nearest ancestor that passes the test applied by supplied boolean method.
-     * @method ancestor
-     * @param {String | Function} fn A selector string or boolean method for testing elements.
-     * If a function is used, it receives the current node being tested as the only argument.
-     * If fn is not passed as an argument, the parent node will be returned.
-     * @param {Boolean} testSelf optional Whether or not to include the element in the scan
-     * @param {String | Function} stopFn optional A selector string or boolean
-     * method to indicate when the search should stop. The search bails when the function
-     * returns true or the selector matches.
-     * If a function is used, it receives the current node being tested as the only argument.
-     * @return {Node} The matching Node instance or null if not found
-     */
-    ancestor: function(fn, testSelf, stopFn) {
-        // testSelf is optional, check for stopFn as 2nd arg
-        if (arguments.length === 2 &&
-                (typeof testSelf == 'string' || typeof testSelf == 'function')) {
-            stopFn = testSelf;
-        }
-
-        return Y.one(Y_DOM.ancestor(this._node, _wrapFn(fn), testSelf, _wrapFn(stopFn)));
-    },
-
-   /**
-     * Returns the ancestors that pass the test applied by supplied boolean method.
-     * @method ancestors
-     * @param {String | Function} fn A selector string or boolean method for testing elements.
-     * @param {Boolean} testSelf optional Whether or not to include the element in the scan
-     * If a function is used, it receives the current node being tested as the only argument.
-     * @return {NodeList} A NodeList instance containing the matching elements
-     */
-    ancestors: function(fn, testSelf, stopFn) {
-        if (arguments.length === 2 &&
-                (typeof testSelf == 'string' || typeof testSelf == 'function')) {
-            stopFn = testSelf;
-        }
-        return Y.all(Y_DOM.ancestors(this._node, _wrapFn(fn), testSelf, _wrapFn(stopFn)));
-    },
-
-    /**
-     * Returns the previous matching sibling.
-     * Returns the nearest element node sibling if no method provided.
-     * @method previous
-     * @param {String | Function} fn A selector or boolean method for testing elements.
-     * If a function is used, it receives the current node being tested as the only argument.
-     * @param {Boolean} [all] Whether text nodes as well as element nodes should be returned, or
-     * just element nodes will be returned(default)
-     * @return {Node} Node instance or null if not found
-     */
-    previous: function(fn, all) {
-        return Y.one(Y_DOM.elementByAxis(this._node, 'previousSibling', _wrapFn(fn), all));
-    },
-
-    /**
-     * Returns the next matching sibling.
-     * Returns the nearest element node sibling if no method provided.
-     * @method next
-     * @param {String | Function} fn A selector or boolean method for testing elements.
-     * If a function is used, it receives the current node being tested as the only argument.
-     * @param {Boolean} [all] Whether text nodes as well as element nodes should be returned, or
-     * just element nodes will be returned(default)
-     * @return {Node} Node instance or null if not found
-     */
-    next: function(fn, all) {
-        return Y.one(Y_DOM.elementByAxis(this._node, 'nextSibling', _wrapFn(fn), all));
-    },
-
-    /**
-     * Returns all matching siblings.
-     * Returns all siblings if no method provided.
-     * @method siblings
-     * @param {String | Function} fn A selector or boolean method for testing elements.
-     * If a function is used, it receives the current node being tested as the only argument.
-     * @return {NodeList} NodeList instance bound to found siblings
-     */
-    siblings: function(fn) {
-        return Y.all(Y_DOM.siblings(this._node, _wrapFn(fn)));
-    },
-
-    /**
-     * Retrieves a single Node instance, the first element matching the given
-     * CSS selector.
-     * Returns null if no match found.
-     * @method one
-     *
-     * @param {string} selector The CSS selector to test against.
-     * @return {Node | null} A Node instance for the matching HTMLElement or null
-     * if no match found.
-     */
-    one: function(selector) {
-        return Y.one(Y.Selector.query(selector, this._node, true));
-    },
-
-    /**
-     * Retrieves a NodeList based on the given CSS selector.
-     * @method all
-     *
-     * @param {string} selector The CSS selector to test against.
-     * @return {NodeList} A NodeList instance for the matching HTMLCollection/Array.
-     */
-    all: function(selector) {
-        var nodelist;
-
-        if (this._node) {
-            nodelist = Y.all(Y.Selector.query(selector, this._node));
-            nodelist._query = selector;
-            nodelist._queryRoot = this._node;
-        }
-
-        return nodelist || Y.all([]);
-    },
-
-    // TODO: allow fn test
-    /**
-     * Test if the supplied node matches the supplied selector.
-     * @method test
-     *
-     * @param {string} selector The CSS selector to test against.
-     * @return {boolean} Whether or not the node matches the selector.
-     */
-    test: function(selector) {
-        return Y.Selector.test(this._node, selector);
-    },
-
-    /**
-     * Removes the node from its parent.
-     * Shortcut for myNode.get('parentNode').removeChild(myNode);
-     * @method remove
-     * @param {Boolean} destroy whether or not to call destroy() on the node
-     * after removal.
-     * @chainable
-     *
-     */
-    remove: function(destroy) {
-        var node = this._node;
-
-        if (node && node.parentNode) {
-            node.parentNode.removeChild(node);
-        }
-
-        if (destroy) {
-            this.destroy();
-        }
-
-        return this;
-    },
-
-    /**
-     * Replace the node with the other node. This is a DOM update only
-     * and does not change the node bound to the Node instance.
-     * Shortcut for myNode.get('parentNode').replaceChild(newNode, myNode);
-     * @method replace
-     * @param {Node | HTMLElement} newNode Node to be inserted
-     * @chainable
-     *
-     */
-    replace: function(newNode) {
-        var node = this._node;
-        if (typeof newNode == 'string') {
-            newNode = Y_Node.create(newNode);
-        }
-        node.parentNode.replaceChild(Y_Node.getDOMNode(newNode), node);
-        return this;
-    },
-
-    /**
-     * @method replaceChild
-     * @for Node
-     * @param {String | HTMLElement | Node} node Node to be inserted
-     * @param {HTMLElement | Node} refNode Node to be replaced
-     * @return {Node} The replaced node
-     */
-    replaceChild: function(node, refNode) {
-        if (typeof node == 'string') {
-            node = Y_DOM.create(node);
-        }
-
-        return Y.one(this._node.replaceChild(Y_Node.getDOMNode(node), Y_Node.getDOMNode(refNode)));
-    },
-
-    /**
-     * Nulls internal node references, removes any plugins and event listeners.
-     * Note that destroy() will not remove the node from its parent or from the DOM. For that
-     * functionality, call remove(true).
-     * @method destroy
-     * @param {Boolean} recursivePurge (optional) Whether or not to remove listeners from the
-     * node's subtree (default is false)
-     *
-     */
-    destroy: function(recursive) {
-        var UID = Y.config.doc.uniqueID ? 'uniqueID' : '_yuid',
-            instance;
-
-        this.purge(); // TODO: only remove events add via this Node
-
-        if (this.unplug) { // may not be a PluginHost
-            this.unplug();
-        }
-
-        this.clearData();
-
-        if (recursive) {
-            Y.NodeList.each(this.all('*'), function(node) {
-                instance = Y_Node._instances[node[UID]];
-                if (instance) {
-                   instance.destroy();
-                } else { // purge in case added by other means
-                    Y.Event.purgeElement(node);
-                }
-            });
-        }
-
-        this._node = null;
-        this._stateProxy = null;
-
-        delete Y_Node._instances[this._yuid];
-    },
-
-    /**
-     * Invokes a method on the Node instance
-     * @method invoke
-     * @param {String} method The name of the method to invoke
-     * @param {any} [args*] Arguments to invoke the method with.
-     * @return {any} Whatever the underly method returns.
-     * DOM Nodes and Collections return values
-     * are converted to Node/NodeList instances.
-     *
-     */
-    invoke: function(method, a, b, c, d, e) {
-        var node = this._node,
-            ret;
-
-        if (a && a._node) {
-            a = a._node;
-        }
-
-        if (b && b._node) {
-            b = b._node;
-        }
-
-        ret = node[method](a, b, c, d, e);
-        return Y_Node.scrubVal(ret, this);
-    },
-
-    /**
-    * @method swap
-    * @description Swap DOM locations with the given node.
-    * This does not change which DOM node each Node instance refers to.
-    * @param {Node} otherNode The node to swap with
-     * @chainable
-    */
-    swap: Y.config.doc.documentElement.swapNode ?
-        function(otherNode) {
-            this._node.swapNode(Y_Node.getDOMNode(otherNode));
-        } :
-        function(otherNode) {
-            otherNode = Y_Node.getDOMNode(otherNode);
-            var node = this._node,
-                parent = otherNode.parentNode,
-                nextSibling = otherNode.nextSibling;
-
-            if (nextSibling === node) {
-                parent.insertBefore(node, otherNode);
-            } else if (otherNode === node.nextSibling) {
-                parent.insertBefore(otherNode, node);
-            } else {
-                node.parentNode.replaceChild(otherNode, node);
-                Y_DOM.addHTML(parent, node, nextSibling);
-            }
-            return this;
-        },
-
-
-    hasMethod: function(method) {
-        var node = this._node;
-        return !!(node && method in node &&
-                typeof node[method] != 'unknown' &&
-            (typeof node[method] == 'function' ||
-                String(node[method]).indexOf('function') === 1)); // IE reports as object, prepends space
-    },
-
-    isFragment: function() {
-        return (this.get('nodeType') === 11);
-    },
-
-    /**
-     * Removes and destroys all of the nodes within the node.
-     * @method empty
-     * @chainable
-     */
-    empty: function() {
-        this.get('childNodes').remove().destroy(true);
-        return this;
-    },
-
-    /**
-     * Returns the DOM node bound to the Node instance
-     * @method getDOMNode
-     * @return {HTMLElement}
-     */
-    getDOMNode: function() {
-        return this._node;
-    }
-}, true);
-
-Y.Node = Y_Node;
-Y.one = Y_Node.one;
-/**
- * The NodeList module provides support for managing collections of Nodes.
- * @module node
- * @submodule node-core
- */
-
-/**
- * The NodeList class provides a wrapper for manipulating DOM NodeLists.
- * NodeList properties can be accessed via the set/get methods.
- * Use Y.all() to retrieve NodeList instances.
- *
- * @class NodeList
- * @constructor
- * @param nodes {String|element|Node|Array} A selector, DOM element, Node, list of DOM elements, or list of Nodes with which to populate this NodeList.
- */
-
-var NodeList = function(nodes) {
-    var tmp = [];
-
-    if (nodes) {
-        if (typeof nodes === 'string') { // selector query
-            this._query = nodes;
-            nodes = Y.Selector.query(nodes);
-        } else if (nodes.nodeType || Y_DOM.isWindow(nodes)) { // domNode || window
-            nodes = [nodes];
-        } else if (nodes._node) { // Y.Node
-            nodes = [nodes._node];
-        } else if (nodes[0] && nodes[0]._node) { // allow array of Y.Nodes
-            Y.Array.each(nodes, function(node) {
-                if (node._node) {
-                    tmp.push(node._node);
-                }
-            });
-            nodes = tmp;
-        } else { // array of domNodes or domNodeList (no mixed array of Y.Node/domNodes)
-            nodes = Y.Array(nodes, 0, true);
-        }
-    }
-
-    /**
-     * The underlying array of DOM nodes bound to the Y.NodeList instance
-     * @property _nodes
-     * @private
-     */
-    this._nodes = nodes || [];
-};
-
-NodeList.NAME = 'NodeList';
-
-/**
- * Retrieves the DOM nodes bound to a NodeList instance
- * @method getDOMNodes
- * @static
- *
- * @param {NodeList} nodelist The NodeList instance
- * @return {Array} The array of DOM nodes bound to the NodeList
- */
-NodeList.getDOMNodes = function(nodelist) {
-    return (nodelist && nodelist._nodes) ? nodelist._nodes : nodelist;
-};
-
-NodeList.each = function(instance, fn, context) {
-    var nodes = instance._nodes;
-    if (nodes && nodes.length) {
-        Y.Array.each(nodes, fn, context || instance);
-    } else {
-    }
-};
-
-NodeList.addMethod = function(name, fn, context) {
-    if (name && fn) {
-        NodeList.prototype[name] = function() {
-            var ret = [],
-                args = arguments;
-
-            Y.Array.each(this._nodes, function(node) {
-                var UID = (node.uniqueID && node.nodeType !== 9 ) ? 'uniqueID' : '_yuid',
-                    instance = Y.Node._instances[node[UID]],
-                    ctx,
-                    result;
-
-                if (!instance) {
-                    instance = NodeList._getTempNode(node);
-                }
-                ctx = context || instance;
-                result = fn.apply(ctx, args);
-                if (result !== undefined && result !== instance) {
-                    ret[ret.length] = result;
-                }
-            });
-
-            // TODO: remove tmp pointer
-            return ret.length ? ret : this;
-        };
-    } else {
-    }
-};
-
-NodeList.importMethod = function(host, name, altName) {
-    if (typeof name === 'string') {
-        altName = altName || name;
-        NodeList.addMethod(name, host[name]);
-    } else {
-        Y.Array.each(name, function(n) {
-            NodeList.importMethod(host, n);
-        });
-    }
-};
-
-NodeList._getTempNode = function(node) {
-    var tmp = NodeList._tempNode;
-    if (!tmp) {
-        tmp = Y.Node.create('<div></div>');
-        NodeList._tempNode = tmp;
-    }
-
-    tmp._node = node;
-    tmp._stateProxy = node;
-    return tmp;
-};
-
-Y.mix(NodeList.prototype, {
-    _invoke: function(method, args, getter) {
-        var ret = (getter) ? [] : this;
-
-        this.each(function(node) {
-            var val = node[method].apply(node, args);
-            if (getter) {
-                ret.push(val);
-            }
-        });
-
-        return ret;
-    },
-
-    /**
-     * Retrieves the Node instance at the given index.
-     * @method item
-     *
-     * @param {Number} index The index of the target Node.
-     * @return {Node} The Node instance at the given index.
-     */
-    item: function(index) {
-        return Y.one((this._nodes || [])[index]);
-    },
-
-    /**
-     * Applies the given function to each Node in the NodeList.
-     * @method each
-     * @param {Function} fn The function to apply. It receives 3 arguments:
-     * the current node instance, the node's index, and the NodeList instance
-     * @param {Object} context optional An optional context to apply the function with
-     * Default context is the current Node instance
-     * @chainable
-     */
-    each: function(fn, context) {
-        var instance = this;
-        Y.Array.each(this._nodes, function(node, index) {
-            node = Y.one(node);
-            return fn.call(context || node, node, index, instance);
-        });
-        return instance;
-    },
-
-    batch: function(fn, context) {
-        var nodelist = this;
-
-        Y.Array.each(this._nodes, function(node, index) {
-            var instance = Y.Node._instances[node[UID]];
-            if (!instance) {
-                instance = NodeList._getTempNode(node);
-            }
-
-            return fn.call(context || instance, instance, index, nodelist);
-        });
-        return nodelist;
-    },
-
-    /**
-     * Executes the function once for each node until a true value is returned.
-     * @method some
-     * @param {Function} fn The function to apply. It receives 3 arguments:
-     * the current node instance, the node's index, and the NodeList instance
-     * @param {Object} context optional An optional context to execute the function from.
-     * Default context is the current Node instance
-     * @return {Boolean} Whether or not the function returned true for any node.
-     */
-    some: function(fn, context) {
-        var instance = this;
-        return Y.Array.some(this._nodes, function(node, index) {
-            node = Y.one(node);
-            context = context || node;
-            return fn.call(context, node, index, instance);
-        });
-    },
-
-    /**
-     * Creates a documenFragment from the nodes bound to the NodeList instance
-     * @method toFrag
-     * @return {Node} a Node instance bound to the documentFragment
-     */
-    toFrag: function() {
-        return Y.one(Y.DOM._nl2frag(this._nodes));
-    },
-
-    /**
-     * Returns the index of the node in the NodeList instance
-     * or -1 if the node isn't found.
-     * @method indexOf
-     * @param {Node | HTMLElement} node the node to search for
-     * @return {Number} the index of the node value or -1 if not found
-     */
-    indexOf: function(node) {
-        return Y.Array.indexOf(this._nodes, Y.Node.getDOMNode(node));
-    },
-
-    /**
-     * Filters the NodeList instance down to only nodes matching the given selector.
-     * @method filter
-     * @param {String} selector The selector to filter against
-     * @return {NodeList} NodeList containing the updated collection
-     * @see Selector
-     */
-    filter: function(selector) {
-        return Y.all(Y.Selector.filter(this._nodes, selector));
-    },
-
-
-    /**
-     * Creates a new NodeList containing all nodes at every n indices, where
-     * remainder n % index equals r.
-     * (zero-based index).
-     * @method modulus
-     * @param {Number} n The offset to use (return every nth node)
-     * @param {Number} r An optional remainder to use with the modulus operation (defaults to zero)
-     * @return {NodeList} NodeList containing the updated collection
-     */
-    modulus: function(n, r) {
-        r = r || 0;
-        var nodes = [];
-        NodeList.each(this, function(node, i) {
-            if (i % n === r) {
-                nodes.push(node);
-            }
-        });
-
-        return Y.all(nodes);
-    },
-
-    /**
-     * Creates a new NodeList containing all nodes at odd indices
-     * (zero-based index).
-     * @method odd
-     * @return {NodeList} NodeList containing the updated collection
-     */
-    odd: function() {
-        return this.modulus(2, 1);
-    },
-
-    /**
-     * Creates a new NodeList containing all nodes at even indices
-     * (zero-based index), including zero.
-     * @method even
-     * @return {NodeList} NodeList containing the updated collection
-     */
-    even: function() {
-        return this.modulus(2);
-    },
-
-    destructor: function() {
-    },
-
-    /**
-     * Reruns the initial query, when created using a selector query
-     * @method refresh
-     * @chainable
-     */
-    refresh: function() {
-        var doc,
-            nodes = this._nodes,
-            query = this._query,
-            root = this._queryRoot;
-
-        if (query) {
-            if (!root) {
-                if (nodes && nodes[0] && nodes[0].ownerDocument) {
-                    root = nodes[0].ownerDocument;
-                }
-            }
-
-            this._nodes = Y.Selector.query(query, root);
-        }
-
-        return this;
-    },
-
-    /**
-     * Returns the current number of items in the NodeList.
-     * @method size
-     * @return {Number} The number of items in the NodeList.
-     */
-    size: function() {
-        return this._nodes.length;
-    },
-
-    /**
-     * Determines if the instance is bound to any nodes
-     * @method isEmpty
-     * @return {Boolean} Whether or not the NodeList is bound to any nodes
-     */
-    isEmpty: function() {
-        return this._nodes.length < 1;
-    },
-
-    toString: function() {
-        var str = '',
-            errorMsg = this[UID] + ': not bound to any nodes',
-            nodes = this._nodes,
-            node;
-
-        if (nodes && nodes[0]) {
-            node = nodes[0];
-            str += node[NODE_NAME];
-            if (node.id) {
-                str += '#' + node.id;
-            }
-
-            if (node.className) {
-                str += '.' + node.className.replace(' ', '.');
-            }
-
-            if (nodes.length > 1) {
-                str += '...[' + nodes.length + ' items]';
-            }
-        }
-        return str || errorMsg;
-    },
-
-    /**
-     * Returns the DOM node bound to the Node instance
-     * @method getDOMNodes
-     * @return {Array}
-     */
-    getDOMNodes: function() {
-        return this._nodes;
-    }
-}, true);
-
-NodeList.importMethod(Y.Node.prototype, [
-     /**
-      * Called on each Node instance. Nulls internal node references,
-      * removes any plugins and event listeners
-      * @method destroy
-      * @param {Boolean} recursivePurge (optional) Whether or not to
-      * remove listeners from the node's subtree (default is false)
-      * @see Node.destroy
-      */
-    'destroy',
-
-     /**
-      * Called on each Node instance. Removes and destroys all of the nodes
-      * within the node
-      * @method empty
-      * @chainable
-      * @see Node.empty
-      */
-    'empty',
-
-     /**
-      * Called on each Node instance. Removes the node from its parent.
-      * Shortcut for myNode.get('parentNode').removeChild(myNode);
-      * @method remove
-      * @param {Boolean} destroy whether or not to call destroy() on the node
-      * after removal.
-      * @chainable
-      * @see Node.remove
-      */
-    'remove',
-
-     /**
-      * Called on each Node instance. Sets an attribute on the Node instance.
-      * Unless pre-configured (via Node.ATTRS), set hands
-      * off to the underlying DOM node.  Only valid
-      * attributes/properties for the node will be set.
-      * To set custom attributes use setAttribute.
-      * @method set
-      * @param {String} attr The attribute to be set.
-      * @param {any} val The value to set the attribute to.
-      * @chainable
-      * @see Node.set
-      */
-    'set'
-]);
-
-// one-off implementation to convert array of Nodes to NodeList
-// e.g. Y.all('input').get('parentNode');
-
-/** Called on each Node instance
-  * @method get
-  * @see Node
-  */
-NodeList.prototype.get = function(attr) {
-    var ret = [],
-        nodes = this._nodes,
-        isNodeList = false,
-        getTemp = NodeList._getTempNode,
-        instance,
-        val;
-
-    if (nodes[0]) {
-        instance = Y.Node._instances[nodes[0]._yuid] || getTemp(nodes[0]);
-        val = instance._get(attr);
-        if (val && val.nodeType) {
-            isNodeList = true;
-        }
-    }
-
-    Y.Array.each(nodes, function(node) {
-        instance = Y.Node._instances[node._yuid];
-
-        if (!instance) {
-            instance = getTemp(node);
-        }
-
-        val = instance._get(attr);
-        if (!isNodeList) { // convert array of Nodes to NodeList
-            val = Y.Node.scrubVal(val, instance);
-        }
-
-        ret.push(val);
-    });
-
-    return (isNodeList) ? Y.all(ret) : ret;
-};
-
-Y.NodeList = NodeList;
-
-Y.all = function(nodes) {
-    return new NodeList(nodes);
-};
-
-Y.Node.all = Y.all;
-/**
- * @module node
- * @submodule node-core
- */
-
-var Y_NodeList = Y.NodeList,
-    ArrayProto = Array.prototype,
-    ArrayMethods = {
-        /** Returns a new NodeList combining the given NodeList(s)
-          * @for NodeList
-          * @method concat
-          * @param {NodeList | Array} valueN Arrays/NodeLists and/or values to
-          * concatenate to the resulting NodeList
-          * @return {NodeList} A new NodeList comprised of this NodeList joined with the input.
-          */
-        'concat': 1,
-        /** Removes the last from the NodeList and returns it.
-          * @for NodeList
-          * @method pop
-          * @return {Node | null} The last item in the NodeList, or null if the list is empty.
-          */
-        'pop': 0,
-        /** Adds the given Node(s) to the end of the NodeList.
-          * @for NodeList
-          * @method push
-          * @param {Node | HTMLElement} nodes One or more nodes to add to the end of the NodeList.
-          */
-        'push': 0,
-        /** Removes the first item from the NodeList and returns it.
-          * @for NodeList
-          * @method shift
-          * @return {Node | null} The first item in the NodeList, or null if the NodeList is empty.
-          */
-        'shift': 0,
-        /** Returns a new NodeList comprising the Nodes in the given range.
-          * @for NodeList
-          * @method slice
-          * @param {Number} begin Zero-based index at which to begin extraction.
-          As a negative index, start indicates an offset from the end of the sequence. slice(-2) extracts the second-to-last element and the last element in the sequence.
-          * @param {Number} end Zero-based index at which to end extraction. slice extracts up to but not including end.
-          slice(1,4) extracts the second element through the fourth element (elements indexed 1, 2, and 3).
-          As a negative index, end indicates an offset from the end of the sequence. slice(2,-1) extracts the third element through the second-to-last element in the sequence.
-          If end is omitted, slice extracts to the end of the sequence.
-          * @return {NodeList} A new NodeList comprised of this NodeList joined with the input.
-          */
-        'slice': 1,
-        /** Changes the content of the NodeList, adding new elements while removing old elements.
-          * @for NodeList
-          * @method splice
-          * @param {Number} index Index at which to start changing the array. If negative, will begin that many elements from the end.
-          * @param {Number} howMany An integer indicating the number of old array elements to remove. If howMany is 0, no elements are removed. In this case, you should specify at least one new element. If no howMany parameter is specified (second syntax above, which is a SpiderMonkey extension), all elements after index are removed.
-          * {Node | HTMLElement| element1, ..., elementN
-          The elements to add to the array. If you don't specify any elements, splice simply removes elements from the array.
-          * @return {NodeList} The element(s) removed.
-          */
-        'splice': 1,
-        /** Adds the given Node(s) to the beginning of the NodeList.
-          * @for NodeList
-          * @method unshift
-          * @param {Node | HTMLElement} nodes One or more nodes to add to the NodeList.
-          */
-        'unshift': 0
-    };
-
-
-Y.Object.each(ArrayMethods, function(returnNodeList, name) {
-    Y_NodeList.prototype[name] = function() {
-        var args = [],
-            i = 0,
-            arg,
-            ret;
-
-        while (typeof (arg = arguments[i++]) != 'undefined') { // use DOM nodes/nodeLists
-            args.push(arg._node || arg._nodes || arg);
-        }
-
-        ret = ArrayProto[name].apply(this._nodes, args);
-
-        if (returnNodeList) {
-            ret = Y.all(ret);
-        } else {
-            ret = Y.Node.scrubVal(ret);
-        }
-
-        return ret;
-    };
-});
-/**
- * @module node
- * @submodule node-core
- */
-
-Y.Array.each([
-    /**
-     * Passes through to DOM method.
-     * @for Node
-     * @method removeChild
-     * @param {HTMLElement | Node} node Node to be removed
-     * @return {Node} The removed node
-     */
-    'removeChild',
-
-    /**
-     * Passes through to DOM method.
-     * @method hasChildNodes
-     * @return {Boolean} Whether or not the node has any childNodes
-     */
-    'hasChildNodes',
-
-    /**
-     * Passes through to DOM method.
-     * @method cloneNode
-     * @param {Boolean} deep Whether or not to perform a deep clone, which includes
-     * subtree and attributes
-     * @return {Node} The clone
-     */
-    'cloneNode',
-
-    /**
-     * Passes through to DOM method.
-     * @method hasAttribute
-     * @param {String} attribute The attribute to test for
-     * @return {Boolean} Whether or not the attribute is present
-     */
-    'hasAttribute',
-
-    /**
-     * Passes through to DOM method.
-     * @method scrollIntoView
-     * @chainable
-     */
-    'scrollIntoView',
-
-    /**
-     * Passes through to DOM method.
-     * @method getElementsByTagName
-     * @param {String} tagName The tagName to collect
-     * @return {NodeList} A NodeList representing the HTMLCollection
-     */
-    'getElementsByTagName',
-
-    /**
-     * Passes through to DOM method.
-     * @method focus
-     * @chainable
-     */
-    'focus',
-
-    /**
-     * Passes through to DOM method.
-     * @method blur
-     * @chainable
-     */
-    'blur',
-
-    /**
-     * Passes through to DOM method.
-     * Only valid on FORM elements
-     * @method submit
-     * @chainable
-     */
-    'submit',
-
-    /**
-     * Passes through to DOM method.
-     * Only valid on FORM elements
-     * @method reset
-     * @chainable
-     */
-    'reset',
-
-    /**
-     * Passes through to DOM method.
-     * @method select
-     * @chainable
-     */
-     'select',
-
-    /**
-     * Passes through to DOM method.
-     * Only valid on TABLE elements
-     * @method createCaption
-     * @chainable
-     */
-    'createCaption'
-
-], function(method) {
-    Y.Node.prototype[method] = function(arg1, arg2, arg3) {
-        var ret = this.invoke(method, arg1, arg2, arg3);
-        return ret;
-    };
-});
-
-/**
- * Passes through to DOM method.
- * @method removeAttribute
- * @param {String} attribute The attribute to be removed
- * @chainable
- */
- // one-off implementation due to IE returning boolean, breaking chaining
-Y.Node.prototype.removeAttribute = function(attr) {
-    var node = this._node;
-    if (node) {
-        node.removeAttribute(attr, 0); // comma zero for IE < 8 to force case-insensitive
-    }
-
-    return this;
-};
-
-Y.Node.importMethod(Y.DOM, [
-    /**
-     * Determines whether the node is an ancestor of another HTML element in the DOM hierarchy.
-     * @method contains
-     * @param {Node | HTMLElement} needle The possible node or descendent
-     * @return {Boolean} Whether or not this node is the needle its ancestor
-     */
-    'contains',
-    /**
-     * Allows setting attributes on DOM nodes, normalizing in some cases.
-     * This passes through to the DOM node, allowing for custom attributes.
-     * @method setAttribute
-     * @for Node
-     * @chainable
-     * @param {string} name The attribute name
-     * @param {string} value The value to set
-     */
-    'setAttribute',
-    /**
-     * Allows getting attributes on DOM nodes, normalizing in some cases.
-     * This passes through to the DOM node, allowing for custom attributes.
-     * @method getAttribute
-     * @for Node
-     * @param {string} name The attribute name
-     * @return {string} The attribute value
-     */
-    'getAttribute',
-
-    /**
-     * Wraps the given HTML around the node.
-     * @method wrap
-     * @param {String} html The markup to wrap around the node.
-     * @chainable
-     * @for Node
-     */
-    'wrap',
-
-    /**
-     * Removes the node's parent node.
-     * @method unwrap
-     * @chainable
-     */
-    'unwrap',
-
-    /**
-     * Applies a unique ID to the node if none exists
-     * @method generateID
-     * @return {String} The existing or generated ID
-     */
-    'generateID'
-]);
-
-Y.NodeList.importMethod(Y.Node.prototype, [
-/**
- * Allows getting attributes on DOM nodes, normalizing in some cases.
- * This passes through to the DOM node, allowing for custom attributes.
- * @method getAttribute
- * @see Node
- * @for NodeList
- * @param {string} name The attribute name
- * @return {string} The attribute value
- */
-
-    'getAttribute',
-/**
- * Allows setting attributes on DOM nodes, normalizing in some cases.
- * This passes through to the DOM node, allowing for custom attributes.
- * @method setAttribute
- * @see Node
- * @for NodeList
- * @chainable
- * @param {string} name The attribute name
- * @param {string} value The value to set
- */
-    'setAttribute',
-
-/**
- * Allows for removing attributes on DOM nodes.
- * This passes through to the DOM node, allowing for custom attributes.
- * @method removeAttribute
- * @see Node
- * @for NodeList
- * @param {string} name The attribute to remove
- */
-    'removeAttribute',
-/**
- * Removes the parent node from node in the list.
- * @method unwrap
- * @chainable
- */
-    'unwrap',
-/**
- * Wraps the given HTML around each node.
- * @method wrap
- * @param {String} html The markup to wrap around the node.
- * @chainable
- */
-    'wrap',
-
-/**
- * Applies a unique ID to each node if none exists
- * @method generateID
- * @return {String} The existing or generated ID
- */
-    'generateID'
-]);
-
-
-}, '3.16.0', {"requires": ["dom-core", "selector"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('color-base', function (Y, NAME) {
-
-/**
-Color provides static methods for color conversion.
-
-    Y.Color.toRGB('f00'); // rgb(255, 0, 0)
-
-    Y.Color.toHex('rgb(255, 255, 0)'); // #ffff00
-
-@module color
-@submodule color-base
-@class Color
-@since 3.8.0
-**/
-
-var REGEX_HEX = /^#?([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})(\ufffe)?/,
-    REGEX_HEX3 = /^#?([\da-fA-F]{1})([\da-fA-F]{1})([\da-fA-F]{1})(\ufffe)?/,
-    REGEX_RGB = /rgba?\(([\d]{1,3}), ?([\d]{1,3}), ?([\d]{1,3}),? ?([.\d]*)?\)/,
-    TYPES = { 'HEX': 'hex', 'RGB': 'rgb', 'RGBA': 'rgba' },
-    CONVERTS = { 'hex': 'toHex', 'rgb': 'toRGB', 'rgba': 'toRGBA' };
-
-
-Y.Color = {
-    /**
-    @static
-    @property KEYWORDS
-    @type Object
-    @since 3.8.0
-    **/
-    KEYWORDS: {
-        'black': '000', 'silver': 'c0c0c0', 'gray': '808080', 'white': 'fff',
-        'maroon': '800000', 'red': 'f00', 'purple': '800080', 'fuchsia': 'f0f',
-        'green': '008000', 'lime': '0f0', 'olive': '808000', 'yellow': 'ff0',
-        'navy': '000080', 'blue': '00f', 'teal': '008080', 'aqua': '0ff'
-    },
-
-    /**
-        NOTE: `(\ufffe)?` is added to the Regular Expression to carve out a
-        place for the alpha channel that is returned from toArray
-        without compromising any usage of the Regular Expression
-
-    @static
-    @property REGEX_HEX
-    @type RegExp
-    @default /^#?([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2})(\ufffe)?/
-    @since 3.8.0
-    **/
-    REGEX_HEX: REGEX_HEX,
-
-    /**
-        NOTE: `(\ufffe)?` is added to the Regular Expression to carve out a
-        place for the alpha channel that is returned from toArray
-        without compromising any usage of the Regular Expression
-
-    @static
-    @property REGEX_HEX3
-    @type RegExp
-    @default /^#?([0-9a-fA-F]{1})([0-9a-fA-F]{1})([0-9a-fA-F]{1})(\ufffe)?/
-    @since 3.8.0
-    **/
-    REGEX_HEX3: REGEX_HEX3,
-
-    /**
-    @static
-    @property REGEX_RGB
-    @type RegExp
-    @default /rgba?\(([0-9]{1,3}), ?([0-9]{1,3}), ?([0-9]{1,3}),? ?([.0-9]{1,3})?\)/
-    @since 3.8.0
-    **/
-    REGEX_RGB: REGEX_RGB,
-
-    re_RGB: REGEX_RGB,
-
-    re_hex: REGEX_HEX,
-
-    re_hex3: REGEX_HEX3,
-
-    /**
-    @static
-    @property STR_HEX
-    @type String
-    @default #{*}{*}{*}
-    @since 3.8.0
-    **/
-    STR_HEX: '#{*}{*}{*}',
-
-    /**
-    @static
-    @property STR_RGB
-    @type String
-    @default rgb({*}, {*}, {*})
-    @since 3.8.0
-    **/
-    STR_RGB: 'rgb({*}, {*}, {*})',
-
-    /**
-    @static
-    @property STR_RGBA
-    @type String
-    @default rgba({*}, {*}, {*}, {*})
-    @since 3.8.0
-    **/
-    STR_RGBA: 'rgba({*}, {*}, {*}, {*})',
-
-    /**
-    @static
-    @property TYPES
-    @type Object
-    @default {'rgb':'rgb', 'rgba':'rgba'}
-    @since 3.8.0
-    **/
-    TYPES: TYPES,
-
-    /**
-    @static
-    @property CONVERTS
-    @type Object
-    @default {}
-    @since 3.8.0
-    **/
-    CONVERTS: CONVERTS,
-
-    /**
-     Converts the provided string to the provided type.
-     You can use the `Y.Color.TYPES` to get a valid `to` type.
-     If the color cannot be converted, the original color will be returned.
-
-     @public
-     @method convert
-     @param {String} str
-     @param {String} to
-     @return {String}
-     @since 3.8.0
-     **/
-    convert: function (str, to) {
-        var convert = Y.Color.CONVERTS[to.toLowerCase()],
-            clr = str;
-
-        if (convert && Y.Color[convert]) {
-            clr = Y.Color[convert](str);
-        }
-
-        return clr;
-    },
-
-    /**
-    Converts provided color value to a hex value string
-
-    @public
-    @method toHex
-    @param {String} str Hex or RGB value string
-    @return {String} returns array of values or CSS string if options.css is true
-    @since 3.8.0
-    **/
-    toHex: function (str) {
-        var clr = Y.Color._convertTo(str, 'hex'),
-            isTransparent = clr.toLowerCase() === 'transparent';
-
-        if (clr.charAt(0) !== '#' && !isTransparent) {
-            clr = '#' + clr;
-        }
-
-        return isTransparent ? clr.toLowerCase() : clr.toUpperCase();
-    },
-
-    /**
-    Converts provided color value to an RGB value string
-    @public
-    @method toRGB
-    @param {String} str Hex or RGB value string
-    @return {String}
-    @since 3.8.0
-    **/
-    toRGB: function (str) {
-        var clr = Y.Color._convertTo(str, 'rgb');
-        return clr.toLowerCase();
-    },
-
-    /**
-    Converts provided color value to an RGB value string
-    @public
-    @method toRGBA
-    @param {String} str Hex or RGB value string
-    @return {String}
-    @since 3.8.0
-    **/
-    toRGBA: function (str) {
-        var clr = Y.Color._convertTo(str, 'rgba' );
-        return clr.toLowerCase();
-    },
-
-    /**
-    Converts the provided color string to an array of values where the
-        last value is the alpha value. Will return an empty array if
-        the provided string is not able to be parsed.
-
-        NOTE: `(\ufffe)?` is added to `HEX` and `HEX3` Regular Expressions to
-        carve out a place for the alpha channel that is returned from
-        toArray without compromising any usage of the Regular Expression
-
-        Y.Color.toArray('fff');              // ['ff', 'ff', 'ff', 1]
-        Y.Color.toArray('rgb(0, 0, 0)');     // ['0', '0', '0', 1]
-        Y.Color.toArray('rgba(0, 0, 0, 0)'); // ['0', '0', '0', 1]
-
-
-
-    @public
-    @method toArray
-    @param {String} str
-    @return {Array}
-    @since 3.8.0
-    **/
-    toArray: function(str) {
-        // parse with regex and return "matches" array
-        var type = Y.Color.findType(str).toUpperCase(),
-            regex,
-            arr,
-            length,
-            lastItem;
-
-        if (type === 'HEX' && str.length < 5) {
-            type = 'HEX3';
-        }
-
-        if (type.charAt(type.length - 1) === 'A') {
-            type = type.slice(0, -1);
-        }
-
-        regex = Y.Color['REGEX_' + type];
-
-        if (regex) {
-            arr = regex.exec(str) || [];
-            length = arr.length;
-
-            if (length) {
-
-                arr.shift();
-                length--;
-
-                if (type === 'HEX3') {
-                    arr[0] += arr[0];
-                    arr[1] += arr[1];
-                    arr[2] += arr[2];
-                }
-
-                lastItem = arr[length - 1];
-                if (!lastItem) {
-                    arr[length - 1] = 1;
-                }
-            }
-        }
-
-        return arr;
-
-    },
-
-    /**
-    Converts the array of values to a string based on the provided template.
-    @public
-    @method fromArray
-    @param {Array} arr
-    @param {String} template
-    @return {String}
-    @since 3.8.0
-    **/
-    fromArray: function(arr, template) {
-        arr = arr.concat();
-
-        if (typeof template === 'undefined') {
-            return arr.join(', ');
-        }
-
-        var replace = '{*}';
-
-        template = Y.Color['STR_' + template.toUpperCase()];
-
-        if (arr.length === 3 && template.match(/\{\*\}/g).length === 4) {
-            arr.push(1);
-        }
-
-        while ( template.indexOf(replace) >= 0 && arr.length > 0) {
-            template = template.replace(replace, arr.shift());
-        }
-
-        return template;
-    },
-
-    /**
-    Finds the value type based on the str value provided.
-    @public
-    @method findType
-    @param {String} str
-    @return {String}
-    @since 3.8.0
-    **/
-    findType: function (str) {
-        if (Y.Color.KEYWORDS[str]) {
-            return 'keyword';
-        }
-
-        var index = str.indexOf('('),
-            key;
-
-        if (index > 0) {
-            key = str.substr(0, index);
-        }
-
-        if (key && Y.Color.TYPES[key.toUpperCase()]) {
-            return Y.Color.TYPES[key.toUpperCase()];
-        }
-
-        return 'hex';
-
-    }, // return 'keyword', 'hex', 'rgb'
-
-    /**
-    Retrives the alpha channel from the provided string. If no alpha
-        channel is present, `1` will be returned.
-    @protected
-    @method _getAlpha
-    @param {String} clr
-    @return {Number}
-    @since 3.8.0
-    **/
-    _getAlpha: function (clr) {
-        var alpha,
-            arr = Y.Color.toArray(clr);
-
-        if (arr.length > 3) {
-            alpha = arr.pop();
-        }
-
-        return +alpha || 1;
-    },
-
-    /**
-    Returns the hex value string if found in the KEYWORDS object
-    @protected
-    @method _keywordToHex
-    @param {String} clr
-    @return {String}
-    @since 3.8.0
-    **/
-    _keywordToHex: function (clr) {
-        var keyword = Y.Color.KEYWORDS[clr];
-
-        if (keyword) {
-            return keyword;
-        }
-    },
-
-    /**
-    Converts the provided color string to the value type provided as `to`
-    @protected
-    @method _convertTo
-    @param {String} clr
-    @param {String} to
-    @return {String}
-    @since 3.8.0
-    **/
-    _convertTo: function(clr, to) {
-
-        if (clr === 'transparent') {
-            return clr;
-        }
-
-        var from = Y.Color.findType(clr),
-            originalTo = to,
-            needsAlpha,
-            alpha,
-            method,
-            ucTo;
-
-        if (from === 'keyword') {
-            clr = Y.Color._keywordToHex(clr);
-            from = 'hex';
-        }
-
-        if (from === 'hex' && clr.length < 5) {
-            if (clr.charAt(0) === '#') {
-                clr = clr.substr(1);
-            }
-
-            clr = '#' + clr.charAt(0) + clr.charAt(0) +
-                        clr.charAt(1) + clr.charAt(1) +
-                        clr.charAt(2) + clr.charAt(2);
-        }
-
-        if (from === to) {
-            return clr;
-        }
-
-        if (from.charAt(from.length - 1) === 'a') {
-            from = from.slice(0, -1);
-        }
-
-        needsAlpha = (to.charAt(to.length - 1) === 'a');
-        if (needsAlpha) {
-            to = to.slice(0, -1);
-            alpha = Y.Color._getAlpha(clr);
-        }
-
-        ucTo = to.charAt(0).toUpperCase() + to.substr(1).toLowerCase();
-        method = Y.Color['_' + from + 'To' + ucTo ];
-
-        // check to see if need conversion to rgb first
-        // check to see if there is a direct conversion method
-        // convertions are: hex <-> rgb <-> hsl
-        if (!method) {
-            if (from !== 'rgb' && to !== 'rgb') {
-                clr = Y.Color['_' + from + 'ToRgb'](clr);
-                from = 'rgb';
-                method = Y.Color['_' + from + 'To' + ucTo ];
-            }
-        }
-
-        if (method) {
-            clr = ((method)(clr, needsAlpha));
-        }
-
-        // process clr from arrays to strings after conversions if alpha is needed
-        if (needsAlpha) {
-            if (!Y.Lang.isArray(clr)) {
-                clr = Y.Color.toArray(clr);
-            }
-            clr.push(alpha);
-            clr = Y.Color.fromArray(clr, originalTo.toUpperCase());
-        }
-
-        return clr;
-    },
-
-    /**
-    Processes the hex string into r, g, b values. Will return values as
-        an array, or as an rgb string.
-    @protected
-    @method _hexToRgb
-    @param {String} str
-    @param {Boolean} [toArray]
-    @return {String|Array}
-    @since 3.8.0
-    **/
-    _hexToRgb: function (str, toArray) {
-        var r, g, b;
-
-        /*jshint bitwise:false*/
-        if (str.charAt(0) === '#') {
-            str = str.substr(1);
-        }
-
-        str = parseInt(str, 16);
-
-        r = str >> 16;
-        g = str >> 8 & 0xFF;
-        b = str & 0xFF;
-
-        if (toArray) {
-            return [r, g, b];
-        }
-
-        return 'rgb(' + r + ', ' + g + ', ' + b + ')';
-    },
-
-    /**
-    Processes the rgb string into r, g, b values. Will return values as
-        an array, or as a hex string.
-    @protected
-    @method _rgbToHex
-    @param {String} str
-    @param {Boolean} [toArray]
-    @return {String|Array}
-    @since 3.8.0
-    **/
-    _rgbToHex: function (str) {
-        /*jshint bitwise:false*/
-        var rgb = Y.Color.toArray(str),
-            hex = rgb[2] | (rgb[1] << 8) | (rgb[0] << 16);
-
-        hex = (+hex).toString(16);
-
-        while (hex.length < 6) {
-            hex = '0' + hex;
-        }
-
-        return '#' + hex;
-    }
-
-};
-
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('dom-style', function (Y, NAME) {
-
-/**
- * Add style management functionality to DOM.
- * @module dom
- * @submodule dom-style
- * @for DOM
- */
-
-var DOCUMENT_ELEMENT = 'documentElement',
-    DEFAULT_VIEW = 'defaultView',
-    OWNER_DOCUMENT = 'ownerDocument',
-    STYLE = 'style',
-    FLOAT = 'float',
-    CSS_FLOAT = 'cssFloat',
-    STYLE_FLOAT = 'styleFloat',
-    TRANSPARENT = 'transparent',
-    GET_COMPUTED_STYLE = 'getComputedStyle',
-    GET_BOUNDING_CLIENT_RECT = 'getBoundingClientRect',
-
-    DOCUMENT = Y.config.doc,
-
-    Y_DOM = Y.DOM,
-
-    TRANSFORM = 'transform',
-    TRANSFORMORIGIN = 'transformOrigin',
-    VENDOR_TRANSFORM = [
-        'WebkitTransform',
-        'MozTransform',
-        'OTransform',
-        'msTransform'
-    ],
-
-    re_color = /color$/i,
-    re_unit = /width|height|top|left|right|bottom|margin|padding/i;
-
-Y.Array.each(VENDOR_TRANSFORM, function(val) {
-    if (val in DOCUMENT[DOCUMENT_ELEMENT].style) {
-        TRANSFORM = val;
-        TRANSFORMORIGIN = val + "Origin";
-    }
-});
-
-Y.mix(Y_DOM, {
-    DEFAULT_UNIT: 'px',
-
-    CUSTOM_STYLES: {
-    },
-
-
-    /**
-     * Sets a style property for a given element.
-     * @method setStyle
-     * @param {HTMLElement} node The HTMLElement to apply the style to.
-     * @param {String} att The style property to set.
-     * @param {String|Number} val The value.
-     * @param {Object} [style] The style node. Defaults to `node.style`.
-     */
-    setStyle: function(node, att, val, style) {
-        style = style || node.style;
-        var CUSTOM_STYLES = Y_DOM.CUSTOM_STYLES;
-
-        if (style) {
-            if (val === null || val === '') { // normalize unsetting
-                val = '';
-            } else if (!isNaN(Number(val)) && re_unit.test(att)) { // number values may need a unit
-                val += Y_DOM.DEFAULT_UNIT;
-            }
-
-            if (att in CUSTOM_STYLES) {
-                if (CUSTOM_STYLES[att].set) {
-                    CUSTOM_STYLES[att].set(node, val, style);
-                    return; // NOTE: return
-                } else if (typeof CUSTOM_STYLES[att] === 'string') {
-                    att = CUSTOM_STYLES[att];
-                }
-            } else if (att === '') { // unset inline styles
-                att = 'cssText';
-                val = '';
-            }
-            style[att] = val;
-        }
-    },
-
-    /**
-     * Returns the current style value for the given property.
-     * @method getStyle
-     * @param {HTMLElement} node The HTMLElement to get the style from.
-     * @param {String} att The style property to get.
-     * @param {Object} [style] The style node. Defaults to `node.style`.
-     */
-    getStyle: function(node, att, style) {
-        style = style || node.style;
-        var CUSTOM_STYLES = Y_DOM.CUSTOM_STYLES,
-            val = '';
-
-        if (style) {
-            if (att in CUSTOM_STYLES) {
-                if (CUSTOM_STYLES[att].get) {
-                    return CUSTOM_STYLES[att].get(node, att, style); // NOTE: return
-                } else if (typeof CUSTOM_STYLES[att] === 'string') {
-                    att = CUSTOM_STYLES[att];
-                }
-            }
-            val = style[att];
-            if (val === '') { // TODO: is empty string sufficient?
-                val = Y_DOM[GET_COMPUTED_STYLE](node, att);
-            }
-        }
-
-        return val;
-    },
-
-    /**
-     * Sets multiple style properties.
-     * @method setStyles
-     * @param {HTMLElement} node The HTMLElement to apply the styles to.
-     * @param {Object} hash An object literal of property:value pairs.
-     */
-    setStyles: function(node, hash) {
-        var style = node.style;
-        Y.each(hash, function(v, n) {
-            Y_DOM.setStyle(node, n, v, style);
-        }, Y_DOM);
-    },
-
-    /**
-     * Returns the computed style for the given node.
-     * @method getComputedStyle
-     * @param {HTMLElement} node The HTMLElement to get the style from.
-     * @param {String} att The style property to get.
-     * @return {String} The computed value of the style property.
-     */
-    getComputedStyle: function(node, att) {
-        var val = '',
-            doc = node[OWNER_DOCUMENT],
-            computed;
-
-        if (node[STYLE] && doc[DEFAULT_VIEW] && doc[DEFAULT_VIEW][GET_COMPUTED_STYLE]) {
-            computed = doc[DEFAULT_VIEW][GET_COMPUTED_STYLE](node, null);
-            if (computed) { // FF may be null in some cases (ticket #2530548)
-                val = computed[att];
-            }
-        }
-        return val;
-    }
-});
-
-// normalize reserved word float alternatives ("cssFloat" or "styleFloat")
-if (DOCUMENT[DOCUMENT_ELEMENT][STYLE][CSS_FLOAT] !== undefined) {
-    Y_DOM.CUSTOM_STYLES[FLOAT] = CSS_FLOAT;
-} else if (DOCUMENT[DOCUMENT_ELEMENT][STYLE][STYLE_FLOAT] !== undefined) {
-    Y_DOM.CUSTOM_STYLES[FLOAT] = STYLE_FLOAT;
-}
-
-// fix opera computedStyle default color unit (convert to rgb)
-if (Y.UA.opera) {
-    Y_DOM[GET_COMPUTED_STYLE] = function(node, att) {
-        var view = node[OWNER_DOCUMENT][DEFAULT_VIEW],
-            val = view[GET_COMPUTED_STYLE](node, '')[att];
-
-        if (re_color.test(att)) {
-            val = Y.Color.toRGB(val);
-        }
-
-        return val;
-    };
-
-}
-
-// safari converts transparent to rgba(), others use "transparent"
-if (Y.UA.webkit) {
-    Y_DOM[GET_COMPUTED_STYLE] = function(node, att) {
-        var view = node[OWNER_DOCUMENT][DEFAULT_VIEW],
-            val = view[GET_COMPUTED_STYLE](node, '')[att];
-
-        if (val === 'rgba(0, 0, 0, 0)') {
-            val = TRANSPARENT;
-        }
-
-        return val;
-    };
-
-}
-
-Y.DOM._getAttrOffset = function(node, attr) {
-    var val = Y.DOM[GET_COMPUTED_STYLE](node, attr),
-        offsetParent = node.offsetParent,
-        position,
-        parentOffset,
-        offset;
-
-    if (val === 'auto') {
-        position = Y.DOM.getStyle(node, 'position');
-        if (position === 'static' || position === 'relative') {
-            val = 0;
-        } else if (offsetParent && offsetParent[GET_BOUNDING_CLIENT_RECT]) {
-            parentOffset = offsetParent[GET_BOUNDING_CLIENT_RECT]()[attr];
-            offset = node[GET_BOUNDING_CLIENT_RECT]()[attr];
-            if (attr === 'left' || attr === 'top') {
-                val = offset - parentOffset;
-            } else {
-                val = parentOffset - node[GET_BOUNDING_CLIENT_RECT]()[attr];
-            }
-        }
-    }
-
-    return val;
-};
-
-Y.DOM._getOffset = function(node) {
-    var pos,
-        xy = null;
-
-    if (node) {
-        pos = Y_DOM.getStyle(node, 'position');
-        xy = [
-            parseInt(Y_DOM[GET_COMPUTED_STYLE](node, 'left'), 10),
-            parseInt(Y_DOM[GET_COMPUTED_STYLE](node, 'top'), 10)
-        ];
-
-        if ( isNaN(xy[0]) ) { // in case of 'auto'
-            xy[0] = parseInt(Y_DOM.getStyle(node, 'left'), 10); // try inline
-            if ( isNaN(xy[0]) ) { // default to offset value
-                xy[0] = (pos === 'relative') ? 0 : node.offsetLeft || 0;
-            }
-        }
-
-        if ( isNaN(xy[1]) ) { // in case of 'auto'
-            xy[1] = parseInt(Y_DOM.getStyle(node, 'top'), 10); // try inline
-            if ( isNaN(xy[1]) ) { // default to offset value
-                xy[1] = (pos === 'relative') ? 0 : node.offsetTop || 0;
-            }
-        }
-    }
-
-    return xy;
-
-};
-
-Y_DOM.CUSTOM_STYLES.transform = {
-    set: function(node, val, style) {
-        style[TRANSFORM] = val;
-    },
-
-    get: function(node) {
-        return Y_DOM[GET_COMPUTED_STYLE](node, TRANSFORM);
-    }
-};
-
-Y_DOM.CUSTOM_STYLES.transformOrigin = {
-    set: function(node, val, style) {
-        style[TRANSFORMORIGIN] = val;
-    },
-
-    get: function(node) {
-        return Y_DOM[GET_COMPUTED_STYLE](node, TRANSFORMORIGIN);
-    }
-};
-
-
-}, '3.16.0', {"requires": ["dom-base", "color-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-base', function (Y, NAME) {
-
-/**
- * @module node
- * @submodule node-base
- */
-
-var methods = [
-/**
- * Determines whether the node has the given className.
- * @method hasClass
- * @for Node
- * @param {String} className the class name to search for
- * @return {Boolean} Whether or not the node has the specified class
- */
- 'hasClass',
-
-/**
- * Adds a class name to the node.
- * @method addClass
- * @param {String} className the class name to add to the node's class attribute
- * @chainable
- */
- 'addClass',
-
-/**
- * Removes a class name from the node.
- * @method removeClass
- * @param {String} className the class name to remove from the node's class attribute
- * @chainable
- */
- 'removeClass',
-
-/**
- * Replace a class with another class on the node.
- * If no oldClassName is present, the newClassName is simply added.
- * @method replaceClass
- * @param {String} oldClassName the class name to be replaced
- * @param {String} newClassName the class name that will be replacing the old class name
- * @chainable
- */
- 'replaceClass',
-
-/**
- * If the className exists on the node it is removed, if it doesn't exist it is added.
- * @method toggleClass
- * @param {String} className the class name to be toggled
- * @param {Boolean} force Option to force adding or removing the class.
- * @chainable
- */
- 'toggleClass'
-];
-
-Y.Node.importMethod(Y.DOM, methods);
-/**
- * Determines whether each node has the given className.
- * @method hasClass
- * @see Node.hasClass
- * @for NodeList
- * @param {String} className the class name to search for
- * @return {Array} An array of booleans for each node bound to the NodeList.
- */
-
-/**
- * Adds a class name to each node.
- * @method addClass
- * @see Node.addClass
- * @param {String} className the class name to add to each node's class attribute
- * @chainable
- */
-
-/**
- * Removes a class name from each node.
- * @method removeClass
- * @see Node.removeClass
- * @param {String} className the class name to remove from each node's class attribute
- * @chainable
- */
-
-/**
- * Replace a class with another class for each node.
- * If no oldClassName is present, the newClassName is simply added.
- * @method replaceClass
- * @see Node.replaceClass
- * @param {String} oldClassName the class name to be replaced
- * @param {String} newClassName the class name that will be replacing the old class name
- * @chainable
- */
-
-/**
- * For each node, if the className exists on the node it is removed, if it doesn't exist it is added.
- * @method toggleClass
- * @see Node.toggleClass
- * @param {String} className the class name to be toggled
- * @chainable
- */
-Y.NodeList.importMethod(Y.Node.prototype, methods);
-/**
- * @module node
- * @submodule node-base
- */
-
-var Y_Node = Y.Node,
-    Y_DOM = Y.DOM;
-
-/**
- * Returns a new dom node using the provided markup string.
- * @method create
- * @static
- * @param {String} html The markup used to create the element.
- * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
- * to escape html content.
- * @param {HTMLDocument} doc An optional document context
- * @return {Node} A Node instance bound to a DOM node or fragment
- * @for Node
- */
-Y_Node.create = function(html, doc) {
-    if (doc && doc._node) {
-        doc = doc._node;
-    }
-    return Y.one(Y_DOM.create(html, doc));
-};
-
-Y.mix(Y_Node.prototype, {
-    /**
-     * Creates a new Node using the provided markup string.
-     * @method create
-     * @param {String} html The markup used to create the element.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content.
-     * @param {HTMLDocument} doc An optional document context
-     * @return {Node} A Node instance bound to a DOM node or fragment
-     */
-    create: Y_Node.create,
-
-    /**
-     * Inserts the content before the reference node.
-     * @method insert
-     * @param {String | Node | HTMLElement | NodeList | HTMLCollection} content The content to insert.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content.
-     * @param {Int | Node | HTMLElement | String} where The position to insert at.
-     * Possible "where" arguments
-     * <dl>
-     * <dt>Y.Node</dt>
-     * <dd>The Node to insert before</dd>
-     * <dt>HTMLElement</dt>
-     * <dd>The element to insert before</dd>
-     * <dt>Int</dt>
-     * <dd>The index of the child element to insert before</dd>
-     * <dt>"replace"</dt>
-     * <dd>Replaces the existing HTML</dd>
-     * <dt>"before"</dt>
-     * <dd>Inserts before the existing HTML</dd>
-     * <dt>"before"</dt>
-     * <dd>Inserts content before the node</dd>
-     * <dt>"after"</dt>
-     * <dd>Inserts content after the node</dd>
-     * </dl>
-     * @chainable
-     */
-    insert: function(content, where) {
-        this._insert(content, where);
-        return this;
-    },
-
-    _insert: function(content, where) {
-        var node = this._node,
-            ret = null;
-
-        if (typeof where == 'number') { // allow index
-            where = this._node.childNodes[where];
-        } else if (where && where._node) { // Node
-            where = where._node;
-        }
-
-        if (content && typeof content != 'string') { // allow Node or NodeList/Array instances
-            content = content._node || content._nodes || content;
-        }
-        ret = Y_DOM.addHTML(node, content, where);
-
-        return ret;
-    },
-
-    /**
-     * Inserts the content as the firstChild of the node.
-     * @method prepend
-     * @param {String | Node | HTMLElement} content The content to insert.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content.
-     * @chainable
-     */
-    prepend: function(content) {
-        return this.insert(content, 0);
-    },
-
-    /**
-     * Inserts the content as the lastChild of the node.
-     * @method append
-     * @param {String | Node | HTMLElement} content The content to insert.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content.
-     * @chainable
-     */
-    append: function(content) {
-        return this.insert(content, null);
-    },
-
-    /**
-     * @method appendChild
-     * @param {String | HTMLElement | Node} node Node to be appended.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content.
-     * @return {Node} The appended node
-     */
-    appendChild: function(node) {
-        return Y_Node.scrubVal(this._insert(node));
-    },
-
-    /**
-     * @method insertBefore
-     * @param {String | HTMLElement | Node} newNode Node to be appended
-     * @param {HTMLElement | Node} refNode Node to be inserted before.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content.
-     * @return {Node} The inserted node
-     */
-    insertBefore: function(newNode, refNode) {
-        return Y.Node.scrubVal(this._insert(newNode, refNode));
-    },
-
-    /**
-     * Appends the node to the given node.
-     * @example
-     *      // appendTo returns the node that has been created beforehand
-     *      Y.Node.create('<p></p>').appendTo('body').set('text', 'hello world!');
-     * @method appendTo
-     * @param {Node | HTMLElement | String} node The node to append to.
-     *  If `node` is a string it will be considered as a css selector and only the first matching node will be used.
-     * @chainable
-     */
-    appendTo: function(node) {
-        Y.one(node).append(this);
-        return this;
-    },
-    
-    // This method is deprecated, and is intentionally left undocumented.
-    // Use `setHTML` instead.
-    setContent: function(content) {
-        this._insert(content, 'replace');
-        return this;
-    },
-    
-    // This method is deprecated, and is intentionally left undocumented.
-    // Use `getHTML` instead.
-    getContent: function() {
-        var node = this;
-
-        if (node._node.nodeType === 11) { // 11 === Node.DOCUMENT_FRAGMENT_NODE
-            // "this", when it is a document fragment, must be cloned because
-            // the nodes contained in the fragment actually disappear once
-            // the fragment is appended anywhere
-            node = node.create("<div/>").append(node.cloneNode(true));
-        }
-
-        return node.get("innerHTML");
-    }
-});
-
-/**
- * Replaces the node's current html content with the content provided.
- * Note that this passes to innerHTML and is not escaped.
- * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
- * to escape html content or `set('text')` to add as text.
- * @method setHTML
- * @param {String | Node | HTMLElement | NodeList | HTMLCollection} content The content to insert
- * @chainable
- */
-Y.Node.prototype.setHTML = Y.Node.prototype.setContent;
-
-/**
- * Returns the node's current html content (e.g. innerHTML)
- * @method getHTML
- * @return {String} The html content
- */
-Y.Node.prototype.getHTML = Y.Node.prototype.getContent;
-
-Y.NodeList.importMethod(Y.Node.prototype, [
-    /**
-     * Called on each Node instance
-     * @for NodeList
-     * @method append
-     * @see Node.append
-     */
-    'append',
-
-    /**
-     * Called on each Node instance
-     * @for NodeList
-     * @method insert
-     * @see Node.insert
-     */
-    'insert',
-
-    /**
-     * Called on each Node instance
-     * @for NodeList
-     * @method appendChild
-     * @see Node.appendChild
-     */
-    'appendChild',
-
-    /**
-     * Called on each Node instance
-     * @for NodeList
-     * @method insertBefore
-     * @see Node.insertBefore
-     */
-    'insertBefore',
-
-    /**
-     * Called on each Node instance
-     * @for NodeList
-     * @method prepend
-     * @see Node.prepend
-     */
-    'prepend',
-
-    'setContent',
-
-    'getContent',
-
-    /**
-     * Called on each Node instance
-     * Note that this passes to innerHTML and is not escaped.
-     * Use <a href="../classes/Escape.html#method_html">`Y.Escape.html()`</a>
-     * to escape html content or `set('text')` to add as text.
-     * @for NodeList
-     * @method setHTML
-     * @see Node.setHTML
-     */
-    'setHTML',
-
-    /**
-     * Called on each Node instance
-     * @for NodeList
-     * @method getHTML
-     * @see Node.getHTML
-     */
-    'getHTML'
-]);
-/**
- * @module node
- * @submodule node-base
- */
-
-var Y_Node = Y.Node,
-    Y_DOM = Y.DOM;
-
-/**
- * Static collection of configuration attributes for special handling
- * @property ATTRS
- * @static
- * @type object
- */
-Y_Node.ATTRS = {
-    /**
-     * Allows for getting and setting the text of an element.
-     * Formatting is preserved and special characters are treated literally.
-     * @config text
-     * @type String
-     */
-    text: {
-        getter: function() {
-            return Y_DOM.getText(this._node);
-        },
-
-        setter: function(content) {
-            Y_DOM.setText(this._node, content);
-            return content;
-        }
-    },
-
-    /**
-     * Allows for getting and setting the text of an element.
-     * Formatting is preserved and special characters are treated literally.
-     * @config for
-     * @type String
-     */
-    'for': {
-        getter: function() {
-            return Y_DOM.getAttribute(this._node, 'for');
-        },
-
-        setter: function(val) {
-            Y_DOM.setAttribute(this._node, 'for', val);
-            return val;
-        }
-    },
-
-    'options': {
-        getter: function() {
-            return this._node.getElementsByTagName('option');
-        }
-    },
-
-    /**
-     * Returns a NodeList instance of all HTMLElement children.
-     * @readOnly
-     * @config children
-     * @type NodeList
-     */
-    'children': {
-        getter: function() {
-            var node = this._node,
-                children = node.children,
-                childNodes, i, len;
-
-            if (!children) {
-                childNodes = node.childNodes;
-                children = [];
-
-                for (i = 0, len = childNodes.length; i < len; ++i) {
-                    if (childNodes[i].tagName) {
-                        children[children.length] = childNodes[i];
-                    }
-                }
-            }
-            return Y.all(children);
-        }
-    },
-
-    value: {
-        getter: function() {
-            return Y_DOM.getValue(this._node);
-        },
-
-        setter: function(val) {
-            Y_DOM.setValue(this._node, val);
-            return val;
-        }
-    }
-};
-
-Y.Node.importMethod(Y.DOM, [
-    /**
-     * Allows setting attributes on DOM nodes, normalizing in some cases.
-     * This passes through to the DOM node, allowing for custom attributes.
-     * @method setAttribute
-     * @for Node
-     * @for NodeList
-     * @chainable
-     * @param {string} name The attribute name
-     * @param {string} value The value to set
-     */
-    'setAttribute',
-    /**
-     * Allows getting attributes on DOM nodes, normalizing in some cases.
-     * This passes through to the DOM node, allowing for custom attributes.
-     * @method getAttribute
-     * @for Node
-     * @for NodeList
-     * @param {string} name The attribute name
-     * @return {string} The attribute value
-     */
-    'getAttribute'
-
-]);
-/**
- * @module node
- * @submodule node-base
- */
-
-var Y_Node = Y.Node;
-var Y_NodeList = Y.NodeList;
-/**
- * List of events that route to DOM events
- * @static
- * @property DOM_EVENTS
- * @for Node
- */
-
-Y_Node.DOM_EVENTS = {
-    abort: 1,
-    beforeunload: 1,
-    blur: 1,
-    change: 1,
-    click: 1,
-    close: 1,
-    command: 1,
-    contextmenu: 1,
-    copy: 1,
-    cut: 1,
-    dblclick: 1,
-    DOMMouseScroll: 1,
-    drag: 1,
-    dragstart: 1,
-    dragenter: 1,
-    dragover: 1,
-    dragleave: 1,
-    dragend: 1,
-    drop: 1,
-    error: 1,
-    focus: 1,
-    key: 1,
-    keydown: 1,
-    keypress: 1,
-    keyup: 1,
-    load: 1,
-    message: 1,
-    mousedown: 1,
-    mouseenter: 1,
-    mouseleave: 1,
-    mousemove: 1,
-    mousemultiwheel: 1,
-    mouseout: 1,
-    mouseover: 1,
-    mouseup: 1,
-    mousewheel: 1,
-    orientationchange: 1,
-    paste: 1,
-    reset: 1,
-    resize: 1,
-    select: 1,
-    selectstart: 1,
-    submit: 1,
-    scroll: 1,
-    textInput: 1,
-    unload: 1
-};
-
-// Add custom event adaptors to this list.  This will make it so
-// that delegate, key, available, contentready, etc all will
-// be available through Node.on
-Y.mix(Y_Node.DOM_EVENTS, Y.Env.evt.plugins);
-
-Y.augment(Y_Node, Y.EventTarget);
-
-Y.mix(Y_Node.prototype, {
-    /**
-     * Removes event listeners from the node and (optionally) its subtree
-     * @method purge
-     * @param {Boolean} recurse (optional) Whether or not to remove listeners from the
-     * node's subtree
-     * @param {String} type (optional) Only remove listeners of the specified type
-     * @chainable
-     *
-     */
-    purge: function(recurse, type) {
-        Y.Event.purgeElement(this._node, recurse, type);
-        return this;
-    }
-
-});
-
-Y.mix(Y.NodeList.prototype, {
-    _prepEvtArgs: function(type, fn, context) {
-        // map to Y.on/after signature (type, fn, nodes, context, arg1, arg2, etc)
-        var args = Y.Array(arguments, 0, true);
-
-        if (args.length < 2) { // type only (event hash) just add nodes
-            args[2] = this._nodes;
-        } else {
-            args.splice(2, 0, this._nodes);
-        }
-
-        args[3] = context || this; // default to NodeList instance as context
-
-        return args;
-    },
-
-    /**
-    Subscribe a callback function for each `Node` in the collection to execute
-    in response to a DOM event.
-
-    NOTE: Generally, the `on()` method should be avoided on `NodeLists`, in
-    favor of using event delegation from a parent Node.  See the Event user
-    guide for details.
-
-    Most DOM events are associated with a preventable default behavior, such as
-    link clicks navigating to a new page.  Callbacks are passed a
-    `DOMEventFacade` object as their first argument (usually called `e`) that
-    can be used to prevent this default behavior with `e.preventDefault()`. See
-    the `DOMEventFacade` API for all available properties and methods on the
-    object.
-
-    By default, the `this` object will be the `NodeList` that the subscription
-    came from, <em>not the `Node` that received the event</em>.  Use
-    `e.currentTarget` to refer to the `Node`.
-
-    Returning `false` from a callback is supported as an alternative to calling
-    `e.preventDefault(); e.stopPropagation();`.  However, it is recommended to
-    use the event methods.
-
-    @example
-
-        Y.all(".sku").on("keydown", function (e) {
-            if (e.keyCode === 13) {
-                e.preventDefault();
-
-                // Use e.currentTarget to refer to the individual Node
-                var item = Y.MyApp.searchInventory( e.currentTarget.get('value') );
-                // etc ...
-            }
-        });
-
-    @method on
-    @param {String} type The name of the event
-    @param {Function} fn The callback to execute in response to the event
-    @param {Object} [context] Override `this` object in callback
-    @param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-    @return {EventHandle} A subscription handle capable of detaching that
-                          subscription
-    @for NodeList
-    **/
-    on: function(type, fn, context) {
-        return Y.on.apply(Y, this._prepEvtArgs.apply(this, arguments));
-    },
-
-    /**
-     * Applies an one-time event listener to each Node bound to the NodeList.
-     * @method once
-     * @param {String} type The event being listened for
-     * @param {Function} fn The handler to call when the event fires
-     * @param {Object} context The context to call the handler with.
-     * Default is the NodeList instance.
-     * @return {EventHandle} A subscription handle capable of detaching that
-     *                    subscription
-     * @for NodeList
-     */
-    once: function(type, fn, context) {
-        return Y.once.apply(Y, this._prepEvtArgs.apply(this, arguments));
-    },
-
-    /**
-     * Applies an event listener to each Node bound to the NodeList.
-     * The handler is called only after all on() handlers are called
-     * and the event is not prevented.
-     * @method after
-     * @param {String} type The event being listened for
-     * @param {Function} fn The handler to call when the event fires
-     * @param {Object} context The context to call the handler with.
-     * Default is the NodeList instance.
-     * @return {EventHandle} A subscription handle capable of detaching that
-     *                    subscription
-     * @for NodeList
-     */
-    after: function(type, fn, context) {
-        return Y.after.apply(Y, this._prepEvtArgs.apply(this, arguments));
-    },
-
-    /**
-     * Applies an one-time event listener to each Node bound to the NodeList
-     * that will be called only after all on() handlers are called and the
-     * event is not prevented.
-     *
-     * @method onceAfter
-     * @param {String} type The event being listened for
-     * @param {Function} fn The handler to call when the event fires
-     * @param {Object} context The context to call the handler with.
-     * Default is the NodeList instance.
-     * @return {EventHandle} A subscription handle capable of detaching that
-     *                    subscription
-     * @for NodeList
-     */
-    onceAfter: function(type, fn, context) {
-        return Y.onceAfter.apply(Y, this._prepEvtArgs.apply(this, arguments));
-    }
-});
-
-Y_NodeList.importMethod(Y.Node.prototype, [
-    /**
-      * Called on each Node instance
-      * @method detach
-      * @see Node.detach
-      * @for NodeList
-      */
-    'detach',
-
-    /** Called on each Node instance
-      * @method detachAll
-      * @see Node.detachAll
-      * @for NodeList
-      */
-    'detachAll'
-]);
-
-/**
-Subscribe a callback function to execute in response to a DOM event or custom
-event.
-
-Most DOM events are associated with a preventable default behavior such as
-link clicks navigating to a new page.  Callbacks are passed a `DOMEventFacade`
-object as their first argument (usually called `e`) that can be used to
-prevent this default behavior with `e.preventDefault()`. See the
-`DOMEventFacade` API for all available properties and methods on the object.
-
-If the event name passed as the first parameter is not a whitelisted DOM event,
-it will be treated as a custom event subscriptions, allowing
-`node.fire('customEventName')` later in the code.  Refer to the Event user guide
-for the full DOM event whitelist.
-
-By default, the `this` object in the callback will refer to the subscribed
-`Node`.
-
-Returning `false` from a callback is supported as an alternative to calling
-`e.preventDefault(); e.stopPropagation();`.  However, it is recommended to use
-the event methods.
-
-@example
-
-    Y.one("#my-form").on("submit", function (e) {
-        e.preventDefault();
-
-        // proceed with ajax form submission instead...
-    });
-
-@method on
-@param {String} type The name of the event
-@param {Function} fn The callback to execute in response to the event
-@param {Object} [context] Override `this` object in callback
-@param {Any} [arg*] 0..n additional arguments to supply to the subscriber
-@return {EventHandle} A subscription handle capable of detaching that
-                      subscription
-@for Node
-**/
-
-Y.mix(Y.Node.ATTRS, {
-    offsetHeight: {
-        setter: function(h) {
-            Y.DOM.setHeight(this._node, h);
-            return h;
-        },
-
-        getter: function() {
-            return this._node.offsetHeight;
-        }
-    },
-
-    offsetWidth: {
-        setter: function(w) {
-            Y.DOM.setWidth(this._node, w);
-            return w;
-        },
-
-        getter: function() {
-            return this._node.offsetWidth;
-        }
-    }
-});
-
-Y.mix(Y.Node.prototype, {
-    sizeTo: function(w, h) {
-        var node;
-        if (arguments.length < 2) {
-            node = Y.one(w);
-            w = node.get('offsetWidth');
-            h = node.get('offsetHeight');
-        }
-
-        this.setAttrs({
-            offsetWidth: w,
-            offsetHeight: h
-        });
-    }
-});
-
-if (!Y.config.doc.documentElement.hasAttribute) { // IE < 8
-    Y.Node.prototype.hasAttribute = function(attr) {
-        if (attr === 'value') {
-            if (this.get('value') !== "") { // IE < 8 fails to populate specified when set in HTML
-                return true;
-            }
-        }
-        return !!(this._node.attributes[attr] &&
-                this._node.attributes[attr].specified);
-    };
-}
-
-// IE throws an error when calling focus() on an element that's invisible, not
-// displayed, or disabled.
-Y.Node.prototype.focus = function () {
-    try {
-        this._node.focus();
-    } catch (e) {
-    }
-
-    return this;
-};
-
-// IE throws error when setting input.type = 'hidden',
-// input.setAttribute('type', 'hidden') and input.attributes.type.value = 'hidden'
-Y.Node.ATTRS.type = {
-    setter: function(val) {
-        if (val === 'hidden') {
-            try {
-                this._node.type = 'hidden';
-            } catch(e) {
-                this._node.style.display = 'none';
-                this._inputType = 'hidden';
-            }
-        } else {
-            try { // IE errors when changing the type from "hidden'
-                this._node.type = val;
-            } catch (e) {
-            }
-        }
-        return val;
-    },
-
-    getter: function() {
-        return this._inputType || this._node.type;
-    },
-
-    _bypassProxy: true // don't update DOM when using with Attribute
-};
-
-if (Y.config.doc.createElement('form').elements.nodeType) {
-    // IE: elements collection is also FORM node which trips up scrubVal.
-    Y.Node.ATTRS.elements = {
-            getter: function() {
-                return this.all('input, textarea, button, select');
-            }
-    };
-}
-/**
- * Provides methods for managing custom Node data.
- *
- * @module node
- * @main node
- * @submodule node-data
- */
-
-Y.mix(Y.Node.prototype, {
-    _initData: function() {
-        if (! ('_data' in this)) {
-            this._data = {};
-        }
-    },
-
-    /**
-    * @method getData
-    * @for Node
-    * @description Retrieves arbitrary data stored on a Node instance.
-    * If no data is associated with the Node, it will attempt to retrieve
-    * a value from the corresponding HTML data attribute. (e.g. node.getData('foo')
-    * will check node.getAttribute('data-foo')).
-    * @param {string} name Optional name of the data field to retrieve.
-    * If no name is given, all data is returned.
-    * @return {any | Object} Whatever is stored at the given field,
-    * or an object hash of all fields.
-    */
-    getData: function(name) {
-        this._initData();
-        var data = this._data,
-            ret = data;
-
-        if (arguments.length) { // single field
-            if (name in data) {
-                ret = data[name];
-            } else { // initialize from HTML attribute
-                ret = this._getDataAttribute(name);
-            }
-        } else if (typeof data == 'object' && data !== null) { // all fields
-            ret = {};
-            Y.Object.each(data, function(v, n) {
-                ret[n] = v;
-            });
-
-            ret = this._getDataAttributes(ret);
-        }
-
-        return ret;
-
-    },
-
-    _getDataAttributes: function(ret) {
-        ret = ret || {};
-        var i = 0,
-            attrs = this._node.attributes,
-            len = attrs.length,
-            prefix = this.DATA_PREFIX,
-            prefixLength = prefix.length,
-            name;
-
-        while (i < len) {
-            name = attrs[i].name;
-            if (name.indexOf(prefix) === 0) {
-                name = name.substr(prefixLength);
-                if (!(name in ret)) { // only merge if not already stored
-                    ret[name] = this._getDataAttribute(name);
-                }
-            }
-
-            i += 1;
-        }
-
-        return ret;
-    },
-
-    _getDataAttribute: function(name) {
-        name = this.DATA_PREFIX + name;
-
-        var node = this._node,
-            attrs = node.attributes,
-            data = attrs && attrs[name] && attrs[name].value;
-
-        return data;
-    },
-
-    /**
-    * @method setData
-    * @for Node
-    * @description Stores arbitrary data on a Node instance.
-    * This is not stored with the DOM node.
-    * @param {string} name The name of the field to set. If no val
-    * is given, name is treated as the data and overrides any existing data.
-    * @param {any} val The value to be assigned to the field.
-    * @chainable
-    */
-    setData: function(name, val) {
-        this._initData();
-        if (arguments.length > 1) {
-            this._data[name] = val;
-        } else {
-            this._data = name;
-        }
-
-       return this;
-    },
-
-    /**
-    * @method clearData
-    * @for Node
-    * @description Clears internally stored data.
-    * @param {string} name The name of the field to clear. If no name
-    * is given, all data is cleared.
-    * @chainable
-    */
-    clearData: function(name) {
-        if ('_data' in this) {
-            if (typeof name != 'undefined') {
-                delete this._data[name];
-            } else {
-                delete this._data;
-            }
-        }
-
-        return this;
-    }
-});
-
-Y.mix(Y.NodeList.prototype, {
-    /**
-    * @method getData
-    * @for NodeList
-    * @description Retrieves arbitrary data stored on each Node instance
-    * bound to the NodeList.
-    * @see Node
-    * @param {string} name Optional name of the data field to retrieve.
-    * If no name is given, all data is returned.
-    * @return {Array} An array containing all of the data for each Node instance.
-    * or an object hash of all fields.
-    */
-    getData: function(name) {
-        var args = (arguments.length) ? [name] : [];
-        return this._invoke('getData', args, true);
-    },
-
-    /**
-    * @method setData
-    * @for NodeList
-    * @description Stores arbitrary data on each Node instance bound to the
-    *  NodeList. This is not stored with the DOM node.
-    * @param {string} name The name of the field to set. If no name
-    * is given, name is treated as the data and overrides any existing data.
-    * @param {any} val The value to be assigned to the field.
-    * @chainable
-    */
-    setData: function(name, val) {
-        var args = (arguments.length > 1) ? [name, val] : [name];
-        return this._invoke('setData', args);
-    },
-
-    /**
-    * @method clearData
-    * @for NodeList
-    * @description Clears data on all Node instances bound to the NodeList.
-    * @param {string} name The name of the field to clear. If no name
-    * is given, all data is cleared.
-    * @chainable
-    */
-    clearData: function(name) {
-        var args = (arguments.length) ? [name] : [];
-        return this._invoke('clearData', [name]);
-    }
-});
-
-
-}, '3.16.0', {"requires": ["event-base", "node-core", "dom-base", "dom-style"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-synthetic', function (Y, NAME) {
-
-/**
- * Define new DOM events that can be subscribed to from Nodes.
- *
- * @module event
- * @submodule event-synthetic
- */
-var CustomEvent = Y.CustomEvent,
-    DOMMap   = Y.Env.evt.dom_map,
-    toArray  = Y.Array,
-    YLang    = Y.Lang,
-    isObject = YLang.isObject,
-    isString = YLang.isString,
-    isArray  = YLang.isArray,
-    query    = Y.Selector.query,
-    noop     = function () {};
-
-/**
- * <p>The triggering mechanism used by SyntheticEvents.</p>
- *
- * <p>Implementers should not instantiate these directly.  Use the Notifier
- * provided to the event's implemented <code>on(node, sub, notifier)</code> or
- * <code>delegate(node, sub, notifier, filter)</code> methods.</p>
- *
- * @class SyntheticEvent.Notifier
- * @constructor
- * @param handle {EventHandle} the detach handle for the subscription to an
- *              internal custom event used to execute the callback passed to
- *              on(..) or delegate(..)
- * @param emitFacade {Boolean} take steps to ensure the first arg received by
- *              the subscription callback is an event facade
- * @private
- * @since 3.2.0
- */
-function Notifier(handle, emitFacade) {
-    this.handle     = handle;
-    this.emitFacade = emitFacade;
-}
-
-/**
- * <p>Executes the subscription callback, passing the firing arguments as the
- * first parameters to that callback. For events that are configured with
- * emitFacade=true, it is common practice to pass the triggering DOMEventFacade
- * as the first parameter.  Barring a proper DOMEventFacade or EventFacade
- * (from a CustomEvent), a new EventFacade will be generated.  In that case, if
- * fire() is called with a simple object, it will be mixed into the facade.
- * Otherwise, the facade will be prepended to the callback parameters.</p>
- *
- * <p>For notifiers provided to delegate logic, the first argument should be an
- * object with a &quot;currentTarget&quot; property to identify what object to
- * default as 'this' in the callback.  Typically this is gleaned from the
- * DOMEventFacade or EventFacade, but if configured with emitFacade=false, an
- * object must be provided.  In that case, the object will be removed from the
- * callback parameters.</p>
- *
- * <p>Additional arguments passed during event subscription will be
- * automatically added after those passed to fire().</p>
- *
- * @method fire
- * @param {EventFacade|DOMEventFacade|any} e (see description)
- * @param {any[]} [arg*] additional arguments received by all subscriptions
- * @private
- */
-Notifier.prototype.fire = function (e) {
-    // first arg to delegate notifier should be an object with currentTarget
-    var args     = toArray(arguments, 0, true),
-        handle   = this.handle,
-        ce       = handle.evt,
-        sub      = handle.sub,
-        thisObj  = sub.context,
-        delegate = sub.filter,
-        event    = e || {},
-        ret;
-
-    if (this.emitFacade) {
-        if (!e || !e.preventDefault) {
-            event = ce._getFacade();
-
-            if (isObject(e) && !e.preventDefault) {
-                Y.mix(event, e, true);
-                args[0] = event;
-            } else {
-                args.unshift(event);
-            }
-        }
-
-        event.type    = ce.type;
-        event.details = args.slice();
-
-        if (delegate) {
-            event.container = ce.host;
-        }
-    } else if (delegate && isObject(e) && e.currentTarget) {
-        args.shift();
-    }
-
-    sub.context = thisObj || event.currentTarget || ce.host;
-    ret = ce.fire.apply(ce, args);
-
-    // have to handle preventedFn and stoppedFn manually because
-    // Notifier CustomEvents are forced to emitFacade=false
-    if (e.prevented && ce.preventedFn) {
-        ce.preventedFn.apply(ce, args);
-    }
-
-    if (e.stopped && ce.stoppedFn) {
-        ce.stoppedFn.apply(ce, args);
-    }
-
-    sub.context = thisObj; // reset for future firing
-
-    // to capture callbacks that return false to stopPropagation.
-    // Useful for delegate implementations
-    return ret;
-};
-
-/**
- * Manager object for synthetic event subscriptions to aggregate multiple synths on the
- * same node without colliding with actual DOM subscription entries in the global map of
- * DOM subscriptions.  Also facilitates proper cleanup on page unload.
- *
- * @class SynthRegistry
- * @constructor
- * @param el {HTMLElement} the DOM element
- * @param yuid {String} the yuid stamp for the element
- * @param key {String} the generated id token used to identify an event type +
- *                     element in the global DOM subscription map.
- * @private
- */
-function SynthRegistry(el, yuid, key) {
-    this.handles = [];
-    this.el      = el;
-    this.key     = key;
-    this.domkey  = yuid;
-}
-
-SynthRegistry.prototype = {
-    constructor: SynthRegistry,
-
-    // A few object properties to fake the CustomEvent interface for page
-    // unload cleanup.  DON'T TOUCH!
-    type      : '_synth',
-    fn        : noop,
-    capture   : false,
-
-    /**
-     * Adds a subscription from the Notifier registry.
-     *
-     * @method register
-     * @param handle {EventHandle} the subscription
-     * @since 3.4.0
-     */
-    register: function (handle) {
-        handle.evt.registry = this;
-        this.handles.push(handle);
-    },
-
-    /**
-     * Removes the subscription from the Notifier registry.
-     *
-     * @method _unregisterSub
-     * @param sub {Subscription} the subscription
-     * @since 3.4.0
-     */
-    unregister: function (sub) {
-        var handles = this.handles,
-            events = DOMMap[this.domkey],
-            i;
-
-        for (i = handles.length - 1; i >= 0; --i) {
-            if (handles[i].sub === sub) {
-                handles.splice(i, 1);
-                break;
-            }
-        }
-
-        // Clean up left over objects when there are no more subscribers.
-        if (!handles.length) {
-            delete events[this.key];
-            if (!Y.Object.size(events)) {
-                delete DOMMap[this.domkey];
-            }
-        }
-    },
-
-    /**
-     * Used by the event system's unload cleanup process.  When navigating
-     * away from the page, the event system iterates the global map of element
-     * subscriptions and detaches everything using detachAll().  Normally,
-     * the map is populated with custom events, so this object needs to
-     * at least support the detachAll method to duck type its way to
-     * cleanliness.
-     *
-     * @method detachAll
-     * @private
-     * @since 3.4.0
-     */
-    detachAll : function () {
-        var handles = this.handles,
-            i = handles.length;
-
-        while (--i >= 0) {
-            handles[i].detach();
-        }
-    }
-};
-
-/**
- * <p>Wrapper class for the integration of new events into the YUI event
- * infrastructure.  Don't instantiate this object directly, use
- * <code>Y.Event.define(type, config)</code>.  See that method for details.</p>
- *
- * <p>Properties that MAY or SHOULD be specified in the configuration are noted
- * below and in the description of <code>Y.Event.define</code>.</p>
- *
- * @class SyntheticEvent
- * @constructor
- * @param cfg {Object} Implementation pieces and configuration
- * @since 3.1.0
- * @in event-synthetic
- */
-function SyntheticEvent() {
-    this._init.apply(this, arguments);
-}
-
-Y.mix(SyntheticEvent, {
-    Notifier: Notifier,
-    SynthRegistry: SynthRegistry,
-
-    /**
-     * Returns the array of subscription handles for a node for the given event
-     * type.  Passing true as the third argument will create a registry entry
-     * in the event system's DOM map to host the array if one doesn't yet exist.
-     *
-     * @method getRegistry
-     * @param node {Node} the node
-     * @param type {String} the event
-     * @param create {Boolean} create a registration entry to host a new array
-     *                  if one doesn't exist.
-     * @return {Array}
-     * @static
-     * @protected
-     * @since 3.2.0
-     */
-    getRegistry: function (node, type, create) {
-        var el     = node._node,
-            yuid   = Y.stamp(el),
-            key    = 'event:' + yuid + type + '_synth',
-            events = DOMMap[yuid];
-
-        if (create) {
-            if (!events) {
-                events = DOMMap[yuid] = {};
-            }
-            if (!events[key]) {
-                events[key] = new SynthRegistry(el, yuid, key);
-            }
-        }
-
-        return (events && events[key]) || null;
-    },
-
-    /**
-     * Alternate <code>_delete()</code> method for the CustomEvent object
-     * created to manage SyntheticEvent subscriptions.
-     *
-     * @method _deleteSub
-     * @param sub {Subscription} the subscription to clean up
-     * @private
-     * @since 3.2.0
-     */
-    _deleteSub: function (sub) {
-        if (sub && sub.fn) {
-            var synth = this.eventDef,
-                method = (sub.filter) ? 'detachDelegate' : 'detach';
-
-            this._subscribers = [];
-
-            if (CustomEvent.keepDeprecatedSubs) {
-                this.subscribers = {};
-            }
-
-            synth[method](sub.node, sub, this.notifier, sub.filter);
-            this.registry.unregister(sub);
-
-            delete sub.fn;
-            delete sub.node;
-            delete sub.context;
-        }
-    },
-
-    prototype: {
-        constructor: SyntheticEvent,
-
-        /**
-         * Construction logic for the event.
-         *
-         * @method _init
-         * @protected
-         */
-        _init: function () {
-            var config = this.publishConfig || (this.publishConfig = {});
-
-            // The notification mechanism handles facade creation
-            this.emitFacade = ('emitFacade' in config) ?
-                                config.emitFacade :
-                                true;
-            config.emitFacade  = false;
-        },
-
-        /**
-         * <p>Implementers MAY provide this method definition.</p>
-         *
-         * <p>Implement this function if the event supports a different
-         * subscription signature.  This function is used by both
-         * <code>on()</code> and <code>delegate()</code>.  The second parameter
-         * indicates that the event is being subscribed via
-         * <code>delegate()</code>.</p>
-         *
-         * <p>Implementations must remove extra arguments from the args list
-         * before returning.  The required args for <code>on()</code>
-         * subscriptions are</p>
-         * <pre><code>[type, callback, target, context, argN...]</code></pre>
-         *
-         * <p>The required args for <code>delegate()</code>
-         * subscriptions are</p>
-         *
-         * <pre><code>[type, callback, target, filter, context, argN...]</code></pre>
-         *
-         * <p>The return value from this function will be stored on the
-         * subscription in the '_extra' property for reference elsewhere.</p>
-         *
-         * @method processArgs
-         * @param args {Array} parmeters passed to Y.on(..) or Y.delegate(..)
-         * @param delegate {Boolean} true if the subscription is from Y.delegate
-         * @return {any}
-         */
-        processArgs: noop,
-
-        /**
-         * <p>Implementers MAY override this property.</p>
-         *
-         * <p>Whether to prevent multiple subscriptions to this event that are
-         * classified as being the same.  By default, this means the subscribed
-         * callback is the same function.  See the <code>subMatch</code>
-         * method.  Setting this to true will impact performance for high volume
-         * events.</p>
-         *
-         * @property preventDups
-         * @type {Boolean}
-         * @default false
-         */
-        //preventDups  : false,
-
-        /**
-         * <p>Implementers SHOULD provide this method definition.</p>
-         *
-         * Implementation logic for subscriptions done via <code>node.on(type,
-         * fn)</code> or <code>Y.on(type, fn, target)</code>.  This
-         * function should set up the monitor(s) that will eventually fire the
-         * event.  Typically this involves subscribing to at least one DOM
-         * event.  It is recommended to store detach handles from any DOM
-         * subscriptions to make for easy cleanup in the <code>detach</code>
-         * method.  Typically these handles are added to the <code>sub</code>
-         * object.  Also for SyntheticEvents that leverage a single DOM
-         * subscription under the hood, it is recommended to pass the DOM event
-         * object to <code>notifier.fire(e)</code>.  (The event name on the
-         * object will be updated).
-         *
-         * @method on
-         * @param node {Node} the node the subscription is being applied to
-         * @param sub {Subscription} the object to track this subscription
-         * @param notifier {SyntheticEvent.Notifier} call notifier.fire(..) to
-         *              trigger the execution of the subscribers
-         */
-        on: noop,
-
-        /**
-         * <p>Implementers SHOULD provide this method definition.</p>
-         *
-         * <p>Implementation logic for detaching subscriptions done via
-         * <code>node.on(type, fn)</code>.  This function should clean up any
-         * subscriptions made in the <code>on()</code> phase.</p>
-         *
-         * @method detach
-         * @param node {Node} the node the subscription was applied to
-         * @param sub {Subscription} the object tracking this subscription
-         * @param notifier {SyntheticEvent.Notifier} the Notifier used to
-         *              trigger the execution of the subscribers
-         */
-        detach: noop,
-
-        /**
-         * <p>Implementers SHOULD provide this method definition.</p>
-         *
-         * <p>Implementation logic for subscriptions done via
-         * <code>node.delegate(type, fn, filter)</code> or
-         * <code>Y.delegate(type, fn, container, filter)</code>.  Like with
-         * <code>on()</code> above, this function should monitor the environment
-         * for the event being fired, and trigger subscription execution by
-         * calling <code>notifier.fire(e)</code>.</p>
-         *
-         * <p>This function receives a fourth argument, which is the filter
-         * used to identify which Node's are of interest to the subscription.
-         * The filter will be either a boolean function that accepts a target
-         * Node for each hierarchy level as the event bubbles, or a selector
-         * string.  To translate selector strings into filter functions, use
-         * <code>Y.delegate.compileFilter(filter)</code>.</p>
-         *
-         * @method delegate
-         * @param node {Node} the node the subscription is being applied to
-         * @param sub {Subscription} the object to track this subscription
-         * @param notifier {SyntheticEvent.Notifier} call notifier.fire(..) to
-         *              trigger the execution of the subscribers
-         * @param filter {String|Function} Selector string or function that
-         *              accepts an event object and returns null, a Node, or an
-         *              array of Nodes matching the criteria for processing.
-         * @since 3.2.0
-         */
-        delegate       : noop,
-
-        /**
-         * <p>Implementers SHOULD provide this method definition.</p>
-         *
-         * <p>Implementation logic for detaching subscriptions done via
-         * <code>node.delegate(type, fn, filter)</code> or
-         * <code>Y.delegate(type, fn, container, filter)</code>.  This function
-         * should clean up any subscriptions made in the
-         * <code>delegate()</code> phase.</p>
-         *
-         * @method detachDelegate
-         * @param node {Node} the node the subscription was applied to
-         * @param sub {Subscription} the object tracking this subscription
-         * @param notifier {SyntheticEvent.Notifier} the Notifier used to
-         *              trigger the execution of the subscribers
-         * @param filter {String|Function} Selector string or function that
-         *              accepts an event object and returns null, a Node, or an
-         *              array of Nodes matching the criteria for processing.
-         * @since 3.2.0
-         */
-        detachDelegate : noop,
-
-        /**
-         * Sets up the boilerplate for detaching the event and facilitating the
-         * execution of subscriber callbacks.
-         *
-         * @method _on
-         * @param args {Array} array of arguments passed to
-         *              <code>Y.on(...)</code> or <code>Y.delegate(...)</code>
-         * @param delegate {Boolean} true if called from
-         * <code>Y.delegate(...)</code>
-         * @return {EventHandle} the detach handle for this subscription
-         * @private
-         * since 3.2.0
-         */
-        _on: function (args, delegate) {
-            var handles  = [],
-                originalArgs = args.slice(),
-                extra    = this.processArgs(args, delegate),
-                selector = args[2],
-                method   = delegate ? 'delegate' : 'on',
-                nodes, handle;
-
-            // Can't just use Y.all because it doesn't support window (yet?)
-            nodes = (isString(selector)) ?
-                query(selector) :
-                toArray(selector || Y.one(Y.config.win));
-
-            if (!nodes.length && isString(selector)) {
-                handle = Y.on('available', function () {
-                    Y.mix(handle, Y[method].apply(Y, originalArgs), true);
-                }, selector);
-
-                return handle;
-            }
-
-            Y.Array.each(nodes, function (node) {
-                var subArgs = args.slice(),
-                    filter;
-
-                node = Y.one(node);
-
-                if (node) {
-                    if (delegate) {
-                        filter = subArgs.splice(3, 1)[0];
-                    }
-
-                    // (type, fn, el, thisObj, ...) => (fn, thisObj, ...)
-                    subArgs.splice(0, 4, subArgs[1], subArgs[3]);
-
-                    if (!this.preventDups ||
-                        !this.getSubs(node, args, null, true))
-                    {
-                        handles.push(this._subscribe(node, method, subArgs, extra, filter));
-                    }
-                }
-            }, this);
-
-            return (handles.length === 1) ?
-                handles[0] :
-                new Y.EventHandle(handles);
-        },
-
-        /**
-         * Creates a new Notifier object for use by this event's
-         * <code>on(...)</code> or <code>delegate(...)</code> implementation
-         * and register the custom event proxy in the DOM system for cleanup.
-         *
-         * @method _subscribe
-         * @param node {Node} the Node hosting the event
-         * @param method {String} "on" or "delegate"
-         * @param args {Array} the subscription arguments passed to either
-         *              <code>Y.on(...)</code> or <code>Y.delegate(...)</code>
-         *              after running through <code>processArgs(args)</code> to
-         *              normalize the argument signature
-         * @param extra {any} Extra data parsed from
-         *              <code>processArgs(args)</code>
-         * @param filter {String|Function} the selector string or function
-         *              filter passed to <code>Y.delegate(...)</code> (not
-         *              present when called from <code>Y.on(...)</code>)
-         * @return {EventHandle}
-         * @private
-         * @since 3.2.0
-         */
-        _subscribe: function (node, method, args, extra, filter) {
-            var dispatcher = new Y.CustomEvent(this.type, this.publishConfig),
-                handle     = dispatcher.on.apply(dispatcher, args),
-                notifier   = new Notifier(handle, this.emitFacade),
-                registry   = SyntheticEvent.getRegistry(node, this.type, true),
-                sub        = handle.sub;
-
-            sub.node   = node;
-            sub.filter = filter;
-            if (extra) {
-                this.applyArgExtras(extra, sub);
-            }
-
-            Y.mix(dispatcher, {
-                eventDef     : this,
-                notifier     : notifier,
-                host         : node,       // I forget what this is for
-                currentTarget: node,       // for generating facades
-                target       : node,       // for generating facades
-                el           : node._node, // For category detach
-
-                _delete      : SyntheticEvent._deleteSub
-            }, true);
-
-            handle.notifier = notifier;
-
-            registry.register(handle);
-
-            // Call the implementation's "on" or "delegate" method
-            this[method](node, sub, notifier, filter);
-
-            return handle;
-        },
-
-        /**
-         * <p>Implementers MAY provide this method definition.</p>
-         *
-         * <p>Implement this function if you want extra data extracted during
-         * processArgs to be propagated to subscriptions on a per-node basis.
-         * That is to say, if you call <code>Y.on('xyz', fn, xtra, 'div')</code>
-         * the data returned from processArgs will be shared
-         * across the subscription objects for all the divs.  If you want each
-         * subscription to receive unique information, do that processing
-         * here.</p>
-         *
-         * <p>The default implementation adds the data extracted by processArgs
-         * to the subscription object as <code>sub._extra</code>.</p>
-         *
-         * @method applyArgExtras
-         * @param extra {any} Any extra data extracted from processArgs
-         * @param sub {Subscription} the individual subscription
-         */
-        applyArgExtras: function (extra, sub) {
-            sub._extra = extra;
-        },
-
-        /**
-         * Removes the subscription(s) from the internal subscription dispatch
-         * mechanism.  See <code>SyntheticEvent._deleteSub</code>.
-         *
-         * @method _detach
-         * @param args {Array} The arguments passed to
-         *                  <code>node.detach(...)</code>
-         * @private
-         * @since 3.2.0
-         */
-        _detach: function (args) {
-            // Can't use Y.all because it doesn't support window (yet?)
-            // TODO: Does Y.all support window now?
-            var target = args[2],
-                els    = (isString(target)) ?
-                            query(target) : toArray(target),
-                node, i, len, handles, j;
-
-            // (type, fn, el, context, filter?) => (type, fn, context, filter?)
-            args.splice(2, 1);
-
-            for (i = 0, len = els.length; i < len; ++i) {
-                node = Y.one(els[i]);
-
-                if (node) {
-                    handles = this.getSubs(node, args);
-
-                    if (handles) {
-                        for (j = handles.length - 1; j >= 0; --j) {
-                            handles[j].detach();
-                        }
-                    }
-                }
-            }
-        },
-
-        /**
-         * Returns the detach handles of subscriptions on a node that satisfy a
-         * search/filter function.  By default, the filter used is the
-         * <code>subMatch</code> method.
-         *
-         * @method getSubs
-         * @param node {Node} the node hosting the event
-         * @param args {Array} the array of original subscription args passed
-         *              to <code>Y.on(...)</code> (before
-         *              <code>processArgs</code>
-         * @param filter {Function} function used to identify a subscription
-         *              for inclusion in the returned array
-         * @param first {Boolean} stop after the first match (used to check for
-         *              duplicate subscriptions)
-         * @return {EventHandle[]} detach handles for the matching subscriptions
-         */
-        getSubs: function (node, args, filter, first) {
-            var registry = SyntheticEvent.getRegistry(node, this.type),
-                handles  = [],
-                allHandles, i, len, handle;
-
-            if (registry) {
-                allHandles = registry.handles;
-
-                if (!filter) {
-                    filter = this.subMatch;
-                }
-
-                for (i = 0, len = allHandles.length; i < len; ++i) {
-                    handle = allHandles[i];
-                    if (filter.call(this, handle.sub, args)) {
-                        if (first) {
-                            return handle;
-                        } else {
-                            handles.push(allHandles[i]);
-                        }
-                    }
-                }
-            }
-
-            return handles.length && handles;
-        },
-
-        /**
-         * <p>Implementers MAY override this to define what constitutes a
-         * &quot;same&quot; subscription.  Override implementations should
-         * consider the lack of a comparator as a match, so calling
-         * <code>getSubs()</code> with no arguments will return all subs.</p>
-         *
-         * <p>Compares a set of subscription arguments against a Subscription
-         * object to determine if they match.  The default implementation
-         * compares the callback function against the second argument passed to
-         * <code>Y.on(...)</code> or <code>node.detach(...)</code> etc.</p>
-         *
-         * @method subMatch
-         * @param sub {Subscription} the existing subscription
-         * @param args {Array} the calling arguments passed to
-         *                  <code>Y.on(...)</code> etc.
-         * @return {Boolean} true if the sub can be described by the args
-         *                  present
-         * @since 3.2.0
-         */
-        subMatch: function (sub, args) {
-            // Default detach cares only about the callback matching
-            return !args[1] || sub.fn === args[1];
-        }
-    }
-}, true);
-
-Y.SyntheticEvent = SyntheticEvent;
-
-/**
- * <p>Defines a new event in the DOM event system.  Implementers are
- * responsible for monitoring for a scenario whereby the event is fired.  A
- * notifier object is provided to the functions identified below.  When the
- * criteria defining the event are met, call notifier.fire( [args] ); to
- * execute event subscribers.</p>
- *
- * <p>The first parameter is the name of the event.  The second parameter is a
- * configuration object which define the behavior of the event system when the
- * new event is subscribed to or detached from.  The methods that should be
- * defined in this configuration object are <code>on</code>,
- * <code>detach</code>, <code>delegate</code>, and <code>detachDelegate</code>.
- * You are free to define any other methods or properties needed to define your
- * event.  Be aware, however, that since the object is used to subclass
- * SyntheticEvent, you should avoid method names used by SyntheticEvent unless
- * your intention is to override the default behavior.</p>
- *
- * <p>This is a list of properties and methods that you can or should specify
- * in the configuration object:</p>
- *
- * <dl>
- *   <dt><code>on</code></dt>
- *       <dd><code>function (node, subscription, notifier)</code> The
- *       implementation logic for subscription.  Any special setup you need to
- *       do to create the environment for the event being fired--E.g. native
- *       DOM event subscriptions.  Store subscription related objects and
- *       state on the <code>subscription</code> object.  When the
- *       criteria have been met to fire the synthetic event, call
- *       <code>notifier.fire(e)</code>.  See Notifier's <code>fire()</code>
- *       method for details about what to pass as parameters.</dd>
- *
- *   <dt><code>detach</code></dt>
- *       <dd><code>function (node, subscription, notifier)</code> The
- *       implementation logic for cleaning up a detached subscription. E.g.
- *       detach any DOM subscriptions added in <code>on</code>.</dd>
- *
- *   <dt><code>delegate</code></dt>
- *       <dd><code>function (node, subscription, notifier, filter)</code> The
- *       implementation logic for subscription via <code>Y.delegate</code> or
- *       <code>node.delegate</code>.  The filter is typically either a selector
- *       string or a function.  You can use
- *       <code>Y.delegate.compileFilter(selectorString)</code> to create a
- *       filter function from a selector string if needed.  The filter function
- *       expects an event object as input and should output either null, a
- *       matching Node, or an array of matching Nodes.  Otherwise, this acts
- *       like <code>on</code> DOM event subscriptions.  Store subscription
- *       related objects and information on the <code>subscription</code>
- *       object.  When the criteria have been met to fire the synthetic event,
- *       call <code>notifier.fire(e)</code> as noted above.</dd>
- *
- *   <dt><code>detachDelegate</code></dt>
- *       <dd><code>function (node, subscription, notifier)</code> The
- *       implementation logic for cleaning up a detached delegate subscription.
- *       E.g. detach any DOM delegate subscriptions added in
- *       <code>delegate</code>.</dd>
- *
- *   <dt><code>publishConfig</code></dt>
- *       <dd>(Object) The configuration object that will be used to instantiate
- *       the underlying CustomEvent. See Notifier's <code>fire</code> method
- *       for details.</dd>
- *
- *   <dt><code>processArgs</code></dt
- *       <dd>
- *          <p><code>function (argArray, fromDelegate)</code> Optional method
- *          to extract any additional arguments from the subscription
- *          signature.  Using this allows <code>on</code> or
- *          <code>delegate</code> signatures like
- *          <code>node.on(&quot;hover&quot;, overCallback,
- *          outCallback)</code>.</p>
- *          <p>When processing an atypical argument signature, make sure the
- *          args array is returned to the normal signature before returning
- *          from the function.  For example, in the &quot;hover&quot; example
- *          above, the <code>outCallback</code> needs to be <code>splice</code>d
- *          out of the array.  The expected signature of the args array for
- *          <code>on()</code> subscriptions is:</p>
- *          <pre>
- *              <code>[type, callback, target, contextOverride, argN...]</code>
- *          </pre>
- *          <p>And for <code>delegate()</code>:</p>
- *          <pre>
- *              <code>[type, callback, target, filter, contextOverride, argN...]</code>
- *          </pre>
- *          <p>where <code>target</code> is the node the event is being
- *          subscribed for.  You can see these signatures documented for
- *          <code>Y.on()</code> and <code>Y.delegate()</code> respectively.</p>
- *          <p>Whatever gets returned from the function will be stored on the
- *          <code>subscription</code> object under
- *          <code>subscription._extra</code>.</p></dd>
- *   <dt><code>subMatch</code></dt>
- *       <dd>
- *           <p><code>function (sub, args)</code>  Compares a set of
- *           subscription arguments against a Subscription object to determine
- *           if they match.  The default implementation compares the callback
- *           function against the second argument passed to
- *           <code>Y.on(...)</code> or <code>node.detach(...)</code> etc.</p>
- *       </dd>
- * </dl>
- *
- * @method define
- * @param type {String} the name of the event
- * @param config {Object} the prototype definition for the new event (see above)
- * @param force {Boolean} override an existing event (use with caution)
- * @return {SyntheticEvent} the subclass implementation instance created to
- *              handle event subscriptions of this type
- * @static
- * @for Event
- * @since 3.1.0
- * @in event-synthetic
- */
-Y.Event.define = function (type, config, force) {
-    var eventDef, Impl, synth;
-
-    if (type && type.type) {
-        eventDef = type;
-        force = config;
-    } else if (config) {
-        eventDef = Y.merge({ type: type }, config);
-    }
-
-    if (eventDef) {
-        if (force || !Y.Node.DOM_EVENTS[eventDef.type]) {
-            Impl = function () {
-                SyntheticEvent.apply(this, arguments);
-            };
-            Y.extend(Impl, SyntheticEvent, eventDef);
-            synth = new Impl();
-
-            type = synth.type;
-
-            Y.Node.DOM_EVENTS[type] = Y.Env.evt.plugins[type] = {
-                eventDef: synth,
-
-                on: function () {
-                    return synth._on(toArray(arguments));
-                },
-
-                delegate: function () {
-                    return synth._on(toArray(arguments), true);
-                },
-
-                detach: function () {
-                    return synth._detach(toArray(arguments));
-                }
-            };
-
-        }
-    } else if (isString(type) || isArray(type)) {
-        Y.Array.each(toArray(type), function (t) {
-            Y.Node.DOM_EVENTS[t] = 1;
-        });
-    }
-
-    return synth;
-};
-
-
-}, '3.16.0', {"requires": ["node-base", "event-custom-complex"]});
-
-define("yui-base", (function (global) {
-    return function () {
-        var ret, fn;
-        return ret || global.YUI;
-    };
-}(this)));
-
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('loader-base', function (Y, NAME) {
-
-/**
- * The YUI loader core
- * @module loader
- * @submodule loader-base
- */
-
-(function() {
-    var VERSION = Y.version,
-        BUILD = '/build/',
-        ROOT = VERSION + '/',
-        CDN_BASE = Y.Env.base,
-        GALLERY_VERSION = 'gallery-2014.04.02-20-01',
-        TNT = '2in3',
-        TNT_VERSION = '4',
-        YUI2_VERSION = '2.9.0',
-        COMBO_BASE = CDN_BASE + 'combo?',
-        META = {
-            version: VERSION,
-            root: ROOT,
-            base: Y.Env.base,
-            comboBase: COMBO_BASE,
-            skin: {
-                defaultSkin: 'sam',
-                base: 'assets/skins/',
-                path: 'skin.css',
-                after: [
-                    'cssreset',
-                    'cssfonts',
-                    'cssgrids',
-                    'cssbase',
-                    'cssreset-context',
-                    'cssfonts-context'
-                ]
-            },
-            groups: {},
-            patterns: {}
-        },
-        groups = META.groups,
-        yui2Update = function(tnt, yui2, config) {
-            var root = TNT + '.' +
-                    (tnt || TNT_VERSION) + '/' +
-                    (yui2 || YUI2_VERSION) + BUILD,
-                base = (config && config.base) ? config.base : CDN_BASE,
-                combo = (config && config.comboBase) ? config.comboBase : COMBO_BASE;
-
-            groups.yui2.base = base + root;
-            groups.yui2.root = root;
-            groups.yui2.comboBase = combo;
-        },
-        galleryUpdate = function(tag, config) {
-            var root = (tag || GALLERY_VERSION) + BUILD,
-                base = (config && config.base) ? config.base : CDN_BASE,
-                combo = (config && config.comboBase) ? config.comboBase : COMBO_BASE;
-
-            groups.gallery.base = base + root;
-            groups.gallery.root = root;
-            groups.gallery.comboBase = combo;
-        };
-
-
-    groups[VERSION] = {};
-
-    groups.gallery = {
-        ext: false,
-        combine: true,
-        comboBase: COMBO_BASE,
-        update: galleryUpdate,
-        patterns: {
-            'gallery-': {},
-            'lang/gallery-': {},
-            'gallerycss-': {
-                type: 'css'
-            }
-        }
-    };
-
-    groups.yui2 = {
-        combine: true,
-        ext: false,
-        comboBase: COMBO_BASE,
-        update: yui2Update,
-        patterns: {
-            'yui2-': {
-                configFn: function(me) {
-                    if (/-skin|reset|fonts|grids|base/.test(me.name)) {
-                        me.type = 'css';
-                        me.path = me.path.replace(/\.js/, '.css');
-                        // this makes skins in builds earlier than
-                        // 2.6.0 work as long as combine is false
-                        me.path = me.path.replace(/\/yui2-skin/,
-                                            '/assets/skins/sam/yui2-skin');
-                    }
-                }
-            }
-        }
-    };
-
-    galleryUpdate();
-    yui2Update();
-
-    if (YUI.Env[VERSION]) {
-        Y.mix(META, YUI.Env[VERSION], false, [
-            'modules',
-            'groups',
-            'skin'
-        ], 0, true);
-    }
-
-    YUI.Env[VERSION] = META;
-}());
-/*jslint forin: true, maxlen: 350 */
-
-/**
- * Loader dynamically loads script and css files.  It includes the dependency
- * information for the version of the library in use, and will automatically pull in
- * dependencies for the modules requested. It can also load the
- * files from the Yahoo! CDN, and it can utilize the combo service provided on
- * this network to reduce the number of http connections required to download
- * YUI files.
- *
- * @module loader
- * @main loader
- * @submodule loader-base
- */
-
-var NOT_FOUND = {},
-    NO_REQUIREMENTS = [],
-    MAX_URL_LENGTH = 1024,
-    GLOBAL_ENV = YUI.Env,
-    GLOBAL_LOADED = GLOBAL_ENV._loaded,
-    CSS = 'css',
-    JS = 'js',
-    INTL = 'intl',
-    DEFAULT_SKIN = 'sam',
-    VERSION = Y.version,
-    ROOT_LANG = '',
-    YObject = Y.Object,
-    oeach = YObject.each,
-    yArray = Y.Array,
-    _queue = GLOBAL_ENV._loaderQueue,
-    META = GLOBAL_ENV[VERSION],
-    SKIN_PREFIX = 'skin-',
-    L = Y.Lang,
-    ON_PAGE = GLOBAL_ENV.mods,
-    modulekey,
-    _path = function(dir, file, type, nomin) {
-        var path = dir + '/' + file;
-        if (!nomin) {
-            path += '-min';
-        }
-        path += '.' + (type || CSS);
-
-        return path;
-    };
-
-
-    if (!YUI.Env._cssLoaded) {
-        YUI.Env._cssLoaded = {};
-    }
-
-
-/**
- * The component metadata is stored in Y.Env.meta.
- * Part of the loader module.
- * @property meta
- * @for YUI
- */
-Y.Env.meta = META;
-
-/**
- * Loader dynamically loads script and css files.  It includes the dependency
- * info for the version of the library in use, and will automatically pull in
- * dependencies for the modules requested. It can load the
- * files from the Yahoo! CDN, and it can utilize the combo service provided on
- * this network to reduce the number of http connections required to download
- * YUI files. You can also specify an external, custom combo service to host
- * your modules as well.
-
-        var Y = YUI();
-        var loader = new Y.Loader({
-            filter: 'debug',
-            base: '../../',
-            root: 'build/',
-            combine: true,
-            require: ['node', 'dd', 'console']
-        });
-        var out = loader.resolve(true);
-
- * If the Loader needs to be patched before it is used for the first time, it
- * should be done through the `doBeforeLoader` hook. Simply make the patch
- * available via configuration before YUI is loaded:
-
-        YUI_config = YUI_config || {};
-        YUI_config.doBeforeLoader = function (config) {
-            var resolve = this.context.Loader.prototype.resolve;
-            this.context.Loader.prototype.resolve = function () {
-                // do something here
-                return resolve.apply(this, arguments);
-            };
-        };
-
- * @constructor
- * @class Loader
- * @param {Object} config an optional set of configuration options.
- * @param {String} config.base The base dir which to fetch this module from
- * @param {String} config.comboBase The Combo service base path. Ex: `http://yui.yahooapis.com/combo?`
- * @param {String} config.root The root path to prepend to module names for the combo service. Ex: `2.5.2/build/`
- * @param {String|Object} config.filter A filter to apply to result urls. <a href="#property_filter">See filter property</a>
- * @param {Object} config.filters Per-component filter specification.  If specified for a given component, this overrides the filter config.
- * @param {Boolean} config.combine Use a combo service to reduce the number of http connections required to load your dependencies
- * @param {Boolean} [config.async=true] Fetch files in async
- * @param {Array} config.ignore: A list of modules that should never be dynamically loaded
- * @param {Array} config.force A list of modules that should always be loaded when required, even if already present on the page
- * @param {HTMLElement|String} config.insertBefore Node or id for a node that should be used as the insertion point for new nodes
- * @param {Object} config.jsAttributes Object literal containing attributes to add to script nodes
- * @param {Object} config.cssAttributes Object literal containing attributes to add to link nodes
- * @param {Number} config.timeout The number of milliseconds before a timeout occurs when dynamically loading nodes.  If not set, there is no timeout
- * @param {Object} config.context Execution context for all callbacks
- * @param {Function} config.onSuccess Callback for the 'success' event
- * @param {Function} config.onFailure Callback for the 'failure' event
- * @param {Function} config.onTimeout Callback for the 'timeout' event
- * @param {Function} config.onProgress Callback executed each time a script or css file is loaded
- * @param {Object} config.modules A list of module definitions.  See <a href="#method_addModule">Loader.addModule</a> for the supported module metadata
- * @param {Object} config.groups A list of group definitions.  Each group can contain specific definitions for `base`, `comboBase`, `combine`, and accepts a list of `modules`.
- * @param {String} config.2in3 The version of the YUI 2 in 3 wrapper to use.  The intrinsic support for YUI 2 modules in YUI 3 relies on versions of the YUI 2 components inside YUI 3 module wrappers.  These wrappers change over time to accomodate the issues that arise from running YUI 2 in a YUI 3 sandbox.
- * @param {String} config.yui2 When using the 2in3 project, you can select the version of YUI 2 to use.  Valid values are `2.2.2`, `2.3.1`, `2.4.1`, `2.5.2`, `2.6.0`, `2.7.0`, `2.8.0`, `2.8.1` and `2.9.0` [default] -- plus all versions of YUI 2 going forward.
- * @param {Function} config.doBeforeLoader An optional hook that allows for the patching of the loader instance. The `Y` instance is available as `this.context` and the only argument to the function is the Loader configuration object.
- */
-Y.Loader = function(o) {
-
-    var self = this;
-
-    //Catch no config passed.
-    o = o || {};
-
-    modulekey = META.md5;
-
-    /**
-     * Internal callback to handle multiple internal insert() calls
-     * so that css is inserted prior to js
-     * @property _internalCallback
-     * @private
-     */
-    // self._internalCallback = null;
-
-    /**
-     * Callback that will be executed when the loader is finished
-     * with an insert
-     * @method onSuccess
-     * @type function
-     */
-    // self.onSuccess = null;
-
-    /**
-     * Callback that will be executed if there is a failure
-     * @method onFailure
-     * @type function
-     */
-    // self.onFailure = null;
-
-    /**
-     * Callback executed each time a script or css file is loaded
-     * @method onProgress
-     * @type function
-     */
-    // self.onProgress = null;
-
-    /**
-     * Callback that will be executed if a timeout occurs
-     * @method onTimeout
-     * @type function
-     */
-    // self.onTimeout = null;
-
-    /**
-     * The execution context for all callbacks
-     * @property context
-     * @default {YUI} the YUI instance
-     */
-    self.context = Y;
-
-    // Hook that allows the patching of loader
-    if (o.doBeforeLoader) {
-        o.doBeforeLoader.apply(self, arguments);
-    }
-
-    /**
-     * Data that is passed to all callbacks
-     * @property data
-     */
-    // self.data = null;
-
-    /**
-     * Node reference or id where new nodes should be inserted before
-     * @property insertBefore
-     * @type string|HTMLElement
-     */
-    // self.insertBefore = null;
-
-    /**
-     * The charset attribute for inserted nodes
-     * @property charset
-     * @type string
-     * @deprecated , use cssAttributes or jsAttributes.
-     */
-    // self.charset = null;
-
-    /**
-     * An object literal containing attributes to add to link nodes
-     * @property cssAttributes
-     * @type object
-     */
-    // self.cssAttributes = null;
-
-    /**
-     * An object literal containing attributes to add to script nodes
-     * @property jsAttributes
-     * @type object
-     */
-    // self.jsAttributes = null;
-
-    /**
-     * The base directory.
-     * @property base
-     * @type string
-     * @default http://yui.yahooapis.com/[YUI VERSION]/build/
-     */
-    self.base = Y.Env.meta.base + Y.Env.meta.root;
-
-    /**
-     * Base path for the combo service
-     * @property comboBase
-     * @type string
-     * @default http://yui.yahooapis.com/combo?
-     */
-    self.comboBase = Y.Env.meta.comboBase;
-
-    /*
-     * Base path for language packs.
-     */
-    // self.langBase = Y.Env.meta.langBase;
-    // self.lang = "";
-
-    /**
-     * If configured, the loader will attempt to use the combo
-     * service for YUI resources and configured external resources.
-     * @property combine
-     * @type boolean
-     * @default true if a base dir isn't in the config
-     */
-    self.combine = o.base &&
-        (o.base.indexOf(self.comboBase.substr(0, 20)) > -1);
-
-    /**
-    * The default seperator to use between files in a combo URL
-    * @property comboSep
-    * @type {String}
-    * @default Ampersand
-    */
-    self.comboSep = '&';
-    /**
-     * Max url length for combo urls.  The default is 1024. This is the URL
-     * limit for the Yahoo! hosted combo servers.  If consuming
-     * a different combo service that has a different URL limit
-     * it is possible to override this default by supplying
-     * the maxURLLength config option.  The config option will
-     * only take effect if lower than the default.
-     *
-     * @property maxURLLength
-     * @type int
-     */
-    self.maxURLLength = MAX_URL_LENGTH;
-
-    /**
-     * Ignore modules registered on the YUI global
-     * @property ignoreRegistered
-     * @default false
-     */
-    self.ignoreRegistered = o.ignoreRegistered;
-
-    /**
-     * Root path to prepend to module path for the combo
-     * service
-     * @property root
-     * @type string
-     * @default [YUI VERSION]/build/
-     */
-    self.root = Y.Env.meta.root;
-
-    /**
-     * Timeout value in milliseconds.  If set, self value will be used by
-     * the get utility.  the timeout event will fire if
-     * a timeout occurs.
-     * @property timeout
-     * @type int
-     */
-    self.timeout = 0;
-
-    /**
-     * A list of modules that should not be loaded, even if
-     * they turn up in the dependency tree
-     * @property ignore
-     * @type string[]
-     */
-    // self.ignore = null;
-
-    /**
-     * A list of modules that should always be loaded, even
-     * if they have already been inserted into the page.
-     * @property force
-     * @type string[]
-     */
-    // self.force = null;
-
-    self.forceMap = {};
-
-    /**
-     * Should we allow rollups
-     * @property allowRollup
-     * @type boolean
-     * @default false
-     */
-    self.allowRollup = false;
-
-    /**
-     * A filter to apply to result urls.  This filter will modify the default
-     * path for all modules.  The default path for the YUI library is the
-     * minified version of the files (e.g., event-min.js).  The filter property
-     * can be a predefined filter or a custom filter.  The valid predefined
-     * filters are:
-     * <dl>
-     *  <dt>DEBUG</dt>
-     *  <dd>Selects the debug versions of the library (e.g., event-debug.js).
-     *      This option will automatically include the Logger widget</dd>
-     *  <dt>RAW</dt>
-     *  <dd>Selects the non-minified version of the library (e.g., event.js).
-     *  </dd>
-     * </dl>
-     * You can also define a custom filter, which must be an object literal
-     * containing a search expression and a replace string:
-     *
-     *      myFilter: {
-     *          'searchExp': "-min\\.js",
-     *          'replaceStr': "-debug.js"
-     *      }
-     *
-     * @property filter
-     * @type string| {searchExp: string, replaceStr: string}
-     */
-    // self.filter = null;
-
-    /**
-     * per-component filter specification.  If specified for a given
-     * component, this overrides the filter config.
-     * @property filters
-     * @type object
-     */
-    self.filters = {};
-
-    /**
-     * The list of requested modules
-     * @property required
-     * @type {string: boolean}
-     */
-    self.required = {};
-
-    /**
-     * If a module name is predefined when requested, it is checked againsts
-     * the patterns provided in this property.  If there is a match, the
-     * module is added with the default configuration.
-     *
-     * At the moment only supporting module prefixes, but anticipate
-     * supporting at least regular expressions.
-     * @property patterns
-     * @type Object
-     */
-    // self.patterns = Y.merge(Y.Env.meta.patterns);
-    self.patterns = {};
-
-    /**
-     * Internal loader instance metadata. Use accessor `getModuleInfo()` instead.
-     */
-    self.moduleInfo = {};
-
-    self.groups = Y.merge(Y.Env.meta.groups);
-
-    /**
-     * Provides the information used to skin the skinnable components.
-     * The following skin definition would result in 'skin1' and 'skin2'
-     * being loaded for calendar (if calendar was requested), and
-     * 'sam' for all other skinnable components:
-     *
-     *      skin: {
-     *          // The default skin, which is automatically applied if not
-     *          // overriden by a component-specific skin definition.
-     *          // Change this in to apply a different skin globally
-     *          defaultSkin: 'sam',
-     *
-     *          // This is combined with the loader base property to get
-     *          // the default root directory for a skin. ex:
-     *          // http://yui.yahooapis.com/2.3.0/build/assets/skins/sam/
-     *          base: 'assets/skins/',
-     *
-     *          // Any component-specific overrides can be specified here,
-     *          // making it possible to load different skins for different
-     *          // components.  It is possible to load more than one skin
-     *          // for a given component as well.
-     *          overrides: {
-     *              calendar: ['skin1', 'skin2']
-     *          }
-     *      }
-     * @property skin
-     * @type {Object}
-     */
-    self.skin = Y.merge(Y.Env.meta.skin);
-
-    /*
-     * Map of conditional modules
-     * @since 3.2.0
-     */
-    self.conditions = {};
-
-    // map of modules with a hash of modules that meet the requirement
-    // self.provides = {};
-
-    self.config = o;
-    self._internal = true;
-
-    self._populateConditionsCache();
-
-    /**
-     * Set when beginning to compute the dependency tree.
-     * Composed of what YUI reports to be loaded combined
-     * with what has been loaded by any instance on the page
-     * with the version number specified in the metadata.
-     * @property loaded
-     * @type {string: boolean}
-     */
-    self.loaded = GLOBAL_LOADED[VERSION];
-
-
-    /**
-    * Should Loader fetch scripts in `async`, defaults to `true`
-    * @property async
-    */
-
-    self.async = true;
-
-    self._inspectPage();
-
-    self._internal = false;
-
-    self._config(o);
-
-    self.forceMap = (self.force) ? Y.Array.hash(self.force) : {};
-
-    self.testresults = null;
-
-    if (Y.config.tests) {
-        self.testresults = Y.config.tests;
-    }
-
-    /**
-     * List of rollup files found in the library metadata
-     * @property rollups
-     */
-    // self.rollups = null;
-
-    /**
-     * Whether or not to load optional dependencies for
-     * the requested modules
-     * @property loadOptional
-     * @type boolean
-     * @default false
-     */
-    // self.loadOptional = false;
-
-    /**
-     * All of the derived dependencies in sorted order, which
-     * will be populated when either calculate() or insert()
-     * is called
-     * @property sorted
-     * @type string[]
-     */
-    self.sorted = [];
-
-    /*
-     * A list of modules to attach to the YUI instance when complete.
-     * If not supplied, the sorted list of dependencies are applied.
-     * @property attaching
-     */
-    // self.attaching = null;
-
-    /**
-     * Flag to indicate the dependency tree needs to be recomputed
-     * if insert is called again.
-     * @property dirty
-     * @type boolean
-     * @default true
-     */
-    self.dirty = true;
-
-    /**
-     * List of modules inserted by the utility
-     * @property inserted
-     * @type {string: boolean}
-     */
-    self.inserted = {};
-
-    /**
-     * List of skipped modules during insert() because the module
-     * was not defined
-     * @property skipped
-     */
-    self.skipped = {};
-
-    // Y.on('yui:load', self.loadNext, self);
-
-    self.tested = {};
-
-    /*
-     * Cached sorted calculate results
-     * @property results
-     * @since 3.2.0
-     */
-    //self.results = {};
-
-    if (self.ignoreRegistered) {
-        //Clear inpage already processed modules.
-        self._resetModules();
-    }
-
-};
-
-Y.Loader.prototype = {
-    /**
-    * Gets the module info from the local moduleInfo hash, or from the
-    * default metadata and populate the local moduleInfo hash.
-    * @method getModuleInfo
-    * @param {string} name of the module
-    * @public
-    */
-    getModuleInfo: function(name) {
-
-        var m = this.moduleInfo[name],
-            rawMetaModules, globalRenderedMods, internal, v;
-
-        if (m) {
-            return m;
-        }
-
-        rawMetaModules = META.modules;
-        globalRenderedMods = GLOBAL_ENV._renderedMods;
-        internal = this._internal;
-
-        /*
-        The logic here is:
-
-        - if the `moduleInfo[name]` is avilable,
-          then short circuit
-        - otherwise, if the module is in the globalCache (cross Y instance),
-          then port it from the global registry into `moduleInfo[name]`
-        - otherwise, if the module has raw metadata (from meta modules)
-          then add it to the global registry and to `moduleInfo[name]`
-
-        */
-        if (globalRenderedMods && globalRenderedMods.hasOwnProperty(name) && !this.ignoreRegistered) {
-            this.moduleInfo[name] = Y.merge(globalRenderedMods[name]);
-        } else {
-            if (rawMetaModules.hasOwnProperty(name)) {
-                this._internal = true; // making sure that modules from raw data are marked as internal
-                v = this.addModule(rawMetaModules[name], name);
-                // Inspect the page for the CSS module and mark it as loaded.
-                if (v && v.type === CSS) {
-                    if (this.isCSSLoaded(v.name, true)) {
-                        this.loaded[v.name] = true;
-                    }
-                }
-                this._internal = internal;
-            }
-        }
-        return this.moduleInfo[name];
-    },
-    /**
-    * Expand the names that are aliases to other modules.
-    * @method _expandAliases
-    * @param {string[]} list a module name or a list of names to be expanded
-    * @private
-    * @return {array}
-    */
-    _expandAliases: function(list) {
-        var expanded = [],
-            aliases = YUI.Env.aliases,
-            i, name;
-        list = Y.Array(list);
-        for (i = 0; i < list.length; i += 1) {
-            name = list[i];
-            expanded.push.apply(expanded, aliases[name] ? aliases[name] : [name]);
-        }
-        return expanded;
-    },
-    /**
-    * Populate the conditions cache from raw modules, this is necessary
-    * because no other module will require a conditional module, instead
-    * the condition has to be executed and then the module is analyzed
-    * to be included in the final requirement list. Without this cache
-    * conditional modules will be simply ignored.
-    * @method _populateConditionsCache
-    * @private
-    */
-    _populateConditionsCache: function() {
-        var rawMetaModules = META.modules,
-            cache = GLOBAL_ENV._conditions,
-            i, j, t, trigger;
-
-        // if we have conditions in cache and cache is enabled
-        // we should port them to this loader instance
-        if (cache && !this.ignoreRegistered) {
-            for (i in cache) {
-                if (cache.hasOwnProperty(i)) {
-                    this.conditions[i] = Y.merge(cache[i]);
-                }
-            }
-        } else {
-            for (i in rawMetaModules) {
-                if (rawMetaModules.hasOwnProperty(i) && rawMetaModules[i].condition) {
-                    t = this._expandAliases(rawMetaModules[i].condition.trigger);
-                    for (j = 0; j < t.length; j += 1) {
-                        trigger = t[j];
-                        this.conditions[trigger] = this.conditions[trigger] || {};
-                        this.conditions[trigger][rawMetaModules[i].name || i] = rawMetaModules[i].condition;
-                    }
-                }
-            }
-            GLOBAL_ENV._conditions = this.conditions;
-        }
-    },
-    /**
-    * Reset modules in the module cache to a pre-processed state so additional
-    * computations with a different skin or language will work as expected.
-    * @method _resetModules
-    * @private
-    */
-    _resetModules: function() {
-        var self = this, i, o,
-            mod, name, details;
-        for (i in self.moduleInfo) {
-            if (self.moduleInfo.hasOwnProperty(i) && self.moduleInfo[i]) {
-                mod = self.moduleInfo[i];
-                name = mod.name;
-                details  = (YUI.Env.mods[name] ? YUI.Env.mods[name].details : null);
-
-                if (details) {
-                    self.moduleInfo[name]._reset = true;
-                    self.moduleInfo[name].requires = details.requires || [];
-                    self.moduleInfo[name].optional = details.optional || [];
-                    self.moduleInfo[name].supersedes = details.supercedes || [];
-                }
-
-                if (mod.defaults) {
-                    for (o in mod.defaults) {
-                        if (mod.defaults.hasOwnProperty(o)) {
-                            if (mod[o]) {
-                                mod[o] = mod.defaults[o];
-                            }
-                        }
-                    }
-                }
-                mod.langCache = undefined;
-                mod.skinCache = undefined;
-                if (mod.skinnable) {
-                    self._addSkin(self.skin.defaultSkin, mod.name);
-                }
-            }
-        }
-    },
-    /**
-    Regex that matches a CSS URL. Used to guess the file type when it's not
-    specified.
-
-    @property REGEX_CSS
-    @type RegExp
-    @final
-    @protected
-    @since 3.5.0
-    **/
-    REGEX_CSS: /\.css(?:[?;].*)?$/i,
-
-    /**
-    * Default filters for raw and debug
-    * @property FILTER_DEFS
-    * @type Object
-    * @final
-    * @protected
-    */
-    FILTER_DEFS: {
-        RAW: {
-            'searchExp': '-min\\.js',
-            'replaceStr': '.js'
-        },
-        DEBUG: {
-            'searchExp': '-min\\.js',
-            'replaceStr': '-debug.js'
-        },
-        COVERAGE: {
-            'searchExp': '-min\\.js',
-            'replaceStr': '-coverage.js'
-        }
-    },
-    /*
-    * Check the pages meta-data and cache the result.
-    * @method _inspectPage
-    * @private
-    */
-    _inspectPage: function() {
-        var self = this, v, m, req, mr, i;
-
-        for (i in ON_PAGE) {
-            if (ON_PAGE.hasOwnProperty(i)) {
-                v = ON_PAGE[i];
-                if (v.details) {
-                    m = self.getModuleInfo(v.name);
-                    req = v.details.requires;
-                    mr = m && m.requires;
-
-                   if (m) {
-                       if (!m._inspected && req && mr.length !== req.length) {
-                           // console.log('deleting ' + m.name);
-                           delete m.expanded;
-                       }
-                   } else {
-                       m = self.addModule(v.details, i);
-                   }
-                   m._inspected = true;
-               }
-            }
-        }
-    },
-    /*
-    * returns true if b is not loaded, and is required directly or by means of modules it supersedes.
-    * @private
-    * @method _requires
-    * @param {String} mod1 The first module to compare
-    * @param {String} mod2 The second module to compare
-    */
-   _requires: function(mod1, mod2) {
-
-        var i, rm, after_map, s,
-            m = this.getModuleInfo(mod1),
-            other = this.getModuleInfo(mod2);
-
-        if (!m || !other) {
-            return false;
-        }
-
-        rm = m.expanded_map;
-        after_map = m.after_map;
-
-        // check if this module should be sorted after the other
-        // do this first to short circut circular deps
-        if (after_map && (mod2 in after_map)) {
-            return true;
-        }
-
-        after_map = other.after_map;
-
-        // and vis-versa
-        if (after_map && (mod1 in after_map)) {
-            return false;
-        }
-
-        // check if this module requires one the other supersedes
-        s = other.supersedes;
-        if (s) {
-            for (i = 0; i < s.length; i++) {
-                if (this._requires(mod1, s[i])) {
-                    return true;
-                }
-            }
-        }
-
-        s = m.supersedes;
-        if (s) {
-            for (i = 0; i < s.length; i++) {
-                if (this._requires(mod2, s[i])) {
-                    return false;
-                }
-            }
-        }
-
-        // check if this module requires the other directly
-        // if (r && yArray.indexOf(r, mod2) > -1) {
-        if (rm && (mod2 in rm)) {
-            return true;
-        }
-
-        // external css files should be sorted below yui css
-        if (m.ext && m.type === CSS && !other.ext && other.type === CSS) {
-            return true;
-        }
-
-        return false;
-    },
-    /**
-    * Apply a new config to the Loader instance
-    * @method _config
-    * @private
-    * @param {Object} o The new configuration
-    */
-    _config: function(o) {
-        var i, j, val, a, f, group, groupName, self = this,
-            mods = [], mod, modInfo;
-        // apply config values
-        if (o) {
-            for (i in o) {
-                if (o.hasOwnProperty(i)) {
-                    val = o[i];
-                    //TODO This should be a case
-                    if (i === 'require') {
-                        self.require(val);
-                    } else if (i === 'skin') {
-                        //If the config.skin is a string, format to the expected object
-                        if (typeof val === 'string') {
-                            self.skin.defaultSkin = o.skin;
-                            val = {
-                                defaultSkin: val
-                            };
-                        }
-
-                        Y.mix(self.skin, val, true);
-                    } else if (i === 'groups') {
-                        for (j in val) {
-                            if (val.hasOwnProperty(j)) {
-                                groupName = j;
-                                group = val[j];
-                                self.addGroup(group, groupName);
-                                if (group.aliases) {
-                                    for (a in group.aliases) {
-                                        if (group.aliases.hasOwnProperty(a)) {
-                                            self.addAlias(group.aliases[a], a);
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                    } else if (i === 'modules') {
-                        // add a hash of module definitions
-                        for (j in val) {
-                            if (val.hasOwnProperty(j)) {
-                                self.addModule(val[j], j);
-                            }
-                        }
-                    } else if (i === 'aliases') {
-                        for (j in val) {
-                            if (val.hasOwnProperty(j)) {
-                                self.addAlias(val[j], j);
-                            }
-                        }
-                    } else if (i === 'gallery') {
-                        if (this.groups.gallery.update) {
-                            this.groups.gallery.update(val, o);
-                        }
-                    } else if (i === 'yui2' || i === '2in3') {
-                        if (this.groups.yui2.update) {
-                            this.groups.yui2.update(o['2in3'], o.yui2, o);
-                        }
-                    } else {
-                        self[i] = val;
-                    }
-                }
-            }
-        }
-
-        // fix filter
-        f = self.filter;
-
-        if (L.isString(f)) {
-            f = f.toUpperCase();
-            self.filterName = f;
-            self.filter = self.FILTER_DEFS[f];
-            if (f === 'DEBUG') {
-                self.require('yui-log', 'dump');
-            }
-        }
-
-        if (self.filterName && self.coverage) {
-            if (self.filterName === 'COVERAGE' && L.isArray(self.coverage) && self.coverage.length) {
-                for (i = 0; i < self.coverage.length; i++) {
-                    mod = self.coverage[i];
-                    modInfo = self.getModuleInfo(mod);
-                    if (modInfo && modInfo.use) {
-                        mods = mods.concat(modInfo.use);
-                    } else {
-                        mods.push(mod);
-                    }
-                }
-                self.filters = self.filters || {};
-                Y.Array.each(mods, function(mod) {
-                    self.filters[mod] = self.FILTER_DEFS.COVERAGE;
-                });
-                self.filterName = 'RAW';
-                self.filter = self.FILTER_DEFS[self.filterName];
-            }
-        }
-
-    },
-
-    /**
-     * Returns the skin module name for the specified skin name.  If a
-     * module name is supplied, the returned skin module name is
-     * specific to the module passed in.
-     * @method formatSkin
-     * @param {string} skin the name of the skin.
-     * @param {string} mod optional: the name of a module to skin.
-     * @return {string} the full skin module name.
-     */
-    formatSkin: function(skin, mod) {
-        var s = SKIN_PREFIX + skin;
-        if (mod) {
-            s = s + '-' + mod;
-        }
-
-        return s;
-    },
-
-    /**
-     * Adds the skin def to the module info
-     * @method _addSkin
-     * @param {string} skin the name of the skin.
-     * @param {string} mod the name of the module.
-     * @param {string} parent parent module if this is a skin of a
-     * submodule or plugin.
-     * @return {string} the module name for the skin.
-     * @private
-     */
-    _addSkin: function(skin, mod, parent) {
-        var pkg, name, nmod,
-            sinf = this.skin,
-            mdef = mod && this.getModuleInfo(mod),
-            ext = mdef && mdef.ext;
-
-        // Add a module definition for the module-specific skin css
-        if (mod) {
-            name = this.formatSkin(skin, mod);
-            if (!this.getModuleInfo(name)) {
-                pkg = mdef.pkg || mod;
-                nmod = {
-                    skin: true,
-                    name: name,
-                    group: mdef.group,
-                    type: 'css',
-                    after: sinf.after,
-                    path: (parent || pkg) + '/' + sinf.base + skin +
-                          '/' + mod + '.css',
-                    ext: ext
-                };
-                if (mdef.base) {
-                    nmod.base = mdef.base;
-                }
-                if (mdef.configFn) {
-                    nmod.configFn = mdef.configFn;
-                }
-                this.addModule(nmod, name);
-
-            }
-        }
-
-        return name;
-    },
-    /**
-    * Adds an alias module to the system
-    * @method addAlias
-    * @param {Array} use An array of modules that makes up this alias
-    * @param {String} name The name of the alias
-    * @example
-    *       var loader = new Y.Loader({});
-    *       loader.addAlias([ 'node', 'yql' ], 'davglass');
-    *       loader.require(['davglass']);
-    *       var out = loader.resolve(true);
-    *
-    *       //out.js will contain Node and YQL modules
-    */
-    addAlias: function(use, name) {
-        YUI.Env.aliases[name] = use;
-        this.addModule({
-            name: name,
-            use: use
-        });
-    },
-    /**
-     * Add a new module group
-     * @method addGroup
-     * @param {Object} config An object containing the group configuration data
-     * @param {String} config.name required, the group name
-     * @param {String} config.base The base directory for this module group
-     * @param {String} config.root The root path to add to each combo resource path
-     * @param {Boolean} config.combine Should the request be combined
-     * @param {String} config.comboBase Combo service base path
-     * @param {Object} config.modules The group of modules
-     * @param {String} name the group name.
-     * @example
-     *      var loader = new Y.Loader({});
-     *      loader.addGroup({
-     *          name: 'davglass',
-     *          combine: true,
-     *          comboBase: '/combo?',
-     *          root: '',
-     *          modules: {
-     *              //Module List here
-     *          }
-     *      }, 'davglass');
-     */
-    addGroup: function(o, name) {
-        var mods = o.modules,
-            self = this, i, v;
-
-        name = name || o.name;
-        o.name = name;
-        self.groups[name] = o;
-
-        if (o.patterns) {
-            for (i in o.patterns) {
-                if (o.patterns.hasOwnProperty(i)) {
-                    o.patterns[i].group = name;
-                    self.patterns[i] = o.patterns[i];
-                }
-            }
-        }
-
-        if (mods) {
-            for (i in mods) {
-                if (mods.hasOwnProperty(i)) {
-                    v = mods[i];
-                    if (typeof v === 'string') {
-                        v = { name: i, fullpath: v };
-                    }
-                    v.group = name;
-                    self.addModule(v, i);
-                }
-            }
-        }
-    },
-
-    /**
-     * Add a new module to the component metadata.
-     * @method addModule
-     * @param {Object} config An object containing the module data.
-     * @param {String} config.name Required, the component name
-     * @param {String} config.type Required, the component type (js or css)
-     * @param {String} config.path Required, the path to the script from `base`
-     * @param {Array} config.requires Array of modules required by this component
-     * @param {Array} [config.optional] Array of optional modules for this component
-     * @param {Array} [config.supersedes] Array of the modules this component replaces
-     * @param {Array} [config.after] Array of modules the components which, if present, should be sorted above this one
-     * @param {Object} [config.after_map] Faster alternative to 'after' -- supply a hash instead of an array
-     * @param {Number} [config.rollup] The number of superseded modules required for automatic rollup
-     * @param {String} [config.fullpath] If `fullpath` is specified, this is used instead of the configured `base + path`
-     * @param {Boolean} [config.skinnable] Flag to determine if skin assets should automatically be pulled in
-     * @param {Object} [config.submodules] Hash of submodules
-     * @param {String} [config.group] The group the module belongs to -- this is set automatically when it is added as part of a group configuration.
-     * @param {Array} [config.lang] Array of BCP 47 language tags of languages for which this module has localized resource bundles, e.g., `["en-GB", "zh-Hans-CN"]`
-     * @param {Object} [config.condition] Specifies that the module should be loaded automatically if a condition is met. This is an object with up to four fields:
-     * @param {String} [config.condition.trigger] The name of a module that can trigger the auto-load
-     * @param {Function} [config.condition.test] A function that returns true when the module is to be loaded.
-     * @param {String} [config.condition.ua] The UA name of <a href="UA.html">Y.UA</a> object that returns true when the module is to be loaded. e.g., `"ie"`, `"nodejs"`.
-     * @param {String} [config.condition.when] Specifies the load order of the conditional module
-     *  with regard to the position of the trigger module.
-     *  This should be one of three values: `before`, `after`, or `instead`.  The default is `after`.
-     * @param {Object} [config.testresults] A hash of test results from `Y.Features.all()`
-     * @param {Function} [config.configFn] A function to exectute when configuring this module
-     * @param {Object} config.configFn.mod The module config, modifying this object will modify it's config. Returning false will delete the module's config.
-     * @param {String} [name] The module name, required if not in the module data.
-     * @return {Object} the module definition or null if the object passed in did not provide all required attributes.
-     */
-    addModule: function(o, name) {
-        name = name || o.name;
-
-        if (typeof o === 'string') {
-            o = { name: name, fullpath: o };
-        }
-
-
-        var subs, i, l, t, sup, s, smod, plugins, plug,
-            j, langs, packName, supName, flatSup, flatLang, lang, ret,
-            overrides, skinname, when, g, p,
-            modInfo = this.moduleInfo[name],
-            conditions = this.conditions, trigger;
-
-        //Only merge this data if the temp flag is set
-        //from an earlier pass from a pattern or else
-        //an override module (YUI_config) can not be used to
-        //replace a default module.
-        if (modInfo && modInfo.temp) {
-            //This catches temp modules loaded via a pattern
-            // The module will be added twice, once from the pattern and
-            // Once from the actual add call, this ensures that properties
-            // that were added to the module the first time around (group: gallery)
-            // are also added the second time around too.
-            o = Y.merge(modInfo, o);
-        }
-
-        o.name = name;
-
-        if (!o || !o.name) {
-            return null;
-        }
-
-        if (!o.type) {
-            //Always assume it's javascript unless the CSS pattern is matched.
-            o.type = JS;
-            p = o.path || o.fullpath;
-            if (p && this.REGEX_CSS.test(p)) {
-                o.type = CSS;
-            }
-        }
-
-        if (!o.path && !o.fullpath) {
-            o.path = _path(name, name, o.type);
-        }
-        o.supersedes = o.supersedes || o.use;
-
-        o.ext = ('ext' in o) ? o.ext : (this._internal) ? false : true;
-
-        // Handle submodule logic
-        subs = o.submodules;
-
-        this.moduleInfo[name] = o;
-
-        o.requires = o.requires || [];
-
-        /*
-        Only allowing the cascade of requires information, since
-        optional and supersedes are far more fine grained than
-        a blanket requires is.
-        */
-        if (this.requires) {
-            for (i = 0; i < this.requires.length; i++) {
-                o.requires.push(this.requires[i]);
-            }
-        }
-        if (o.group && this.groups && this.groups[o.group]) {
-            g = this.groups[o.group];
-            if (g.requires) {
-                for (i = 0; i < g.requires.length; i++) {
-                    o.requires.push(g.requires[i]);
-                }
-            }
-        }
-
-
-        if (!o.defaults) {
-            o.defaults = {
-                requires: o.requires ? [].concat(o.requires) : null,
-                supersedes: o.supersedes ? [].concat(o.supersedes) : null,
-                optional: o.optional ? [].concat(o.optional) : null
-            };
-        }
-
-        if (o.skinnable && o.ext && o.temp) {
-            skinname = this._addSkin(this.skin.defaultSkin, name);
-            o.requires.unshift(skinname);
-        }
-
-        if (o.requires.length) {
-            o.requires = this.filterRequires(o.requires) || [];
-        }
-
-        if (!o.langPack && o.lang) {
-            langs = yArray(o.lang);
-            for (j = 0; j < langs.length; j++) {
-                lang = langs[j];
-                packName = this.getLangPackName(lang, name);
-                smod = this.getModuleInfo(packName);
-                if (!smod) {
-                    smod = this._addLangPack(lang, o, packName);
-                }
-            }
-        }
-
-
-        if (subs) {
-            sup = o.supersedes || [];
-            l = 0;
-
-            for (i in subs) {
-                if (subs.hasOwnProperty(i)) {
-                    s = subs[i];
-
-                    s.path = s.path || _path(name, i, o.type);
-                    s.pkg = name;
-                    s.group = o.group;
-
-                    if (s.supersedes) {
-                        sup = sup.concat(s.supersedes);
-                    }
-
-                    smod = this.addModule(s, i);
-                    sup.push(i);
-
-                    if (smod.skinnable) {
-                        o.skinnable = true;
-                        overrides = this.skin.overrides;
-                        if (overrides && overrides[i]) {
-                            for (j = 0; j < overrides[i].length; j++) {
-                                skinname = this._addSkin(overrides[i][j],
-                                         i, name);
-                                sup.push(skinname);
-                            }
-                        }
-                        skinname = this._addSkin(this.skin.defaultSkin,
-                                        i, name);
-                        sup.push(skinname);
-                    }
-
-                    // looks like we are expected to work out the metadata
-                    // for the parent module language packs from what is
-                    // specified in the child modules.
-                    if (s.lang && s.lang.length) {
-
-                        langs = yArray(s.lang);
-                        for (j = 0; j < langs.length; j++) {
-                            lang = langs[j];
-                            packName = this.getLangPackName(lang, name);
-                            supName = this.getLangPackName(lang, i);
-                            smod = this.getModuleInfo(packName);
-
-                            if (!smod) {
-                                smod = this._addLangPack(lang, o, packName);
-                            }
-
-                            flatSup = flatSup || yArray.hash(smod.supersedes);
-
-                            if (!(supName in flatSup)) {
-                                smod.supersedes.push(supName);
-                            }
-
-                            o.lang = o.lang || [];
-
-                            flatLang = flatLang || yArray.hash(o.lang);
-
-                            if (!(lang in flatLang)) {
-                                o.lang.push(lang);
-                            }
-
-// Add rollup file, need to add to supersedes list too
-
-                            // default packages
-                            packName = this.getLangPackName(ROOT_LANG, name);
-                            supName = this.getLangPackName(ROOT_LANG, i);
-
-                            smod = this.getModuleInfo(packName);
-
-                            if (!smod) {
-                                smod = this._addLangPack(lang, o, packName);
-                            }
-
-                            if (!(supName in flatSup)) {
-                                smod.supersedes.push(supName);
-                            }
-
-// Add rollup file, need to add to supersedes list too
-
-                        }
-                    }
-
-                    l++;
-                }
-            }
-            //o.supersedes = YObject.keys(yArray.hash(sup));
-            o.supersedes = yArray.dedupe(sup);
-            if (this.allowRollup) {
-                o.rollup = (l < 4) ? l : Math.min(l - 1, 4);
-            }
-        }
-
-        plugins = o.plugins;
-        if (plugins) {
-            for (i in plugins) {
-                if (plugins.hasOwnProperty(i)) {
-                    plug = plugins[i];
-                    plug.pkg = name;
-                    plug.path = plug.path || _path(name, i, o.type);
-                    plug.requires = plug.requires || [];
-                    plug.group = o.group;
-                    this.addModule(plug, i);
-                    if (o.skinnable) {
-                        this._addSkin(this.skin.defaultSkin, i, name);
-                    }
-
-                }
-            }
-        }
-
-        if (o.condition) {
-            t = this._expandAliases(o.condition.trigger);
-            for (i = 0; i < t.length; i++) {
-                trigger = t[i];
-                when = o.condition.when;
-                conditions[trigger] = conditions[trigger] || {};
-                conditions[trigger][name] = o.condition;
-                // the 'when' attribute can be 'before', 'after', or 'instead'
-                // the default is after.
-                if (when && when !== 'after') {
-                    if (when === 'instead') { // replace the trigger
-                        o.supersedes = o.supersedes || [];
-                        o.supersedes.push(trigger);
-                    }
-                    // before the trigger
-                        // the trigger requires the conditional mod,
-                        // so it should appear before the conditional
-                        // mod if we do not intersede.
-                } else { // after the trigger
-                    o.after = o.after || [];
-                    o.after.push(trigger);
-                }
-            }
-        }
-
-        if (o.supersedes) {
-            o.supersedes = this.filterRequires(o.supersedes);
-        }
-
-        if (o.after) {
-            o.after = this.filterRequires(o.after);
-            o.after_map = yArray.hash(o.after);
-        }
-
-        // this.dirty = true;
-
-        if (o.configFn) {
-            ret = o.configFn(o);
-            if (ret === false) {
-                delete this.moduleInfo[name];
-                delete GLOBAL_ENV._renderedMods[name];
-                o = null;
-            }
-        }
-        //Add to global cache
-        if (o) {
-            if (!GLOBAL_ENV._renderedMods) {
-                GLOBAL_ENV._renderedMods = {};
-            }
-            GLOBAL_ENV._renderedMods[name] = Y.mix(GLOBAL_ENV._renderedMods[name] || {}, o);
-            GLOBAL_ENV._conditions = conditions;
-        }
-
-        return o;
-    },
-
-    /**
-     * Add a requirement for one or more module
-     * @method require
-     * @param {string[] | string*} what the modules to load.
-     */
-    require: function(what) {
-        var a = (typeof what === 'string') ? yArray(arguments) : what;
-        this.dirty = true;
-        this.required = Y.merge(this.required, yArray.hash(this.filterRequires(a)));
-
-        this._explodeRollups();
-    },
-    /**
-    * Grab all the items that were asked for, check to see if the Loader
-    * meta-data contains a "use" array. If it doesm remove the asked item and replace it with
-    * the content of the "use".
-    * This will make asking for: "dd"
-    * Actually ask for: "dd-ddm-base,dd-ddm,dd-ddm-drop,dd-drag,dd-proxy,dd-constrain,dd-drop,dd-scroll,dd-drop-plugin"
-    * @private
-    * @method _explodeRollups
-    */
-    _explodeRollups: function() {
-        var self = this, m, m2, i, a, v, len, len2,
-        r = self.required;
-
-        if (!self.allowRollup) {
-            for (i in r) {
-                if (r.hasOwnProperty(i)) {
-                    m = self.getModule(i);
-                    if (m && m.use) {
-                        len = m.use.length;
-                        for (a = 0; a < len; a++) {
-                            m2 = self.getModule(m.use[a]);
-                            if (m2 && m2.use) {
-                                len2 = m2.use.length;
-                                for (v = 0; v < len2; v++) {
-                                    r[m2.use[v]] = true;
-                                }
-                            } else {
-                                r[m.use[a]] = true;
-                            }
-                        }
-                    }
-                }
-            }
-            self.required = r;
-        }
-
-    },
-    /**
-    * Explodes the required array to remove aliases and replace them with real modules
-    * @method filterRequires
-    * @param {Array} r The original requires array
-    * @return {Array} The new array of exploded requirements
-    */
-    filterRequires: function(r) {
-        if (r) {
-            if (!Y.Lang.isArray(r)) {
-                r = [r];
-            }
-            r = Y.Array(r);
-            var c = [], i, mod, o, m;
-
-            for (i = 0; i < r.length; i++) {
-                mod = this.getModule(r[i]);
-                if (mod && mod.use) {
-                    for (o = 0; o < mod.use.length; o++) {
-                        //Must walk the other modules in case a module is a rollup of rollups (datatype)
-                        m = this.getModule(mod.use[o]);
-                        if (m && m.use && (m.name !== mod.name)) {
-                            c = Y.Array.dedupe([].concat(c, this.filterRequires(m.use)));
-                        } else {
-                            c.push(mod.use[o]);
-                        }
-                    }
-                } else {
-                    c.push(r[i]);
-                }
-            }
-            r = c;
-        }
-        return r;
-    },
-    /**
-     * Returns an object containing properties for all modules required
-     * in order to load the requested module
-     * @method getRequires
-     * @param {object}  mod The module definition from moduleInfo.
-     * @return {array} the expanded requirement list.
-     */
-    getRequires: function(mod) {
-
-        if (!mod) {
-            //console.log('returning no reqs for ' + mod.name);
-            return NO_REQUIREMENTS;
-        }
-
-        if (mod._parsed) {
-            //console.log('returning requires for ' + mod.name, mod.requires);
-            return mod.expanded || NO_REQUIREMENTS;
-        }
-
-        //TODO add modue cache here out of scope..
-
-        var i, m, j, add, packName, lang, testresults = this.testresults,
-            name = mod.name, cond,
-            adddef = ON_PAGE[name] && ON_PAGE[name].details,
-            d, go, def,
-            r, old_mod,
-            o, skinmod, skindef, skinpar, skinname,
-            intl = mod.lang || mod.intl,
-            ftests = Y.Features && Y.Features.tests.load,
-            hash, reparse;
-
-        // console.log(name);
-
-        // pattern match leaves module stub that needs to be filled out
-        if (mod.temp && adddef) {
-            old_mod = mod;
-            mod = this.addModule(adddef, name);
-            mod.group = old_mod.group;
-            mod.pkg = old_mod.pkg;
-            delete mod.expanded;
-        }
-
-        // console.log('cache: ' + mod.langCache + ' == ' + this.lang);
-
-        //If a skin or a lang is different, reparse..
-        reparse = !((!this.lang || mod.langCache === this.lang) && (mod.skinCache === this.skin.defaultSkin));
-
-        if (mod.expanded && !reparse) {
-            return mod.expanded;
-        }
-
-
-        d = [];
-        hash = {};
-        r = this.filterRequires(mod.requires);
-        if (mod.lang) {
-            //If a module has a lang attribute, auto add the intl requirement.
-            d.unshift('intl');
-            r.unshift('intl');
-            intl = true;
-        }
-        o = this.filterRequires(mod.optional);
-
-
-        mod._parsed = true;
-        mod.langCache = this.lang;
-        mod.skinCache = this.skin.defaultSkin;
-
-        for (i = 0; i < r.length; i++) {
-            if (!hash[r[i]]) {
-                d.push(r[i]);
-                hash[r[i]] = true;
-                m = this.getModule(r[i]);
-                if (m) {
-                    add = this.getRequires(m);
-                    intl = intl || (m.expanded_map &&
-                        (INTL in m.expanded_map));
-                    for (j = 0; j < add.length; j++) {
-                        d.push(add[j]);
-                    }
-                }
-            }
-        }
-
-        // get the requirements from superseded modules, if any
-        r = this.filterRequires(mod.supersedes);
-        if (r) {
-            for (i = 0; i < r.length; i++) {
-                if (!hash[r[i]]) {
-                    // if this module has submodules, the requirements list is
-                    // expanded to include the submodules.  This is so we can
-                    // prevent dups when a submodule is already loaded and the
-                    // parent is requested.
-                    if (mod.submodules) {
-                        d.push(r[i]);
-                    }
-
-                    hash[r[i]] = true;
-                    m = this.getModule(r[i]);
-
-                    if (m) {
-                        add = this.getRequires(m);
-                        intl = intl || (m.expanded_map &&
-                            (INTL in m.expanded_map));
-                        for (j = 0; j < add.length; j++) {
-                            d.push(add[j]);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (o && this.loadOptional) {
-            for (i = 0; i < o.length; i++) {
-                if (!hash[o[i]]) {
-                    d.push(o[i]);
-                    hash[o[i]] = true;
-                    m = this.getModuleInfo(o[i]);
-                    if (m) {
-                        add = this.getRequires(m);
-                        intl = intl || (m.expanded_map &&
-                            (INTL in m.expanded_map));
-                        for (j = 0; j < add.length; j++) {
-                            d.push(add[j]);
-                        }
-                    }
-                }
-            }
-        }
-
-        cond = this.conditions[name];
-
-        if (cond) {
-            //Set the module to not parsed since we have conditionals and this could change the dependency tree.
-            mod._parsed = false;
-            if (testresults && ftests) {
-                oeach(testresults, function(result, id) {
-                    var condmod = ftests[id].name;
-                    if (!hash[condmod] && ftests[id].trigger === name) {
-                        if (result && ftests[id]) {
-                            hash[condmod] = true;
-                            d.push(condmod);
-                        }
-                    }
-                });
-            } else {
-                for (i in cond) {
-                    if (cond.hasOwnProperty(i)) {
-                        if (!hash[i]) {
-                            def = cond[i];
-                            //first see if they've specfied a ua check
-                            //then see if they've got a test fn & if it returns true
-                            //otherwise just having a condition block is enough
-                            go = def && ((!def.ua && !def.test) || (def.ua && Y.UA[def.ua]) ||
-                                        (def.test && def.test(Y, r)));
-
-                            if (go) {
-                                hash[i] = true;
-                                d.push(i);
-                                m = this.getModule(i);
-                                if (m) {
-                                    add = this.getRequires(m);
-                                    for (j = 0; j < add.length; j++) {
-                                        d.push(add[j]);
-                                    }
-
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Create skin modules
-        if (mod.skinnable) {
-            skindef = this.skin.overrides;
-            for (i in YUI.Env.aliases) {
-                if (YUI.Env.aliases.hasOwnProperty(i)) {
-                    if (Y.Array.indexOf(YUI.Env.aliases[i], name) > -1) {
-                        skinpar = i;
-                    }
-                }
-            }
-            if (skindef && (skindef[name] || (skinpar && skindef[skinpar]))) {
-                skinname = name;
-                if (skindef[skinpar]) {
-                    skinname = skinpar;
-                }
-                for (i = 0; i < skindef[skinname].length; i++) {
-                    skinmod = this._addSkin(skindef[skinname][i], name);
-                    if (!this.isCSSLoaded(skinmod, this._boot)) {
-                        d.push(skinmod);
-                    }
-                }
-            } else {
-                skinmod = this._addSkin(this.skin.defaultSkin, name);
-                if (!this.isCSSLoaded(skinmod, this._boot)) {
-                    d.push(skinmod);
-                }
-            }
-        }
-
-        mod._parsed = false;
-
-        if (intl) {
-
-            if (mod.lang && !mod.langPack && Y.Intl) {
-                lang = Y.Intl.lookupBestLang(this.lang || ROOT_LANG, mod.lang);
-                packName = this.getLangPackName(lang, name);
-                if (packName) {
-                    d.unshift(packName);
-                }
-            }
-            d.unshift(INTL);
-        }
-
-        mod.expanded_map = yArray.hash(d);
-
-        mod.expanded = YObject.keys(mod.expanded_map);
-
-        return mod.expanded;
-    },
-    /**
-    * Check to see if named css module is already loaded on the page
-    * @method isCSSLoaded
-    * @param {String} name The name of the css file
-    * @param {Boolean} skip To skip the short-circuit for ignoreRegister
-    * @return Boolean
-    */
-    isCSSLoaded: function(name, skip) {
-        //TODO - Make this call a batching call with name being an array
-        if (!name || !YUI.Env.cssStampEl || (!skip && this.ignoreRegistered)) {
-            return false;
-        }
-        var el = YUI.Env.cssStampEl,
-            ret = false,
-            mod = YUI.Env._cssLoaded[name],
-            style = el.currentStyle; //IE
-
-
-        if (mod !== undefined) {
-            return mod;
-        }
-
-        //Add the classname to the element
-        el.className = name;
-
-        if (!style) {
-            style = Y.config.doc.defaultView.getComputedStyle(el, null);
-        }
-
-        if (style && style.display === 'none') {
-            ret = true;
-        }
-
-
-        el.className = ''; //Reset the classname to ''
-
-        YUI.Env._cssLoaded[name] = ret;
-
-        return ret;
-    },
-
-    /**
-     * Returns a hash of module names the supplied module satisfies.
-     * @method getProvides
-     * @param {string} name The name of the module.
-     * @return {object} what this module provides.
-     */
-    getProvides: function(name) {
-        var m = this.getModule(name), o, s;
-            // supmap = this.provides;
-
-        if (!m) {
-            return NOT_FOUND;
-        }
-
-        if (m && !m.provides) {
-            o = {};
-            s = m.supersedes;
-
-            if (s) {
-                yArray.each(s, function(v) {
-                    Y.mix(o, this.getProvides(v));
-                }, this);
-            }
-
-            o[name] = true;
-            m.provides = o;
-
-        }
-
-        return m.provides;
-    },
-
-    /**
-     * Calculates the dependency tree, the result is stored in the sorted
-     * property.
-     * @method calculate
-     * @param {object} o optional options object.
-     * @param {string} type optional argument to prune modules.
-     */
-    calculate: function(o, type) {
-        if (o || type || this.dirty) {
-
-            if (o) {
-                this._config(o);
-            }
-
-            if (!this._init) {
-                this._setup();
-            }
-
-            this._explode();
-
-            if (this.allowRollup) {
-                this._rollup();
-            } else {
-                this._explodeRollups();
-            }
-            this._reduce();
-            this._sort();
-        }
-    },
-    /**
-    * Creates a "psuedo" package for languages provided in the lang array
-    * @method _addLangPack
-    * @private
-    * @param {String} lang The language to create
-    * @param {Object} m The module definition to create the language pack around
-    * @param {String} packName The name of the package (e.g: lang/datatype-date-en-US)
-    * @return {Object} The module definition
-    */
-    _addLangPack: function(lang, m, packName) {
-        var name = m.name,
-            packPath, conf,
-            existing = this.getModuleInfo(packName);
-
-        if (!existing) {
-
-            packPath = _path((m.pkg || name), packName, JS, true);
-
-            conf = {
-                path: packPath,
-                intl: true,
-                langPack: true,
-                ext: m.ext,
-                group: m.group,
-                supersedes: []
-            };
-            if (m.root) {
-                conf.root = m.root;
-            }
-            if (m.base) {
-                conf.base = m.base;
-            }
-
-            if (m.configFn) {
-                conf.configFn = m.configFn;
-            }
-
-            this.addModule(conf, packName);
-
-            if (lang) {
-                Y.Env.lang = Y.Env.lang || {};
-                Y.Env.lang[lang] = Y.Env.lang[lang] || {};
-                Y.Env.lang[lang][name] = true;
-            }
-        }
-
-        return this.getModuleInfo(packName);
-    },
-
-    /**
-     * Investigates the current YUI configuration on the page.  By default,
-     * modules already detected will not be loaded again unless a force
-     * option is encountered.  Called by calculate()
-     * @method _setup
-     * @private
-     */
-    _setup: function() {
-        var info = this.moduleInfo, name, i, j, m, l,
-            packName;
-
-        for (name in info) {
-            if (info.hasOwnProperty(name)) {
-                m = info[name];
-                if (m) {
-
-                    // remove dups
-                    //m.requires = YObject.keys(yArray.hash(m.requires));
-                    m.requires = yArray.dedupe(m.requires);
-
-                    // Create lang pack modules
-                    //if (m.lang && m.lang.length) {
-                    if (m.lang) {
-                        // Setup root package if the module has lang defined,
-                        // it needs to provide a root language pack
-                        packName = this.getLangPackName(ROOT_LANG, name);
-                        this._addLangPack(null, m, packName);
-                    }
-
-                }
-            }
-        }
-
-
-        //l = Y.merge(this.inserted);
-        l = {};
-
-        // available modules
-        if (!this.ignoreRegistered) {
-            Y.mix(l, GLOBAL_ENV.mods);
-        }
-
-        // add the ignore list to the list of loaded packages
-        if (this.ignore) {
-            Y.mix(l, yArray.hash(this.ignore));
-        }
-
-        // expand the list to include superseded modules
-        for (j in l) {
-            if (l.hasOwnProperty(j)) {
-                Y.mix(l, this.getProvides(j));
-            }
-        }
-
-        // remove modules on the force list from the loaded list
-        if (this.force) {
-            for (i = 0; i < this.force.length; i++) {
-                if (this.force[i] in l) {
-                    delete l[this.force[i]];
-                }
-            }
-        }
-
-        Y.mix(this.loaded, l);
-
-        this._init = true;
-    },
-
-    /**
-     * Builds a module name for a language pack
-     * @method getLangPackName
-     * @param {string} lang the language code.
-     * @param {string} mname the module to build it for.
-     * @return {string} the language pack module name.
-     */
-    getLangPackName: function(lang, mname) {
-        return ('lang/' + mname + ((lang) ? '_' + lang : ''));
-    },
-    /**
-     * Inspects the required modules list looking for additional
-     * dependencies.  Expands the required list to include all
-     * required modules.  Called by calculate()
-     * @method _explode
-     * @private
-     */
-    _explode: function() {
-        //TODO Move done out of scope
-        var r = this.required, m, reqs, done = {},
-            self = this, name, expound;
-
-        // the setup phase is over, all modules have been created
-        self.dirty = false;
-
-        self._explodeRollups();
-        r = self.required;
-
-        for (name in r) {
-            if (r.hasOwnProperty(name)) {
-                if (!done[name]) {
-                    done[name] = true;
-                    m = self.getModule(name);
-                    if (m) {
-                        expound = m.expound;
-
-                        if (expound) {
-                            r[expound] = self.getModule(expound);
-                            reqs = self.getRequires(r[expound]);
-                            Y.mix(r, yArray.hash(reqs));
-                        }
-
-                        reqs = self.getRequires(m);
-                        Y.mix(r, yArray.hash(reqs));
-                    }
-                }
-            }
-        }
-
-    },
-    /**
-    * The default method used to test a module against a pattern
-    * @method _patternTest
-    * @private
-    * @param {String} mname The module being tested
-    * @param {String} pname The pattern to match
-    */
-    _patternTest: function(mname, pname) {
-        return (mname.indexOf(pname) > -1);
-    },
-    /**
-    * Get's the loader meta data for the requested module
-    * @method getModule
-    * @param {String} mname The module name to get
-    * @return {Object} The module metadata
-    */
-    getModule: function(mname) {
-        //TODO: Remove name check - it's a quick hack to fix pattern WIP
-        if (!mname) {
-            return null;
-        }
-
-        var p, found, pname,
-            m = this.getModuleInfo(mname),
-            patterns = this.patterns;
-
-        // check the patterns library to see if we should automatically add
-        // the module with defaults
-        if (!m || (m && m.ext)) {
-            for (pname in patterns) {
-                if (patterns.hasOwnProperty(pname)) {
-                    p = patterns[pname];
-
-                    //There is no test method, create a default one that tests
-                    // the pattern against the mod name
-                    if (!p.test) {
-                        p.test = this._patternTest;
-                    }
-
-                    if (p.test(mname, pname)) {
-                        // use the metadata supplied for the pattern
-                        // as the module definition.
-                        found = p;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (!m) {
-            if (found) {
-                if (p.action) {
-                    p.action.call(this, mname, pname);
-                } else {
-                    // ext true or false?
-                    m = this.addModule(Y.merge(found), mname);
-                    if (found.configFn) {
-                        m.configFn = found.configFn;
-                    }
-                    m.temp = true;
-                }
-            }
-        } else {
-            if (found && m && found.configFn && !m.configFn) {
-                m.configFn = found.configFn;
-                m.configFn(m);
-            }
-        }
-
-        return m;
-    },
-
-    // impl in rollup submodule
-    _rollup: function() { },
-
-    /**
-     * Remove superceded modules and loaded modules.  Called by
-     * calculate() after we have the mega list of all dependencies
-     * @method _reduce
-     * @return {object} the reduced dependency hash.
-     * @private
-     */
-    _reduce: function(r) {
-
-        r = r || this.required;
-
-        var i, j, s, m, type = this.loadType,
-        ignore = this.ignore ? yArray.hash(this.ignore) : false;
-
-        for (i in r) {
-            if (r.hasOwnProperty(i)) {
-                m = this.getModule(i);
-                // remove if already loaded
-                if (((this.loaded[i] || ON_PAGE[i]) &&
-                        !this.forceMap[i] && !this.ignoreRegistered) ||
-                        (type && m && m.type !== type)) {
-                    delete r[i];
-                }
-                if (ignore && ignore[i]) {
-                    delete r[i];
-                }
-                // remove anything this module supersedes
-                s = m && m.supersedes;
-                if (s) {
-                    for (j = 0; j < s.length; j++) {
-                        if (s[j] in r) {
-                            delete r[s[j]];
-                        }
-                    }
-                }
-            }
-        }
-
-        return r;
-    },
-    /**
-    * Handles the queue when a module has been loaded for all cases
-    * @method _finish
-    * @private
-    * @param {String} msg The message from Loader
-    * @param {Boolean} success A boolean denoting success or failure
-    */
-    _finish: function(msg, success) {
-
-        _queue.running = false;
-
-        var onEnd = this.onEnd;
-        if (onEnd) {
-            onEnd.call(this.context, {
-                msg: msg,
-                data: this.data,
-                success: success
-            });
-        }
-        this._continue();
-    },
-    /**
-    * The default Loader onSuccess handler, calls this.onSuccess with a payload
-    * @method _onSuccess
-    * @private
-    */
-    _onSuccess: function() {
-        var self = this, skipped = Y.merge(self.skipped), fn,
-            failed = [], rreg = self.requireRegistration,
-            success, msg, i, mod;
-
-        for (i in skipped) {
-            if (skipped.hasOwnProperty(i)) {
-                delete self.inserted[i];
-            }
-        }
-
-        self.skipped = {};
-
-        for (i in self.inserted) {
-            if (self.inserted.hasOwnProperty(i)) {
-                mod = self.getModule(i);
-                if (mod && rreg && mod.type === JS && !(i in YUI.Env.mods)) {
-                    failed.push(i);
-                } else {
-                    Y.mix(self.loaded, self.getProvides(i));
-                }
-            }
-        }
-
-        fn = self.onSuccess;
-        msg = (failed.length) ? 'notregistered' : 'success';
-        success = !(failed.length);
-        if (fn) {
-            fn.call(self.context, {
-                msg: msg,
-                data: self.data,
-                success: success,
-                failed: failed,
-                skipped: skipped
-            });
-        }
-        self._finish(msg, success);
-    },
-    /**
-    * The default Loader onProgress handler, calls this.onProgress with a payload
-    * @method _onProgress
-    * @private
-    */
-    _onProgress: function(e) {
-        var self = this, i;
-        //set the internal cache to what just came in.
-        if (e.data && e.data.length) {
-            for (i = 0; i < e.data.length; i++) {
-                e.data[i] = self.getModule(e.data[i].name);
-            }
-        }
-        if (self.onProgress) {
-            self.onProgress.call(self.context, {
-                name: e.url,
-                data: e.data
-            });
-        }
-    },
-    /**
-    * The default Loader onFailure handler, calls this.onFailure with a payload
-    * @method _onFailure
-    * @private
-    */
-    _onFailure: function(o) {
-        var f = this.onFailure, msg = [], i = 0, len = o.errors.length;
-
-        for (i; i < len; i++) {
-            msg.push(o.errors[i].error);
-        }
-
-        msg = msg.join(',');
-
-
-        if (f) {
-            f.call(this.context, {
-                msg: msg,
-                data: this.data,
-                success: false
-            });
-        }
-
-        this._finish(msg, false);
-
-    },
-
-    /**
-    * The default Loader onTimeout handler, calls this.onTimeout with a payload
-    * @method _onTimeout
-    * @param {Get.Transaction} transaction The Transaction object from `Y.Get`
-    * @private
-    */
-    _onTimeout: function(transaction) {
-        var f = this.onTimeout;
-        if (f) {
-            f.call(this.context, {
-                msg: 'timeout',
-                data: this.data,
-                success: false,
-                transaction: transaction
-            });
-        }
-    },
-
-    /**
-     * Sorts the dependency tree.  The last step of calculate()
-     * @method _sort
-     * @private
-     */
-    _sort: function() {
-        var name,
-
-            // Object containing module names.
-            required = this.required,
-
-            // Keep track of whether we've visited a module.
-            visited = {};
-
-        // Will contain modules names, in the correct order,
-        // according to dependencies.
-        this.sorted = [];
-
-        for (name in required) {
-            if (!visited[name] && required.hasOwnProperty(name)) {
-                this._visit(name, visited);
-            }
-        }
-    },
-
-    /**
-     * Recursively visits the dependencies of the module name
-     * passed in, and appends each module name to the `sorted` property.
-     * @param {String} name The name of a module.
-     * @param {Object} visited Keeps track of whether a module was visited.
-     * @method _visit
-     * @private
-     */
-    _visit: function (name, visited) {
-        var required, condition, moduleInfo, dependency, dependencies,
-            trigger, isAfter, i, l;
-
-        visited[name] = true;
-        required = this.required;
-        moduleInfo = this.moduleInfo[name];
-        condition = this.conditions[name] || {};
-
-        if (moduleInfo) {
-            // Recurse on each dependency of this module,
-            // figuring out its dependencies, and so on.
-            dependencies = moduleInfo.expanded || moduleInfo.requires;
-
-            for (i = 0, l = dependencies.length; i < l; ++i) {
-                dependency = dependencies[i];
-                trigger = condition[dependency];
-
-                // We cannot process this dependency yet if it must
-                // appear after our current module.
-                isAfter = trigger && (!trigger.when || trigger.when === "after");
-
-                // Is this module name in the required list of modules,
-                // and have we not already visited it?
-                if (required[dependency] && !visited[dependency] && !isAfter) {
-                    this._visit(dependency, visited);
-                }
-            }
-        }
-
-        this.sorted.push(name);
-    },
-
-    /**
-    * Handles the actual insertion of script/link tags
-    * @method _insert
-    * @private
-    * @param {Object} source The YUI instance the request came from
-    * @param {Object} o The metadata to include
-    * @param {String} type JS or CSS
-    * @param {Boolean} [skipcalc=false] Do a Loader.calculate on the meta
-    */
-    _insert: function(source, o, type, skipcalc) {
-
-
-        // restore the state at the time of the request
-        if (source) {
-            this._config(source);
-        }
-
-        // build the dependency list
-        // don't include type so we can process CSS and script in
-        // one pass when the type is not specified.
-
-        var modules = this.resolve(!skipcalc),
-            self = this, comp = 0, actions = 0,
-            mods = {}, deps, complete;
-
-        self._refetch = [];
-
-        if (type) {
-            //Filter out the opposite type and reset the array so the checks later work
-            modules[((type === JS) ? CSS : JS)] = [];
-        }
-        if (!self.fetchCSS) {
-            modules.css = [];
-        }
-        if (modules.js.length) {
-            comp++;
-        }
-        if (modules.css.length) {
-            comp++;
-        }
-
-        //console.log('Resolved Modules: ', modules);
-
-        complete = function(d) {
-            actions++;
-            var errs = {}, i = 0, o = 0, u = '', fn,
-                modName, resMods;
-
-            if (d && d.errors) {
-                for (i = 0; i < d.errors.length; i++) {
-                    if (d.errors[i].request) {
-                        u = d.errors[i].request.url;
-                    } else {
-                        u = d.errors[i];
-                    }
-                    errs[u] = u;
-                }
-            }
-
-            if (d && d.data && d.data.length && (d.type === 'success')) {
-                for (i = 0; i < d.data.length; i++) {
-                    self.inserted[d.data[i].name] = true;
-                    //If the external module has a skin or a lang, reprocess it
-                    if (d.data[i].lang || d.data[i].skinnable) {
-                        delete self.inserted[d.data[i].name];
-                        self._refetch.push(d.data[i].name);
-                    }
-                }
-            }
-
-            if (actions === comp) {
-                self._loading = null;
-                if (self._refetch.length) {
-                    //Get the deps for the new meta-data and reprocess
-                    for (i = 0; i < self._refetch.length; i++) {
-                        deps = self.getRequires(self.getModule(self._refetch[i]));
-                        for (o = 0; o < deps.length; o++) {
-                            if (!self.inserted[deps[o]]) {
-                                //We wouldn't be to this point without the module being here
-                                mods[deps[o]] = deps[o];
-                            }
-                        }
-                    }
-                    mods = Y.Object.keys(mods);
-                    if (mods.length) {
-                        self.require(mods);
-                        resMods = self.resolve(true);
-                        if (resMods.cssMods.length) {
-                            for (i=0; i <  resMods.cssMods.length; i++) {
-                                modName = resMods.cssMods[i].name;
-                                delete YUI.Env._cssLoaded[modName];
-                                if (self.isCSSLoaded(modName)) {
-                                    self.inserted[modName] = true;
-                                    delete self.required[modName];
-                                }
-                            }
-                            self.sorted = [];
-                            self._sort();
-                        }
-                        d = null; //bail
-                        self._insert(); //insert the new deps
-                    }
-                }
-                if (d && d.fn) {
-                    fn = d.fn;
-                    delete d.fn;
-                    fn.call(self, d);
-                }
-            }
-        };
-
-        this._loading = true;
-
-        if (!modules.js.length && !modules.css.length) {
-            actions = -1;
-            complete({
-                fn: self._onSuccess
-            });
-            return;
-        }
-
-
-        if (modules.css.length) { //Load CSS first
-            Y.Get.css(modules.css, {
-                data: modules.cssMods,
-                attributes: self.cssAttributes,
-                insertBefore: self.insertBefore,
-                charset: self.charset,
-                timeout: self.timeout,
-                context: self,
-                onProgress: function(e) {
-                    self._onProgress.call(self, e);
-                },
-                onTimeout: function(d) {
-                    self._onTimeout.call(self, d);
-                },
-                onSuccess: function(d) {
-                    d.type = 'success';
-                    d.fn = self._onSuccess;
-                    complete.call(self, d);
-                },
-                onFailure: function(d) {
-                    d.type = 'failure';
-                    d.fn = self._onFailure;
-                    complete.call(self, d);
-                }
-            });
-        }
-
-        if (modules.js.length) {
-            Y.Get.js(modules.js, {
-                data: modules.jsMods,
-                insertBefore: self.insertBefore,
-                attributes: self.jsAttributes,
-                charset: self.charset,
-                timeout: self.timeout,
-                autopurge: false,
-                context: self,
-                async: self.async,
-                onProgress: function(e) {
-                    self._onProgress.call(self, e);
-                },
-                onTimeout: function(d) {
-                    self._onTimeout.call(self, d);
-                },
-                onSuccess: function(d) {
-                    d.type = 'success';
-                    d.fn = self._onSuccess;
-                    complete.call(self, d);
-                },
-                onFailure: function(d) {
-                    d.type = 'failure';
-                    d.fn = self._onFailure;
-                    complete.call(self, d);
-                }
-            });
-        }
-    },
-    /**
-    * Once a loader operation is completely finished, process any additional queued items.
-    * @method _continue
-    * @private
-    */
-    _continue: function() {
-        if (!(_queue.running) && _queue.size() > 0) {
-            _queue.running = true;
-            _queue.next()();
-        }
-    },
-
-    /**
-     * inserts the requested modules and their dependencies.
-     * <code>type</code> can be "js" or "css".  Both script and
-     * css are inserted if type is not provided.
-     * @method insert
-     * @param {object} o optional options object.
-     * @param {string} type the type of dependency to insert.
-     */
-    insert: function(o, type, skipsort) {
-        var self = this, copy = Y.merge(this);
-        delete copy.require;
-        delete copy.dirty;
-        _queue.add(function() {
-            self._insert(copy, o, type, skipsort);
-        });
-        this._continue();
-    },
-
-    /**
-     * Executed every time a module is loaded, and if we are in a load
-     * cycle, we attempt to load the next script.  Public so that it
-     * is possible to call this if using a method other than
-     * Y.register to determine when scripts are fully loaded
-     * @method loadNext
-     * @deprecated
-     * @param {string} mname optional the name of the module that has
-     * been loaded (which is usually why it is time to load the next
-     * one).
-     */
-    loadNext: function() {
-        return;
-    },
-
-    /**
-     * Apply filter defined for this instance to a url/path
-     * @method _filter
-     * @param {string} u the string to filter.
-     * @param {string} name the name of the module, if we are processing
-     * a single module as opposed to a combined url.
-     * @return {string} the filtered string.
-     * @private
-     */
-    _filter: function(u, name, group) {
-        var f = this.filter,
-            hasFilter = name && (name in this.filters),
-            modFilter = hasFilter && this.filters[name],
-            groupName = group || (this.getModuleInfo(name) || {}).group || null;
-
-        if (groupName && this.groups[groupName] && this.groups[groupName].filter) {
-            modFilter = this.groups[groupName].filter;
-            hasFilter = true;
-        }
-
-        if (u) {
-            if (hasFilter) {
-                f = (L.isString(modFilter)) ? this.FILTER_DEFS[modFilter.toUpperCase()] || null : modFilter;
-            }
-            if (f) {
-                u = u.replace(new RegExp(f.searchExp, 'g'), f.replaceStr);
-            }
-        }
-        return u;
-    },
-
-    /**
-     * Generates the full url for a module
-     * @method _url
-     * @param {string} path the path fragment.
-     * @param {String} name The name of the module
-     * @param {String} [base] The base url to use. Defaults to self.base
-     * @return {string} the full url.
-     * @private
-     */
-    _url: function(path, name, base) {
-        return this._filter((base || this.base || '') + path, name);
-    },
-    /**
-    * Returns an Object hash of file arrays built from `loader.sorted` or from an arbitrary list of sorted modules.
-    * @method resolve
-    * @param {Boolean} [calc=false] Perform a loader.calculate() before anything else
-    * @param {Array} [s] An override for the loader.sorted array. Defaults to
-    * `loader.sorted`.
-    * @return {Object} Object hash (js and css) of two arrays of file lists
-    * @example This method can be used as an off-line dep calculator
-    *
-    *        var Y = YUI();
-    *        var loader = new Y.Loader({
-    *            filter: 'debug',
-    *            base: '../../',
-    *            root: 'build/',
-    *            combine: true,
-    *            require: ['node', 'dd', 'console']
-    *        });
-    *        var out = loader.resolve(true);
-    *
-    */
-    resolve: function(calc, s) {
-
-        var len, i, m, url, group, groupName, j, frag,
-            comboSource, comboSources, mods, comboBase,
-            base, urls, u = [], tmpBase, baseLen, resCombos = {},
-            self = this, comboSep, maxURLLength,
-            inserted = (self.ignoreRegistered) ? {} : self.inserted,
-            resolved = { js: [], jsMods: [], css: [], cssMods: [] },
-            type = self.loadType || 'js', addSingle;
-
-        if (self.skin.overrides || self.skin.defaultSkin !== DEFAULT_SKIN || self.ignoreRegistered) {
-            self._resetModules();
-        }
-
-        if (calc) {
-            self.calculate();
-        }
-        s = s || self.sorted;
-
-        addSingle = function(m) {
-
-            if (m) {
-                group = (m.group && self.groups[m.group]) || NOT_FOUND;
-
-                //Always assume it's async
-                if (group.async === false) {
-                    m.async = group.async;
-                }
-
-                url = (m.fullpath) ? self._filter(m.fullpath, s[i]) :
-                      self._url(m.path, s[i], group.base || m.base);
-
-                if (m.attributes || m.async === false) {
-                    url = {
-                        url: url,
-                        async: m.async
-                    };
-                    if (m.attributes) {
-                        url.attributes = m.attributes;
-                    }
-                }
-                resolved[m.type].push(url);
-                resolved[m.type + 'Mods'].push(m);
-            } else {
-            }
-
-        };
-
-        len = s.length;
-
-        // the default combo base
-        comboBase = self.comboBase;
-
-        url = comboBase;
-
-        comboSources = {};
-
-        for (i = 0; i < len; i++) {
-            comboSource = comboBase;
-            m = self.getModule(s[i]);
-            groupName = m && m.group;
-            group = self.groups[groupName];
-            if (groupName && group) {
-
-                if (!group.combine || m.fullpath) {
-                    //This is not a combo module, skip it and load it singly later.
-                    addSingle(m);
-                    continue;
-                }
-                m.combine = true;
-                if (group.comboBase) {
-                    comboSource = group.comboBase;
-                }
-
-                if ("root" in group && L.isValue(group.root)) {
-                    m.root = group.root;
-                }
-                m.comboSep = group.comboSep || self.comboSep;
-                m.maxURLLength = group.maxURLLength || self.maxURLLength;
-            } else {
-                if (!self.combine) {
-                    //This is not a combo module, skip it and load it singly later.
-                    addSingle(m);
-                    continue;
-                }
-            }
-
-            comboSources[comboSource] = comboSources[comboSource] || [];
-            comboSources[comboSource].push(m);
-        }
-
-        for (j in comboSources) {
-            if (comboSources.hasOwnProperty(j)) {
-                resCombos[j] = resCombos[j] || { js: [], jsMods: [], css: [], cssMods: [] };
-                url = j;
-                mods = comboSources[j];
-                len = mods.length;
-
-                if (len) {
-                    for (i = 0; i < len; i++) {
-                        if (inserted[mods[i]]) {
-                            continue;
-                        }
-                        m = mods[i];
-                        // Do not try to combine non-yui JS unless combo def
-                        // is found
-                        if (m && (m.combine || !m.ext)) {
-                            resCombos[j].comboSep = m.comboSep;
-                            resCombos[j].group = m.group;
-                            resCombos[j].maxURLLength = m.maxURLLength;
-                            frag = ((L.isValue(m.root)) ? m.root : self.root) + (m.path || m.fullpath);
-                            frag = self._filter(frag, m.name);
-                            resCombos[j][m.type].push(frag);
-                            resCombos[j][m.type + 'Mods'].push(m);
-                        } else {
-                            //Add them to the next process..
-                            if (mods[i]) {
-                                addSingle(mods[i]);
-                            }
-                        }
-
-                    }
-                }
-            }
-        }
-
-
-        for (j in resCombos) {
-            if (resCombos.hasOwnProperty(j)) {
-                base = j;
-                comboSep = resCombos[base].comboSep || self.comboSep;
-                maxURLLength = resCombos[base].maxURLLength || self.maxURLLength;
-                for (type in resCombos[base]) {
-                    if (type === JS || type === CSS) {
-                        urls = resCombos[base][type];
-                        mods = resCombos[base][type + 'Mods'];
-                        len = urls.length;
-                        tmpBase = base + urls.join(comboSep);
-                        baseLen = tmpBase.length;
-                        if (maxURLLength <= base.length) {
-                            maxURLLength = MAX_URL_LENGTH;
-                        }
-
-                        if (len) {
-                            if (baseLen > maxURLLength) {
-                                u = [];
-                                for (s = 0; s < len; s++) {
-                                    u.push(urls[s]);
-                                    tmpBase = base + u.join(comboSep);
-
-                                    if (tmpBase.length > maxURLLength) {
-                                        m = u.pop();
-                                        tmpBase = base + u.join(comboSep);
-                                        resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
-                                        u = [];
-                                        if (m) {
-                                            u.push(m);
-                                        }
-                                    }
-                                }
-                                if (u.length) {
-                                    tmpBase = base + u.join(comboSep);
-                                    resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
-                                }
-                            } else {
-                                resolved[type].push(self._filter(tmpBase, null, resCombos[base].group));
-                            }
-                        }
-                        resolved[type + 'Mods'] = resolved[type + 'Mods'].concat(mods);
-                    }
-                }
-            }
-        }
-
-        resCombos = null;
-
-        return resolved;
-    },
-    /**
-    Shortcut to calculate, resolve and load all modules.
-
-        var loader = new Y.Loader({
-            ignoreRegistered: true,
-            modules: {
-                mod: {
-                    path: 'mod.js'
-                }
-            },
-            requires: [ 'mod' ]
-        });
-        loader.load(function() {
-            console.log('All modules have loaded..');
-        });
-
-
-    @method load
-    @param {Function} cb Executed after all load operations are complete
-    */
-    load: function(cb) {
-        if (!cb) {
-            return;
-        }
-        var self = this,
-            out = self.resolve(true);
-
-        self.data = out;
-
-        self.onEnd = function() {
-            cb.apply(self.context || self, arguments);
-        };
-
-        self.insert();
-    }
-};
-
-
-
-}, '@VERSION@', {"requires": ["get", "features"]});
-YUI.add('loader-rollup', function (Y, NAME) {
-
-/**
- * Optional automatic rollup logic for reducing http connections
- * when not using a combo service.
- * @module loader
- * @submodule rollup
- */
-
-/**
- * Look for rollup packages to determine if all of the modules a
- * rollup supersedes are required.  If so, include the rollup to
- * help reduce the total number of connections required.  Called
- * by calculate().  This is an optional feature, and requires the
- * appropriate submodule to function.
- * @method _rollup
- * @for Loader
- * @private
- */
-Y.Loader.prototype._rollup = function() {
-    var i, j, m, s, r = this.required, roll,
-        info = this.moduleInfo, rolled, c, smod;
-
-    // find and cache rollup modules
-    if (this.dirty || !this.rollups) {
-        this.rollups = {};
-        for (i in info) {
-            if (info.hasOwnProperty(i)) {
-                m = this.getModule(i);
-                // if (m && m.rollup && m.supersedes) {
-                if (m && m.rollup) {
-                    this.rollups[i] = m;
-                }
-            }
-        }
-    }
-
-    // make as many passes as needed to pick up rollup rollups
-    for (;;) {
-        rolled = false;
-
-        // go through the rollup candidates
-        for (i in this.rollups) {
-            if (this.rollups.hasOwnProperty(i)) {
-                // there can be only one, unless forced
-                if (!r[i] && ((!this.loaded[i]) || this.forceMap[i])) {
-                    m = this.getModule(i);
-                    s = m.supersedes || [];
-                    roll = false;
-
-                    // @TODO remove continue
-                    if (!m.rollup) {
-                        continue;
-                    }
-
-                    c = 0;
-
-                    // check the threshold
-                    for (j = 0; j < s.length; j++) {
-                        smod = info[s[j]];
-
-                        // if the superseded module is loaded, we can't
-                        // load the rollup unless it has been forced.
-                        if (this.loaded[s[j]] && !this.forceMap[s[j]]) {
-                            roll = false;
-                            break;
-                        // increment the counter if this module is required.
-                        // if we are beyond the rollup threshold, we will
-                        // use the rollup module
-                        } else if (r[s[j]] && m.type === smod.type) {
-                            c++;
-                            roll = (c >= m.rollup);
-                            if (roll) {
-                                break;
-                            }
-                        }
-                    }
-
-                    if (roll) {
-                        // add the rollup
-                        r[i] = true;
-                        rolled = true;
-
-                        // expand the rollup's dependencies
-                        this.getRequires(m);
-                    }
-                }
-            }
-        }
-
-        // if we made it here w/o rolling up something, we are done
-        if (!rolled) {
-            break;
-        }
-    }
-};
-
-
-}, '@VERSION@', {"requires": ["loader-base"]});
-YUI.add('loader-yui3', function (Y, NAME) {
-
-/* This file is auto-generated by (yogi.js loader --mix --yes) */
-
-/*jshint maxlen:900, eqeqeq: false */
-
-/**
- * YUI 3 module metadata
- * @module loader
- * @submodule loader-yui3
- */
-YUI.Env[Y.version].modules = YUI.Env[Y.version].modules || {};
-Y.mix(YUI.Env[Y.version].modules, {
-    "align-plugin": {
-        "requires": [
-            "node-screen",
-            "node-pluginhost"
-        ]
-    },
-    "anim": {
-        "use": [
-            "anim-base",
-            "anim-color",
-            "anim-curve",
-            "anim-easing",
-            "anim-node-plugin",
-            "anim-scroll",
-            "anim-xy"
-        ]
-    },
-    "anim-base": {
-        "requires": [
-            "base-base",
-            "node-style"
-        ]
-    },
-    "anim-color": {
-        "requires": [
-            "anim-base"
-        ]
-    },
-    "anim-curve": {
-        "requires": [
-            "anim-xy"
-        ]
-    },
-    "anim-easing": {
-        "requires": [
-            "anim-base"
-        ]
-    },
-    "anim-node-plugin": {
-        "requires": [
-            "node-pluginhost",
-            "anim-base"
-        ]
-    },
-    "anim-scroll": {
-        "requires": [
-            "anim-base"
-        ]
-    },
-    "anim-shape": {
-        "requires": [
-            "anim-base",
-            "anim-easing",
-            "anim-color",
-            "matrix"
-        ]
-    },
-    "anim-shape-transform": {
-        "use": [
-            "anim-shape"
-        ]
-    },
-    "anim-xy": {
-        "requires": [
-            "anim-base",
-            "node-screen"
-        ]
-    },
-    "app": {
-        "use": [
-            "app-base",
-            "app-content",
-            "app-transitions",
-            "lazy-model-list",
-            "model",
-            "model-list",
-            "model-sync-rest",
-            "model-sync-local",
-            "router",
-            "view",
-            "view-node-map"
-        ]
-    },
-    "app-base": {
-        "requires": [
-            "classnamemanager",
-            "pjax-base",
-            "router",
-            "view"
-        ]
-    },
-    "app-content": {
-        "requires": [
-            "app-base",
-            "pjax-content"
-        ]
-    },
-    "app-transitions": {
-        "requires": [
-            "app-base"
-        ]
-    },
-    "app-transitions-css": {
-        "type": "css"
-    },
-    "app-transitions-native": {
-        "condition": {
-            "name": "app-transitions-native",
-            "test": function (Y) {
-    var doc  = Y.config.doc,
-        node = doc ? doc.documentElement : null;
-
-    if (node && node.style) {
-        return ('MozTransition' in node.style || 'WebkitTransition' in node.style || 'transition' in node.style);
-    }
-
-    return false;
-},
-            "trigger": "app-transitions"
-        },
-        "requires": [
-            "app-transitions",
-            "app-transitions-css",
-            "parallel",
-            "transition"
-        ]
-    },
-    "array-extras": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "array-invoke": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "arraylist": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "arraylist-add": {
-        "requires": [
-            "arraylist"
-        ]
-    },
-    "arraylist-filter": {
-        "requires": [
-            "arraylist"
-        ]
-    },
-    "arraysort": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "async-queue": {
-        "requires": [
-            "event-custom"
-        ]
-    },
-    "attribute": {
-        "use": [
-            "attribute-base",
-            "attribute-complex"
-        ]
-    },
-    "attribute-base": {
-        "requires": [
-            "attribute-core",
-            "attribute-observable",
-            "attribute-extras"
-        ]
-    },
-    "attribute-complex": {
-        "requires": [
-            "attribute-base"
-        ]
-    },
-    "attribute-core": {
-        "requires": [
-            "oop"
-        ]
-    },
-    "attribute-events": {
-        "use": [
-            "attribute-observable"
-        ]
-    },
-    "attribute-extras": {
-        "requires": [
-            "oop"
-        ]
-    },
-    "attribute-observable": {
-        "requires": [
-            "event-custom"
-        ]
-    },
-    "autocomplete": {
-        "use": [
-            "autocomplete-base",
-            "autocomplete-sources",
-            "autocomplete-list",
-            "autocomplete-plugin"
-        ]
-    },
-    "autocomplete-base": {
-        "optional": [
-            "autocomplete-sources"
-        ],
-        "requires": [
-            "array-extras",
-            "base-build",
-            "escape",
-            "event-valuechange",
-            "node-base"
-        ]
-    },
-    "autocomplete-filters": {
-        "requires": [
-            "array-extras",
-            "text-wordbreak"
-        ]
-    },
-    "autocomplete-filters-accentfold": {
-        "requires": [
-            "array-extras",
-            "text-accentfold",
-            "text-wordbreak"
-        ]
-    },
-    "autocomplete-highlighters": {
-        "requires": [
-            "array-extras",
-            "highlight-base"
-        ]
-    },
-    "autocomplete-highlighters-accentfold": {
-        "requires": [
-            "array-extras",
-            "highlight-accentfold"
-        ]
-    },
-    "autocomplete-list": {
-        "after": [
-            "autocomplete-sources"
-        ],
-        "lang": [
-            "en",
-            "es",
-            "hu",
-            "it"
-        ],
-        "requires": [
-            "autocomplete-base",
-            "event-resize",
-            "node-screen",
-            "selector-css3",
-            "shim-plugin",
-            "widget",
-            "widget-position",
-            "widget-position-align"
-        ],
-        "skinnable": true
-    },
-    "autocomplete-list-keys": {
-        "condition": {
-            "name": "autocomplete-list-keys",
-            "test": function (Y) {
-    // Only add keyboard support to autocomplete-list if this doesn't appear to
-    // be an iOS or Android-based mobile device.
-    //
-    // There's currently no feasible way to actually detect whether a device has
-    // a hardware keyboard, so this sniff will have to do. It can easily be
-    // overridden by manually loading the autocomplete-list-keys module.
-    //
-    // Worth noting: even though iOS supports bluetooth keyboards, Mobile Safari
-    // doesn't fire the keyboard events used by AutoCompleteList, so there's
-    // no point loading the -keys module even when a bluetooth keyboard may be
-    // available.
-    return !(Y.UA.ios || Y.UA.android);
-},
-            "trigger": "autocomplete-list"
-        },
-        "requires": [
-            "autocomplete-list",
-            "base-build"
-        ]
-    },
-    "autocomplete-plugin": {
-        "requires": [
-            "autocomplete-list",
-            "node-pluginhost"
-        ]
-    },
-    "autocomplete-sources": {
-        "optional": [
-            "io-base",
-            "json-parse",
-            "jsonp",
-            "yql"
-        ],
-        "requires": [
-            "autocomplete-base"
-        ]
-    },
-    "axes": {
-        "use": [
-            "axis-numeric",
-            "axis-category",
-            "axis-time",
-            "axis-stacked"
-        ]
-    },
-    "axes-base": {
-        "use": [
-            "axis-numeric-base",
-            "axis-category-base",
-            "axis-time-base",
-            "axis-stacked-base"
-        ]
-    },
-    "axis": {
-        "requires": [
-            "dom",
-            "widget",
-            "widget-position",
-            "widget-stack",
-            "graphics",
-            "axis-base"
-        ]
-    },
-    "axis-base": {
-        "requires": [
-            "classnamemanager",
-            "datatype-number",
-            "datatype-date",
-            "base",
-            "event-custom"
-        ]
-    },
-    "axis-category": {
-        "requires": [
-            "axis",
-            "axis-category-base"
-        ]
-    },
-    "axis-category-base": {
-        "requires": [
-            "axis-base"
-        ]
-    },
-    "axis-numeric": {
-        "requires": [
-            "axis",
-            "axis-numeric-base"
-        ]
-    },
-    "axis-numeric-base": {
-        "requires": [
-            "axis-base"
-        ]
-    },
-    "axis-stacked": {
-        "requires": [
-            "axis-numeric",
-            "axis-stacked-base"
-        ]
-    },
-    "axis-stacked-base": {
-        "requires": [
-            "axis-numeric-base"
-        ]
-    },
-    "axis-time": {
-        "requires": [
-            "axis",
-            "axis-time-base"
-        ]
-    },
-    "axis-time-base": {
-        "requires": [
-            "axis-base"
-        ]
-    },
-    "base": {
-        "use": [
-            "base-base",
-            "base-pluginhost",
-            "base-build"
-        ]
-    },
-    "base-base": {
-        "requires": [
-            "attribute-base",
-            "base-core",
-            "base-observable"
-        ]
-    },
-    "base-build": {
-        "requires": [
-            "base-base"
-        ]
-    },
-    "base-core": {
-        "requires": [
-            "attribute-core"
-        ]
-    },
-    "base-observable": {
-        "requires": [
-            "attribute-observable",
-            "base-core"
-        ]
-    },
-    "base-pluginhost": {
-        "requires": [
-            "base-base",
-            "pluginhost"
-        ]
-    },
-    "button": {
-        "requires": [
-            "button-core",
-            "cssbutton",
-            "widget"
-        ]
-    },
-    "button-core": {
-        "requires": [
-            "attribute-core",
-            "classnamemanager",
-            "node-base",
-            "escape"
-        ]
-    },
-    "button-group": {
-        "requires": [
-            "button-plugin",
-            "cssbutton",
-            "widget"
-        ]
-    },
-    "button-plugin": {
-        "requires": [
-            "button-core",
-            "cssbutton",
-            "node-pluginhost"
-        ]
-    },
-    "cache": {
-        "use": [
-            "cache-base",
-            "cache-offline",
-            "cache-plugin"
-        ]
-    },
-    "cache-base": {
-        "requires": [
-            "base"
-        ]
-    },
-    "cache-offline": {
-        "requires": [
-            "cache-base",
-            "json"
-        ]
-    },
-    "cache-plugin": {
-        "requires": [
-            "plugin",
-            "cache-base"
-        ]
-    },
-    "calendar": {
-        "requires": [
-            "calendar-base",
-            "calendarnavigator"
-        ],
-        "skinnable": true
-    },
-    "calendar-base": {
-        "lang": [
-            "de",
-            "en",
-            "es",
-            "es-AR",
-            "fr",
-            "hu",
-            "it",
-            "ja",
-            "nb-NO",
-            "nl",
-            "pt-BR",
-            "ru",
-            "zh-Hans",
-            "zh-Hans-CN",
-            "zh-Hant",
-            "zh-Hant-HK",
-            "zh-HANT-TW"
-        ],
-        "requires": [
-            "widget",
-            "datatype-date",
-            "datatype-date-math",
-            "cssgrids"
-        ],
-        "skinnable": true
-    },
-    "calendarnavigator": {
-        "requires": [
-            "plugin",
-            "classnamemanager",
-            "datatype-date",
-            "node"
-        ],
-        "skinnable": true
-    },
-    "charts": {
-        "use": [
-            "charts-base"
-        ]
-    },
-    "charts-base": {
-        "requires": [
-            "dom",
-            "event-mouseenter",
-            "event-touch",
-            "graphics-group",
-            "axes",
-            "series-pie",
-            "series-line",
-            "series-marker",
-            "series-area",
-            "series-spline",
-            "series-column",
-            "series-bar",
-            "series-areaspline",
-            "series-combo",
-            "series-combospline",
-            "series-line-stacked",
-            "series-marker-stacked",
-            "series-area-stacked",
-            "series-spline-stacked",
-            "series-column-stacked",
-            "series-bar-stacked",
-            "series-areaspline-stacked",
-            "series-combo-stacked",
-            "series-combospline-stacked"
-        ]
-    },
-    "charts-legend": {
-        "requires": [
-            "charts-base"
-        ]
-    },
-    "classnamemanager": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "clickable-rail": {
-        "requires": [
-            "slider-base"
-        ]
-    },
-    "collection": {
-        "use": [
-            "array-extras",
-            "arraylist",
-            "arraylist-add",
-            "arraylist-filter",
-            "array-invoke"
-        ]
-    },
-    "color": {
-        "use": [
-            "color-base",
-            "color-hsl",
-            "color-harmony"
-        ]
-    },
-    "color-base": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "color-harmony": {
-        "requires": [
-            "color-hsl"
-        ]
-    },
-    "color-hsl": {
-        "requires": [
-            "color-base"
-        ]
-    },
-    "color-hsv": {
-        "requires": [
-            "color-base"
-        ]
-    },
-    "console": {
-        "lang": [
-            "en",
-            "es",
-            "hu",
-            "it",
-            "ja"
-        ],
-        "requires": [
-            "yui-log",
-            "widget"
-        ],
-        "skinnable": true
-    },
-    "console-filters": {
-        "requires": [
-            "plugin",
-            "console"
-        ],
-        "skinnable": true
-    },
-    "content-editable": {
-        "requires": [
-            "node-base",
-            "editor-selection",
-            "stylesheet",
-            "plugin"
-        ]
-    },
-    "controller": {
-        "use": [
-            "router"
-        ]
-    },
-    "cookie": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "createlink-base": {
-        "requires": [
-            "editor-base"
-        ]
-    },
-    "cssbase": {
-        "after": [
-            "cssreset",
-            "cssfonts",
-            "cssgrids",
-            "cssreset-context",
-            "cssfonts-context",
-            "cssgrids-context"
-        ],
-        "type": "css"
-    },
-    "cssbase-context": {
-        "after": [
-            "cssreset",
-            "cssfonts",
-            "cssgrids",
-            "cssreset-context",
-            "cssfonts-context",
-            "cssgrids-context"
-        ],
-        "type": "css"
-    },
-    "cssbutton": {
-        "type": "css"
-    },
-    "cssfonts": {
-        "type": "css"
-    },
-    "cssfonts-context": {
-        "type": "css"
-    },
-    "cssgrids": {
-        "optional": [
-            "cssnormalize"
-        ],
-        "type": "css"
-    },
-    "cssgrids-base": {
-        "optional": [
-            "cssnormalize"
-        ],
-        "type": "css"
-    },
-    "cssgrids-responsive": {
-        "optional": [
-            "cssnormalize"
-        ],
-        "requires": [
-            "cssgrids",
-            "cssgrids-responsive-base"
-        ],
-        "type": "css"
-    },
-    "cssgrids-units": {
-        "optional": [
-            "cssnormalize"
-        ],
-        "requires": [
-            "cssgrids-base"
-        ],
-        "type": "css"
-    },
-    "cssnormalize": {
-        "type": "css"
-    },
-    "cssnormalize-context": {
-        "type": "css"
-    },
-    "cssreset": {
-        "type": "css"
-    },
-    "cssreset-context": {
-        "type": "css"
-    },
-    "dataschema": {
-        "use": [
-            "dataschema-base",
-            "dataschema-json",
-            "dataschema-xml",
-            "dataschema-array",
-            "dataschema-text"
-        ]
-    },
-    "dataschema-array": {
-        "requires": [
-            "dataschema-base"
-        ]
-    },
-    "dataschema-base": {
-        "requires": [
-            "base"
-        ]
-    },
-    "dataschema-json": {
-        "requires": [
-            "dataschema-base",
-            "json"
-        ]
-    },
-    "dataschema-text": {
-        "requires": [
-            "dataschema-base"
-        ]
-    },
-    "dataschema-xml": {
-        "requires": [
-            "dataschema-base"
-        ]
-    },
-    "datasource": {
-        "use": [
-            "datasource-local",
-            "datasource-io",
-            "datasource-get",
-            "datasource-function",
-            "datasource-cache",
-            "datasource-jsonschema",
-            "datasource-xmlschema",
-            "datasource-arrayschema",
-            "datasource-textschema",
-            "datasource-polling"
-        ]
-    },
-    "datasource-arrayschema": {
-        "requires": [
-            "datasource-local",
-            "plugin",
-            "dataschema-array"
-        ]
-    },
-    "datasource-cache": {
-        "requires": [
-            "datasource-local",
-            "plugin",
-            "cache-base"
-        ]
-    },
-    "datasource-function": {
-        "requires": [
-            "datasource-local"
-        ]
-    },
-    "datasource-get": {
-        "requires": [
-            "datasource-local",
-            "get"
-        ]
-    },
-    "datasource-io": {
-        "requires": [
-            "datasource-local",
-            "io-base"
-        ]
-    },
-    "datasource-jsonschema": {
-        "requires": [
-            "datasource-local",
-            "plugin",
-            "dataschema-json"
-        ]
-    },
-    "datasource-local": {
-        "requires": [
-            "base"
-        ]
-    },
-    "datasource-polling": {
-        "requires": [
-            "datasource-local"
-        ]
-    },
-    "datasource-textschema": {
-        "requires": [
-            "datasource-local",
-            "plugin",
-            "dataschema-text"
-        ]
-    },
-    "datasource-xmlschema": {
-        "requires": [
-            "datasource-local",
-            "plugin",
-            "datatype-xml",
-            "dataschema-xml"
-        ]
-    },
-    "datatable": {
-        "use": [
-            "datatable-core",
-            "datatable-table",
-            "datatable-head",
-            "datatable-body",
-            "datatable-base",
-            "datatable-column-widths",
-            "datatable-message",
-            "datatable-mutable",
-            "datatable-sort",
-            "datatable-datasource"
-        ]
-    },
-    "datatable-base": {
-        "requires": [
-            "datatable-core",
-            "datatable-table",
-            "datatable-head",
-            "datatable-body",
-            "base-build",
-            "widget"
-        ],
-        "skinnable": true
-    },
-    "datatable-body": {
-        "requires": [
-            "datatable-core",
-            "view",
-            "classnamemanager"
-        ]
-    },
-    "datatable-column-widths": {
-        "requires": [
-            "datatable-base"
-        ]
-    },
-    "datatable-core": {
-        "requires": [
-            "escape",
-            "model-list",
-            "node-event-delegate"
-        ]
-    },
-    "datatable-datasource": {
-        "requires": [
-            "datatable-base",
-            "plugin",
-            "datasource-local"
-        ]
-    },
-    "datatable-foot": {
-        "requires": [
-            "datatable-core",
-            "view"
-        ]
-    },
-    "datatable-formatters": {
-        "requires": [
-            "datatable-body",
-            "datatype-number-format",
-            "datatype-date-format",
-            "escape"
-        ]
-    },
-    "datatable-head": {
-        "requires": [
-            "datatable-core",
-            "view",
-            "classnamemanager"
-        ]
-    },
-    "datatable-highlight": {
-        "requires": [
-            "datatable-base",
-            "event-hover"
-        ],
-        "skinnable": true
-    },
-    "datatable-keynav": {
-        "requires": [
-            "datatable-base"
-        ]
-    },
-    "datatable-message": {
-        "lang": [
-            "en",
-            "fr",
-            "es",
-            "hu",
-            "it"
-        ],
-        "requires": [
-            "datatable-base"
-        ],
-        "skinnable": true
-    },
-    "datatable-mutable": {
-        "requires": [
-            "datatable-base"
-        ]
-    },
-    "datatable-paginator": {
-        "lang": [
-            "en",
-            "fr"
-        ],
-        "requires": [
-            "model",
-            "view",
-            "paginator-core",
-            "datatable-foot",
-            "datatable-paginator-templates"
-        ],
-        "skinnable": true
-    },
-    "datatable-paginator-templates": {
-        "requires": [
-            "template"
-        ]
-    },
-    "datatable-scroll": {
-        "requires": [
-            "datatable-base",
-            "datatable-column-widths",
-            "dom-screen"
-        ],
-        "skinnable": true
-    },
-    "datatable-sort": {
-        "lang": [
-            "en",
-            "fr",
-            "es",
-            "hu"
-        ],
-        "requires": [
-            "datatable-base"
-        ],
-        "skinnable": true
-    },
-    "datatable-table": {
-        "requires": [
-            "datatable-core",
-            "datatable-head",
-            "datatable-body",
-            "view",
-            "classnamemanager"
-        ]
-    },
-    "datatype": {
-        "use": [
-            "datatype-date",
-            "datatype-number",
-            "datatype-xml"
-        ]
-    },
-    "datatype-date": {
-        "use": [
-            "datatype-date-parse",
-            "datatype-date-format",
-            "datatype-date-math"
-        ]
-    },
-    "datatype-date-format": {
-        "lang": [
-            "ar",
-            "ar-JO",
-            "ca",
-            "ca-ES",
-            "da",
-            "da-DK",
-            "de",
-            "de-AT",
-            "de-DE",
-            "el",
-            "el-GR",
-            "en",
-            "en-AU",
-            "en-CA",
-            "en-GB",
-            "en-IE",
-            "en-IN",
-            "en-JO",
-            "en-MY",
-            "en-NZ",
-            "en-PH",
-            "en-SG",
-            "en-US",
-            "es",
-            "es-AR",
-            "es-BO",
-            "es-CL",
-            "es-CO",
-            "es-EC",
-            "es-ES",
-            "es-MX",
-            "es-PE",
-            "es-PY",
-            "es-US",
-            "es-UY",
-            "es-VE",
-            "fi",
-            "fi-FI",
-            "fr",
-            "fr-BE",
-            "fr-CA",
-            "fr-FR",
-            "hi",
-            "hi-IN",
-            "hu",
-            "id",
-            "id-ID",
-            "it",
-            "it-IT",
-            "ja",
-            "ja-JP",
-            "ko",
-            "ko-KR",
-            "ms",
-            "ms-MY",
-            "nb",
-            "nb-NO",
-            "nl",
-            "nl-BE",
-            "nl-NL",
-            "pl",
-            "pl-PL",
-            "pt",
-            "pt-BR",
-            "ro",
-            "ro-RO",
-            "ru",
-            "ru-RU",
-            "sv",
-            "sv-SE",
-            "th",
-            "th-TH",
-            "tr",
-            "tr-TR",
-            "vi",
-            "vi-VN",
-            "zh-Hans",
-            "zh-Hans-CN",
-            "zh-Hant",
-            "zh-Hant-HK",
-            "zh-Hant-TW"
-        ]
-    },
-    "datatype-date-math": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "datatype-date-parse": {},
-    "datatype-number": {
-        "use": [
-            "datatype-number-parse",
-            "datatype-number-format"
-        ]
-    },
-    "datatype-number-format": {},
-    "datatype-number-parse": {
-        "requires": [
-            "escape"
-        ]
-    },
-    "datatype-xml": {
-        "use": [
-            "datatype-xml-parse",
-            "datatype-xml-format"
-        ]
-    },
-    "datatype-xml-format": {},
-    "datatype-xml-parse": {},
-    "dd": {
-        "use": [
-            "dd-ddm-base",
-            "dd-ddm",
-            "dd-ddm-drop",
-            "dd-drag",
-            "dd-proxy",
-            "dd-constrain",
-            "dd-drop",
-            "dd-scroll",
-            "dd-delegate"
-        ]
-    },
-    "dd-constrain": {
-        "requires": [
-            "dd-drag"
-        ]
-    },
-    "dd-ddm": {
-        "requires": [
-            "dd-ddm-base",
-            "event-resize"
-        ]
-    },
-    "dd-ddm-base": {
-        "requires": [
-            "node",
-            "base",
-            "yui-throttle",
-            "classnamemanager"
-        ]
-    },
-    "dd-ddm-drop": {
-        "requires": [
-            "dd-ddm"
-        ]
-    },
-    "dd-delegate": {
-        "requires": [
-            "dd-drag",
-            "dd-drop-plugin",
-            "event-mouseenter"
-        ]
-    },
-    "dd-drag": {
-        "requires": [
-            "dd-ddm-base"
-        ]
-    },
-    "dd-drop": {
-        "requires": [
-            "dd-drag",
-            "dd-ddm-drop"
-        ]
-    },
-    "dd-drop-plugin": {
-        "requires": [
-            "dd-drop"
-        ]
-    },
-    "dd-gestures": {
-        "condition": {
-            "name": "dd-gestures",
-            "trigger": "dd-drag",
-            "ua": "touchEnabled"
-        },
-        "requires": [
-            "dd-drag",
-            "event-synthetic",
-            "event-gestures"
-        ]
-    },
-    "dd-plugin": {
-        "optional": [
-            "dd-constrain",
-            "dd-proxy"
-        ],
-        "requires": [
-            "dd-drag"
-        ]
-    },
-    "dd-proxy": {
-        "requires": [
-            "dd-drag"
-        ]
-    },
-    "dd-scroll": {
-        "requires": [
-            "dd-drag"
-        ]
-    },
-    "dial": {
-        "lang": [
-            "en",
-            "es",
-            "hu"
-        ],
-        "requires": [
-            "widget",
-            "dd-drag",
-            "event-mouseenter",
-            "event-move",
-            "event-key",
-            "transition",
-            "intl"
-        ],
-        "skinnable": true
-    },
-    "dom": {
-        "use": [
-            "dom-base",
-            "dom-screen",
-            "dom-style",
-            "selector-native",
-            "selector"
-        ]
-    },
-    "dom-base": {
-        "requires": [
-            "dom-core"
-        ]
-    },
-    "dom-core": {
-        "requires": [
-            "oop",
-            "features"
-        ]
-    },
-    "dom-screen": {
-        "requires": [
-            "dom-base",
-            "dom-style"
-        ]
-    },
-    "dom-style": {
-        "requires": [
-            "dom-base",
-            "color-base"
-        ]
-    },
-    "dom-style-ie": {
-        "condition": {
-            "name": "dom-style-ie",
-            "test": function (Y) {
-
-    var testFeature = Y.Features.test,
-        addFeature = Y.Features.add,
-        WINDOW = Y.config.win,
-        DOCUMENT = Y.config.doc,
-        DOCUMENT_ELEMENT = 'documentElement',
-        ret = false;
-
-    addFeature('style', 'computedStyle', {
-        test: function() {
-            return WINDOW && 'getComputedStyle' in WINDOW;
-        }
-    });
-
-    addFeature('style', 'opacity', {
-        test: function() {
-            return DOCUMENT && 'opacity' in DOCUMENT[DOCUMENT_ELEMENT].style;
-        }
-    });
-
-    ret =  (!testFeature('style', 'opacity') &&
-            !testFeature('style', 'computedStyle'));
-
-    return ret;
-},
-            "trigger": "dom-style"
-        },
-        "requires": [
-            "dom-style"
-        ]
-    },
-    "dump": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "editor": {
-        "use": [
-            "frame",
-            "editor-selection",
-            "exec-command",
-            "editor-base",
-            "editor-para",
-            "editor-br",
-            "editor-bidi",
-            "editor-tab",
-            "createlink-base"
-        ]
-    },
-    "editor-base": {
-        "requires": [
-            "base",
-            "frame",
-            "node",
-            "exec-command",
-            "editor-selection"
-        ]
-    },
-    "editor-bidi": {
-        "requires": [
-            "editor-base"
-        ]
-    },
-    "editor-br": {
-        "requires": [
-            "editor-base"
-        ]
-    },
-    "editor-inline": {
-        "requires": [
-            "editor-base",
-            "content-editable"
-        ]
-    },
-    "editor-lists": {
-        "requires": [
-            "editor-base"
-        ]
-    },
-    "editor-para": {
-        "requires": [
-            "editor-para-base"
-        ]
-    },
-    "editor-para-base": {
-        "requires": [
-            "editor-base"
-        ]
-    },
-    "editor-para-ie": {
-        "condition": {
-            "name": "editor-para-ie",
-            "trigger": "editor-para",
-            "ua": "ie",
-            "when": "instead"
-        },
-        "requires": [
-            "editor-para-base"
-        ]
-    },
-    "editor-selection": {
-        "requires": [
-            "node"
-        ]
-    },
-    "editor-tab": {
-        "requires": [
-            "editor-base"
-        ]
-    },
-    "escape": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "event": {
-        "after": [
-            "node-base"
-        ],
-        "use": [
-            "event-base",
-            "event-delegate",
-            "event-synthetic",
-            "event-mousewheel",
-            "event-mouseenter",
-            "event-key",
-            "event-focus",
-            "event-resize",
-            "event-hover",
-            "event-outside",
-            "event-touch",
-            "event-move",
-            "event-flick",
-            "event-valuechange",
-            "event-tap"
-        ]
-    },
-    "event-base": {
-        "after": [
-            "node-base"
-        ],
-        "requires": [
-            "event-custom-base"
-        ]
-    },
-    "event-base-ie": {
-        "after": [
-            "event-base"
-        ],
-        "condition": {
-            "name": "event-base-ie",
-            "test": function(Y) {
-    var imp = Y.config.doc && Y.config.doc.implementation;
-    return (imp && (!imp.hasFeature('Events', '2.0')));
-},
-            "trigger": "node-base"
-        },
-        "requires": [
-            "node-base"
-        ]
-    },
-    "event-contextmenu": {
-        "requires": [
-            "event-synthetic",
-            "dom-screen"
-        ]
-    },
-    "event-custom": {
-        "use": [
-            "event-custom-base",
-            "event-custom-complex"
-        ]
-    },
-    "event-custom-base": {
-        "requires": [
-            "oop"
-        ]
-    },
-    "event-custom-complex": {
-        "requires": [
-            "event-custom-base"
-        ]
-    },
-    "event-delegate": {
-        "requires": [
-            "node-base"
-        ]
-    },
-    "event-flick": {
-        "requires": [
-            "node-base",
-            "event-touch",
-            "event-synthetic"
-        ]
-    },
-    "event-focus": {
-        "requires": [
-            "event-synthetic"
-        ]
-    },
-    "event-gestures": {
-        "use": [
-            "event-flick",
-            "event-move"
-        ]
-    },
-    "event-hover": {
-        "requires": [
-            "event-mouseenter"
-        ]
-    },
-    "event-key": {
-        "requires": [
-            "event-synthetic"
-        ]
-    },
-    "event-mouseenter": {
-        "requires": [
-            "event-synthetic"
-        ]
-    },
-    "event-mousewheel": {
-        "requires": [
-            "node-base"
-        ]
-    },
-    "event-move": {
-        "requires": [
-            "node-base",
-            "event-touch",
-            "event-synthetic"
-        ]
-    },
-    "event-outside": {
-        "requires": [
-            "event-synthetic"
-        ]
-    },
-    "event-resize": {
-        "requires": [
-            "node-base",
-            "event-synthetic"
-        ]
-    },
-    "event-simulate": {
-        "requires": [
-            "event-base"
-        ]
-    },
-    "event-synthetic": {
-        "requires": [
-            "node-base",
-            "event-custom-complex"
-        ]
-    },
-    "event-tap": {
-        "requires": [
-            "node-base",
-            "event-base",
-            "event-touch",
-            "event-synthetic"
-        ]
-    },
-    "event-touch": {
-        "requires": [
-            "node-base"
-        ]
-    },
-    "event-valuechange": {
-        "requires": [
-            "event-focus",
-            "event-synthetic"
-        ]
-    },
-    "exec-command": {
-        "requires": [
-            "frame"
-        ]
-    },
-    "features": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "file": {
-        "requires": [
-            "file-flash",
-            "file-html5"
-        ]
-    },
-    "file-flash": {
-        "requires": [
-            "base"
-        ]
-    },
-    "file-html5": {
-        "requires": [
-            "base"
-        ]
-    },
-    "frame": {
-        "requires": [
-            "base",
-            "node",
-            "plugin",
-            "selector-css3",
-            "yui-throttle"
-        ]
-    },
-    "gesture-simulate": {
-        "requires": [
-            "async-queue",
-            "event-simulate",
-            "node-screen"
-        ]
-    },
-    "get": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "graphics": {
-        "requires": [
-            "node",
-            "event-custom",
-            "pluginhost",
-            "matrix",
-            "classnamemanager"
-        ]
-    },
-    "graphics-canvas": {
-        "condition": {
-            "name": "graphics-canvas",
-            "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useCanvas = Y.config.defaultGraphicEngine && Y.config.defaultGraphicEngine == "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    return (!svg || useCanvas) && (canvas && canvas.getContext && canvas.getContext("2d"));
-},
-            "trigger": "graphics"
-        },
-        "requires": [
-            "graphics"
-        ]
-    },
-    "graphics-canvas-default": {
-        "condition": {
-            "name": "graphics-canvas-default",
-            "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useCanvas = Y.config.defaultGraphicEngine && Y.config.defaultGraphicEngine == "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    return (!svg || useCanvas) && (canvas && canvas.getContext && canvas.getContext("2d"));
-},
-            "trigger": "graphics"
-        }
-    },
-    "graphics-group": {
-        "requires": [
-            "graphics"
-        ]
-    },
-    "graphics-svg": {
-        "condition": {
-            "name": "graphics-svg",
-            "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
-    return svg && (useSVG || !canvas);
-},
-            "trigger": "graphics"
-        },
-        "requires": [
-            "graphics"
-        ]
-    },
-    "graphics-svg-default": {
-        "condition": {
-            "name": "graphics-svg-default",
-            "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-        useSVG = !Y.config.defaultGraphicEngine || Y.config.defaultGraphicEngine != "canvas",
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas"),
-        svg = (DOCUMENT && DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1"));
-    
-    return svg && (useSVG || !canvas);
-},
-            "trigger": "graphics"
-        }
-    },
-    "graphics-vml": {
-        "condition": {
-            "name": "graphics-vml",
-            "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas");
-    return (DOCUMENT && !DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") && (!canvas || !canvas.getContext || !canvas.getContext("2d")));
-},
-            "trigger": "graphics"
-        },
-        "requires": [
-            "graphics"
-        ]
-    },
-    "graphics-vml-default": {
-        "condition": {
-            "name": "graphics-vml-default",
-            "test": function(Y) {
-    var DOCUMENT = Y.config.doc,
-		canvas = DOCUMENT && DOCUMENT.createElement("canvas");
-    return (DOCUMENT && !DOCUMENT.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") && (!canvas || !canvas.getContext || !canvas.getContext("2d")));
-},
-            "trigger": "graphics"
-        }
-    },
-    "handlebars": {
-        "use": [
-            "handlebars-compiler"
-        ]
-    },
-    "handlebars-base": {
-        "requires": []
-    },
-    "handlebars-compiler": {
-        "requires": [
-            "handlebars-base"
-        ]
-    },
-    "highlight": {
-        "use": [
-            "highlight-base",
-            "highlight-accentfold"
-        ]
-    },
-    "highlight-accentfold": {
-        "requires": [
-            "highlight-base",
-            "text-accentfold"
-        ]
-    },
-    "highlight-base": {
-        "requires": [
-            "array-extras",
-            "classnamemanager",
-            "escape",
-            "text-wordbreak"
-        ]
-    },
-    "history": {
-        "use": [
-            "history-base",
-            "history-hash",
-            "history-html5"
-        ]
-    },
-    "history-base": {
-        "requires": [
-            "event-custom-complex"
-        ]
-    },
-    "history-hash": {
-        "after": [
-            "history-html5"
-        ],
-        "requires": [
-            "event-synthetic",
-            "history-base",
-            "yui-later"
-        ]
-    },
-    "history-hash-ie": {
-        "condition": {
-            "name": "history-hash-ie",
-            "test": function (Y) {
-    var docMode = Y.config.doc && Y.config.doc.documentMode;
-
-    return Y.UA.ie && (!('onhashchange' in Y.config.win) ||
-            !docMode || docMode < 8);
-},
-            "trigger": "history-hash"
-        },
-        "requires": [
-            "history-hash",
-            "node-base"
-        ]
-    },
-    "history-html5": {
-        "optional": [
-            "json"
-        ],
-        "requires": [
-            "event-base",
-            "history-base",
-            "node-base"
-        ]
-    },
-    "imageloader": {
-        "requires": [
-            "base-base",
-            "node-style",
-            "node-screen"
-        ]
-    },
-    "intl": {
-        "requires": [
-            "intl-base",
-            "event-custom"
-        ]
-    },
-    "intl-base": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "io": {
-        "use": [
-            "io-base",
-            "io-xdr",
-            "io-form",
-            "io-upload-iframe",
-            "io-queue"
-        ]
-    },
-    "io-base": {
-        "requires": [
-            "event-custom-base",
-            "querystring-stringify-simple"
-        ]
-    },
-    "io-form": {
-        "requires": [
-            "io-base",
-            "node-base"
-        ]
-    },
-    "io-nodejs": {
-        "condition": {
-            "name": "io-nodejs",
-            "trigger": "io-base",
-            "ua": "nodejs"
-        },
-        "requires": [
-            "io-base"
-        ]
-    },
-    "io-queue": {
-        "requires": [
-            "io-base",
-            "queue-promote"
-        ]
-    },
-    "io-upload-iframe": {
-        "requires": [
-            "io-base",
-            "node-base"
-        ]
-    },
-    "io-xdr": {
-        "requires": [
-            "io-base",
-            "datatype-xml-parse"
-        ]
-    },
-    "json": {
-        "use": [
-            "json-parse",
-            "json-stringify"
-        ]
-    },
-    "json-parse": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "json-parse-shim": {
-        "condition": {
-            "name": "json-parse-shim",
-            "test": function (Y) {
-    var _JSON = Y.config.global.JSON,
-        Native = Object.prototype.toString.call(_JSON) === '[object JSON]' && _JSON,
-        nativeSupport = Y.config.useNativeJSONParse !== false && !!Native;
-
-    function workingNative( k, v ) {
-        return k === "ok" ? true : v;
-    }
-    
-    // Double check basic functionality.  This is mainly to catch early broken
-    // implementations of the JSON API in Firefox 3.1 beta1 and beta2
-    if ( nativeSupport ) {
-        try {
-            nativeSupport = ( Native.parse( '{"ok":false}', workingNative ) ).ok;
-        }
-        catch ( e ) {
-            nativeSupport = false;
-        }
-    }
-
-    return !nativeSupport;
-},
-            "trigger": "json-parse"
-        },
-        "requires": [
-            "json-parse"
-        ]
-    },
-    "json-stringify": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "json-stringify-shim": {
-        "condition": {
-            "name": "json-stringify-shim",
-            "test": function (Y) {
-    var _JSON = Y.config.global.JSON,
-        Native = Object.prototype.toString.call(_JSON) === '[object JSON]' && _JSON,
-        nativeSupport = Y.config.useNativeJSONStringify !== false && !!Native;
-
-    // Double check basic native functionality.  This is primarily to catch broken
-    // early JSON API implementations in Firefox 3.1 beta1 and beta2.
-    if ( nativeSupport ) {
-        try {
-            nativeSupport = ( '0' === Native.stringify(0) );
-        } catch ( e ) {
-            nativeSupport = false;
-        }
-    }
-
-
-    return !nativeSupport;
-},
-            "trigger": "json-stringify"
-        },
-        "requires": [
-            "json-stringify"
-        ]
-    },
-    "jsonp": {
-        "requires": [
-            "get",
-            "oop"
-        ]
-    },
-    "jsonp-url": {
-        "requires": [
-            "jsonp"
-        ]
-    },
-    "lazy-model-list": {
-        "requires": [
-            "model-list"
-        ]
-    },
-    "loader": {
-        "use": [
-            "loader-base",
-            "loader-rollup",
-            "loader-yui3"
-        ]
-    },
-    "loader-base": {
-        "requires": [
-            "get",
-            "features"
-        ]
-    },
-    "loader-rollup": {
-        "requires": [
-            "loader-base"
-        ]
-    },
-    "loader-yui3": {
-        "requires": [
-            "loader-base"
-        ]
-    },
-    "matrix": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "model": {
-        "requires": [
-            "base-build",
-            "escape",
-            "json-parse"
-        ]
-    },
-    "model-list": {
-        "requires": [
-            "array-extras",
-            "array-invoke",
-            "arraylist",
-            "base-build",
-            "escape",
-            "json-parse",
-            "model"
-        ]
-    },
-    "model-sync-local": {
-        "requires": [
-            "model",
-            "json-stringify"
-        ]
-    },
-    "model-sync-rest": {
-        "requires": [
-            "model",
-            "io-base",
-            "json-stringify"
-        ]
-    },
-    "node": {
-        "use": [
-            "node-base",
-            "node-event-delegate",
-            "node-pluginhost",
-            "node-screen",
-            "node-style"
-        ]
-    },
-    "node-base": {
-        "requires": [
-            "event-base",
-            "node-core",
-            "dom-base",
-            "dom-style"
-        ]
-    },
-    "node-core": {
-        "requires": [
-            "dom-core",
-            "selector"
-        ]
-    },
-    "node-event-delegate": {
-        "requires": [
-            "node-base",
-            "event-delegate"
-        ]
-    },
-    "node-event-html5": {
-        "requires": [
-            "node-base"
-        ]
-    },
-    "node-event-simulate": {
-        "requires": [
-            "node-base",
-            "event-simulate",
-            "gesture-simulate"
-        ]
-    },
-    "node-flick": {
-        "requires": [
-            "classnamemanager",
-            "transition",
-            "event-flick",
-            "plugin"
-        ],
-        "skinnable": true
-    },
-    "node-focusmanager": {
-        "requires": [
-            "attribute",
-            "node",
-            "plugin",
-            "node-event-simulate",
-            "event-key",
-            "event-focus"
-        ]
-    },
-    "node-load": {
-        "requires": [
-            "node-base",
-            "io-base"
-        ]
-    },
-    "node-menunav": {
-        "requires": [
-            "node",
-            "classnamemanager",
-            "plugin",
-            "node-focusmanager"
-        ],
-        "skinnable": true
-    },
-    "node-pluginhost": {
-        "requires": [
-            "node-base",
-            "pluginhost"
-        ]
-    },
-    "node-screen": {
-        "requires": [
-            "dom-screen",
-            "node-base"
-        ]
-    },
-    "node-scroll-info": {
-        "requires": [
-            "array-extras",
-            "base-build",
-            "event-resize",
-            "node-pluginhost",
-            "plugin",
-            "selector"
-        ]
-    },
-    "node-style": {
-        "requires": [
-            "dom-style",
-            "node-base"
-        ]
-    },
-    "oop": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "overlay": {
-        "requires": [
-            "widget",
-            "widget-stdmod",
-            "widget-position",
-            "widget-position-align",
-            "widget-stack",
-            "widget-position-constrain"
-        ],
-        "skinnable": true
-    },
-    "paginator": {
-        "requires": [
-            "paginator-core"
-        ]
-    },
-    "paginator-core": {
-        "requires": [
-            "base"
-        ]
-    },
-    "paginator-url": {
-        "requires": [
-            "paginator"
-        ]
-    },
-    "panel": {
-        "requires": [
-            "widget",
-            "widget-autohide",
-            "widget-buttons",
-            "widget-modality",
-            "widget-position",
-            "widget-position-align",
-            "widget-position-constrain",
-            "widget-stack",
-            "widget-stdmod"
-        ],
-        "skinnable": true
-    },
-    "parallel": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "pjax": {
-        "requires": [
-            "pjax-base",
-            "pjax-content"
-        ]
-    },
-    "pjax-base": {
-        "requires": [
-            "classnamemanager",
-            "node-event-delegate",
-            "router"
-        ]
-    },
-    "pjax-content": {
-        "requires": [
-            "io-base",
-            "node-base",
-            "router"
-        ]
-    },
-    "pjax-plugin": {
-        "requires": [
-            "node-pluginhost",
-            "pjax",
-            "plugin"
-        ]
-    },
-    "plugin": {
-        "requires": [
-            "base-base"
-        ]
-    },
-    "pluginhost": {
-        "use": [
-            "pluginhost-base",
-            "pluginhost-config"
-        ]
-    },
-    "pluginhost-base": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "pluginhost-config": {
-        "requires": [
-            "pluginhost-base"
-        ]
-    },
-    "promise": {
-        "requires": [
-            "timers"
-        ]
-    },
-    "querystring": {
-        "use": [
-            "querystring-parse",
-            "querystring-stringify"
-        ]
-    },
-    "querystring-parse": {
-        "requires": [
-            "yui-base",
-            "array-extras"
-        ]
-    },
-    "querystring-parse-simple": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "querystring-stringify": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "querystring-stringify-simple": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "queue-promote": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "range-slider": {
-        "requires": [
-            "slider-base",
-            "slider-value-range",
-            "clickable-rail"
-        ]
-    },
-    "recordset": {
-        "use": [
-            "recordset-base",
-            "recordset-sort",
-            "recordset-filter",
-            "recordset-indexer"
-        ]
-    },
-    "recordset-base": {
-        "requires": [
-            "base",
-            "arraylist"
-        ]
-    },
-    "recordset-filter": {
-        "requires": [
-            "recordset-base",
-            "array-extras",
-            "plugin"
-        ]
-    },
-    "recordset-indexer": {
-        "requires": [
-            "recordset-base",
-            "plugin"
-        ]
-    },
-    "recordset-sort": {
-        "requires": [
-            "arraysort",
-            "recordset-base",
-            "plugin"
-        ]
-    },
-    "resize": {
-        "use": [
-            "resize-base",
-            "resize-proxy",
-            "resize-constrain"
-        ]
-    },
-    "resize-base": {
-        "requires": [
-            "base",
-            "widget",
-            "event",
-            "oop",
-            "dd-drag",
-            "dd-delegate",
-            "dd-drop"
-        ],
-        "skinnable": true
-    },
-    "resize-constrain": {
-        "requires": [
-            "plugin",
-            "resize-base"
-        ]
-    },
-    "resize-plugin": {
-        "optional": [
-            "resize-constrain"
-        ],
-        "requires": [
-            "resize-base",
-            "plugin"
-        ]
-    },
-    "resize-proxy": {
-        "requires": [
-            "plugin",
-            "resize-base"
-        ]
-    },
-    "router": {
-        "optional": [
-            "querystring-parse"
-        ],
-        "requires": [
-            "array-extras",
-            "base-build",
-            "history"
-        ]
-    },
-    "scrollview": {
-        "requires": [
-            "scrollview-base",
-            "scrollview-scrollbars"
-        ]
-    },
-    "scrollview-base": {
-        "requires": [
-            "widget",
-            "event-gestures",
-            "event-mousewheel",
-            "transition"
-        ],
-        "skinnable": true
-    },
-    "scrollview-base-ie": {
-        "condition": {
-            "name": "scrollview-base-ie",
-            "trigger": "scrollview-base",
-            "ua": "ie"
-        },
-        "requires": [
-            "scrollview-base"
-        ]
-    },
-    "scrollview-list": {
-        "requires": [
-            "plugin",
-            "classnamemanager"
-        ],
-        "skinnable": true
-    },
-    "scrollview-paginator": {
-        "requires": [
-            "plugin",
-            "classnamemanager"
-        ]
-    },
-    "scrollview-scrollbars": {
-        "requires": [
-            "classnamemanager",
-            "transition",
-            "plugin"
-        ],
-        "skinnable": true
-    },
-    "selector": {
-        "requires": [
-            "selector-native"
-        ]
-    },
-    "selector-css2": {
-        "condition": {
-            "name": "selector-css2",
-            "test": function (Y) {
-    var DOCUMENT = Y.config.doc,
-        ret = DOCUMENT && !('querySelectorAll' in DOCUMENT);
-
-    return ret;
-},
-            "trigger": "selector"
-        },
-        "requires": [
-            "selector-native"
-        ]
-    },
-    "selector-css3": {
-        "requires": [
-            "selector-native",
-            "selector-css2"
-        ]
-    },
-    "selector-native": {
-        "requires": [
-            "dom-base"
-        ]
-    },
-    "series-area": {
-        "requires": [
-            "series-cartesian",
-            "series-fill-util"
-        ]
-    },
-    "series-area-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-area"
-        ]
-    },
-    "series-areaspline": {
-        "requires": [
-            "series-area",
-            "series-curve-util"
-        ]
-    },
-    "series-areaspline-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-areaspline"
-        ]
-    },
-    "series-bar": {
-        "requires": [
-            "series-marker",
-            "series-histogram-base"
-        ]
-    },
-    "series-bar-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-bar"
-        ]
-    },
-    "series-base": {
-        "requires": [
-            "graphics",
-            "axis-base"
-        ]
-    },
-    "series-candlestick": {
-        "requires": [
-            "series-range"
-        ]
-    },
-    "series-cartesian": {
-        "requires": [
-            "series-base"
-        ]
-    },
-    "series-column": {
-        "requires": [
-            "series-marker",
-            "series-histogram-base"
-        ]
-    },
-    "series-column-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-column"
-        ]
-    },
-    "series-combo": {
-        "requires": [
-            "series-cartesian",
-            "series-line-util",
-            "series-plot-util",
-            "series-fill-util"
-        ]
-    },
-    "series-combo-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-combo"
-        ]
-    },
-    "series-combospline": {
-        "requires": [
-            "series-combo",
-            "series-curve-util"
-        ]
-    },
-    "series-combospline-stacked": {
-        "requires": [
-            "series-combo-stacked",
-            "series-curve-util"
-        ]
-    },
-    "series-curve-util": {},
-    "series-fill-util": {},
-    "series-histogram-base": {
-        "requires": [
-            "series-cartesian",
-            "series-plot-util"
-        ]
-    },
-    "series-line": {
-        "requires": [
-            "series-cartesian",
-            "series-line-util"
-        ]
-    },
-    "series-line-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-line"
-        ]
-    },
-    "series-line-util": {},
-    "series-marker": {
-        "requires": [
-            "series-cartesian",
-            "series-plot-util"
-        ]
-    },
-    "series-marker-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-marker"
-        ]
-    },
-    "series-ohlc": {
-        "requires": [
-            "series-range"
-        ]
-    },
-    "series-pie": {
-        "requires": [
-            "series-base",
-            "series-plot-util"
-        ]
-    },
-    "series-plot-util": {},
-    "series-range": {
-        "requires": [
-            "series-cartesian"
-        ]
-    },
-    "series-spline": {
-        "requires": [
-            "series-line",
-            "series-curve-util"
-        ]
-    },
-    "series-spline-stacked": {
-        "requires": [
-            "series-stacked",
-            "series-spline"
-        ]
-    },
-    "series-stacked": {
-        "requires": [
-            "axis-stacked"
-        ]
-    },
-    "shim-plugin": {
-        "requires": [
-            "node-style",
-            "node-pluginhost"
-        ]
-    },
-    "slider": {
-        "use": [
-            "slider-base",
-            "slider-value-range",
-            "clickable-rail",
-            "range-slider"
-        ]
-    },
-    "slider-base": {
-        "requires": [
-            "widget",
-            "dd-constrain",
-            "event-key"
-        ],
-        "skinnable": true
-    },
-    "slider-value-range": {
-        "requires": [
-            "slider-base"
-        ]
-    },
-    "sortable": {
-        "requires": [
-            "dd-delegate",
-            "dd-drop-plugin",
-            "dd-proxy"
-        ]
-    },
-    "sortable-scroll": {
-        "requires": [
-            "dd-scroll",
-            "sortable"
-        ]
-    },
-    "stylesheet": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "substitute": {
-        "optional": [
-            "dump"
-        ],
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "swf": {
-        "requires": [
-            "event-custom",
-            "node",
-            "swfdetect",
-            "escape"
-        ]
-    },
-    "swfdetect": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "tabview": {
-        "requires": [
-            "widget",
-            "widget-parent",
-            "widget-child",
-            "tabview-base",
-            "node-pluginhost",
-            "node-focusmanager"
-        ],
-        "skinnable": true
-    },
-    "tabview-base": {
-        "requires": [
-            "node-event-delegate",
-            "classnamemanager"
-        ]
-    },
-    "tabview-plugin": {
-        "requires": [
-            "tabview-base"
-        ]
-    },
-    "template": {
-        "use": [
-            "template-base",
-            "template-micro"
-        ]
-    },
-    "template-base": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "template-micro": {
-        "requires": [
-            "escape"
-        ]
-    },
-    "test": {
-        "requires": [
-            "event-simulate",
-            "event-custom",
-            "json-stringify"
-        ]
-    },
-    "test-console": {
-        "requires": [
-            "console-filters",
-            "test",
-            "array-extras"
-        ],
-        "skinnable": true
-    },
-    "text": {
-        "use": [
-            "text-accentfold",
-            "text-wordbreak"
-        ]
-    },
-    "text-accentfold": {
-        "requires": [
-            "array-extras",
-            "text-data-accentfold"
-        ]
-    },
-    "text-data-accentfold": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "text-data-wordbreak": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "text-wordbreak": {
-        "requires": [
-            "array-extras",
-            "text-data-wordbreak"
-        ]
-    },
-    "timers": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "transition": {
-        "requires": [
-            "node-style"
-        ]
-    },
-    "transition-timer": {
-        "condition": {
-            "name": "transition-timer",
-            "test": function (Y) {
-    var DOCUMENT = Y.config.doc,
-        node = (DOCUMENT) ? DOCUMENT.documentElement: null,
-        ret = true;
-
-    if (node && node.style) {
-        ret = !('MozTransition' in node.style || 'WebkitTransition' in node.style || 'transition' in node.style);
-    }
-
-    return ret;
-},
-            "trigger": "transition"
-        },
-        "requires": [
-            "transition"
-        ]
-    },
-    "tree": {
-        "requires": [
-            "base-build",
-            "tree-node"
-        ]
-    },
-    "tree-labelable": {
-        "requires": [
-            "tree"
-        ]
-    },
-    "tree-lazy": {
-        "requires": [
-            "base-pluginhost",
-            "plugin",
-            "tree"
-        ]
-    },
-    "tree-node": {},
-    "tree-openable": {
-        "requires": [
-            "tree"
-        ]
-    },
-    "tree-selectable": {
-        "requires": [
-            "tree"
-        ]
-    },
-    "tree-sortable": {
-        "requires": [
-            "tree"
-        ]
-    },
-    "uploader": {
-        "requires": [
-            "uploader-html5",
-            "uploader-flash"
-        ]
-    },
-    "uploader-flash": {
-        "requires": [
-            "swfdetect",
-            "escape",
-            "widget",
-            "base",
-            "cssbutton",
-            "node",
-            "event-custom",
-            "uploader-queue"
-        ]
-    },
-    "uploader-html5": {
-        "requires": [
-            "widget",
-            "node-event-simulate",
-            "file-html5",
-            "uploader-queue"
-        ]
-    },
-    "uploader-queue": {
-        "requires": [
-            "base"
-        ]
-    },
-    "view": {
-        "requires": [
-            "base-build",
-            "node-event-delegate"
-        ]
-    },
-    "view-node-map": {
-        "requires": [
-            "view"
-        ]
-    },
-    "widget": {
-        "use": [
-            "widget-base",
-            "widget-htmlparser",
-            "widget-skin",
-            "widget-uievents"
-        ]
-    },
-    "widget-anim": {
-        "requires": [
-            "anim-base",
-            "plugin",
-            "widget"
-        ]
-    },
-    "widget-autohide": {
-        "requires": [
-            "base-build",
-            "event-key",
-            "event-outside",
-            "widget"
-        ]
-    },
-    "widget-base": {
-        "requires": [
-            "attribute",
-            "base-base",
-            "base-pluginhost",
-            "classnamemanager",
-            "event-focus",
-            "node-base",
-            "node-style"
-        ],
-        "skinnable": true
-    },
-    "widget-base-ie": {
-        "condition": {
-            "name": "widget-base-ie",
-            "trigger": "widget-base",
-            "ua": "ie"
-        },
-        "requires": [
-            "widget-base"
-        ]
-    },
-    "widget-buttons": {
-        "requires": [
-            "button-plugin",
-            "cssbutton",
-            "widget-stdmod"
-        ]
-    },
-    "widget-child": {
-        "requires": [
-            "base-build",
-            "widget"
-        ]
-    },
-    "widget-htmlparser": {
-        "requires": [
-            "widget-base"
-        ]
-    },
-    "widget-modality": {
-        "requires": [
-            "base-build",
-            "event-outside",
-            "widget"
-        ],
-        "skinnable": true
-    },
-    "widget-parent": {
-        "requires": [
-            "arraylist",
-            "base-build",
-            "widget"
-        ]
-    },
-    "widget-position": {
-        "requires": [
-            "base-build",
-            "node-screen",
-            "widget"
-        ]
-    },
-    "widget-position-align": {
-        "requires": [
-            "widget-position"
-        ]
-    },
-    "widget-position-constrain": {
-        "requires": [
-            "widget-position"
-        ]
-    },
-    "widget-skin": {
-        "requires": [
-            "widget-base"
-        ]
-    },
-    "widget-stack": {
-        "requires": [
-            "base-build",
-            "widget"
-        ],
-        "skinnable": true
-    },
-    "widget-stdmod": {
-        "requires": [
-            "base-build",
-            "widget"
-        ]
-    },
-    "widget-uievents": {
-        "requires": [
-            "node-event-delegate",
-            "widget-base"
-        ]
-    },
-    "yql": {
-        "requires": [
-            "oop"
-        ]
-    },
-    "yql-jsonp": {
-        "condition": {
-            "name": "yql-jsonp",
-            "test": function (Y) {
-    /* Only load the JSONP module when not in nodejs or winjs
-    TODO Make the winjs module a CORS module
-    */
-    return (!Y.UA.nodejs && !Y.UA.winjs);
-},
-            "trigger": "yql"
-        },
-        "requires": [
-            "yql",
-            "jsonp",
-            "jsonp-url"
-        ]
-    },
-    "yql-nodejs": {
-        "condition": {
-            "name": "yql-nodejs",
-            "trigger": "yql",
-            "ua": "nodejs"
-        },
-        "requires": [
-            "yql"
-        ]
-    },
-    "yql-winjs": {
-        "condition": {
-            "name": "yql-winjs",
-            "trigger": "yql",
-            "ua": "winjs"
-        },
-        "requires": [
-            "yql"
-        ]
-    },
-    "yui": {},
-    "yui-base": {},
-    "yui-later": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "yui-log": {
-        "requires": [
-            "yui-base"
-        ]
-    },
-    "yui-throttle": {
-        "requires": [
-            "yui-base"
-        ]
-    }
-});
-YUI.Env[Y.version].md5 = 'e61397b06e7b9d3e4298ee7a7a4ea6a1';
-
-
-}, '@VERSION@', {"requires": ["loader-base"]});
-YUI.add('loader', function (Y, NAME) {}, '@VERSION@', {"use": ["loader-base", "loader-rollup", "loader-yui3"]});
-
-define("yui-loader", ["yui-base"], (function (global) {
-    return function () {
-        var ret, fn;
-        return ret || global.YUI;
-    };
-}(this)));
-
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-focus', function (Y, NAME) {
-
-/**
- * Adds bubbling and delegation support to DOM events focus and blur.
- *
- * @module event
- * @submodule event-focus
- */
-var Event    = Y.Event,
-
-    YLang    = Y.Lang,
-
-    isString = YLang.isString,
-
-    arrayIndex = Y.Array.indexOf,
-
-    useActivate = (function() {
-
-        // Changing the structure of this test, so that it doesn't use inline JS in HTML,
-        // which throws an exception in Win8 packaged apps, due to additional security restrictions:
-        // http://msdn.microsoft.com/en-us/library/windows/apps/hh465380.aspx#differences
-
-        var supported = false,
-            doc = Y.config.doc,
-            p;
-
-        if (doc) {
-
-            p = doc.createElement("p");
-            p.setAttribute("onbeforeactivate", ";");
-
-            // onbeforeactivate is a function in IE8+.
-            // onbeforeactivate is a string in IE6,7 (unfortunate, otherwise we could have just checked for function below).
-            // onbeforeactivate is a function in IE10, in a Win8 App environment (no exception running the test).
-
-            // onbeforeactivate is undefined in Webkit/Gecko.
-            // onbeforeactivate is a function in Webkit/Gecko if it's a supported event (e.g. onclick).
-
-            supported = (p.onbeforeactivate !== undefined);
-        }
-
-        return supported;
-    }());
-
-function define(type, proxy, directEvent) {
-    var nodeDataKey = '_' + type + 'Notifiers';
-
-    Y.Event.define(type, {
-
-        _useActivate : useActivate,
-
-        _attach: function (el, notifier, delegate) {
-            if (Y.DOM.isWindow(el)) {
-                return Event._attach([type, function (e) {
-                    notifier.fire(e);
-                }, el]);
-            } else {
-                return Event._attach(
-                    [proxy, this._proxy, el, this, notifier, delegate],
-                    { capture: true });
-            }
-        },
-
-        _proxy: function (e, notifier, delegate) {
-            var target        = e.target,
-                currentTarget = e.currentTarget,
-                notifiers     = target.getData(nodeDataKey),
-                yuid          = Y.stamp(currentTarget._node),
-                defer         = (useActivate || target !== currentTarget),
-                directSub;
-
-            notifier.currentTarget = (delegate) ? target : currentTarget;
-            notifier.container     = (delegate) ? currentTarget : null;
-
-            // Maintain a list to handle subscriptions from nested
-            // containers div#a>div#b>input #a.on(focus..) #b.on(focus..),
-            // use one focus or blur subscription that fires notifiers from
-            // #b then #a to emulate bubble sequence.
-            if (!notifiers) {
-                notifiers = {};
-                target.setData(nodeDataKey, notifiers);
-
-                // only subscribe to the element's focus if the target is
-                // not the current target (
-                if (defer) {
-                    directSub = Event._attach(
-                        [directEvent, this._notify, target._node]).sub;
-                    directSub.once = true;
-                }
-            } else {
-                // In old IE, defer is always true.  In capture-phase browsers,
-                // The delegate subscriptions will be encountered first, which
-                // will establish the notifiers data and direct subscription
-                // on the node.  If there is also a direct subscription to the
-                // node's focus/blur, it should not call _notify because the
-                // direct subscription from the delegate sub(s) exists, which
-                // will call _notify.  So this avoids _notify being called
-                // twice, unnecessarily.
-                defer = true;
-            }
-
-            if (!notifiers[yuid]) {
-                notifiers[yuid] = [];
-            }
-
-            notifiers[yuid].push(notifier);
-
-            if (!defer) {
-                this._notify(e);
-            }
-        },
-
-        _notify: function (e, container) {
-            var currentTarget = e.currentTarget,
-                notifierData  = currentTarget.getData(nodeDataKey),
-                axisNodes     = currentTarget.ancestors(),
-                doc           = currentTarget.get('ownerDocument'),
-                delegates     = [],
-                                // Used to escape loops when there are no more
-                                // notifiers to consider
-                count         = notifierData ?
-                                    Y.Object.keys(notifierData).length :
-                                    0,
-                target, notifiers, notifier, yuid, match, tmp, i, len, sub, ret;
-
-            // clear the notifications list (mainly for delegation)
-            currentTarget.clearData(nodeDataKey);
-
-            // Order the delegate subs by their placement in the parent axis
-            axisNodes.push(currentTarget);
-            // document.get('ownerDocument') returns null
-            // which we'll use to prevent having duplicate Nodes in the list
-            if (doc) {
-                axisNodes.unshift(doc);
-            }
-
-            // ancestors() returns the Nodes from top to bottom
-            axisNodes._nodes.reverse();
-
-            if (count) {
-                // Store the count for step 2
-                tmp = count;
-                axisNodes.some(function (node) {
-                    var yuid      = Y.stamp(node),
-                        notifiers = notifierData[yuid],
-                        i, len;
-
-                    if (notifiers) {
-                        count--;
-                        for (i = 0, len = notifiers.length; i < len; ++i) {
-                            if (notifiers[i].handle.sub.filter) {
-                                delegates.push(notifiers[i]);
-                            }
-                        }
-                    }
-
-                    return !count;
-                });
-                count = tmp;
-            }
-
-            // Walk up the parent axis, notifying direct subscriptions and
-            // testing delegate filters.
-            while (count && (target = axisNodes.shift())) {
-                yuid = Y.stamp(target);
-
-                notifiers = notifierData[yuid];
-
-                if (notifiers) {
-                    for (i = 0, len = notifiers.length; i < len; ++i) {
-                        notifier = notifiers[i];
-                        sub      = notifier.handle.sub;
-                        match    = true;
-
-                        e.currentTarget = target;
-
-                        if (sub.filter) {
-                            match = sub.filter.apply(target,
-                                [target, e].concat(sub.args || []));
-
-                            // No longer necessary to test against this
-                            // delegate subscription for the nodes along
-                            // the parent axis.
-                            delegates.splice(
-                                arrayIndex(delegates, notifier), 1);
-                        }
-
-                        if (match) {
-                            // undefined for direct subs
-                            e.container = notifier.container;
-                            ret = notifier.fire(e);
-                        }
-
-                        if (ret === false || e.stopped === 2) {
-                            break;
-                        }
-                    }
-
-                    delete notifiers[yuid];
-                    count--;
-                }
-
-                if (e.stopped !== 2) {
-                    // delegates come after subs targeting this specific node
-                    // because they would not normally report until they'd
-                    // bubbled to the container node.
-                    for (i = 0, len = delegates.length; i < len; ++i) {
-                        notifier = delegates[i];
-                        sub = notifier.handle.sub;
-
-                        if (sub.filter.apply(target,
-                            [target, e].concat(sub.args || []))) {
-
-                            e.container = notifier.container;
-                            e.currentTarget = target;
-                            ret = notifier.fire(e);
-                        }
-
-                        if (ret === false || e.stopped === 2 ||
-                            // If e.stopPropagation() is called, notify any
-                            // delegate subs from the same container, but break
-                            // once the container changes. This emulates
-                            // delegate() behavior for events like 'click' which
-                            // won't notify delegates higher up the parent axis.
-                            (e.stopped && delegates[i+1] &&
-                             delegates[i+1].container !== notifier.container)) {
-                            break;
-                        }
-                    }
-                }
-
-                if (e.stopped) {
-                    break;
-                }
-            }
-        },
-
-        on: function (node, sub, notifier) {
-            sub.handle = this._attach(node._node, notifier);
-        },
-
-        detach: function (node, sub) {
-            sub.handle.detach();
-        },
-
-        delegate: function (node, sub, notifier, filter) {
-            if (isString(filter)) {
-                sub.filter = function (target) {
-                    return Y.Selector.test(target._node, filter,
-                        node === target ? null : node._node);
-                };
-            }
-
-            sub.handle = this._attach(node._node, notifier, true);
-        },
-
-        detachDelegate: function (node, sub) {
-            sub.handle.detach();
-        }
-    }, true);
-}
-
-// For IE, we need to defer to focusin rather than focus because
-// `el.focus(); doSomething();` executes el.onbeforeactivate, el.onactivate,
-// el.onfocusin, doSomething, then el.onfocus.  All others support capture
-// phase focus, which executes before doSomething.  To guarantee consistent
-// behavior for this use case, IE's direct subscriptions are made against
-// focusin so subscribers will be notified before js following el.focus() is
-// executed.
-if (useActivate) {
-    //     name     capture phase       direct subscription
-    define("focus", "beforeactivate",   "focusin");
-    define("blur",  "beforedeactivate", "focusout");
-} else {
-    define("focus", "focus", "focus");
-    define("blur",  "blur",  "blur");
-}
-
-
-}, '3.16.0', {"requires": ["event-synthetic"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-style', function (Y, NAME) {
-
-(function(Y) {
-/**
- * Extended Node interface for managing node styles.
- * @module node
- * @submodule node-style
- */
-
-Y.mix(Y.Node.prototype, {
-    /**
-     * Sets a style property of the node.
-     * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
-     * @method setStyle
-     * @param {String} attr The style attribute to set.
-     * @param {String|Number} val The value.
-     * @chainable
-     */
-    setStyle: function(attr, val) {
-        Y.DOM.setStyle(this._node, attr, val);
-        return this;
-    },
-
-    /**
-     * Sets multiple style properties on the node.
-     * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
-     * @method setStyles
-     * @param {Object} hash An object literal of property:value pairs.
-     * @chainable
-     */
-    setStyles: function(hash) {
-        Y.DOM.setStyles(this._node, hash);
-        return this;
-    },
-
-    /**
-     * Returns the style's current value.
-     * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
-     * @method getStyle
-     * @for Node
-     * @param {String} attr The style attribute to retrieve.
-     * @return {String} The current value of the style property for the element.
-     */
-
-     getStyle: function(attr) {
-        return Y.DOM.getStyle(this._node, attr);
-     },
-
-    /**
-     * Returns the computed value for the given style property.
-     * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
-     * @method getComputedStyle
-     * @param {String} attr The style attribute to retrieve.
-     * @return {String} The computed value of the style property for the element.
-     */
-     getComputedStyle: function(attr) {
-        return Y.DOM.getComputedStyle(this._node, attr);
-     }
-});
-
-/**
- * Returns an array of values for each node.
- * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
- * @method getStyle
- * @for NodeList
- * @see Node.getStyle
- * @param {String} attr The style attribute to retrieve.
- * @return {Array} The current values of the style property for the element.
- */
-
-/**
- * Returns an array of the computed value for each node.
- * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
- * @method getComputedStyle
- * @see Node.getComputedStyle
- * @param {String} attr The style attribute to retrieve.
- * @return {Array} The computed values for each node.
- */
-
-/**
- * Sets a style property on each node.
- * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
- * @method setStyle
- * @see Node.setStyle
- * @param {String} attr The style attribute to set.
- * @param {String|Number} val The value.
- * @chainable
- */
-
-/**
- * Sets multiple style properties on each node.
- * Use camelCase (e.g. 'backgroundColor') for multi-word properties.
- * @method setStyles
- * @see Node.setStyles
- * @param {Object} hash An object literal of property:value pairs.
- * @chainable
- */
-
-// These are broken out to handle undefined return (avoid false positive for
-// chainable)
-
-Y.NodeList.importMethod(Y.Node.prototype, ['getStyle', 'getComputedStyle', 'setStyle', 'setStyles']);
-})(Y);
-/**
- * @module node
- * @submodule node-base
- */
-
-var Y_Node = Y.Node;
-
-Y.mix(Y_Node.prototype, {
-    /**
-     * Makes the node visible.
-     * If the "transition" module is loaded, show optionally
-     * animates the showing of the node using either the default
-     * transition effect ('fadeIn'), or the given named effect.
-     * @method show
-     * @for Node
-     * @param {String} name A named Transition effect to use as the show effect.
-     * @param {Object} config Options to use with the transition.
-     * @param {Function} callback An optional function to run after the transition completes.
-     * @chainable
-     */
-    show: function(callback) {
-        callback = arguments[arguments.length - 1];
-        this.toggleView(true, callback);
-        return this;
-    },
-
-    /**
-     * The implementation for showing nodes.
-     * Default is to remove the hidden attribute and reset the CSS style.display property.
-     * @method _show
-     * @protected
-     * @chainable
-     */
-    _show: function() {
-        this.removeAttribute('hidden');
-
-        // For back-compat we need to leave this in for browsers that
-        // do not visually hide a node via the hidden attribute
-        // and for users that check visibility based on style display.
-        this.setStyle('display', '');
-
-    },
-
-    /**
-    Returns whether the node is hidden by YUI or not. The hidden status is
-    determined by the 'hidden' attribute and the value of the 'display' CSS
-    property.
-
-    @method _isHidden
-    @return {Boolean} `true` if the node is hidden.
-    @private
-    **/
-    _isHidden: function() {
-        return  this.hasAttribute('hidden') || Y.DOM.getComputedStyle(this._node, 'display') === 'none';
-    },
-
-    /**
-     * Displays or hides the node.
-     * If the "transition" module is loaded, toggleView optionally
-     * animates the toggling of the node using given named effect.
-     * @method toggleView
-     * @for Node
-     * @param {Boolean} [on] An optional boolean value to force the node to be shown or hidden
-     * @param {Function} [callback] An optional function to run after the transition completes.
-     * @chainable
-     */
-    toggleView: function(on, callback) {
-        this._toggleView.apply(this, arguments);
-        return this;
-    },
-
-    _toggleView: function(on, callback) {
-        callback = arguments[arguments.length - 1];
-
-        // base on current state if not forcing
-        if (typeof on != 'boolean') {
-            on = (this._isHidden()) ? 1 : 0;
-        }
-
-        if (on) {
-            this._show();
-        }  else {
-            this._hide();
-        }
-
-        if (typeof callback == 'function') {
-            callback.call(this);
-        }
-
-        return this;
-    },
-
-    /**
-     * Hides the node.
-     * If the "transition" module is loaded, hide optionally
-     * animates the hiding of the node using either the default
-     * transition effect ('fadeOut'), or the given named effect.
-     * @method hide
-     * @param {String} name A named Transition effect to use as the show effect.
-     * @param {Object} config Options to use with the transition.
-     * @param {Function} callback An optional function to run after the transition completes.
-     * @chainable
-     */
-    hide: function(callback) {
-        callback = arguments[arguments.length - 1];
-        this.toggleView(false, callback);
-        return this;
-    },
-
-    /**
-     * The implementation for hiding nodes.
-     * Default is to set the hidden attribute to true and set the CSS style.display to 'none'.
-     * @method _hide
-     * @protected
-     * @chainable
-     */
-    _hide: function() {
-        this.setAttribute('hidden', 'hidden');
-
-        // For back-compat we need to leave this in for browsers that
-        // do not visually hide a node via the hidden attribute
-        // and for users that check visibility based on style display.
-        this.setStyle('display', 'none');
-    }
-});
-
-Y.NodeList.importMethod(Y.Node.prototype, [
-    /**
-     * Makes each node visible.
-     * If the "transition" module is loaded, show optionally
-     * animates the showing of the node using either the default
-     * transition effect ('fadeIn'), or the given named effect.
-     * @method show
-     * @param {String} name A named Transition effect to use as the show effect.
-     * @param {Object} config Options to use with the transition.
-     * @param {Function} callback An optional function to run after the transition completes.
-     * @for NodeList
-     * @chainable
-     */
-    'show',
-
-    /**
-     * Hides each node.
-     * If the "transition" module is loaded, hide optionally
-     * animates the hiding of the node using either the default
-     * transition effect ('fadeOut'), or the given named effect.
-     * @method hide
-     * @param {String} name A named Transition effect to use as the show effect.
-     * @param {Object} config Options to use with the transition.
-     * @param {Function} callback An optional function to run after the transition completes.
-     * @chainable
-     */
-    'hide',
-
-    /**
-     * Displays or hides each node.
-     * If the "transition" module is loaded, toggleView optionally
-     * animates the toggling of the nodes using given named effect.
-     * @method toggleView
-     * @param {Boolean} [on] An optional boolean value to force the nodes to be shown or hidden
-     * @param {Function} [callback] An optional function to run after the transition completes.
-     * @chainable
-     */
-    'toggleView'
-]);
-
-
-}, '3.16.0', {"requires": ["dom-style", "node-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('widget-base', function (Y, NAME) {
-
-/**
- * Provides the base Widget class, with HTML Parser support
- *
- * @module widget
- * @main widget
- */
-
-/**
- * Provides the base Widget class
- *
- * @module widget
- * @submodule widget-base
- */
-var L = Y.Lang,
-    Node = Y.Node,
-
-    ClassNameManager = Y.ClassNameManager,
-
-    _getClassName = ClassNameManager.getClassName,
-    _getWidgetClassName,
-
-    _toInitialCap = Y.cached(function(str) {
-        return str.substring(0, 1).toUpperCase() + str.substring(1);
-    }),
-
-    // K-Weight, IE GC optimizations
-    CONTENT = "content",
-    VISIBLE = "visible",
-    HIDDEN = "hidden",
-    DISABLED = "disabled",
-    FOCUSED = "focused",
-    WIDTH = "width",
-    HEIGHT = "height",
-    BOUNDING_BOX = "boundingBox",
-    CONTENT_BOX = "contentBox",
-    PARENT_NODE = "parentNode",
-    OWNER_DOCUMENT = "ownerDocument",
-    AUTO = "auto",
-    SRC_NODE = "srcNode",
-    BODY = "body",
-    TAB_INDEX = "tabIndex",
-    ID = "id",
-    RENDER = "render",
-    RENDERED = "rendered",
-    DESTROYED = "destroyed",
-    STRINGS = "strings",
-    DIV = "<div></div>",
-    CHANGE = "Change",
-    LOADING = "loading",
-
-    _UISET = "_uiSet",
-
-    EMPTY_STR = "",
-    EMPTY_FN = function() {},
-
-    TRUE = true,
-    FALSE = false,
-
-    UI,
-    ATTRS = {},
-    UI_ATTRS = [VISIBLE, DISABLED, HEIGHT, WIDTH, FOCUSED, TAB_INDEX],
-
-    WEBKIT = Y.UA.webkit,
-
-    // Widget nodeid-to-instance map.
-    _instances = {};
-
-/**
- * A base class for widgets, providing:
- * <ul>
- *    <li>The render lifecycle method, in addition to the init and destroy
- *        lifecycle methods provide by Base</li>
- *    <li>Abstract methods to support consistent MVC structure across
- *        widgets: renderer, renderUI, bindUI, syncUI</li>
- *    <li>Support for common widget attributes, such as boundingBox, contentBox, visible,
- *        disabled, focused, strings</li>
- * </ul>
- *
- * @param config {Object} Object literal specifying widget configuration properties.
- *
- * @class Widget
- * @constructor
- * @extends Base
- */
-function Widget(config) {
-
-    // kweight
-    var widget = this,
-        parentNode,
-        render,
-        constructor = widget.constructor;
-
-    widget._strs = {};
-    widget._cssPrefix = constructor.CSS_PREFIX || _getClassName(constructor.NAME.toLowerCase());
-
-    // We need a config for HTML_PARSER to work.
-    config = config || {};
-
-    Widget.superclass.constructor.call(widget, config);
-
-    render = widget.get(RENDER);
-
-    if (render) {
-        // Render could be a node or boolean
-        if (render !== TRUE) {
-            parentNode = render;
-        }
-        widget.render(parentNode);
-    }
-}
-
-/**
- * Static property provides a string to identify the class.
- * <p>
- * Currently used to apply class identifiers to the bounding box
- * and to classify events fired by the widget.
- * </p>
- *
- * @property NAME
- * @type String
- * @static
- */
-Widget.NAME = "widget";
-
-/**
- * Constant used to identify state changes originating from
- * the DOM (as opposed to the JavaScript model).
- *
- * @property UI_SRC
- * @type String
- * @static
- * @final
- */
-UI = Widget.UI_SRC = "ui";
-
-/**
- * Static property used to define the default attribute
- * configuration for the Widget.
- *
- * @property ATTRS
- * @type Object
- * @static
- */
-Widget.ATTRS = ATTRS;
-
-// Trying to optimize kweight by setting up attrs this way saves about 0.4K min'd
-
-/**
- * @attribute id
- * @writeOnce
- * @default Generated using guid()
- * @type String
- */
-
-ATTRS[ID] = {
-    valueFn: "_guid",
-    writeOnce: TRUE
-};
-
-/**
- * Flag indicating whether or not this Widget
- * has been through the render lifecycle phase.
- *
- * @attribute rendered
- * @readOnly
- * @default false
- * @type boolean
- */
-ATTRS[RENDERED] = {
-    value:FALSE,
-    readOnly: TRUE
-};
-
-/**
- * @attribute boundingBox
- * @description The outermost DOM node for the Widget, used for sizing and positioning
- * of a Widget as well as a containing element for any decorator elements used
- * for skinning.
- * @type String | Node
- * @writeOnce
- */
-ATTRS[BOUNDING_BOX] = {
-    valueFn:"_defaultBB",
-    setter: "_setBB",
-    writeOnce: TRUE
-};
-
-/**
- * @attribute contentBox
- * @description A DOM node that is a direct descendant of a Widget's bounding box that
- * houses its content.
- * @type String | Node
- * @writeOnce
- */
-ATTRS[CONTENT_BOX] = {
-    valueFn:"_defaultCB",
-    setter: "_setCB",
-    writeOnce: TRUE
-};
-
-/**
- * @attribute tabIndex
- * @description Number (between -32767 to 32767) indicating the widget's
- * position in the default tab flow.  The value is used to set the
- * "tabIndex" attribute on the widget's bounding box.  Negative values allow
- * the widget to receive DOM focus programmatically (by calling the focus
- * method), while being removed from the default tab flow.  A value of
- * null removes the "tabIndex" attribute from the widget's bounding box.
- * @type Number
- * @default null
- */
-ATTRS[TAB_INDEX] = {
-    value: null,
-    validator: "_validTabIndex"
-};
-
-/**
- * @attribute focused
- * @description Boolean indicating if the Widget, or one of its descendants,
- * has focus.
- * @readOnly
- * @default false
- * @type boolean
- */
-ATTRS[FOCUSED] = {
-    value: FALSE,
-    readOnly:TRUE
-};
-
-/**
- * @attribute disabled
- * @description Boolean indicating if the Widget should be disabled. The disabled implementation
- * is left to the specific classes extending widget.
- * @default false
- * @type boolean
- */
-ATTRS[DISABLED] = {
-    value: FALSE
-};
-
-/**
- * @attribute visible
- * @description Boolean indicating whether or not the Widget is visible.
- * @default TRUE
- * @type boolean
- */
-ATTRS[VISIBLE] = {
-    value: TRUE
-};
-
-/**
- * @attribute height
- * @description String with units, or number, representing the height of the Widget. If a number is provided,
- * the default unit, defined by the Widgets DEF_UNIT, property is used.
- * @default EMPTY_STR
- * @type {String | Number}
- */
-ATTRS[HEIGHT] = {
-    value: EMPTY_STR
-};
-
-/**
- * @attribute width
- * @description String with units, or number, representing the width of the Widget. If a number is provided,
- * the default unit, defined by the Widgets DEF_UNIT, property is used.
- * @default EMPTY_STR
- * @type {String | Number}
- */
-ATTRS[WIDTH] = {
-    value: EMPTY_STR
-};
-
-/**
- * @attribute strings
- * @description Collection of strings used to label elements of the Widget's UI.
- * @default null
- * @type Object
- */
-ATTRS[STRINGS] = {
-    value: {},
-    setter: "_strSetter",
-    getter: "_strGetter"
-};
-
-/**
- * Whether or not to render the widget automatically after init, and optionally, to which parent node.
- *
- * @attribute render
- * @type boolean | Node
- * @writeOnce
- */
-ATTRS[RENDER] = {
-    value:FALSE,
-    writeOnce:TRUE
-};
-
-/**
- * The css prefix which the static Widget.getClassName method should use when constructing class names
- *
- * @property CSS_PREFIX
- * @type String
- * @default Widget.NAME.toLowerCase()
- * @private
- * @static
- */
-Widget.CSS_PREFIX = _getClassName(Widget.NAME.toLowerCase());
-
-/**
- * Generate a standard prefixed classname for the Widget, prefixed by the default prefix defined
- * by the <code>Y.config.classNamePrefix</code> attribute used by <code>ClassNameManager</code> and
- * <code>Widget.NAME.toLowerCase()</code> (e.g. "yui-widget-xxxxx-yyyyy", based on default values for
- * the prefix and widget class name).
- * <p>
- * The instance based version of this method can be used to generate standard prefixed classnames,
- * based on the instances NAME, as opposed to Widget.NAME. This method should be used when you
- * need to use a constant class name across different types instances.
- * </p>
- * @method getClassName
- * @param {String*} args* 0..n strings which should be concatenated, using the default separator defined by ClassNameManager, to create the class name
- */
-Widget.getClassName = function() {
-    // arguments needs to be array'fied to concat
-    return _getClassName.apply(ClassNameManager, [Widget.CSS_PREFIX].concat(Y.Array(arguments), true));
-};
-
-_getWidgetClassName = Widget.getClassName;
-
-/**
- * Returns the widget instance whose bounding box contains, or is, the given node.
- * <p>
- * In the case of nested widgets, the nearest bounding box ancestor is used to
- * return the widget instance.
- * </p>
- * @method getByNode
- * @static
- * @param node {Node | String} The node for which to return a Widget instance. If a selector
- * string is passed in, which selects more than one node, the first node found is used.
- * @return {Widget} Widget instance, or null if not found.
- */
-Widget.getByNode = function(node) {
-    var widget,
-        widgetMarker = _getWidgetClassName();
-
-    node = Node.one(node);
-    if (node) {
-        node = node.ancestor("." + widgetMarker, true);
-        if (node) {
-            widget = _instances[Y.stamp(node, true)];
-        }
-    }
-
-    return widget || null;
-};
-
-Y.extend(Widget, Y.Base, {
-
-    /**
-     * Returns a class name prefixed with the the value of the
-     * <code>YUI.config.classNamePrefix</code> attribute + the instances <code>NAME</code> property.
-     * Uses <code>YUI.config.classNameDelimiter</code> attribute to delimit the provided strings.
-     * e.g.
-     * <code>
-     * <pre>
-     *    // returns "yui-slider-foo-bar", for a slider instance
-     *    var scn = slider.getClassName('foo','bar');
-     *
-     *    // returns "yui-overlay-foo-bar", for an overlay instance
-     *    var ocn = overlay.getClassName('foo','bar');
-     * </pre>
-     * </code>
-     *
-     * @method getClassName
-     * @param {String} [classnames*] One or more classname bits to be joined and prefixed
-     */
-    getClassName: function () {
-        return _getClassName.apply(ClassNameManager, [this._cssPrefix].concat(Y.Array(arguments), true));
-    },
-
-    /**
-     * Initializer lifecycle implementation for the Widget class. Registers the
-     * widget instance, and runs through the Widget's HTML_PARSER definition.
-     *
-     * @method initializer
-     * @protected
-     * @param  config {Object} Configuration object literal for the widget
-     */
-    initializer: function(config) {
-
-        var bb = this.get(BOUNDING_BOX);
-
-        if (bb instanceof Node) {
-            this._mapInstance(Y.stamp(bb));
-        }
-
-        /**
-         * Notification event, which widget implementations can fire, when
-         * they change the content of the widget. This event has no default
-         * behavior and cannot be prevented, so the "on" or "after"
-         * moments are effectively equivalent (with on listeners being invoked before
-         * after listeners).
-         *
-         * @event widget:contentUpdate
-         * @preventable false
-         * @param {EventFacade} e The Event Facade
-         */
-    },
-
-    /**
-     * Utility method used to add an entry to the boundingBox id to instance map.
-     *
-     * This method can be used to populate the instance with lazily created boundingBox Node references.
-     *
-     * @method _mapInstance
-     * @param {String} The boundingBox id
-     * @protected
-     */
-    _mapInstance : function(id) {
-        _instances[id] = this;
-    },
-
-    /**
-     * Destructor lifecycle implementation for the Widget class. Purges events attached
-     * to the bounding box and content box, removes them from the DOM and removes
-     * the Widget from the list of registered widgets.
-     *
-     * @method destructor
-     * @protected
-     */
-    destructor: function() {
-
-        var boundingBox = this.get(BOUNDING_BOX),
-            bbGuid;
-
-        if (boundingBox instanceof Node) {
-            bbGuid = Y.stamp(boundingBox,true);
-
-            if (bbGuid in _instances) {
-                delete _instances[bbGuid];
-            }
-
-            this._destroyBox();
-        }
-    },
-
-    /**
-     * <p>
-     * Destroy lifecycle method. Fires the destroy
-     * event, prior to invoking destructors for the
-     * class hierarchy.
-     *
-     * Overrides Base's implementation, to support arguments to destroy
-     * </p>
-     * <p>
-     * Subscribers to the destroy
-     * event can invoke preventDefault on the event object, to prevent destruction
-     * from proceeding.
-     * </p>
-     * @method destroy
-     * @param destroyAllNodes {Boolean} If true, all nodes contained within the Widget are
-     * removed and destroyed. Defaults to false due to potentially high run-time cost.
-     * @return {Widget} A reference to this object
-     * @chainable
-     */
-    destroy: function(destroyAllNodes) {
-        this._destroyAllNodes = destroyAllNodes;
-        return Widget.superclass.destroy.apply(this);
-    },
-
-    /**
-     * Removes and destroys the widgets rendered boundingBox, contentBox,
-     * and detaches bound UI events.
-     *
-     * @method _destroyBox
-     * @protected
-     */
-    _destroyBox : function() {
-
-        var boundingBox = this.get(BOUNDING_BOX),
-            contentBox = this.get(CONTENT_BOX),
-            deep = this._destroyAllNodes,
-            same;
-
-        same = boundingBox && boundingBox.compareTo(contentBox);
-
-        if (this.UI_EVENTS) {
-            this._destroyUIEvents();
-        }
-
-        this._unbindUI(boundingBox);
-
-        if (contentBox) {
-            if (deep) {
-                contentBox.empty();
-            }
-            contentBox.remove(TRUE);
-        }
-
-        if (!same) {
-            if (deep) {
-                boundingBox.empty();
-            }
-            boundingBox.remove(TRUE);
-        }
-    },
-
-    /**
-     * Establishes the initial DOM for the widget. Invoking this
-     * method will lead to the creating of all DOM elements for
-     * the widget (or the manipulation of existing DOM elements
-     * for the progressive enhancement use case).
-     * <p>
-     * This method should only be invoked once for an initialized
-     * widget.
-     * </p>
-     * <p>
-     * It delegates to the widget specific renderer method to do
-     * the actual work.
-     * </p>
-     *
-     * @method render
-     * @chainable
-     * @final
-     * @param  parentNode {Object | String} Optional. The Node under which the
-     * Widget is to be rendered. This can be a Node instance or a CSS selector string.
-     * <p>
-     * If the selector string returns more than one Node, the first node will be used
-     * as the parentNode. NOTE: This argument is required if both the boundingBox and contentBox
-     * are not currently in the document. If it's not provided, the Widget will be rendered
-     * to the body of the current document in this case.
-     * </p>
-     */
-    render: function(parentNode) {
-
-        if (!this.get(DESTROYED) && !this.get(RENDERED)) {
-             /**
-              * Lifecycle event for the render phase, fired prior to rendering the UI
-              * for the widget (prior to invoking the widget's renderer method).
-              * <p>
-              * Subscribers to the "on" moment of this event, will be notified
-              * before the widget is rendered.
-              * </p>
-              * <p>
-              * Subscribers to the "after" moment of this event, will be notified
-              * after rendering is complete.
-              * </p>
-              *
-              * @event render
-              * @preventable _defRenderFn
-              * @param {EventFacade} e The Event Facade
-              */
-            this.publish(RENDER, {
-                queuable:FALSE,
-                fireOnce:TRUE,
-                defaultTargetOnly:TRUE,
-                defaultFn: this._defRenderFn
-            });
-
-            this.fire(RENDER, {parentNode: (parentNode) ? Node.one(parentNode) : null});
-        }
-        return this;
-    },
-
-    /**
-     * Default render handler
-     *
-     * @method _defRenderFn
-     * @protected
-     * @param {EventFacade} e The Event object
-     * @param {Node} parentNode The parent node to render to, if passed in to the <code>render</code> method
-     */
-    _defRenderFn : function(e) {
-        this._parentNode = e.parentNode;
-
-        this.renderer();
-        this._set(RENDERED, TRUE);
-
-        this._removeLoadingClassNames();
-    },
-
-    /**
-     * Creates DOM (or manipulates DOM for progressive enhancement)
-     * This method is invoked by render() and is not chained
-     * automatically for the class hierarchy (unlike initializer, destructor)
-     * so it should be chained manually for subclasses if required.
-     *
-     * @method renderer
-     * @protected
-     */
-    renderer: function() {
-        // kweight
-        var widget = this;
-
-        widget._renderUI();
-        widget.renderUI();
-
-        widget._bindUI();
-        widget.bindUI();
-
-        widget._syncUI();
-        widget.syncUI();
-    },
-
-    /**
-     * Configures/Sets up listeners to bind Widget State to UI/DOM
-     *
-     * This method is not called by framework and is not chained
-     * automatically for the class hierarchy.
-     *
-     * @method bindUI
-     * @protected
-     */
-    bindUI: EMPTY_FN,
-
-    /**
-     * Adds nodes to the DOM
-     *
-     * This method is not called by framework and is not chained
-     * automatically for the class hierarchy.
-     *
-     * @method renderUI
-     * @protected
-     */
-    renderUI: EMPTY_FN,
-
-    /**
-     * Refreshes the rendered UI, based on Widget State
-     *
-     * This method is not called by framework and is not chained
-     * automatically for the class hierarchy.
-     *
-     * @method syncUI
-     * @protected
-     *
-     */
-    syncUI: EMPTY_FN,
-
-    /**
-     * @method hide
-     * @description Hides the Widget by setting the "visible" attribute to "false".
-     * @chainable
-     */
-    hide: function() {
-        return this.set(VISIBLE, FALSE);
-    },
-
-    /**
-     * @method show
-     * @description Shows the Widget by setting the "visible" attribute to "true".
-     * @chainable
-     */
-    show: function() {
-        return this.set(VISIBLE, TRUE);
-    },
-
-    /**
-     * @method focus
-     * @description Causes the Widget to receive the focus by setting the "focused"
-     * attribute to "true".
-     * @chainable
-     */
-    focus: function () {
-        return this._set(FOCUSED, TRUE);
-    },
-
-    /**
-     * @method blur
-     * @description Causes the Widget to lose focus by setting the "focused" attribute
-     * to "false"
-     * @chainable
-     */
-    blur: function () {
-        return this._set(FOCUSED, FALSE);
-    },
-
-    /**
-     * @method enable
-     * @description Set the Widget's "disabled" attribute to "false".
-     * @chainable
-     */
-    enable: function() {
-        return this.set(DISABLED, FALSE);
-    },
-
-    /**
-     * @method disable
-     * @description Set the Widget's "disabled" attribute to "true".
-     * @chainable
-     */
-    disable: function() {
-        return this.set(DISABLED, TRUE);
-    },
-
-    /**
-     * @method _uiSizeCB
-     * @protected
-     * @param {boolean} expand
-     */
-    _uiSizeCB : function(expand) {
-        this.get(CONTENT_BOX).toggleClass(_getWidgetClassName(CONTENT, "expanded"), expand);
-    },
-
-    /**
-     * Helper method to collect the boundingBox and contentBox and append to the provided parentNode, if not
-     * already a child. The owner document of the boundingBox, or the owner document of the contentBox will be used
-     * as the document into which the Widget is rendered if a parentNode is node is not provided. If both the boundingBox and
-     * the contentBox are not currently in the document, and no parentNode is provided, the widget will be rendered
-     * to the current document's body.
-     *
-     * @method _renderBox
-     * @private
-     * @param {Node} parentNode The parentNode to render the widget to. If not provided, and both the boundingBox and
-     * the contentBox are not currently in the document, the widget will be rendered to the current document's body.
-     */
-    _renderBox: function(parentNode) {
-
-        // TODO: Performance Optimization [ More effective algo to reduce Node refs, compares, replaces? ]
-
-        var widget = this, // kweight
-            contentBox = widget.get(CONTENT_BOX),
-            boundingBox = widget.get(BOUNDING_BOX),
-            srcNode = widget.get(SRC_NODE),
-            defParentNode = widget.DEF_PARENT_NODE,
-
-            doc = (srcNode && srcNode.get(OWNER_DOCUMENT)) || boundingBox.get(OWNER_DOCUMENT) || contentBox.get(OWNER_DOCUMENT);
-
-        // If srcNode (assume it's always in doc), have contentBox take its place (widget render responsible for re-use of srcNode contents)
-        if (srcNode && !srcNode.compareTo(contentBox) && !contentBox.inDoc(doc)) {
-            srcNode.replace(contentBox);
-        }
-
-        if (!boundingBox.compareTo(contentBox.get(PARENT_NODE)) && !boundingBox.compareTo(contentBox)) {
-            // If contentBox box is already in the document, have boundingBox box take it's place
-            if (contentBox.inDoc(doc)) {
-                contentBox.replace(boundingBox);
-            }
-            boundingBox.appendChild(contentBox);
-        }
-
-        parentNode = parentNode || (defParentNode && Node.one(defParentNode));
-
-        if (parentNode) {
-            parentNode.appendChild(boundingBox);
-        } else if (!boundingBox.inDoc(doc)) {
-            Node.one(BODY).insert(boundingBox, 0);
-        }
-    },
-
-    /**
-     * Setter for the boundingBox attribute
-     *
-     * @method _setBB
-     * @private
-     * @param {Node|String} node
-     * @return Node
-     */
-    _setBB: function(node) {
-        return this._setBox(this.get(ID), node, this.BOUNDING_TEMPLATE, true);
-    },
-
-    /**
-     * Setter for the contentBox attribute
-     *
-     * @method _setCB
-     * @private
-     * @param {Node|String} node
-     * @return Node
-     */
-    _setCB: function(node) {
-        return (this.CONTENT_TEMPLATE === null) ? this.get(BOUNDING_BOX) : this._setBox(null, node, this.CONTENT_TEMPLATE, false);
-    },
-
-    /**
-     * Returns the default value for the boundingBox attribute.
-     *
-     * For the Widget class, this will most commonly be null (resulting in a new
-     * boundingBox node instance being created), unless a srcNode was provided
-     * and CONTENT_TEMPLATE is null, in which case it will be srcNode.
-     * This behavior was introduced in 3.16.0 to accomodate single-box widgets
-     * whose BB & CB both point to srcNode (e.g. Y.Button).
-     *
-     * @method _defaultBB
-     * @protected
-     */
-    _defaultBB : function() {
-        var node = this.get(SRC_NODE),
-            nullCT = (this.CONTENT_TEMPLATE === null);
-
-        return ((node && nullCT) ? node : null);
-    },
-
-    /**
-     * Returns the default value for the contentBox attribute.
-     *
-     * For the Widget class, this will be the srcNode if provided, otherwise null (resulting in
-     * a new contentBox node instance being created)
-     *
-     * @method _defaultCB
-     * @protected
-     */
-    _defaultCB : function(node) {
-        return this.get(SRC_NODE) || null;
-    },
-
-    /**
-     * Helper method to set the bounding/content box, or create it from
-     * the provided template if not found.
-     *
-     * @method _setBox
-     * @private
-     *
-     * @param {String} id The node's id attribute
-     * @param {Node|String} node The node reference
-     * @param {String} template HTML string template for the node
-     * @param {boolean} isBounding true if this is the boundingBox, false if it's the contentBox
-     * @return {Node} The node
-     */
-    _setBox : function(id, node, template, isBounding) {
-
-        node = Node.one(node);
-
-        if (!node) {
-            node = Node.create(template);
-
-            if (isBounding) {
-                this._bbFromTemplate = true;
-            } else {
-                this._cbFromTemplate = true;
-            }
-        }
-
-        if (!node.get(ID)) {
-            node.set(ID, id || Y.guid());
-        }
-
-        return node;
-    },
-
-    /**
-     * Initializes the UI state for the Widget's bounding/content boxes.
-     *
-     * @method _renderUI
-     * @protected
-     */
-    _renderUI: function() {
-        this._renderBoxClassNames();
-        this._renderBox(this._parentNode);
-    },
-
-    /**
-     * Applies standard class names to the boundingBox and contentBox
-     *
-     * @method _renderBoxClassNames
-     * @protected
-     */
-    _renderBoxClassNames : function() {
-        var classes = this._getClasses(),
-            cl,
-            boundingBox = this.get(BOUNDING_BOX),
-            i;
-
-        boundingBox.addClass(_getWidgetClassName());
-
-        // Start from Widget Sub Class
-        for (i = classes.length-3; i >= 0; i--) {
-            cl = classes[i];
-            boundingBox.addClass(cl.CSS_PREFIX || _getClassName(cl.NAME.toLowerCase()));
-        }
-
-        // Use instance based name for content box
-        this.get(CONTENT_BOX).addClass(this.getClassName(CONTENT));
-    },
-
-    /**
-     * Removes class names representative of the widget's loading state from
-     * the boundingBox.
-     *
-     * @method _removeLoadingClassNames
-     * @protected
-     */
-    _removeLoadingClassNames: function () {
-
-        var boundingBox = this.get(BOUNDING_BOX),
-            contentBox = this.get(CONTENT_BOX),
-            instClass = this.getClassName(LOADING),
-            widgetClass = _getWidgetClassName(LOADING);
-
-        boundingBox.removeClass(widgetClass)
-                   .removeClass(instClass);
-
-        contentBox.removeClass(widgetClass)
-                  .removeClass(instClass);
-    },
-
-    /**
-     * Sets up DOM and CustomEvent listeners for the widget.
-     *
-     * @method _bindUI
-     * @protected
-     */
-    _bindUI: function() {
-        this._bindAttrUI(this._UI_ATTRS.BIND);
-        this._bindDOM();
-    },
-
-    /**
-     * @method _unbindUI
-     * @protected
-     */
-    _unbindUI : function(boundingBox) {
-        this._unbindDOM(boundingBox);
-    },
-
-    /**
-     * Sets up DOM listeners, on elements rendered by the widget.
-     *
-     * @method _bindDOM
-     * @protected
-     */
-    _bindDOM : function() {
-        var oDocument = this.get(BOUNDING_BOX).get(OWNER_DOCUMENT),
-            focusHandle = Widget._hDocFocus;
-
-        // Shared listener across all Widgets.
-        if (!focusHandle) {
-            focusHandle = Widget._hDocFocus = oDocument.on("focus", this._onDocFocus, this);
-            focusHandle.listeners = {
-                count: 0
-            };
-        }
-
-        focusHandle.listeners[Y.stamp(this, true)] = true;
-        focusHandle.listeners.count++;
-
-        //	Fix for Webkit:
-        //	Document doesn't receive focus in Webkit when the user mouses
-        //	down on it, so the "focused" attribute won't get set to the
-        //	correct value. Keeping this instance based for now, potential better performance.
-        //  Otherwise we'll end up looking up widgets from the DOM on every mousedown.
-        if (WEBKIT){
-            this._hDocMouseDown = oDocument.on("mousedown", this._onDocMouseDown, this);
-        }
-    },
-
-    /**
-     * @method _unbindDOM
-     * @protected
-     */
-    _unbindDOM : function(boundingBox) {
-
-        var focusHandle = Widget._hDocFocus,
-            yuid = Y.stamp(this, true),
-            focusListeners,
-            mouseHandle = this._hDocMouseDown;
-
-        if (focusHandle) {
-
-            focusListeners = focusHandle.listeners;
-
-            if (focusListeners[yuid]) {
-                delete focusListeners[yuid];
-                focusListeners.count--;
-            }
-
-            if (focusListeners.count === 0) {
-                focusHandle.detach();
-                Widget._hDocFocus = null;
-            }
-        }
-
-        if (WEBKIT && mouseHandle) {
-            mouseHandle.detach();
-        }
-    },
-
-    /**
-     * Updates the widget UI to reflect the attribute state.
-     *
-     * @method _syncUI
-     * @protected
-     */
-    _syncUI: function() {
-        this._syncAttrUI(this._UI_ATTRS.SYNC);
-    },
-
-    /**
-     * Sets the height on the widget's bounding box element
-     *
-     * @method _uiSetHeight
-     * @protected
-     * @param {String | Number} val
-     */
-    _uiSetHeight: function(val) {
-        this._uiSetDim(HEIGHT, val);
-        this._uiSizeCB((val !== EMPTY_STR && val !== AUTO));
-    },
-
-    /**
-     * Sets the width on the widget's bounding box element
-     *
-     * @method _uiSetWidth
-     * @protected
-     * @param {String | Number} val
-     */
-    _uiSetWidth: function(val) {
-        this._uiSetDim(WIDTH, val);
-    },
-
-    /**
-     * @method _uiSetDim
-     * @private
-     * @param {String} dim The dimension - "width" or "height"
-     * @param {Number | String} val The value to set
-     */
-    _uiSetDim: function(dimension, val) {
-        this.get(BOUNDING_BOX).setStyle(dimension, L.isNumber(val) ? val + this.DEF_UNIT : val);
-    },
-
-    /**
-     * Sets the visible state for the UI
-     *
-     * @method _uiSetVisible
-     * @protected
-     * @param {boolean} val
-     */
-    _uiSetVisible: function(val) {
-        this.get(BOUNDING_BOX).toggleClass(this.getClassName(HIDDEN), !val);
-    },
-
-    /**
-     * Sets the disabled state for the UI
-     *
-     * @method _uiSetDisabled
-     * @protected
-     * @param {boolean} val
-     */
-    _uiSetDisabled: function(val) {
-        this.get(BOUNDING_BOX).toggleClass(this.getClassName(DISABLED), val);
-    },
-
-    /**
-     * Sets the focused state for the UI
-     *
-     * @method _uiSetFocused
-     * @protected
-     * @param {boolean} val
-     * @param {string} src String representing the source that triggered an update to
-     * the UI.
-     */
-    _uiSetFocused: function(val, src) {
-         var boundingBox = this.get(BOUNDING_BOX);
-         boundingBox.toggleClass(this.getClassName(FOCUSED), val);
-
-         if (src !== UI) {
-            if (val) {
-                boundingBox.focus();
-            } else {
-                boundingBox.blur();
-            }
-         }
-    },
-
-    /**
-     * Set the tabIndex on the widget's rendered UI
-     *
-     * @method _uiSetTabIndex
-     * @protected
-     * @param Number
-     */
-    _uiSetTabIndex: function(index) {
-        var boundingBox = this.get(BOUNDING_BOX);
-
-        if (L.isNumber(index)) {
-            boundingBox.set(TAB_INDEX, index);
-        } else {
-            boundingBox.removeAttribute(TAB_INDEX);
-        }
-    },
-
-    /**
-     * @method _onDocMouseDown
-     * @description "mousedown" event handler for the owner document of the
-     * widget's bounding box.
-     * @protected
-     * @param {EventFacade} evt The event facade for the DOM focus event
-     */
-    _onDocMouseDown: function (evt) {
-        if (this._domFocus) {
-            this._onDocFocus(evt);
-        }
-    },
-
-    /**
-     * DOM focus event handler, used to sync the state of the Widget with the DOM
-     *
-     * @method _onDocFocus
-     * @protected
-     * @param {EventFacade} evt The event facade for the DOM focus event
-     */
-    _onDocFocus: function (evt) {
-        var widget = Widget.getByNode(evt.target),
-            activeWidget = Widget._active;
-
-        if (activeWidget && (activeWidget !== widget)) {
-            activeWidget._domFocus = false;
-            activeWidget._set(FOCUSED, false, {src:UI});
-
-            Widget._active = null;
-        }
-
-        if (widget) {
-            widget._domFocus = true;
-            widget._set(FOCUSED, true, {src:UI});
-
-            Widget._active = widget;
-        }
-    },
-
-    /**
-     * Generic toString implementation for all widgets.
-     *
-     * @method toString
-     * @return {String} The default string value for the widget [ displays the NAME of the instance, and the unique id ]
-     */
-    toString: function() {
-        // Using deprecated name prop for kweight squeeze.
-        return this.name + "[" + this.get(ID) + "]";
-    },
-
-    /**
-     * Default unit to use for dimension values
-     *
-     * @property DEF_UNIT
-     * @type String
-     */
-    DEF_UNIT : "px",
-
-    /**
-     * Default node to render the bounding box to. If not set,
-     * will default to the current document body.
-     *
-     * @property DEF_PARENT_NODE
-     * @type String | Node
-     */
-    DEF_PARENT_NODE : null,
-
-    /**
-     * Property defining the markup template for content box. If your Widget doesn't
-     * need the dual boundingBox/contentBox structure, set CONTENT_TEMPLATE to null,
-     * and contentBox and boundingBox will both point to the same Node.
-     *
-     * @property CONTENT_TEMPLATE
-     * @type String
-     */
-    CONTENT_TEMPLATE : DIV,
-
-    /**
-     * Property defining the markup template for bounding box.
-     *
-     * @property BOUNDING_TEMPLATE
-     * @type String
-     */
-    BOUNDING_TEMPLATE : DIV,
-
-    /**
-     * @method _guid
-     * @protected
-     */
-    _guid : function() {
-        return Y.guid();
-    },
-
-    /**
-     * @method _validTabIndex
-     * @protected
-     * @param {Number} tabIndex
-     */
-    _validTabIndex : function (tabIndex) {
-        return (L.isNumber(tabIndex) || L.isNull(tabIndex));
-    },
-
-    /**
-     * Binds after listeners for the list of attributes provided
-     *
-     * @method _bindAttrUI
-     * @private
-     * @param {Array} attrs
-     */
-    _bindAttrUI : function(attrs) {
-        var i,
-            l = attrs.length;
-
-        for (i = 0; i < l; i++) {
-            this.after(attrs[i] + CHANGE, this._setAttrUI);
-        }
-    },
-
-    /**
-     * Invokes the _uiSet&#61;ATTR NAME&#62; method for the list of attributes provided
-     *
-     * @method _syncAttrUI
-     * @private
-     * @param {Array} attrs
-     */
-    _syncAttrUI : function(attrs) {
-        var i, l = attrs.length, attr;
-        for (i = 0; i < l; i++) {
-            attr = attrs[i];
-            this[_UISET + _toInitialCap(attr)](this.get(attr));
-        }
-    },
-
-    /**
-     * @method _setAttrUI
-     * @private
-     * @param {EventFacade} e
-     */
-    _setAttrUI : function(e) {
-        if (e.target === this) {
-            this[_UISET + _toInitialCap(e.attrName)](e.newVal, e.src);
-        }
-    },
-
-    /**
-     * The default setter for the strings attribute. Merges partial sets
-     * into the full string set, to allow users to partial sets of strings
-     *
-     * @method _strSetter
-     * @protected
-     * @param {Object} strings
-     * @return {String} The full set of strings to set
-     */
-    _strSetter : function(strings) {
-        return Y.merge(this.get(STRINGS), strings);
-    },
-
-    /**
-     * Helper method to get a specific string value
-     *
-     * @deprecated Used by deprecated WidgetLocale implementations.
-     * @method getString
-     * @param {String} key
-     * @return {String} The string
-     */
-    getString : function(key) {
-        return this.get(STRINGS)[key];
-    },
-
-    /**
-     * Helper method to get the complete set of strings for the widget
-     *
-     * @deprecated  Used by deprecated WidgetLocale implementations.
-     * @method getStrings
-     * @param {String} key
-     * @return {String} The strings
-     */
-    getStrings : function() {
-        return this.get(STRINGS);
-    },
-
-    /**
-     * The lists of UI attributes to bind and sync for widget's _bindUI and _syncUI implementations
-     *
-     * @property _UI_ATTRS
-     * @type Object
-     * @private
-     */
-    _UI_ATTRS : {
-        BIND: UI_ATTRS,
-        SYNC: UI_ATTRS
-    }
-});
-
-Y.Widget = Widget;
-
-
-}, '3.16.0', {
-    "requires": [
-        "attribute",
-        "base-base",
-        "base-pluginhost",
-        "classnamemanager",
-        "event-focus",
-        "node-base",
-        "node-style"
-    ],
-    "skinnable": true
-});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('widget-htmlparser', function (Y, NAME) {
-
-/**
- * Adds HTML Parser support to the base Widget class
- *
- * @module widget
- * @submodule widget-htmlparser
- * @for Widget
- */
-
-var Widget = Y.Widget,
-    Node = Y.Node,
-    Lang = Y.Lang,
-
-    SRC_NODE = "srcNode",
-    CONTENT_BOX = "contentBox";
-
-/**
- * Object hash, defining how attribute values are to be parsed from
- * markup contained in the widget's content box. e.g.:
- * <pre>
- *   {
- *       // Set single Node references using selector syntax
- *       // (selector is run through node.one)
- *       titleNode: "span.yui-title",
- *       // Set NodeList references using selector syntax
- *       // (array indicates selector is to be run through node.all)
- *       listNodes: ["li.yui-item"],
- *       // Set other attribute types, using a parse function.
- *       // Context is set to the widget instance.
- *       label: function(contentBox) {
- *           return contentBox.one("span.title").get("innerHTML");
- *       }
- *   }
- * </pre>
- *
- * @property HTML_PARSER
- * @type Object
- * @static
- */
-Widget.HTML_PARSER = {};
-
-/**
- * The build configuration for the Widget class.
- * <p>
- * Defines the static fields which need to be aggregated,
- * when this class is used as the main class passed to
- * the <a href="Base.html#method_build">Base.build</a> method.
- * </p>
- * @property _buildCfg
- * @type Object
- * @static
- * @final
- * @private
- */
-Widget._buildCfg = {
-    aggregates : ["HTML_PARSER"]
-};
-
-/**
- * The DOM node to parse for configuration values, passed to the Widget's HTML_PARSER definition
- *
- * @attribute srcNode
- * @type String | Node
- * @writeOnce
- */
-Widget.ATTRS[SRC_NODE] = {
-    value: null,
-    setter: Node.one,
-    getter: "_getSrcNode",
-    writeOnce: true
-};
-
-Y.mix(Widget.prototype, {
-
-    /**
-     * @method _getSrcNode
-     * @protected
-     * @return {Node} The Node to apply HTML_PARSER to
-     */
-    _getSrcNode : function(val) {
-        return val || this.get(CONTENT_BOX);
-    },
-
-    /**
-     * Implement the BaseCore _preAddAttrs method hook, to add
-     * the srcNode and related attributes, so that HTML_PARSER
-     * (which relies on `this.get("srcNode")`) can merge in it's
-     * results before the rest of the attributes are added.
-     *
-     * @method _preAddAttrs
-     * @protected
-     *
-     * @param attrs {Object} The full hash of statically defined ATTRS
-     * attributes being added for this instance
-     *
-     * @param userVals {Object} The hash of user values passed to
-     * the constructor
-     *
-     * @param lazy {boolean} Whether or not to add the attributes lazily
-     */
-    _preAddAttrs : function(attrs, userVals, lazy) {
-
-        var preAttrs = {
-            id : attrs.id,
-            boundingBox : attrs.boundingBox,
-            contentBox : attrs.contentBox,
-            srcNode : attrs.srcNode
-        };
-
-        this.addAttrs(preAttrs, userVals, lazy);
-
-        delete attrs.boundingBox;
-        delete attrs.contentBox;
-        delete attrs.srcNode;
-        delete attrs.id;
-
-        if (this._applyParser) {
-            this._applyParser(userVals);
-        }
-    },
-
-    /**
-     * @method _applyParsedConfig
-     * @protected
-     * @return {Object} The merged configuration literal
-     */
-    _applyParsedConfig : function(node, cfg, parsedCfg) {
-        return (parsedCfg) ? Y.mix(cfg, parsedCfg, false) : cfg;
-    },
-
-    /**
-     * Utility method used to apply the <code>HTML_PARSER</code> configuration for the
-     * instance, to retrieve config data values.
-     *
-     * @method _applyParser
-     * @protected
-     * @param config {Object} User configuration object (will be populated with values from Node)
-     */
-    _applyParser : function(config) {
-
-        var widget = this,
-            srcNode = this._getNodeToParse(),
-            schema = widget._getHtmlParser(),
-            parsedConfig,
-            val;
-
-        if (schema && srcNode) {
-            Y.Object.each(schema, function(v, k, o) {
-                val = null;
-
-                if (Lang.isFunction(v)) {
-                    val = v.call(widget, srcNode);
-                } else {
-                    if (Lang.isArray(v)) {
-                        val = srcNode.all(v[0]);
-                        if (val.isEmpty()) {
-                            val = null;
-                        }
-                    } else {
-                        val = srcNode.one(v);
-                    }
-                }
-
-                if (val !== null && val !== undefined) {
-                    parsedConfig = parsedConfig || {};
-                    parsedConfig[k] = val;
-                }
-            });
-        }
-        config = widget._applyParsedConfig(srcNode, config, parsedConfig);
-    },
-
-    /**
-     * Determines whether we have a node reference which we should try and parse.
-     *
-     * The current implementation does not parse nodes generated from CONTENT_TEMPLATE,
-     * only explicitly set srcNode, or contentBox attributes.
-     *
-     * @method _getNodeToParse
-     * @return {Node} The node reference to apply HTML_PARSER to.
-     * @private
-     */
-    _getNodeToParse : function() {
-        var srcNode = this.get("srcNode");
-        return (!this._cbFromTemplate) ? srcNode : null;
-    },
-
-    /**
-     * Gets the HTML_PARSER definition for this instance, by merging HTML_PARSER
-     * definitions across the class hierarchy.
-     *
-     * @private
-     * @method _getHtmlParser
-     * @return {Object} HTML_PARSER definition for this instance
-     */
-    _getHtmlParser : function() {
-        // Removed caching for kweight. This is a private method
-        // and only called once so don't need to cache HTML_PARSER
-        var classes = this._getClasses(),
-            parser = {},
-            i, p;
-
-        for (i = classes.length - 1; i >= 0; i--) {
-            p = classes[i].HTML_PARSER;
-            if (p) {
-                Y.mix(parser, p, true);
-            }
-        }
-        return parser;
-    }
-});
-
-
-}, '3.16.0', {"requires": ["widget-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('widget-skin', function (Y, NAME) {
-
-/**
- * Provides skin related utlility methods.
- *
- * @module widget
- * @submodule widget-skin
- */
-var BOUNDING_BOX = "boundingBox",
-    CONTENT_BOX = "contentBox",
-    SKIN = "skin",
-    _getClassName = Y.ClassNameManager.getClassName;
-
-/**
- * Returns the name of the skin that's currently applied to the widget.
- *
- * Searches up the Widget's ancestor axis for, by default, a class
- * yui3-skin-(name), and returns the (name) portion. Otherwise, returns null.
- *
- * This is only really useful after the widget's DOM structure is in the
- * document, either by render or by progressive enhancement.
- *
- * @method getSkinName
- * @for Widget
- * @param {String} [skinPrefix] The prefix which the implementation uses for the skin
- * ("yui3-skin-" is the default).
- *
- * NOTE: skinPrefix will be used as part of a regular expression:
- *
- *     new RegExp('\\b' + skinPrefix + '(\\S+)')
- *
- * Although an unlikely use case, literal characters which may result in an invalid
- * regular expression should be escaped.
- *
- * @return {String} The name of the skin, or null, if a matching skin class is not found.
- */
-
-Y.Widget.prototype.getSkinName = function (skinPrefix) {
-
-    var root = this.get( CONTENT_BOX ) || this.get( BOUNDING_BOX ),
-        match,
-        search;
-
-    skinPrefix = skinPrefix || _getClassName(SKIN, "");
-
-    search = new RegExp( '\\b' + skinPrefix + '(\\S+)' );
-
-    if ( root ) {
-        root.ancestor( function ( node ) {
-            match = node.get( 'className' ).match( search );
-            return match;
-        } );
-    }
-
-    return ( match ) ? match[1] : null;
-};
-
-
-}, '3.16.0', {"requires": ["widget-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-delegate', function (Y, NAME) {
-
-/**
- * Adds event delegation support to the library.
- *
- * @module event
- * @submodule event-delegate
- */
-
-var toArray          = Y.Array,
-    YLang            = Y.Lang,
-    isString         = YLang.isString,
-    isObject         = YLang.isObject,
-    isArray          = YLang.isArray,
-    selectorTest     = Y.Selector.test,
-    detachCategories = Y.Env.evt.handles;
-
-/**
- * <p>Sets up event delegation on a container element.  The delegated event
- * will use a supplied selector or filtering function to test if the event
- * references at least one node that should trigger the subscription
- * callback.</p>
- *
- * <p>Selector string filters will trigger the callback if the event originated
- * from a node that matches it or is contained in a node that matches it.
- * Function filters are called for each Node up the parent axis to the
- * subscribing container node, and receive at each level the Node and the event
- * object.  The function should return true (or a truthy value) if that Node
- * should trigger the subscription callback.  Note, it is possible for filters
- * to match multiple Nodes for a single event.  In this case, the delegate
- * callback will be executed for each matching Node.</p>
- *
- * <p>For each matching Node, the callback will be executed with its 'this'
- * object set to the Node matched by the filter (unless a specific context was
- * provided during subscription), and the provided event's
- * <code>currentTarget</code> will also be set to the matching Node.  The
- * containing Node from which the subscription was originally made can be
- * referenced as <code>e.container</code>.
- *
- * @method delegate
- * @param type {String} the event type to delegate
- * @param fn {Function} the callback function to execute.  This function
- *              will be provided the event object for the delegated event.
- * @param el {String|node} the element that is the delegation container
- * @param filter {string|Function} a selector that must match the target of the
- *              event or a function to test target and its parents for a match
- * @param context optional argument that specifies what 'this' refers to.
- * @param args* 0..n additional arguments to pass on to the callback function.
- *              These arguments will be added after the event object.
- * @return {EventHandle} the detach handle
- * @static
- * @for Event
- */
-function delegate(type, fn, el, filter) {
-    var args     = toArray(arguments, 0, true),
-        query    = isString(el) ? el : null,
-        typeBits, synth, container, categories, cat, i, len, handles, handle;
-
-    // Support Y.delegate({ click: fnA, key: fnB }, el, filter, ...);
-    // and Y.delegate(['click', 'key'], fn, el, filter, ...);
-    if (isObject(type)) {
-        handles = [];
-
-        if (isArray(type)) {
-            for (i = 0, len = type.length; i < len; ++i) {
-                args[0] = type[i];
-                handles.push(Y.delegate.apply(Y, args));
-            }
-        } else {
-            // Y.delegate({'click', fn}, el, filter) =>
-            // Y.delegate('click', fn, el, filter)
-            args.unshift(null); // one arg becomes two; need to make space
-
-            for (i in type) {
-                if (type.hasOwnProperty(i)) {
-                    args[0] = i;
-                    args[1] = type[i];
-                    handles.push(Y.delegate.apply(Y, args));
-                }
-            }
-        }
-
-        return new Y.EventHandle(handles);
-    }
-
-    typeBits = type.split(/\|/);
-
-    if (typeBits.length > 1) {
-        cat  = typeBits.shift();
-        args[0] = type = typeBits.shift();
-    }
-
-    synth = Y.Node.DOM_EVENTS[type];
-
-    if (isObject(synth) && synth.delegate) {
-        handle = synth.delegate.apply(synth, arguments);
-    }
-
-    if (!handle) {
-        if (!type || !fn || !el || !filter) {
-            return;
-        }
-
-        container = (query) ? Y.Selector.query(query, null, true) : el;
-
-        if (!container && isString(el)) {
-            handle = Y.on('available', function () {
-                Y.mix(handle, Y.delegate.apply(Y, args), true);
-            }, el);
-        }
-
-        if (!handle && container) {
-            args.splice(2, 2, container); // remove the filter
-
-            handle = Y.Event._attach(args, { facade: false });
-            handle.sub.filter  = filter;
-            handle.sub._notify = delegate.notifySub;
-        }
-    }
-
-    if (handle && cat) {
-        categories = detachCategories[cat]  || (detachCategories[cat] = {});
-        categories = categories[type] || (categories[type] = []);
-        categories.push(handle);
-    }
-
-    return handle;
-}
-
-/**
-Overrides the <code>_notify</code> method on the normal DOM subscription to
-inject the filtering logic and only proceed in the case of a match.
-
-This method is hosted as a private property of the `delegate` method
-(e.g. `Y.delegate.notifySub`)
-
-@method notifySub
-@param thisObj {Object} default 'this' object for the callback
-@param args {Array} arguments passed to the event's <code>fire()</code>
-@param ce {CustomEvent} the custom event managing the DOM subscriptions for
-             the subscribed event on the subscribing node.
-@return {Boolean} false if the event was stopped
-@private
-@static
-@since 3.2.0
-**/
-delegate.notifySub = function (thisObj, args, ce) {
-    // Preserve args for other subscribers
-    args = args.slice();
-    if (this.args) {
-        args.push.apply(args, this.args);
-    }
-
-    // Only notify subs if the event occurred on a targeted element
-    var currentTarget = delegate._applyFilter(this.filter, args, ce),
-        //container     = e.currentTarget,
-        e, i, len, ret;
-
-    if (currentTarget) {
-        // Support multiple matches up the the container subtree
-        currentTarget = toArray(currentTarget);
-
-        // The second arg is the currentTarget, but we'll be reusing this
-        // facade, replacing the currentTarget for each use, so it doesn't
-        // matter what element we seed it with.
-        e = args[0] = new Y.DOMEventFacade(args[0], ce.el, ce);
-
-        e.container = Y.one(ce.el);
-
-        for (i = 0, len = currentTarget.length; i < len && !e.stopped; ++i) {
-            e.currentTarget = Y.one(currentTarget[i]);
-
-            ret = this.fn.apply(this.context || e.currentTarget, args);
-
-            if (ret === false) { // stop further notifications
-                break;
-            }
-        }
-
-        return ret;
-    }
-};
-
-/**
-Compiles a selector string into a filter function to identify whether
-Nodes along the parent axis of an event's target should trigger event
-notification.
-
-This function is memoized, so previously compiled filter functions are
-returned if the same selector string is provided.
-
-This function may be useful when defining synthetic events for delegate
-handling.
-
-Hosted as a property of the `delegate` method (e.g. `Y.delegate.compileFilter`).
-
-@method compileFilter
-@param selector {String} the selector string to base the filtration on
-@return {Function}
-@since 3.2.0
-@static
-**/
-delegate.compileFilter = Y.cached(function (selector) {
-    return function (target, e) {
-        return selectorTest(target._node, selector,
-            (e.currentTarget === e.target) ? null : e.currentTarget._node);
-    };
-});
-
-/**
-Regex to test for disabled elements during filtering. This is only relevant to
-IE to normalize behavior with other browsers, which swallow events that occur
-to disabled elements. IE fires the event from the parent element instead of the
-original target, though it does preserve `event.srcElement` as the disabled
-element. IE also supports disabled on `<a>`, but the event still bubbles, so it
-acts more like `e.preventDefault()` plus styling. That issue is not handled here
-because other browsers fire the event on the `<a>`, so delegate is supported in
-both cases.
-
-@property _disabledRE
-@type {RegExp}
-@protected
-@since 3.8.1
-**/
-delegate._disabledRE = /^(?:button|input|select|textarea)$/i;
-
-/**
-Walks up the parent axis of an event's target, and tests each element
-against a supplied filter function.  If any Nodes, including the container,
-satisfy the filter, the delegated callback will be triggered for each.
-
-Hosted as a protected property of the `delegate` method (e.g.
-`Y.delegate._applyFilter`).
-
-@method _applyFilter
-@param filter {Function} boolean function to test for inclusion in event
-                 notification
-@param args {Array} the arguments that would be passed to subscribers
-@param ce   {CustomEvent} the DOM event wrapper
-@return {Node|Node[]|undefined} The Node or Nodes that satisfy the filter
-@protected
-**/
-delegate._applyFilter = function (filter, args, ce) {
-    var e         = args[0],
-        container = ce.el, // facadeless events in IE, have no e.currentTarget
-        target    = e.target || e.srcElement,
-        match     = [],
-        isContainer = false;
-
-    // Resolve text nodes to their containing element
-    if (target.nodeType === 3) {
-        target = target.parentNode;
-    }
-
-    // For IE. IE propagates events from the parent element of disabled
-    // elements, where other browsers swallow the event entirely. To normalize
-    // this in IE, filtering for matching elements should abort if the target
-    // is a disabled form control.
-    if (target.disabled && delegate._disabledRE.test(target.nodeName)) {
-        return match;
-    }
-
-    // passing target as the first arg rather than leaving well enough alone
-    // making 'this' in the filter function refer to the target.  This is to
-    // support bound filter functions.
-    args.unshift(target);
-
-    if (isString(filter)) {
-        while (target) {
-            isContainer = (target === container);
-            if (selectorTest(target, filter, (isContainer ? null: container))) {
-                match.push(target);
-            }
-
-            if (isContainer) {
-                break;
-            }
-
-            target = target.parentNode;
-        }
-    } else {
-        // filter functions are implementer code and should receive wrappers
-        args[0] = Y.one(target);
-        args[1] = new Y.DOMEventFacade(e, container, ce);
-
-        while (target) {
-            // filter(target, e, extra args...) - this === target
-            if (filter.apply(args[0], args)) {
-                match.push(target);
-            }
-
-            if (target === container) {
-                break;
-            }
-
-            target = target.parentNode;
-            args[0] = Y.one(target);
-        }
-        args[1] = e; // restore the raw DOM event
-    }
-
-    if (match.length <= 1) {
-        match = match[0]; // single match or undefined
-    }
-
-    // remove the target
-    args.shift();
-
-    return match;
-};
-
-/**
- * Sets up event delegation on a container element.  The delegated event
- * will use a supplied filter to test if the callback should be executed.
- * This filter can be either a selector string or a function that returns
- * a Node to use as the currentTarget for the event.
- *
- * The event object for the delegated event is supplied to the callback
- * function.  It is modified slightly in order to support all properties
- * that may be needed for event delegation.  'currentTarget' is set to
- * the element that matched the selector string filter or the Node returned
- * from the filter function.  'container' is set to the element that the
- * listener is delegated from (this normally would be the 'currentTarget').
- *
- * Filter functions will be called with the arguments that would be passed to
- * the callback function, including the event object as the first parameter.
- * The function should return false (or a falsey value) if the success criteria
- * aren't met, and the Node to use as the event's currentTarget and 'this'
- * object if they are.
- *
- * @method delegate
- * @param type {string} the event type to delegate
- * @param fn {function} the callback function to execute.  This function
- * will be provided the event object for the delegated event.
- * @param el {string|node} the element that is the delegation container
- * @param filter {string|function} a selector that must match the target of the
- * event or a function that returns a Node or false.
- * @param context optional argument that specifies what 'this' refers to.
- * @param args* 0..n additional arguments to pass on to the callback function.
- * These arguments will be added after the event object.
- * @return {EventHandle} the detach handle
- * @for YUI
- */
-Y.delegate = Y.Event.delegate = delegate;
-
-
-}, '3.16.0', {"requires": ["node-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-event-delegate', function (Y, NAME) {
-
-/**
- * Functionality to make the node a delegated event container
- * @module node
- * @submodule node-event-delegate
- */
-
-/**
- * <p>Sets up a delegation listener for an event occurring inside the Node.
- * The delegated event will be verified against a supplied selector or
- * filtering function to test if the event references at least one node that
- * should trigger the subscription callback.</p>
- *
- * <p>Selector string filters will trigger the callback if the event originated
- * from a node that matches it or is contained in a node that matches it.
- * Function filters are called for each Node up the parent axis to the
- * subscribing container node, and receive at each level the Node and the event
- * object.  The function should return true (or a truthy value) if that Node
- * should trigger the subscription callback.  Note, it is possible for filters
- * to match multiple Nodes for a single event.  In this case, the delegate
- * callback will be executed for each matching Node.</p>
- *
- * <p>For each matching Node, the callback will be executed with its 'this'
- * object set to the Node matched by the filter (unless a specific context was
- * provided during subscription), and the provided event's
- * <code>currentTarget</code> will also be set to the matching Node.  The
- * containing Node from which the subscription was originally made can be
- * referenced as <code>e.container</code>.
- *
- * @method delegate
- * @param type {String} the event type to delegate
- * @param fn {Function} the callback function to execute.  This function
- *              will be provided the event object for the delegated event.
- * @param spec {String|Function} a selector that must match the target of the
- *              event or a function to test target and its parents for a match
- * @param context {Object} optional argument that specifies what 'this' refers to.
- * @param args* {any} 0..n additional arguments to pass on to the callback function.
- *              These arguments will be added after the event object.
- * @return {EventHandle} the detach handle
- * @for Node
- */
-Y.Node.prototype.delegate = function(type) {
-
-    var args = Y.Array(arguments, 0, true),
-        index = (Y.Lang.isObject(type) && !Y.Lang.isArray(type)) ? 1 : 2;
-
-    args.splice(index, 0, this._node);
-
-    return Y.delegate.apply(Y, args);
-};
-
-
-}, '3.16.0', {"requires": ["node-base", "event-delegate"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('widget-uievents', function (Y, NAME) {
-
-/**
- * Support for Widget UI Events (Custom Events fired by the widget, which wrap the underlying DOM events - e.g. widget:click, widget:mousedown)
- *
- * @module widget
- * @submodule widget-uievents
- */
-
-var BOUNDING_BOX = "boundingBox",
-    Widget = Y.Widget,
-    RENDER = "render",
-    L = Y.Lang,
-    EVENT_PREFIX_DELIMITER = ":",
-
-    //  Map of Node instances serving as a delegation containers for a specific
-    //  event type to Widget instances using that delegation container.
-    _uievts = Y.Widget._uievts = Y.Widget._uievts || {};
-
-Y.mix(Widget.prototype, {
-
-    /**
-     * Destructor logic for UI event infrastructure,
-     * invoked during Widget destruction.
-     *
-     * @method _destroyUIEvents
-     * @for Widget
-     * @private
-     */
-    _destroyUIEvents: function() {
-
-        var widgetGuid = Y.stamp(this, true);
-
-        Y.each(_uievts, function (info, key) {
-            if (info.instances[widgetGuid]) {
-                //  Unregister this Widget instance as needing this delegated
-                //  event listener.
-                delete info.instances[widgetGuid];
-
-                //  There are no more Widget instances using this delegated
-                //  event listener, so detach it.
-
-                if (Y.Object.isEmpty(info.instances)) {
-                    info.handle.detach();
-
-                    if (_uievts[key]) {
-                        delete _uievts[key];
-                    }
-                }
-            }
-        });
-    },
-
-    /**
-     * Map of DOM events that should be fired as Custom Events by the
-     * Widget instance.
-     *
-     * @property UI_EVENTS
-     * @for Widget
-     * @type Object
-     */
-    UI_EVENTS: Y.Node.DOM_EVENTS,
-
-    /**
-     * Returns the node on which to bind delegate listeners.
-     *
-     * @method _getUIEventNode
-     * @for Widget
-     * @protected
-     */
-    _getUIEventNode: function () {
-        return this.get(BOUNDING_BOX);
-    },
-
-    /**
-     * Binds a delegated DOM event listener of the specified type to the
-     * Widget's outtermost DOM element to facilitate the firing of a Custom
-     * Event of the same type for the Widget instance.
-     *
-     * @method _createUIEvent
-     * @for Widget
-     * @param type {String} String representing the name of the event
-     * @private
-     */
-    _createUIEvent: function (type) {
-
-        var uiEvtNode = this._getUIEventNode(),
-            key = (Y.stamp(uiEvtNode) + type),
-            info = _uievts[key],
-            handle;
-
-        //  For each Node instance: Ensure that there is only one delegated
-        //  event listener used to fire Widget UI events.
-
-        if (!info) {
-
-            handle = uiEvtNode.delegate(type, function (evt) {
-
-                var widget = Widget.getByNode(this);
-
-                // Widget could be null if node instance belongs to
-                // another Y instance.
-
-                if (widget) {
-                    if (widget._filterUIEvent(evt)) {
-                        widget.fire(evt.type, { domEvent: evt });
-                    }
-                }
-
-            }, "." + Y.Widget.getClassName());
-
-            _uievts[key] = info = { instances: {}, handle: handle };
-        }
-
-        //  Register this Widget as using this Node as a delegation container.
-        info.instances[Y.stamp(this)] = 1;
-    },
-
-    /**
-     * This method is used to determine if we should fire
-     * the UI Event or not. The default implementation makes sure
-     * that for nested delegates (nested unrelated widgets), we don't
-     * fire the UI event listener more than once at each level.
-     *
-     * <p>For example, without the additional filter, if you have nested
-     * widgets, each widget will have a delegate listener. If you
-     * click on the inner widget, the inner delegate listener's
-     * filter will match once, but the outer will match twice
-     * (based on delegate's design) - once for the inner widget,
-     * and once for the outer.</p>
-     *
-     * @method _filterUIEvent
-     * @for Widget
-     * @param {DOMEventFacade} evt
-     * @return {boolean} true if it's OK to fire the custom UI event, false if not.
-     * @private
-     *
-     */
-    _filterUIEvent: function(evt) {
-        // Either it's hitting this widget's delegate container (and not some other widget's),
-        // or the container it's hitting is handling this widget's ui events.
-        return (evt.currentTarget.compareTo(evt.container) || evt.container.compareTo(this._getUIEventNode()));
-    },
-
-    /**
-     * Determines if the specified event is a UI event.
-     *
-     * @private
-     * @method _isUIEvent
-     * @for Widget
-     * @param type {String} String representing the name of the event
-     * @return {String} Event Returns the name of the UI Event, otherwise
-     * undefined.
-     */
-    _getUIEvent: function (type) {
-
-        if (L.isString(type)) {
-            var sType = this.parseType(type)[1],
-                iDelim,
-                returnVal;
-
-            if (sType) {
-                // TODO: Get delimiter from ET, or have ET support this.
-                iDelim = sType.indexOf(EVENT_PREFIX_DELIMITER);
-                if (iDelim > -1) {
-                    sType = sType.substring(iDelim + EVENT_PREFIX_DELIMITER.length);
-                }
-
-                if (this.UI_EVENTS[sType]) {
-                    returnVal = sType;
-                }
-            }
-
-            return returnVal;
-        }
-    },
-
-    /**
-     * Sets up infrastructure required to fire a UI event.
-     *
-     * @private
-     * @method _initUIEvent
-     * @for Widget
-     * @param type {String} String representing the name of the event
-     * @return {String}
-     */
-    _initUIEvent: function (type) {
-        var sType = this._getUIEvent(type),
-            queue = this._uiEvtsInitQueue || {};
-
-        if (sType && !queue[sType]) {
-
-            this._uiEvtsInitQueue = queue[sType] = 1;
-
-            this.after(RENDER, function() {
-                this._createUIEvent(sType);
-                delete this._uiEvtsInitQueue[sType];
-            });
-        }
-    },
-
-    //  Override of "on" from Base to facilitate the firing of Widget events
-    //  based on DOM events of the same name/type (e.g. "click", "mouseover").
-    //  Temporary solution until we have the ability to listen to when
-    //  someone adds an event listener (bug 2528230)
-    on: function (type) {
-        this._initUIEvent(type);
-        return Widget.superclass.on.apply(this, arguments);
-    },
-
-    //  Override of "publish" from Base to facilitate the firing of Widget events
-    //  based on DOM events of the same name/type (e.g. "click", "mouseover").
-    //  Temporary solution until we have the ability to listen to when
-    //  someone publishes an event (bug 2528230)
-    publish: function (type, config) {
-        var sType = this._getUIEvent(type);
-        if (sType && config && config.defaultFn) {
-            this._initUIEvent(sType);
-        }
-        return Widget.superclass.publish.apply(this, arguments);
-    }
-
-}, true); // overwrite existing EventTarget methods
-
-
-}, '3.16.0', {"requires": ["node-event-delegate", "widget-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('event-simulate', function (Y, NAME) {
-
-(function() {
-/**
- * Simulate user interaction by generating native DOM events.
- *
- * @module event-simulate
- * @requires event
- */
-
-//shortcuts
-var L   = Y.Lang,
-    win = Y.config.win,
-    isFunction  = L.isFunction,
-    isString    = L.isString,
-    isBoolean   = L.isBoolean,
-    isObject    = L.isObject,
-    isNumber    = L.isNumber,
-
-    //mouse events supported
-    mouseEvents = {
-        click:      1,
-        dblclick:   1,
-        mouseover:  1,
-        mouseout:   1,
-        mousedown:  1,
-        mouseup:    1,
-        mousemove:  1,
-        contextmenu:1
-    },
-
-    pointerEvents = (win && win.PointerEvent) ? {
-        pointerover:  1,
-        pointerout:   1,
-        pointerdown:  1,
-        pointerup:    1,
-        pointermove:  1
-    } : {
-        MSPointerOver:  1,
-        MSPointerOut:   1,
-        MSPointerDown:  1,
-        MSPointerUp:    1,
-        MSPointerMove:  1
-    },
-
-    //key events supported
-    keyEvents   = {
-        keydown:    1,
-        keyup:      1,
-        keypress:   1
-    },
-
-    //HTML events supported
-    uiEvents  = {
-        submit:     1,
-        blur:       1,
-        change:     1,
-        focus:      1,
-        resize:     1,
-        scroll:     1,
-        select:     1
-    },
-
-    //events that bubble by default
-    bubbleEvents = {
-        scroll:     1,
-        resize:     1,
-        reset:      1,
-        submit:     1,
-        change:     1,
-        select:     1,
-        error:      1,
-        abort:      1
-    },
-
-    //touch events supported
-    touchEvents = {
-        touchstart: 1,
-        touchmove: 1,
-        touchend: 1,
-        touchcancel: 1
-    },
-
-    gestureEvents = {
-        gesturestart: 1,
-        gesturechange: 1,
-        gestureend: 1
-    };
-
-//all key, mouse and touch events bubble
-Y.mix(bubbleEvents, mouseEvents);
-Y.mix(bubbleEvents, keyEvents);
-Y.mix(bubbleEvents, touchEvents);
-
-/*
- * Note: Intentionally not for YUIDoc generation.
- * Simulates a key event using the given event information to populate
- * the generated event object. This method does browser-equalizing
- * calculations to account for differences in the DOM and IE event models
- * as well as different browser quirks. Note: keydown causes Safari 2.x to
- * crash.
- * @method simulateKeyEvent
- * @private
- * @static
- * @param {HTMLElement} target The target of the given event.
- * @param {String} type The type of event to fire. This can be any one of
- *      the following: keyup, keydown, and keypress.
- * @param {Boolean} [bubbles=true] Indicates if the event can be
- *      bubbled up. DOM Level 3 specifies that all key events bubble by
- *      default.
- * @param {Boolean} [cancelable=true] Indicates if the event can be
- *      canceled using preventDefault(). DOM Level 3 specifies that all
- *      key events can be cancelled.
- * @param {Window} [view=window] The view containing the target. This is
- *      typically the window object.
- * @param {Boolean} [ctrlKey=false] Indicates if one of the CTRL keys
- *      is pressed while the event is firing.
- * @param {Boolean} [altKey=false] Indicates if one of the ALT keys
- *      is pressed while the event is firing.
- * @param {Boolean} [shiftKey=false] Indicates if one of the SHIFT keys
- *      is pressed while the event is firing.
- * @param {Boolean} [metaKey=false] Indicates if one of the META keys
- *      is pressed while the event is firing.
- * @param {Number} [keyCode=0] The code for the key that is in use.
- * @param {Number} [charCode=0] The Unicode code for the character
- *      associated with the key being used.
- */
-function simulateKeyEvent(target /*:HTMLElement*/, type /*:String*/,
-                             bubbles /*:Boolean*/,  cancelable /*:Boolean*/,
-                             view /*:Window*/,
-                             ctrlKey /*:Boolean*/,    altKey /*:Boolean*/,
-                             shiftKey /*:Boolean*/,   metaKey /*:Boolean*/,
-                             keyCode /*:int*/,        charCode /*:int*/) /*:Void*/
-{
-    //check target
-    if (!target){
-        Y.error("simulateKeyEvent(): Invalid target.");
-    }
-
-    //check event type
-    if (isString(type)){
-        type = type.toLowerCase();
-        switch(type){
-            case "textevent": //DOM Level 3
-                type = "keypress";
-                break;
-            case "keyup":
-            case "keydown":
-            case "keypress":
-                break;
-            default:
-                Y.error("simulateKeyEvent(): Event type '" + type + "' not supported.");
-        }
-    } else {
-        Y.error("simulateKeyEvent(): Event type must be a string.");
-    }
-
-    //setup default values
-    if (!isBoolean(bubbles)){
-        bubbles = true; //all key events bubble
-    }
-    if (!isBoolean(cancelable)){
-        cancelable = true; //all key events can be cancelled
-    }
-    if (!isObject(view)){
-        view = Y.config.win; //view is typically window
-    }
-    if (!isBoolean(ctrlKey)){
-        ctrlKey = false;
-    }
-    if (!isBoolean(altKey)){
-        altKey = false;
-    }
-    if (!isBoolean(shiftKey)){
-        shiftKey = false;
-    }
-    if (!isBoolean(metaKey)){
-        metaKey = false;
-    }
-    if (!isNumber(keyCode)){
-        keyCode = 0;
-    }
-    if (!isNumber(charCode)){
-        charCode = 0;
-    }
-
-    //try to create a mouse event
-    var customEvent /*:MouseEvent*/ = null;
-
-    //check for DOM-compliant browsers first
-    if (isFunction(Y.config.doc.createEvent)){
-
-        try {
-
-            //try to create key event
-            customEvent = Y.config.doc.createEvent("KeyEvents");
-
-            /*
-             * Interesting problem: Firefox implemented a non-standard
-             * version of initKeyEvent() based on DOM Level 2 specs.
-             * Key event was removed from DOM Level 2 and re-introduced
-             * in DOM Level 3 with a different interface. Firefox is the
-             * only browser with any implementation of Key Events, so for
-             * now, assume it's Firefox if the above line doesn't error.
-             */
-            // @TODO: Decipher between Firefox's implementation and a correct one.
-            customEvent.initKeyEvent(type, bubbles, cancelable, view, ctrlKey,
-                altKey, shiftKey, metaKey, keyCode, charCode);
-
-        } catch (ex /*:Error*/){
-
-            /*
-             * If it got here, that means key events aren't officially supported.
-             * Safari/WebKit is a real problem now. WebKit 522 won't let you
-             * set keyCode, charCode, or other properties if you use a
-             * UIEvent, so we first must try to create a generic event. The
-             * fun part is that this will throw an error on Safari 2.x. The
-             * end result is that we need another try...catch statement just to
-             * deal with this mess.
-             */
-            try {
-
-                //try to create generic event - will fail in Safari 2.x
-                customEvent = Y.config.doc.createEvent("Events");
-
-            } catch (uierror /*:Error*/){
-
-                //the above failed, so create a UIEvent for Safari 2.x
-                customEvent = Y.config.doc.createEvent("UIEvents");
-
-            } finally {
-
-                customEvent.initEvent(type, bubbles, cancelable);
-
-                //initialize
-                customEvent.view = view;
-                customEvent.altKey = altKey;
-                customEvent.ctrlKey = ctrlKey;
-                customEvent.shiftKey = shiftKey;
-                customEvent.metaKey = metaKey;
-                customEvent.keyCode = keyCode;
-                customEvent.charCode = charCode;
-
-            }
-
-        }
-
-        //fire the event
-        target.dispatchEvent(customEvent);
-
-    } else if (isObject(Y.config.doc.createEventObject)){ //IE
-
-        //create an IE event object
-        customEvent = Y.config.doc.createEventObject();
-
-        //assign available properties
-        customEvent.bubbles = bubbles;
-        customEvent.cancelable = cancelable;
-        customEvent.view = view;
-        customEvent.ctrlKey = ctrlKey;
-        customEvent.altKey = altKey;
-        customEvent.shiftKey = shiftKey;
-        customEvent.metaKey = metaKey;
-
-        /*
-         * IE doesn't support charCode explicitly. CharCode should
-         * take precedence over any keyCode value for accurate
-         * representation.
-         */
-        customEvent.keyCode = (charCode > 0) ? charCode : keyCode;
-
-        //fire the event
-        target.fireEvent("on" + type, customEvent);
-
-    } else {
-        Y.error("simulateKeyEvent(): No event simulation framework present.");
-    }
-}
-
-/*
- * Note: Intentionally not for YUIDoc generation.
- * Simulates a mouse event using the given event information to populate
- * the generated event object. This method does browser-equalizing
- * calculations to account for differences in the DOM and IE event models
- * as well as different browser quirks.
- * @method simulateMouseEvent
- * @private
- * @static
- * @param {HTMLElement} target The target of the given event.
- * @param {String} type The type of event to fire. This can be any one of
- *      the following: click, dblclick, mousedown, mouseup, mouseout,
- *      mouseover, and mousemove.
- * @param {Boolean} bubbles (Optional) Indicates if the event can be
- *      bubbled up. DOM Level 2 specifies that all mouse events bubble by
- *      default. The default is true.
- * @param {Boolean} cancelable (Optional) Indicates if the event can be
- *      canceled using preventDefault(). DOM Level 2 specifies that all
- *      mouse events except mousemove can be cancelled. The default
- *      is true for all events except mousemove, for which the default
- *      is false.
- * @param {Window} view (Optional) The view containing the target. This is
- *      typically the window object. The default is window.
- * @param {Number} detail (Optional) The number of times the mouse button has
- *      been used. The default value is 1.
- * @param {Number} screenX (Optional) The x-coordinate on the screen at which
- *      point the event occured. The default is 0.
- * @param {Number} screenY (Optional) The y-coordinate on the screen at which
- *      point the event occured. The default is 0.
- * @param {Number} clientX (Optional) The x-coordinate on the client at which
- *      point the event occured. The default is 0.
- * @param {Number} clientY (Optional) The y-coordinate on the client at which
- *      point the event occured. The default is 0.
- * @param {Boolean} ctrlKey (Optional) Indicates if one of the CTRL keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} altKey (Optional) Indicates if one of the ALT keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} shiftKey (Optional) Indicates if one of the SHIFT keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} metaKey (Optional) Indicates if one of the META keys
- *      is pressed while the event is firing. The default is false.
- * @param {Number} button (Optional) The button being pressed while the event
- *      is executing. The value should be 0 for the primary mouse button
- *      (typically the left button), 1 for the terciary mouse button
- *      (typically the middle button), and 2 for the secondary mouse button
- *      (typically the right button). The default is 0.
- * @param {HTMLElement} relatedTarget (Optional) For mouseout events,
- *      this is the element that the mouse has moved to. For mouseover
- *      events, this is the element that the mouse has moved from. This
- *      argument is ignored for all other events. The default is null.
- */
-function simulateMouseEvent(target /*:HTMLElement*/, type /*:String*/,
-                               bubbles /*:Boolean*/,  cancelable /*:Boolean*/,
-                               view /*:Window*/,        detail /*:int*/,
-                               screenX /*:int*/,        screenY /*:int*/,
-                               clientX /*:int*/,        clientY /*:int*/,
-                               ctrlKey /*:Boolean*/,    altKey /*:Boolean*/,
-                               shiftKey /*:Boolean*/,   metaKey /*:Boolean*/,
-                               button /*:int*/,         relatedTarget /*:HTMLElement*/) /*:Void*/
-{
-    //check target
-    if (!target){
-        Y.error("simulateMouseEvent(): Invalid target.");
-    }
-
-
-    if (isString(type)){
-
-        //make sure it's a supported mouse event or an msPointerEvent.
-        if (!mouseEvents[type.toLowerCase()] && !pointerEvents[type]){
-            Y.error("simulateMouseEvent(): Event type '" + type + "' not supported.");
-        }
-    }
-    else {
-        Y.error("simulateMouseEvent(): Event type must be a string.");
-    }
-
-    //setup default values
-    if (!isBoolean(bubbles)){
-        bubbles = true; //all mouse events bubble
-    }
-    if (!isBoolean(cancelable)){
-        cancelable = (type !== "mousemove"); //mousemove is the only one that can't be cancelled
-    }
-    if (!isObject(view)){
-        view = Y.config.win; //view is typically window
-    }
-    if (!isNumber(detail)){
-        detail = 1;  //number of mouse clicks must be at least one
-    }
-    if (!isNumber(screenX)){
-        screenX = 0;
-    }
-    if (!isNumber(screenY)){
-        screenY = 0;
-    }
-    if (!isNumber(clientX)){
-        clientX = 0;
-    }
-    if (!isNumber(clientY)){
-        clientY = 0;
-    }
-    if (!isBoolean(ctrlKey)){
-        ctrlKey = false;
-    }
-    if (!isBoolean(altKey)){
-        altKey = false;
-    }
-    if (!isBoolean(shiftKey)){
-        shiftKey = false;
-    }
-    if (!isBoolean(metaKey)){
-        metaKey = false;
-    }
-    if (!isNumber(button)){
-        button = 0;
-    }
-
-    relatedTarget = relatedTarget || null;
-
-    //try to create a mouse event
-    var customEvent /*:MouseEvent*/ = null;
-
-    //check for DOM-compliant browsers first
-    if (isFunction(Y.config.doc.createEvent)){
-
-        customEvent = Y.config.doc.createEvent("MouseEvents");
-
-        //Safari 2.x (WebKit 418) still doesn't implement initMouseEvent()
-        if (customEvent.initMouseEvent){
-            customEvent.initMouseEvent(type, bubbles, cancelable, view, detail,
-                                 screenX, screenY, clientX, clientY,
-                                 ctrlKey, altKey, shiftKey, metaKey,
-                                 button, relatedTarget);
-        } else { //Safari
-
-            //the closest thing available in Safari 2.x is UIEvents
-            customEvent = Y.config.doc.createEvent("UIEvents");
-            customEvent.initEvent(type, bubbles, cancelable);
-            customEvent.view = view;
-            customEvent.detail = detail;
-            customEvent.screenX = screenX;
-            customEvent.screenY = screenY;
-            customEvent.clientX = clientX;
-            customEvent.clientY = clientY;
-            customEvent.ctrlKey = ctrlKey;
-            customEvent.altKey = altKey;
-            customEvent.metaKey = metaKey;
-            customEvent.shiftKey = shiftKey;
-            customEvent.button = button;
-            customEvent.relatedTarget = relatedTarget;
-        }
-
-        /*
-         * Check to see if relatedTarget has been assigned. Firefox
-         * versions less than 2.0 don't allow it to be assigned via
-         * initMouseEvent() and the property is readonly after event
-         * creation, so in order to keep YAHOO.util.getRelatedTarget()
-         * working, assign to the IE proprietary toElement property
-         * for mouseout event and fromElement property for mouseover
-         * event.
-         */
-        if (relatedTarget && !customEvent.relatedTarget){
-            if (type === "mouseout"){
-                customEvent.toElement = relatedTarget;
-            } else if (type === "mouseover"){
-                customEvent.fromElement = relatedTarget;
-            }
-        }
-
-        //fire the event
-        target.dispatchEvent(customEvent);
-
-    } else if (isObject(Y.config.doc.createEventObject)){ //IE
-
-        //create an IE event object
-        customEvent = Y.config.doc.createEventObject();
-
-        //assign available properties
-        customEvent.bubbles = bubbles;
-        customEvent.cancelable = cancelable;
-        customEvent.view = view;
-        customEvent.detail = detail;
-        customEvent.screenX = screenX;
-        customEvent.screenY = screenY;
-        customEvent.clientX = clientX;
-        customEvent.clientY = clientY;
-        customEvent.ctrlKey = ctrlKey;
-        customEvent.altKey = altKey;
-        customEvent.metaKey = metaKey;
-        customEvent.shiftKey = shiftKey;
-
-        //fix button property for IE's wacky implementation
-        switch(button){
-            case 0:
-                customEvent.button = 1;
-                break;
-            case 1:
-                customEvent.button = 4;
-                break;
-            case 2:
-                //leave as is
-                break;
-            default:
-                customEvent.button = 0;
-        }
-
-        /*
-         * Have to use relatedTarget because IE won't allow assignment
-         * to toElement or fromElement on generic events. This keeps
-         * YAHOO.util.customEvent.getRelatedTarget() functional.
-         */
-        customEvent.relatedTarget = relatedTarget;
-
-        //fire the event
-        target.fireEvent("on" + type, customEvent);
-
-    } else {
-        Y.error("simulateMouseEvent(): No event simulation framework present.");
-    }
-}
-
-/*
- * Note: Intentionally not for YUIDoc generation.
- * Simulates a UI event using the given event information to populate
- * the generated event object. This method does browser-equalizing
- * calculations to account for differences in the DOM and IE event models
- * as well as different browser quirks.
- * @method simulateHTMLEvent
- * @private
- * @static
- * @param {HTMLElement} target The target of the given event.
- * @param {String} type The type of event to fire. This can be any one of
- *      the following: click, dblclick, mousedown, mouseup, mouseout,
- *      mouseover, and mousemove.
- * @param {Boolean} bubbles (Optional) Indicates if the event can be
- *      bubbled up. DOM Level 2 specifies that all mouse events bubble by
- *      default. The default is true.
- * @param {Boolean} cancelable (Optional) Indicates if the event can be
- *      canceled using preventDefault(). DOM Level 2 specifies that all
- *      mouse events except mousemove can be cancelled. The default
- *      is true for all events except mousemove, for which the default
- *      is false.
- * @param {Window} view (Optional) The view containing the target. This is
- *      typically the window object. The default is window.
- * @param {Number} detail (Optional) The number of times the mouse button has
- *      been used. The default value is 1.
- */
-function simulateUIEvent(target /*:HTMLElement*/, type /*:String*/,
-                               bubbles /*:Boolean*/,  cancelable /*:Boolean*/,
-                               view /*:Window*/,        detail /*:int*/) /*:Void*/
-{
-
-    //check target
-    if (!target){
-        Y.error("simulateUIEvent(): Invalid target.");
-    }
-
-    //check event type
-    if (isString(type)){
-        type = type.toLowerCase();
-
-        //make sure it's a supported mouse event
-        if (!uiEvents[type]){
-            Y.error("simulateUIEvent(): Event type '" + type + "' not supported.");
-        }
-    } else {
-        Y.error("simulateUIEvent(): Event type must be a string.");
-    }
-
-    //try to create a mouse event
-    var customEvent = null;
-
-
-    //setup default values
-    if (!isBoolean(bubbles)){
-        bubbles = (type in bubbleEvents);  //not all events bubble
-    }
-    if (!isBoolean(cancelable)){
-        cancelable = (type === "submit"); //submit is the only one that can be cancelled
-    }
-    if (!isObject(view)){
-        view = Y.config.win; //view is typically window
-    }
-    if (!isNumber(detail)){
-        detail = 1;  //usually not used but defaulted to this
-    }
-
-    //check for DOM-compliant browsers first
-    if (isFunction(Y.config.doc.createEvent)){
-
-        //just a generic UI Event object is needed
-        customEvent = Y.config.doc.createEvent("UIEvents");
-        customEvent.initUIEvent(type, bubbles, cancelable, view, detail);
-
-        //fire the event
-        target.dispatchEvent(customEvent);
-
-    } else if (isObject(Y.config.doc.createEventObject)){ //IE
-
-        //create an IE event object
-        customEvent = Y.config.doc.createEventObject();
-
-        //assign available properties
-        customEvent.bubbles = bubbles;
-        customEvent.cancelable = cancelable;
-        customEvent.view = view;
-        customEvent.detail = detail;
-
-        //fire the event
-        target.fireEvent("on" + type, customEvent);
-
-    } else {
-        Y.error("simulateUIEvent(): No event simulation framework present.");
-    }
-}
-
-/*
- * (iOS only) This is for creating native DOM gesture events which only iOS
- * v2.0+ is supporting.
- *
- * @method simulateGestureEvent
- * @private
- * @param {HTMLElement} target The target of the given event.
- * @param {String} type The type of event to fire. This can be any one of
- *      the following: touchstart, touchmove, touchend, touchcancel.
- * @param {Boolean} bubbles (Optional) Indicates if the event can be
- *      bubbled up. DOM Level 2 specifies that all mouse events bubble by
- *      default. The default is true.
- * @param {Boolean} cancelable (Optional) Indicates if the event can be
- *      canceled using preventDefault(). DOM Level 2 specifies that all
- *      touch events except touchcancel can be cancelled. The default
- *      is true for all events except touchcancel, for which the default
- *      is false.
- * @param {Window} view (Optional) The view containing the target. This is
- *      typically the window object. The default is window.
- * @param {Number} detail (Optional) Specifies some detail information about
- *      the event depending on the type of event.
- * @param {Number} screenX (Optional) The x-coordinate on the screen at which
- *      point the event occured. The default is 0.
- * @param {Number} screenY (Optional) The y-coordinate on the screen at which
- *      point the event occured. The default is 0.
- * @param {Number} clientX (Optional) The x-coordinate on the client at which
- *      point the event occured. The default is 0.
- * @param {Number} clientY (Optional) The y-coordinate on the client at which
- *      point the event occured. The default is 0.
- * @param {Boolean} ctrlKey (Optional) Indicates if one of the CTRL keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} altKey (Optional) Indicates if one of the ALT keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} shiftKey (Optional) Indicates if one of the SHIFT keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} metaKey (Optional) Indicates if one of the META keys
- *      is pressed while the event is firing. The default is false.
- * @param {Number} scale (iOS v2+ only) The distance between two fingers
- *      since the start of an event as a multiplier of the initial distance.
- *      The default value is 1.0.
- * @param {Number} rotation (iOS v2+ only) The delta rotation since the start
- *      of an event, in degrees, where clockwise is positive and
- *      counter-clockwise is negative. The default value is 0.0.
- */
-function simulateGestureEvent(target, type,
-    bubbles,            // boolean
-    cancelable,         // boolean
-    view,               // DOMWindow
-    detail,             // long
-    screenX, screenY,   // long
-    clientX, clientY,   // long
-    ctrlKey, altKey, shiftKey, metaKey, // boolean
-    scale,              // float
-    rotation            // float
-) {
-    var customEvent;
-
-    if(!Y.UA.ios || Y.UA.ios<2.0) {
-        Y.error("simulateGestureEvent(): Native gesture DOM eventframe is not available in this platform.");
-    }
-
-    // check taget
-    if (!target){
-        Y.error("simulateGestureEvent(): Invalid target.");
-    }
-
-    //check event type
-    if (Y.Lang.isString(type)) {
-        type = type.toLowerCase();
-
-        //make sure it's a supported touch event
-        if (!gestureEvents[type]){
-            Y.error("simulateTouchEvent(): Event type '" + type + "' not supported.");
-        }
-    } else {
-        Y.error("simulateGestureEvent(): Event type must be a string.");
-    }
-
-    // setup default values
-    if (!Y.Lang.isBoolean(bubbles)) { bubbles = true; } // bubble by default
-    if (!Y.Lang.isBoolean(cancelable)) { cancelable = true; }
-    if (!Y.Lang.isObject(view))     { view = Y.config.win; }
-    if (!Y.Lang.isNumber(detail))   { detail = 2; }     // usually not used.
-    if (!Y.Lang.isNumber(screenX))  { screenX = 0; }
-    if (!Y.Lang.isNumber(screenY))  { screenY = 0; }
-    if (!Y.Lang.isNumber(clientX))  { clientX = 0; }
-    if (!Y.Lang.isNumber(clientY))  { clientY = 0; }
-    if (!Y.Lang.isBoolean(ctrlKey)) { ctrlKey = false; }
-    if (!Y.Lang.isBoolean(altKey))  { altKey = false; }
-    if (!Y.Lang.isBoolean(shiftKey)){ shiftKey = false; }
-    if (!Y.Lang.isBoolean(metaKey)) { metaKey = false; }
-
-    if (!Y.Lang.isNumber(scale)){ scale = 1.0; }
-    if (!Y.Lang.isNumber(rotation)){ rotation = 0.0; }
-
-    customEvent = Y.config.doc.createEvent("GestureEvent");
-
-    customEvent.initGestureEvent(type, bubbles, cancelable, view, detail,
-        screenX, screenY, clientX, clientY,
-        ctrlKey, altKey, shiftKey, metaKey,
-        target, scale, rotation);
-
-    target.dispatchEvent(customEvent);
-}
-
-
-/*
- * @method simulateTouchEvent
- * @private
- * @param {HTMLElement} target The target of the given event.
- * @param {String} type The type of event to fire. This can be any one of
- *      the following: touchstart, touchmove, touchend, touchcancel.
- * @param {Boolean} bubbles (Optional) Indicates if the event can be
- *      bubbled up. DOM Level 2 specifies that all mouse events bubble by
- *      default. The default is true.
- * @param {Boolean} cancelable (Optional) Indicates if the event can be
- *      canceled using preventDefault(). DOM Level 2 specifies that all
- *      touch events except touchcancel can be cancelled. The default
- *      is true for all events except touchcancel, for which the default
- *      is false.
- * @param {Window} view (Optional) The view containing the target. This is
- *      typically the window object. The default is window.
- * @param {Number} detail (Optional) Specifies some detail information about
- *      the event depending on the type of event.
- * @param {Number} screenX (Optional) The x-coordinate on the screen at which
- *      point the event occured. The default is 0.
- * @param {Number} screenY (Optional) The y-coordinate on the screen at which
- *      point the event occured. The default is 0.
- * @param {Number} clientX (Optional) The x-coordinate on the client at which
- *      point the event occured. The default is 0.
- * @param {Number} clientY (Optional) The y-coordinate on the client at which
- *      point the event occured. The default is 0.
- * @param {Boolean} ctrlKey (Optional) Indicates if one of the CTRL keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} altKey (Optional) Indicates if one of the ALT keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} shiftKey (Optional) Indicates if one of the SHIFT keys
- *      is pressed while the event is firing. The default is false.
- * @param {Boolean} metaKey (Optional) Indicates if one of the META keys
- *      is pressed while the event is firing. The default is false.
- * @param {TouchList} touches A collection of Touch objects representing
- *      all touches associated with this event.
- * @param {TouchList} targetTouches A collection of Touch objects
- *      representing all touches associated with this target.
- * @param {TouchList} changedTouches A collection of Touch objects
- *      representing all touches that changed in this event.
- * @param {Number} scale (iOS v2+ only) The distance between two fingers
- *      since the start of an event as a multiplier of the initial distance.
- *      The default value is 1.0.
- * @param {Number} rotation (iOS v2+ only) The delta rotation since the start
- *      of an event, in degrees, where clockwise is positive and
- *      counter-clockwise is negative. The default value is 0.0.
- */
-function simulateTouchEvent(target, type,
-    bubbles,            // boolean
-    cancelable,         // boolean
-    view,               // DOMWindow
-    detail,             // long
-    screenX, screenY,   // long
-    clientX, clientY,   // long
-    ctrlKey, altKey, shiftKey, metaKey, // boolean
-    touches,            // TouchList
-    targetTouches,      // TouchList
-    changedTouches,     // TouchList
-    scale,              // float
-    rotation            // float
-) {
-
-    var customEvent;
-
-    // check taget
-    if (!target){
-        Y.error("simulateTouchEvent(): Invalid target.");
-    }
-
-    //check event type
-    if (Y.Lang.isString(type)) {
-        type = type.toLowerCase();
-
-        //make sure it's a supported touch event
-        if (!touchEvents[type]){
-            Y.error("simulateTouchEvent(): Event type '" + type + "' not supported.");
-        }
-    } else {
-        Y.error("simulateTouchEvent(): Event type must be a string.");
-    }
-
-    // note that the caller is responsible to pass appropriate touch objects.
-    // check touch objects
-    // Android(even 4.0) doesn't define TouchList yet
-    /*if(type === 'touchstart' || type === 'touchmove') {
-        if(!touches instanceof TouchList) {
-            Y.error('simulateTouchEvent(): Invalid touches. It must be a TouchList');
-        } else {
-            if(touches.length === 0) {
-                Y.error('simulateTouchEvent(): No touch object found.');
-            }
-        }
-    } else if(type === 'touchend') {
-        if(!changedTouches instanceof TouchList) {
-            Y.error('simulateTouchEvent(): Invalid touches. It must be a TouchList');
-        } else {
-            if(changedTouches.length === 0) {
-                Y.error('simulateTouchEvent(): No touch object found.');
-            }
-        }
-    }*/
-
-    if(type === 'touchstart' || type === 'touchmove') {
-        if(touches.length === 0) {
-            Y.error('simulateTouchEvent(): No touch object in touches');
-        }
-    } else if(type === 'touchend') {
-        if(changedTouches.length === 0) {
-            Y.error('simulateTouchEvent(): No touch object in changedTouches');
-        }
-    }
-
-    // setup default values
-    if (!Y.Lang.isBoolean(bubbles)) { bubbles = true; } // bubble by default.
-    if (!Y.Lang.isBoolean(cancelable)) {
-        cancelable = (type !== "touchcancel"); // touchcancel is not cancelled
-    }
-    if (!Y.Lang.isObject(view))     { view = Y.config.win; }
-    if (!Y.Lang.isNumber(detail))   { detail = 1; } // usually not used. defaulted to # of touch objects.
-    if (!Y.Lang.isNumber(screenX))  { screenX = 0; }
-    if (!Y.Lang.isNumber(screenY))  { screenY = 0; }
-    if (!Y.Lang.isNumber(clientX))  { clientX = 0; }
-    if (!Y.Lang.isNumber(clientY))  { clientY = 0; }
-    if (!Y.Lang.isBoolean(ctrlKey)) { ctrlKey = false; }
-    if (!Y.Lang.isBoolean(altKey))  { altKey = false; }
-    if (!Y.Lang.isBoolean(shiftKey)){ shiftKey = false; }
-    if (!Y.Lang.isBoolean(metaKey)) { metaKey = false; }
-    if (!Y.Lang.isNumber(scale))    { scale = 1.0; }
-    if (!Y.Lang.isNumber(rotation)) { rotation = 0.0; }
-
-
-    //check for DOM-compliant browsers first
-    if (Y.Lang.isFunction(Y.config.doc.createEvent)) {
-        if (Y.UA.android) {
-            /*
-                * Couldn't find android start version that supports touch event.
-                * Assumed supported(btw APIs broken till icecream sandwitch)
-                * from the beginning.
-            */
-            if(Y.UA.android < 4.0) {
-                /*
-                    * Touch APIs are broken in androids older than 4.0. We will use
-                    * simulated touch apis for these versions.
-                    * App developer still can listen for touch events. This events
-                    * will be dispatched with touch event types.
-                    *
-                    * (Note) Used target for the relatedTarget. Need to verify if
-                    * it has a side effect.
-                */
-                customEvent = Y.config.doc.createEvent("MouseEvents");
-                customEvent.initMouseEvent(type, bubbles, cancelable, view, detail,
-                    screenX, screenY, clientX, clientY,
-                    ctrlKey, altKey, shiftKey, metaKey,
-                    0, target);
-
-                customEvent.touches = touches;
-                customEvent.targetTouches = targetTouches;
-                customEvent.changedTouches = changedTouches;
-            } else {
-                customEvent = Y.config.doc.createEvent("TouchEvent");
-
-                // Andoroid isn't compliant W3C initTouchEvent method signature.
-                customEvent.initTouchEvent(touches, targetTouches, changedTouches,
-                    type, view,
-                    screenX, screenY, clientX, clientY,
-                    ctrlKey, altKey, shiftKey, metaKey);
-            }
-        } else if (Y.UA.ios) {
-            if(Y.UA.ios >= 2.0) {
-                customEvent = Y.config.doc.createEvent("TouchEvent");
-
-                // Available iOS 2.0 and later
-                customEvent.initTouchEvent(type, bubbles, cancelable, view, detail,
-                    screenX, screenY, clientX, clientY,
-                    ctrlKey, altKey, shiftKey, metaKey,
-                    touches, targetTouches, changedTouches,
-                    scale, rotation);
-            } else {
-                Y.error('simulateTouchEvent(): No touch event simulation framework present for iOS, '+Y.UA.ios+'.');
-            }
-        } else {
-            Y.error('simulateTouchEvent(): Not supported agent yet, '+Y.UA.userAgent);
-        }
-
-        //fire the event
-        target.dispatchEvent(customEvent);
-    //} else if (Y.Lang.isObject(doc.createEventObject)){ // Windows Mobile/IE, support later
-    } else {
-        Y.error('simulateTouchEvent(): No event simulation framework present.');
-    }
-}
-
-/**
- * Simulates the event or gesture with the given name on a target.
- * @param {HTMLElement} target The DOM element that's the target of the event.
- * @param {String} type The type of event or name of the supported gesture to simulate
- *      (i.e., "click", "doubletap", "flick").
- * @param {Object} options (Optional) Extra options to copy onto the event object.
- *      For gestures, options are used to refine the gesture behavior.
- * @for Event
- * @method simulate
- * @static
- */
-Y.Event.simulate = function(target, type, options){
-
-    options = options || {};
-
-    if (mouseEvents[type] || pointerEvents[type]){
-        simulateMouseEvent(target, type, options.bubbles,
-            options.cancelable, options.view, options.detail, options.screenX,
-            options.screenY, options.clientX, options.clientY, options.ctrlKey,
-            options.altKey, options.shiftKey, options.metaKey, options.button,
-            options.relatedTarget);
-    } else if (keyEvents[type]){
-        simulateKeyEvent(target, type, options.bubbles,
-            options.cancelable, options.view, options.ctrlKey,
-            options.altKey, options.shiftKey, options.metaKey,
-            options.keyCode, options.charCode);
-    } else if (uiEvents[type]){
-        simulateUIEvent(target, type, options.bubbles,
-            options.cancelable, options.view, options.detail);
-
-    // touch low-level event simulation
-    } else if (touchEvents[type]) {
-        if((Y.config.win && ("ontouchstart" in Y.config.win)) && !(Y.UA.phantomjs) && !(Y.UA.chrome && Y.UA.chrome < 6)) {
-            simulateTouchEvent(target, type,
-                options.bubbles, options.cancelable, options.view, options.detail,
-                options.screenX, options.screenY, options.clientX, options.clientY,
-                options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-                options.touches, options.targetTouches, options.changedTouches,
-                options.scale, options.rotation);
-        } else {
-            Y.error("simulate(): Event '" + type + "' can't be simulated. Use gesture-simulate module instead.");
-        }
-
-    // ios gesture low-level event simulation (iOS v2+ only)
-    } else if(Y.UA.ios && Y.UA.ios >= 2.0 && gestureEvents[type]) {
-        simulateGestureEvent(target, type,
-            options.bubbles, options.cancelable, options.view, options.detail,
-            options.screenX, options.screenY, options.clientX, options.clientY,
-            options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-            options.scale, options.rotation);
-
-    // anything else
-    } else {
-        Y.error("simulate(): Event '" + type + "' can't be simulated.");
-    }
-};
-
-
-})();
-
-
-
-}, '3.16.0', {"requires": ["event-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('async-queue', function (Y, NAME) {
-
-/**
- * <p>AsyncQueue allows you create a chain of function callbacks executed
- * via setTimeout (or synchronously) that are guaranteed to run in order.
- * Items in the queue can be promoted or removed.  Start or resume the
- * execution chain with run().  pause() to temporarily delay execution, or
- * stop() to halt and clear the queue.</p>
- *
- * @module async-queue
- */
-
-/**
- * <p>A specialized queue class that supports scheduling callbacks to execute
- * sequentially, iteratively, even asynchronously.</p>
- *
- * <p>Callbacks can be function refs or objects with the following keys.  Only
- * the <code>fn</code> key is required.</p>
- *
- * <ul>
- * <li><code>fn</code> -- The callback function</li>
- * <li><code>context</code> -- The execution context for the callbackFn.</li>
- * <li><code>args</code> -- Arguments to pass to callbackFn.</li>
- * <li><code>timeout</code> -- Millisecond delay before executing callbackFn.
- *                     (Applies to each iterative execution of callback)</li>
- * <li><code>iterations</code> -- Number of times to repeat the callback.
- * <li><code>until</code> -- Repeat the callback until this function returns
- *                         true.  This setting trumps iterations.</li>
- * <li><code>autoContinue</code> -- Set to false to prevent the AsyncQueue from
- *                        executing the next callback in the Queue after
- *                        the callback completes.</li>
- * <li><code>id</code> -- Name that can be used to get, promote, get the
- *                        indexOf, or delete this callback.</li>
- * </ul>
- *
- * @class AsyncQueue
- * @extends EventTarget
- * @constructor
- * @param callback* {Function|Object} 0..n callbacks to seed the queue
- */
-Y.AsyncQueue = function() {
-    this._init();
-    this.add.apply(this, arguments);
-};
-
-var Queue   = Y.AsyncQueue,
-    EXECUTE = 'execute',
-    SHIFT   = 'shift',
-    PROMOTE = 'promote',
-    REMOVE  = 'remove',
-
-    isObject   = Y.Lang.isObject,
-    isFunction = Y.Lang.isFunction;
-
-/**
- * <p>Static default values used to populate callback configuration properties.
- * Preconfigured defaults include:</p>
- *
- * <ul>
- *  <li><code>autoContinue</code>: <code>true</code></li>
- *  <li><code>iterations</code>: 1</li>
- *  <li><code>timeout</code>: 10 (10ms between callbacks)</li>
- *  <li><code>until</code>: (function to run until iterations &lt;= 0)</li>
- * </ul>
- *
- * @property defaults
- * @type {Object}
- * @static
- */
-Queue.defaults = Y.mix({
-    autoContinue : true,
-    iterations   : 1,
-    timeout      : 10,
-    until        : function () {
-        this.iterations |= 0;
-        return this.iterations <= 0;
-    }
-}, Y.config.queueDefaults || {});
-
-Y.extend(Queue, Y.EventTarget, {
-    /**
-     * Used to indicate the queue is currently executing a callback.
-     *
-     * @property _running
-     * @type {Boolean|Object} true for synchronous callback execution, the
-     *                        return handle from Y.later for async callbacks.
-     *                        Otherwise false.
-     * @protected
-     */
-    _running : false,
-
-    /**
-     * Initializes the AsyncQueue instance properties and events.
-     *
-     * @method _init
-     * @protected
-     */
-    _init : function () {
-        Y.EventTarget.call(this, { prefix: 'queue', emitFacade: true });
-
-        this._q = [];
-
-        /**
-         * Callback defaults for this instance.  Static defaults that are not
-         * overridden are also included.
-         *
-         * @property defaults
-         * @type {Object}
-         */
-        this.defaults = {};
-
-        this._initEvents();
-    },
-
-    /**
-     * Initializes the instance events.
-     *
-     * @method _initEvents
-     * @protected
-     */
-    _initEvents : function () {
-        this.publish({
-            'execute' : { defaultFn : this._defExecFn,    emitFacade: true },
-            'shift'   : { defaultFn : this._defShiftFn,   emitFacade: true },
-            'add'     : { defaultFn : this._defAddFn,     emitFacade: true },
-            'promote' : { defaultFn : this._defPromoteFn, emitFacade: true },
-            'remove'  : { defaultFn : this._defRemoveFn,  emitFacade: true }
-        });
-    },
-
-    /**
-     * Returns the next callback needing execution.  If a callback is
-     * configured to repeat via iterations or until, it will be returned until
-     * the completion criteria is met.
-     *
-     * When the queue is empty, null is returned.
-     *
-     * @method next
-     * @return {Function} the callback to execute
-     */
-    next : function () {
-        var callback;
-
-        while (this._q.length) {
-            callback = this._q[0] = this._prepare(this._q[0]);
-            if (callback && callback.until()) {
-                this.fire(SHIFT, { callback: callback });
-                callback = null;
-            } else {
-                break;
-            }
-        }
-
-        return callback || null;
-    },
-
-    /**
-     * Default functionality for the &quot;shift&quot; event.  Shifts the
-     * callback stored in the event object's <em>callback</em> property from
-     * the queue if it is the first item.
-     *
-     * @method _defShiftFn
-     * @param e {Event} The event object
-     * @protected
-     */
-    _defShiftFn : function (e) {
-        if (this.indexOf(e.callback) === 0) {
-            this._q.shift();
-        }
-    },
-
-    /**
-     * Creates a wrapper function to execute the callback using the aggregated
-     * configuration generated by combining the static AsyncQueue.defaults, the
-     * instance defaults, and the specified callback settings.
-     *
-     * The wrapper function is decorated with the callback configuration as
-     * properties for runtime modification.
-     *
-     * @method _prepare
-     * @param callback {Object|Function} the raw callback
-     * @return {Function} a decorated function wrapper to execute the callback
-     * @protected
-     */
-    _prepare: function (callback) {
-        if (isFunction(callback) && callback._prepared) {
-            return callback;
-        }
-
-        var config = Y.merge(
-            Queue.defaults,
-            { context : this, args: [], _prepared: true },
-            this.defaults,
-            (isFunction(callback) ? { fn: callback } : callback)),
-
-            wrapper = Y.bind(function () {
-                if (!wrapper._running) {
-                    wrapper.iterations--;
-                }
-                if (isFunction(wrapper.fn)) {
-                    wrapper.fn.apply(wrapper.context || Y,
-                                     Y.Array(wrapper.args));
-                }
-            }, this);
-
-        return Y.mix(wrapper, config);
-    },
-
-    /**
-     * Sets the queue in motion.  All queued callbacks will be executed in
-     * order unless pause() or stop() is called or if one of the callbacks is
-     * configured with autoContinue: false.
-     *
-     * @method run
-     * @return {AsyncQueue} the AsyncQueue instance
-     * @chainable
-     */
-    run : function () {
-        var callback,
-            cont = true;
-
-        if (this._executing) {
-            this._running = true;
-            return this;
-        }
-
-        for (callback = this.next();
-            callback && !this.isRunning();
-            callback = this.next())
-        {
-            cont = (callback.timeout < 0) ?
-                this._execute(callback) :
-                this._schedule(callback);
-
-            // Break to avoid an extra call to next (final-expression of the
-            // 'for' loop), because the until function of the next callback
-            // in the queue may return a wrong result if it depends on the
-            // not-yet-finished work of the previous callback.
-            if (!cont) {
-                break;
-            }
-        }
-
-        if (!callback) {
-            /**
-             * Event fired when there is no remaining callback in the running queue. Also fired after stop().
-             * @event complete
-             */
-            this.fire('complete');
-        }
-
-        return this;
-    },
-
-    /**
-     * Handles the execution of callbacks. Returns a boolean indicating
-     * whether it is appropriate to continue running.
-     *
-     * @method _execute
-     * @param callback {Object} the callback object to execute
-     * @return {Boolean} whether the run loop should continue
-     * @protected
-     */
-    _execute : function (callback) {
-
-        this._running   = callback._running = true;
-        this._executing = callback;
-
-        callback.iterations--;
-        this.fire(EXECUTE, { callback: callback });
-
-        var cont = this._running && callback.autoContinue;
-
-        this._running   = callback._running = false;
-        this._executing = false;
-
-        return cont;
-    },
-
-    /**
-     * Schedules the execution of asynchronous callbacks.
-     *
-     * @method _schedule
-     * @param callback {Object} the callback object to execute
-     * @return {Boolean} whether the run loop should continue
-     * @protected
-     */
-    _schedule : function (callback) {
-        this._running = Y.later(callback.timeout, this, function () {
-            if (this._execute(callback)) {
-                this.run();
-            }
-        });
-
-        return false;
-    },
-
-    /**
-     * Determines if the queue is waiting for a callback to complete execution.
-     *
-     * @method isRunning
-     * @return {Boolean} true if queue is waiting for a
-     *                   from any initiated transactions
-     */
-    isRunning : function () {
-        return !!this._running;
-    },
-
-    /**
-     * Default functionality for the &quot;execute&quot; event.  Executes the
-     * callback function
-     *
-     * @method _defExecFn
-     * @param e {Event} the event object
-     * @protected
-     */
-    _defExecFn : function (e) {
-        e.callback();
-    },
-
-    /**
-     * Add any number of callbacks to the end of the queue. Callbacks may be
-     * provided as functions or objects.
-     *
-     * @method add
-     * @param callback* {Function|Object} 0..n callbacks
-     * @return {AsyncQueue} the AsyncQueue instance
-     * @chainable
-     */
-    add : function () {
-        this.fire('add', { callbacks: Y.Array(arguments,0,true) });
-
-        return this;
-    },
-
-    /**
-     * Default functionality for the &quot;add&quot; event.  Adds the callbacks
-     * in the event facade to the queue. Callbacks successfully added to the
-     * queue are present in the event's <code>added</code> property in the
-     * after phase.
-     *
-     * @method _defAddFn
-     * @param e {Event} the event object
-     * @protected
-     */
-    _defAddFn : function(e) {
-        var _q = this._q,
-            added = [];
-
-        Y.Array.each(e.callbacks, function (c) {
-            if (isObject(c)) {
-                _q.push(c);
-                added.push(c);
-            }
-        });
-
-        e.added = added;
-    },
-
-    /**
-     * Pause the execution of the queue after the execution of the current
-     * callback completes.  If called from code outside of a queued callback,
-     * clears the timeout for the pending callback. Paused queue can be
-     * restarted with q.run()
-     *
-     * @method pause
-     * @return {AsyncQueue} the AsyncQueue instance
-     * @chainable
-     */
-    pause: function () {
-        if (this._running && isObject(this._running)) {
-            this._running.cancel();
-        }
-
-        this._running = false;
-
-        return this;
-    },
-
-    /**
-     * Stop and clear the queue after the current execution of the
-     * current callback completes.
-     *
-     * @method stop
-     * @return {AsyncQueue} the AsyncQueue instance
-     * @chainable
-     */
-    stop : function () {
-
-        this._q = [];
-
-        if (this._running && isObject(this._running)) {
-            this._running.cancel();
-            this._running = false;
-        }
-        // otherwise don't systematically set this._running to false, because if
-        // stop has been called from inside a queued callback, the _execute method
-        // currenty running needs to call run() one more time for the 'complete'
-        // event to be fired.
-
-        // if stop is called from outside a callback, we need to explicitely call
-        // run() once again to fire the 'complete' event.
-        if (!this._executing) {
-            this.run();
-        }
-
-        return this;
-    },
-
-    /**
-     * Returns the current index of a callback.  Pass in either the id or
-     * callback function from getCallback.
-     *
-     * @method indexOf
-     * @param callback {String|Function} the callback or its specified id
-     * @return {Number} index of the callback or -1 if not found
-     */
-    indexOf : function (callback) {
-        var i = 0, len = this._q.length, c;
-
-        for (; i < len; ++i) {
-            c = this._q[i];
-            if (c === callback || c.id === callback) {
-                return i;
-            }
-        }
-
-        return -1;
-    },
-
-    /**
-     * Retrieve a callback by its id.  Useful to modify the configuration
-     * while the queue is running.
-     *
-     * @method getCallback
-     * @param id {String} the id assigned to the callback
-     * @return {Object} the callback object
-     */
-    getCallback : function (id) {
-        var i = this.indexOf(id);
-
-        return (i > -1) ? this._q[i] : null;
-    },
-
-    /**
-     * Promotes the named callback to the top of the queue. If a callback is
-     * currently executing or looping (via until or iterations), the promotion
-     * is scheduled to occur after the current callback has completed.
-     *
-     * @method promote
-     * @param callback {String|Object} the callback object or a callback's id
-     * @return {AsyncQueue} the AsyncQueue instance
-     * @chainable
-     */
-    promote : function (callback) {
-        var payload = { callback : callback },e;
-
-        if (this.isRunning()) {
-            e = this.after(SHIFT, function () {
-                    this.fire(PROMOTE, payload);
-                    e.detach();
-                }, this);
-        } else {
-            this.fire(PROMOTE, payload);
-        }
-
-        return this;
-    },
-
-    /**
-     * <p>Default functionality for the &quot;promote&quot; event.  Promotes the
-     * named callback to the head of the queue.</p>
-     *
-     * <p>The event object will contain a property &quot;callback&quot;, which
-     * holds the id of a callback or the callback object itself.</p>
-     *
-     * @method _defPromoteFn
-     * @param e {Event} the custom event
-     * @protected
-     */
-    _defPromoteFn : function (e) {
-        var i = this.indexOf(e.callback),
-            promoted = (i > -1) ? this._q.splice(i,1)[0] : null;
-
-        e.promoted = promoted;
-
-        if (promoted) {
-            this._q.unshift(promoted);
-        }
-    },
-
-    /**
-     * Removes the callback from the queue.  If the queue is active, the
-     * removal is scheduled to occur after the current callback has completed.
-     *
-     * @method remove
-     * @param callback {String|Object} the callback object or a callback's id
-     * @return {AsyncQueue} the AsyncQueue instance
-     * @chainable
-     */
-    remove : function (callback) {
-        var payload = { callback : callback },e;
-
-        // Can't return the removed callback because of the deferral until
-        // current callback is complete
-        if (this.isRunning()) {
-            e = this.after(SHIFT, function () {
-                    this.fire(REMOVE, payload);
-                    e.detach();
-                },this);
-        } else {
-            this.fire(REMOVE, payload);
-        }
-
-        return this;
-    },
-
-    /**
-     * <p>Default functionality for the &quot;remove&quot; event.  Removes the
-     * callback from the queue.</p>
-     *
-     * <p>The event object will contain a property &quot;callback&quot;, which
-     * holds the id of a callback or the callback object itself.</p>
-     *
-     * @method _defRemoveFn
-     * @param e {Event} the custom event
-     * @protected
-     */
-    _defRemoveFn : function (e) {
-        var i = this.indexOf(e.callback);
-
-        e.removed = (i > -1) ? this._q.splice(i,1)[0] : null;
-    },
-
-    /**
-     * Returns the number of callbacks in the queue.
-     *
-     * @method size
-     * @return {Number}
-     */
-    size : function () {
-        // next() flushes callbacks that have met their until() criteria and
-        // therefore shouldn't count since they wouldn't execute anyway.
-        if (!this.isRunning()) {
-            this.next();
-        }
-
-        return this._q.length;
-    }
-});
-
-
-
-}, '3.16.0', {"requires": ["event-custom"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('dom-screen', function (Y, NAME) {
-
-(function(Y) {
-
-/**
- * Adds position and region management functionality to DOM.
- * @module dom
- * @submodule dom-screen
- * @for DOM
- */
-
-var DOCUMENT_ELEMENT = 'documentElement',
-    COMPAT_MODE = 'compatMode',
-    POSITION = 'position',
-    FIXED = 'fixed',
-    RELATIVE = 'relative',
-    LEFT = 'left',
-    TOP = 'top',
-    _BACK_COMPAT = 'BackCompat',
-    MEDIUM = 'medium',
-    BORDER_LEFT_WIDTH = 'borderLeftWidth',
-    BORDER_TOP_WIDTH = 'borderTopWidth',
-    GET_BOUNDING_CLIENT_RECT = 'getBoundingClientRect',
-    GET_COMPUTED_STYLE = 'getComputedStyle',
-
-    Y_DOM = Y.DOM,
-
-    // TODO: how about thead/tbody/tfoot/tr?
-    // TODO: does caption matter?
-    RE_TABLE = /^t(?:able|d|h)$/i,
-
-    SCROLL_NODE;
-
-if (Y.UA.ie) {
-    if (Y.config.doc[COMPAT_MODE] !== 'BackCompat') {
-        SCROLL_NODE = DOCUMENT_ELEMENT;
-    } else {
-        SCROLL_NODE = 'body';
-    }
-}
-
-Y.mix(Y_DOM, {
-    /**
-     * Returns the inner height of the viewport (exludes scrollbar).
-     * @method winHeight
-     * @return {Number} The current height of the viewport.
-     */
-    winHeight: function(node) {
-        var h = Y_DOM._getWinSize(node).height;
-        return h;
-    },
-
-    /**
-     * Returns the inner width of the viewport (exludes scrollbar).
-     * @method winWidth
-     * @return {Number} The current width of the viewport.
-     */
-    winWidth: function(node) {
-        var w = Y_DOM._getWinSize(node).width;
-        return w;
-    },
-
-    /**
-     * Document height
-     * @method docHeight
-     * @return {Number} The current height of the document.
-     */
-    docHeight:  function(node) {
-        var h = Y_DOM._getDocSize(node).height;
-        return Math.max(h, Y_DOM._getWinSize(node).height);
-    },
-
-    /**
-     * Document width
-     * @method docWidth
-     * @return {Number} The current width of the document.
-     */
-    docWidth:  function(node) {
-        var w = Y_DOM._getDocSize(node).width;
-        return Math.max(w, Y_DOM._getWinSize(node).width);
-    },
-
-    /**
-     * Amount page has been scroll horizontally
-     * @method docScrollX
-     * @return {Number} The current amount the screen is scrolled horizontally.
-     */
-    docScrollX: function(node, doc) {
-        doc = doc || (node) ? Y_DOM._getDoc(node) : Y.config.doc; // perf optimization
-        var dv = doc.defaultView,
-            pageOffset = (dv) ? dv.pageXOffset : 0;
-        return Math.max(doc[DOCUMENT_ELEMENT].scrollLeft, doc.body.scrollLeft, pageOffset);
-    },
-
-    /**
-     * Amount page has been scroll vertically
-     * @method docScrollY
-     * @return {Number} The current amount the screen is scrolled vertically.
-     */
-    docScrollY:  function(node, doc) {
-        doc = doc || (node) ? Y_DOM._getDoc(node) : Y.config.doc; // perf optimization
-        var dv = doc.defaultView,
-            pageOffset = (dv) ? dv.pageYOffset : 0;
-        return Math.max(doc[DOCUMENT_ELEMENT].scrollTop, doc.body.scrollTop, pageOffset);
-    },
-
-    /**
-     * Gets the current position of an element based on page coordinates.
-     * Element must be part of the DOM tree to have page coordinates
-     * (display:none or elements not appended return false).
-     * @method getXY
-     * @param element The target element
-     * @return {Array} The XY position of the element
-
-     TODO: test inDocument/display?
-     */
-    getXY: function() {
-        if (Y.config.doc[DOCUMENT_ELEMENT][GET_BOUNDING_CLIENT_RECT]) {
-            return function(node) {
-                var xy = null,
-                    scrollLeft,
-                    scrollTop,
-                    mode,
-                    box,
-                    offX,
-                    offY,
-                    doc,
-                    win,
-                    inDoc,
-                    rootNode;
-
-                if (node && node.tagName) {
-                    doc = node.ownerDocument;
-                    mode = doc[COMPAT_MODE];
-
-                    if (mode !== _BACK_COMPAT) {
-                        rootNode = doc[DOCUMENT_ELEMENT];
-                    } else {
-                        rootNode = doc.body;
-                    }
-
-                    // inline inDoc check for perf
-                    if (rootNode.contains) {
-                        inDoc = rootNode.contains(node);
-                    } else {
-                        inDoc = Y.DOM.contains(rootNode, node);
-                    }
-
-                    if (inDoc) {
-                        win = doc.defaultView;
-
-                        // inline scroll calc for perf
-                        if (win && 'pageXOffset' in win) {
-                            scrollLeft = win.pageXOffset;
-                            scrollTop = win.pageYOffset;
-                        } else {
-                            scrollLeft = (SCROLL_NODE) ? doc[SCROLL_NODE].scrollLeft : Y_DOM.docScrollX(node, doc);
-                            scrollTop = (SCROLL_NODE) ? doc[SCROLL_NODE].scrollTop : Y_DOM.docScrollY(node, doc);
-                        }
-
-                        if (Y.UA.ie) { // IE < 8, quirks, or compatMode
-                            if (!doc.documentMode || doc.documentMode < 8 || mode === _BACK_COMPAT) {
-                                offX = rootNode.clientLeft;
-                                offY = rootNode.clientTop;
-                            }
-                        }
-                        box = node[GET_BOUNDING_CLIENT_RECT]();
-                        xy = [box.left, box.top];
-
-                        if (offX || offY) {
-                                xy[0] -= offX;
-                                xy[1] -= offY;
-
-                        }
-                        if ((scrollTop || scrollLeft)) {
-                            if (!Y.UA.ios || (Y.UA.ios >= 4.2)) {
-                                xy[0] += scrollLeft;
-                                xy[1] += scrollTop;
-                            }
-
-                        }
-                    } else {
-                        xy = Y_DOM._getOffset(node);
-                    }
-                }
-                return xy;
-            };
-        } else {
-            return function(node) { // manually calculate by crawling up offsetParents
-                //Calculate the Top and Left border sizes (assumes pixels)
-                var xy = null,
-                    doc,
-                    parentNode,
-                    bCheck,
-                    scrollTop,
-                    scrollLeft;
-
-                if (node) {
-                    if (Y_DOM.inDoc(node)) {
-                        xy = [node.offsetLeft, node.offsetTop];
-                        doc = node.ownerDocument;
-                        parentNode = node;
-                        // TODO: refactor with !! or just falsey
-                        bCheck = ((Y.UA.gecko || Y.UA.webkit > 519) ? true : false);
-
-                        // TODO: worth refactoring for TOP/LEFT only?
-                        while ((parentNode = parentNode.offsetParent)) {
-                            xy[0] += parentNode.offsetLeft;
-                            xy[1] += parentNode.offsetTop;
-                            if (bCheck) {
-                                xy = Y_DOM._calcBorders(parentNode, xy);
-                            }
-                        }
-
-                        // account for any scrolled ancestors
-                        if (Y_DOM.getStyle(node, POSITION) != FIXED) {
-                            parentNode = node;
-
-                            while ((parentNode = parentNode.parentNode)) {
-                                scrollTop = parentNode.scrollTop;
-                                scrollLeft = parentNode.scrollLeft;
-
-                                //Firefox does something funky with borders when overflow is not visible.
-                                if (Y.UA.gecko && (Y_DOM.getStyle(parentNode, 'overflow') !== 'visible')) {
-                                        xy = Y_DOM._calcBorders(parentNode, xy);
-                                }
-
-
-                                if (scrollTop || scrollLeft) {
-                                    xy[0] -= scrollLeft;
-                                    xy[1] -= scrollTop;
-                                }
-                            }
-                            xy[0] += Y_DOM.docScrollX(node, doc);
-                            xy[1] += Y_DOM.docScrollY(node, doc);
-
-                        } else {
-                            //Fix FIXED position -- add scrollbars
-                            xy[0] += Y_DOM.docScrollX(node, doc);
-                            xy[1] += Y_DOM.docScrollY(node, doc);
-                        }
-                    } else {
-                        xy = Y_DOM._getOffset(node);
-                    }
-                }
-
-                return xy;
-            };
-        }
-    }(),// NOTE: Executing for loadtime branching
-
-    /**
-    Gets the width of vertical scrollbars on overflowed containers in the body
-    content.
-
-    @method getScrollbarWidth
-    @return {Number} Pixel width of a scrollbar in the current browser
-    **/
-    getScrollbarWidth: Y.cached(function () {
-        var doc      = Y.config.doc,
-            testNode = doc.createElement('div'),
-            body     = doc.getElementsByTagName('body')[0],
-            // 0.1 because cached doesn't support falsy refetch values
-            width    = 0.1;
-
-        if (body) {
-            testNode.style.cssText = "position:absolute;visibility:hidden;overflow:scroll;width:20px;";
-            testNode.appendChild(doc.createElement('p')).style.height = '1px';
-            body.insertBefore(testNode, body.firstChild);
-            width = testNode.offsetWidth - testNode.clientWidth;
-
-            body.removeChild(testNode);
-        }
-
-        return width;
-    }, null, 0.1),
-
-    /**
-     * Gets the current X position of an element based on page coordinates.
-     * Element must be part of the DOM tree to have page coordinates
-     * (display:none or elements not appended return false).
-     * @method getX
-     * @param element The target element
-     * @return {Number} The X position of the element
-     */
-
-    getX: function(node) {
-        return Y_DOM.getXY(node)[0];
-    },
-
-    /**
-     * Gets the current Y position of an element based on page coordinates.
-     * Element must be part of the DOM tree to have page coordinates
-     * (display:none or elements not appended return false).
-     * @method getY
-     * @param element The target element
-     * @return {Number} The Y position of the element
-     */
-
-    getY: function(node) {
-        return Y_DOM.getXY(node)[1];
-    },
-
-    /**
-     * Set the position of an html element in page coordinates.
-     * The element must be part of the DOM tree to have page coordinates (display:none or elements not appended return false).
-     * @method setXY
-     * @param element The target element
-     * @param {Array} xy Contains X & Y values for new position (coordinates are page-based)
-     * @param {Boolean} noRetry By default we try and set the position a second time if the first fails
-     */
-    setXY: function(node, xy, noRetry) {
-        var setStyle = Y_DOM.setStyle,
-            pos,
-            delta,
-            newXY,
-            currentXY;
-
-        if (node && xy) {
-            pos = Y_DOM.getStyle(node, POSITION);
-
-            delta = Y_DOM._getOffset(node);
-            if (pos == 'static') { // default to relative
-                pos = RELATIVE;
-                setStyle(node, POSITION, pos);
-            }
-            currentXY = Y_DOM.getXY(node);
-
-            if (xy[0] !== null) {
-                setStyle(node, LEFT, xy[0] - currentXY[0] + delta[0] + 'px');
-            }
-
-            if (xy[1] !== null) {
-                setStyle(node, TOP, xy[1] - currentXY[1] + delta[1] + 'px');
-            }
-
-            if (!noRetry) {
-                newXY = Y_DOM.getXY(node);
-                if (newXY[0] !== xy[0] || newXY[1] !== xy[1]) {
-                    Y_DOM.setXY(node, xy, true);
-                }
-            }
-
-        } else {
-        }
-    },
-
-    /**
-     * Set the X position of an html element in page coordinates, regardless of how the element is positioned.
-     * The element(s) must be part of the DOM tree to have page coordinates (display:none or elements not appended return false).
-     * @method setX
-     * @param element The target element
-     * @param {Number} x The X values for new position (coordinates are page-based)
-     */
-    setX: function(node, x) {
-        return Y_DOM.setXY(node, [x, null]);
-    },
-
-    /**
-     * Set the Y position of an html element in page coordinates, regardless of how the element is positioned.
-     * The element(s) must be part of the DOM tree to have page coordinates (display:none or elements not appended return false).
-     * @method setY
-     * @param element The target element
-     * @param {Number} y The Y values for new position (coordinates are page-based)
-     */
-    setY: function(node, y) {
-        return Y_DOM.setXY(node, [null, y]);
-    },
-
-    /**
-     * @method swapXY
-     * @description Swap the xy position with another node
-     * @param {Node} node The node to swap with
-     * @param {Node} otherNode The other node to swap with
-     * @return {Node}
-     */
-    swapXY: function(node, otherNode) {
-        var xy = Y_DOM.getXY(node);
-        Y_DOM.setXY(node, Y_DOM.getXY(otherNode));
-        Y_DOM.setXY(otherNode, xy);
-    },
-
-    _calcBorders: function(node, xy2) {
-        var t = parseInt(Y_DOM[GET_COMPUTED_STYLE](node, BORDER_TOP_WIDTH), 10) || 0,
-            l = parseInt(Y_DOM[GET_COMPUTED_STYLE](node, BORDER_LEFT_WIDTH), 10) || 0;
-        if (Y.UA.gecko) {
-            if (RE_TABLE.test(node.tagName)) {
-                t = 0;
-                l = 0;
-            }
-        }
-        xy2[0] += l;
-        xy2[1] += t;
-        return xy2;
-    },
-
-    _getWinSize: function(node, doc) {
-        doc  = doc || (node) ? Y_DOM._getDoc(node) : Y.config.doc;
-        var win = doc.defaultView || doc.parentWindow,
-            mode = doc[COMPAT_MODE],
-            h = win.innerHeight,
-            w = win.innerWidth,
-            root = doc[DOCUMENT_ELEMENT];
-
-        if ( mode && !Y.UA.opera ) { // IE, Gecko
-            if (mode != 'CSS1Compat') { // Quirks
-                root = doc.body;
-            }
-            h = root.clientHeight;
-            w = root.clientWidth;
-        }
-        return { height: h, width: w };
-    },
-
-    _getDocSize: function(node) {
-        var doc = (node) ? Y_DOM._getDoc(node) : Y.config.doc,
-            root = doc[DOCUMENT_ELEMENT];
-
-        if (doc[COMPAT_MODE] != 'CSS1Compat') {
-            root = doc.body;
-        }
-
-        return { height: root.scrollHeight, width: root.scrollWidth };
-    }
-});
-
-})(Y);
-(function(Y) {
-var TOP = 'top',
-    RIGHT = 'right',
-    BOTTOM = 'bottom',
-    LEFT = 'left',
-
-    getOffsets = function(r1, r2) {
-        var t = Math.max(r1[TOP], r2[TOP]),
-            r = Math.min(r1[RIGHT], r2[RIGHT]),
-            b = Math.min(r1[BOTTOM], r2[BOTTOM]),
-            l = Math.max(r1[LEFT], r2[LEFT]),
-            ret = {};
-
-        ret[TOP] = t;
-        ret[RIGHT] = r;
-        ret[BOTTOM] = b;
-        ret[LEFT] = l;
-        return ret;
-    },
-
-    DOM = Y.DOM;
-
-Y.mix(DOM, {
-    /**
-     * Returns an Object literal containing the following about this element: (top, right, bottom, left)
-     * @for DOM
-     * @method region
-     * @param {HTMLElement} element The DOM element.
-     * @return {Object} Object literal containing the following about this element: (top, right, bottom, left)
-     */
-    region: function(node) {
-        var xy = DOM.getXY(node),
-            ret = false;
-
-        if (node && xy) {
-            ret = DOM._getRegion(
-                xy[1], // top
-                xy[0] + node.offsetWidth, // right
-                xy[1] + node.offsetHeight, // bottom
-                xy[0] // left
-            );
-        }
-
-        return ret;
-    },
-
-    /**
-     * Find the intersect information for the passed nodes.
-     * @method intersect
-     * @for DOM
-     * @param {HTMLElement} element The first element
-     * @param {HTMLElement | Object} element2 The element or region to check the interect with
-     * @param {Object} altRegion An object literal containing the region for the first element if we already have the data (for performance e.g. DragDrop)
-     * @return {Object} Object literal containing the following intersection data: (top, right, bottom, left, area, yoff, xoff, inRegion)
-     */
-    intersect: function(node, node2, altRegion) {
-        var r = altRegion || DOM.region(node), region = {},
-            n = node2,
-            off;
-
-        if (n.tagName) {
-            region = DOM.region(n);
-        } else if (Y.Lang.isObject(node2)) {
-            region = node2;
-        } else {
-            return false;
-        }
-
-        off = getOffsets(region, r);
-        return {
-            top: off[TOP],
-            right: off[RIGHT],
-            bottom: off[BOTTOM],
-            left: off[LEFT],
-            area: ((off[BOTTOM] - off[TOP]) * (off[RIGHT] - off[LEFT])),
-            yoff: ((off[BOTTOM] - off[TOP])),
-            xoff: (off[RIGHT] - off[LEFT]),
-            inRegion: DOM.inRegion(node, node2, false, altRegion)
-        };
-
-    },
-    /**
-     * Check if any part of this node is in the passed region
-     * @method inRegion
-     * @for DOM
-     * @param {Object} node The node to get the region from
-     * @param {Object} node2 The second node to get the region from or an Object literal of the region
-     * @param {Boolean} all Should all of the node be inside the region
-     * @param {Object} altRegion An object literal containing the region for this node if we already have the data (for performance e.g. DragDrop)
-     * @return {Boolean} True if in region, false if not.
-     */
-    inRegion: function(node, node2, all, altRegion) {
-        var region = {},
-            r = altRegion || DOM.region(node),
-            n = node2,
-            off;
-
-        if (n.tagName) {
-            region = DOM.region(n);
-        } else if (Y.Lang.isObject(node2)) {
-            region = node2;
-        } else {
-            return false;
-        }
-
-        if (all) {
-            return (
-                r[LEFT]   >= region[LEFT]   &&
-                r[RIGHT]  <= region[RIGHT]  &&
-                r[TOP]    >= region[TOP]    &&
-                r[BOTTOM] <= region[BOTTOM]  );
-        } else {
-            off = getOffsets(region, r);
-            if (off[BOTTOM] >= off[TOP] && off[RIGHT] >= off[LEFT]) {
-                return true;
-            } else {
-                return false;
-            }
-
-        }
-    },
-
-    /**
-     * Check if any part of this element is in the viewport
-     * @method inViewportRegion
-     * @for DOM
-     * @param {HTMLElement} element The DOM element.
-     * @param {Boolean} all Should all of the node be inside the region
-     * @param {Object} altRegion An object literal containing the region for this node if we already have the data (for performance e.g. DragDrop)
-     * @return {Boolean} True if in region, false if not.
-     */
-    inViewportRegion: function(node, all, altRegion) {
-        return DOM.inRegion(node, DOM.viewportRegion(node), all, altRegion);
-
-    },
-
-    _getRegion: function(t, r, b, l) {
-        var region = {};
-
-        region[TOP] = region[1] = t;
-        region[LEFT] = region[0] = l;
-        region[BOTTOM] = b;
-        region[RIGHT] = r;
-        region.width = region[RIGHT] - region[LEFT];
-        region.height = region[BOTTOM] - region[TOP];
-
-        return region;
-    },
-
-    /**
-     * Returns an Object literal containing the following about the visible region of viewport: (top, right, bottom, left)
-     * @method viewportRegion
-     * @for DOM
-     * @return {Object} Object literal containing the following about the visible region of the viewport: (top, right, bottom, left)
-     */
-    viewportRegion: function(node) {
-        node = node || Y.config.doc.documentElement;
-        var ret = false,
-            scrollX,
-            scrollY;
-
-        if (node) {
-            scrollX = DOM.docScrollX(node);
-            scrollY = DOM.docScrollY(node);
-
-            ret = DOM._getRegion(scrollY, // top
-                DOM.winWidth(node) + scrollX, // right
-                scrollY + DOM.winHeight(node), // bottom
-                scrollX); // left
-        }
-
-        return ret;
-    }
-});
-})(Y);
-
-
-}, '3.16.0', {"requires": ["dom-base", "dom-style"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-screen', function (Y, NAME) {
-
-/**
- * Extended Node interface for managing regions and screen positioning.
- * Adds support for positioning elements and normalizes window size and scroll detection.
- * @module node
- * @submodule node-screen
- */
-
-// these are all "safe" returns, no wrapping required
-Y.each([
-    /**
-     * Returns the inner width of the viewport (exludes scrollbar).
-     * @config winWidth
-     * @for Node
-     * @type {Number}
-     */
-    'winWidth',
-
-    /**
-     * Returns the inner height of the viewport (exludes scrollbar).
-     * @config winHeight
-     * @type {Number}
-     */
-    'winHeight',
-
-    /**
-     * Document width
-     * @config docWidth
-     * @type {Number}
-     */
-    'docWidth',
-
-    /**
-     * Document height
-     * @config docHeight
-     * @type {Number}
-     */
-    'docHeight',
-
-    /**
-     * Pixel distance the page has been scrolled horizontally
-     * @config docScrollX
-     * @type {Number}
-     */
-    'docScrollX',
-
-    /**
-     * Pixel distance the page has been scrolled vertically
-     * @config docScrollY
-     * @type {Number}
-     */
-    'docScrollY'
-    ],
-    function(name) {
-        Y.Node.ATTRS[name] = {
-            getter: function() {
-                var args = Array.prototype.slice.call(arguments);
-                args.unshift(Y.Node.getDOMNode(this));
-
-                return Y.DOM[name].apply(this, args);
-            }
-        };
-    }
-);
-
-Y.Node.ATTRS.scrollLeft = {
-    getter: function() {
-        var node = Y.Node.getDOMNode(this);
-        return ('scrollLeft' in node) ? node.scrollLeft : Y.DOM.docScrollX(node);
-    },
-
-    setter: function(val) {
-        var node = Y.Node.getDOMNode(this);
-        if (node) {
-            if ('scrollLeft' in node) {
-                node.scrollLeft = val;
-            } else if (node.document || node.nodeType === 9) {
-                Y.DOM._getWin(node).scrollTo(val, Y.DOM.docScrollY(node)); // scroll window if win or doc
-            }
-        } else {
-        }
-    }
-};
-
-Y.Node.ATTRS.scrollTop = {
-    getter: function() {
-        var node = Y.Node.getDOMNode(this);
-        return ('scrollTop' in node) ? node.scrollTop : Y.DOM.docScrollY(node);
-    },
-
-    setter: function(val) {
-        var node = Y.Node.getDOMNode(this);
-        if (node) {
-            if ('scrollTop' in node) {
-                node.scrollTop = val;
-            } else if (node.document || node.nodeType === 9) {
-                Y.DOM._getWin(node).scrollTo(Y.DOM.docScrollX(node), val); // scroll window if win or doc
-            }
-        } else {
-        }
-    }
-};
-
-Y.Node.importMethod(Y.DOM, [
-/**
- * Gets the current position of the node in page coordinates.
- * @method getXY
- * @for Node
- * @return {Array} The XY position of the node
-*/
-    'getXY',
-
-/**
- * Set the position of the node in page coordinates, regardless of how the node is positioned.
- * @method setXY
- * @param {Array} xy Contains X & Y values for new position (coordinates are page-based)
- * @chainable
- */
-    'setXY',
-
-/**
- * Gets the current position of the node in page coordinates.
- * @method getX
- * @return {Number} The X position of the node
-*/
-    'getX',
-
-/**
- * Set the position of the node in page coordinates, regardless of how the node is positioned.
- * @method setX
- * @param {Number} x X value for new position (coordinates are page-based)
- * @chainable
- */
-    'setX',
-
-/**
- * Gets the current position of the node in page coordinates.
- * @method getY
- * @return {Number} The Y position of the node
-*/
-    'getY',
-
-/**
- * Set the position of the node in page coordinates, regardless of how the node is positioned.
- * @method setY
- * @param {Number} y Y value for new position (coordinates are page-based)
- * @chainable
- */
-    'setY',
-
-/**
- * Swaps the XY position of this node with another node.
- * @method swapXY
- * @param {Node | HTMLElement} otherNode The node to swap with.
- * @chainable
- */
-    'swapXY'
-]);
-
-/**
- * @module node
- * @submodule node-screen
- */
-
-/**
- * Returns a region object for the node
- * @config region
- * @for Node
- * @type Node
- */
-Y.Node.ATTRS.region = {
-    getter: function() {
-        var node = this.getDOMNode(),
-            region;
-
-        if (node && !node.tagName) {
-            if (node.nodeType === 9) { // document
-                node = node.documentElement;
-            }
-        }
-        if (Y.DOM.isWindow(node)) {
-            region = Y.DOM.viewportRegion(node);
-        } else {
-            region = Y.DOM.region(node);
-        }
-        return region;
-    }
-};
-
-/**
- * Returns a region object for the node's viewport
- * @config viewportRegion
- * @type Node
- */
-Y.Node.ATTRS.viewportRegion = {
-    getter: function() {
-        return Y.DOM.viewportRegion(Y.Node.getDOMNode(this));
-    }
-};
-
-Y.Node.importMethod(Y.DOM, 'inViewportRegion');
-
-// these need special treatment to extract 2nd node arg
-/**
- * Compares the intersection of the node with another node or region
- * @method intersect
- * @for Node
- * @param {Node|Object} node2 The node or region to compare with.
- * @param {Object} altRegion An alternate region to use (rather than this node's).
- * @return {Object} An object representing the intersection of the regions.
- */
-Y.Node.prototype.intersect = function(node2, altRegion) {
-    var node1 = Y.Node.getDOMNode(this);
-    if (Y.instanceOf(node2, Y.Node)) { // might be a region object
-        node2 = Y.Node.getDOMNode(node2);
-    }
-    return Y.DOM.intersect(node1, node2, altRegion);
-};
-
-/**
- * Determines whether or not the node is within the given region.
- * @method inRegion
- * @param {Node|Object} node2 The node or region to compare with.
- * @param {Boolean} all Whether or not all of the node must be in the region.
- * @param {Object} altRegion An alternate region to use (rather than this node's).
- * @return {Boolean} True if in region, false if not.
- */
-Y.Node.prototype.inRegion = function(node2, all, altRegion) {
-    var node1 = Y.Node.getDOMNode(this);
-    if (Y.instanceOf(node2, Y.Node)) { // might be a region object
-        node2 = Y.Node.getDOMNode(node2);
-    }
-    return Y.DOM.inRegion(node1, node2, all, altRegion);
-};
-
-
-}, '3.16.0', {"requires": ["dom-screen", "node-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('gesture-simulate', function (Y, NAME) {
-
-/**
- * Simulate high-level user gestures by generating a set of native DOM events.
- *
- * @module gesture-simulate
- * @requires event-simulate, async-queue, node-screen
- */
-
-var NAME = "gesture-simulate",
-
-    // phantomjs check may be temporary, until we determine if it really support touch all the way through, like it claims to (http://code.google.com/p/phantomjs/issues/detail?id=375)
-    SUPPORTS_TOUCH = ((Y.config.win && ("ontouchstart" in Y.config.win)) && !(Y.UA.phantomjs) && !(Y.UA.chrome && Y.UA.chrome < 6)),
-
-    gestureNames = {
-        tap: 1,
-        doubletap: 1,
-        press: 1,
-        move: 1,
-        flick: 1,
-        pinch: 1,
-        rotate: 1
-    },
-
-    touchEvents = {
-        touchstart: 1,
-        touchmove: 1,
-        touchend: 1,
-        touchcancel: 1
-    },
-
-    document = Y.config.doc,
-    emptyTouchList,
-
-    EVENT_INTERVAL = 20,        // 20ms
-    START_PAGEX,                // will be adjusted to the node element center
-    START_PAGEY,                // will be adjusted to the node element center
-
-    // defaults that user can override.
-    DEFAULTS = {
-        // tap gestures
-        HOLD_TAP: 10,           // 10ms
-        DELAY_TAP: 10,          // 10ms
-
-        // press gesture
-        HOLD_PRESS: 3000,       // 3sec
-        MIN_HOLD_PRESS: 1000,   // 1sec
-        MAX_HOLD_PRESS: 60000,  // 1min
-
-        // move gesture
-        DISTANCE_MOVE: 200,     // 200 pixels
-        DURATION_MOVE: 1000,    // 1sec
-        MAX_DURATION_MOVE: 5000,// 5sec
-
-        // flick gesture
-        MIN_VELOCITY_FLICK: 1.3,
-        DISTANCE_FLICK: 200,     // 200 pixels
-        DURATION_FLICK: 1000,    // 1sec
-        MAX_DURATION_FLICK: 5000,// 5sec
-
-        // pinch/rotation
-        DURATION_PINCH: 1000     // 1sec
-    },
-
-    TOUCH_START = 'touchstart',
-    TOUCH_MOVE = 'touchmove',
-    TOUCH_END = 'touchend',
-
-    GESTURE_START = 'gesturestart',
-    GESTURE_CHANGE = 'gesturechange',
-    GESTURE_END = 'gestureend',
-
-    MOUSE_UP    = 'mouseup',
-    MOUSE_MOVE  = 'mousemove',
-    MOUSE_DOWN  = 'mousedown',
-    MOUSE_CLICK = 'click',
-    MOUSE_DBLCLICK = 'dblclick',
-
-    X_AXIS = 'x',
-    Y_AXIS = 'y';
-
-
-function Simulations(node) {
-    if(!node) {
-        Y.error(NAME+': invalid target node');
-    }
-    this.node = node;
-    this.target = Y.Node.getDOMNode(node);
-
-    var startXY = this.node.getXY(),
-        dims = this._getDims();
-
-    START_PAGEX = startXY[0] + (dims[0])/2;
-    START_PAGEY = startXY[1] + (dims[1])/2;
-}
-
-Simulations.prototype = {
-
-    /**
-     * Helper method to convert a degree to a radian.
-     *
-     * @method _toRadian
-     * @private
-     * @param {Number} deg A degree to be converted to a radian.
-     * @return {Number} The degree in radian.
-     */
-    _toRadian: function(deg) {
-        return deg * (Math.PI/180);
-    },
-
-    /**
-     * Helper method to get height/width while accounting for
-     * rotation/scale transforms where possible by using the
-     * bounding client rectangle height/width instead of the
-     * offsetWidth/Height which region uses.
-     * @method _getDims
-     * @private
-     * @return {Array} Array with [height, width]
-     */
-    _getDims : function() {
-        var region,
-            width,
-            height;
-
-        // Ideally, this should be in DOM somewhere.
-        if (this.target.getBoundingClientRect) {
-            region = this.target.getBoundingClientRect();
-
-            if ("height" in region) {
-                height = region.height;
-            } else {
-                // IE7,8 has getBCR, but no height.
-                height = Math.abs(region.bottom - region.top);
-            }
-
-            if ("width" in region) {
-                width = region.width;
-            } else {
-                // IE7,8 has getBCR, but no width.
-                width = Math.abs(region.right - region.left);
-            }
-        } else {
-            region = this.node.get("region");
-            width = region.width;
-            height = region.height;
-        }
-
-        return [width, height];
-    },
-
-    /**
-     * Helper method to convert a point relative to the node element into
-     * the point in the page coordination.
-     *
-     * @method _calculateDefaultPoint
-     * @private
-     * @param {Array} point A point relative to the node element.
-     * @return {Array} The same point in the page coordination.
-     */
-    _calculateDefaultPoint: function(point) {
-
-        var height;
-
-        if(!Y.Lang.isArray(point) || point.length === 0) {
-            point = [START_PAGEX, START_PAGEY];
-        } else {
-            if(point.length == 1) {
-                height = this._getDims[1];
-                point[1] = height/2;
-            }
-            // convert to page(viewport) coordination
-            point[0] = this.node.getX() + point[0];
-            point[1] = this.node.getY() + point[1];
-        }
-
-        return point;
-    },
-
-    /**
-     * The "rotate" and "pinch" methods are essencially same with the exact same
-     * arguments. Only difference is the required parameters. The rotate method
-     * requires "rotation" parameter while the pinch method requires "startRadius"
-     * and "endRadius" parameters.
-     *
-     * @method rotate
-     * @param {Function} cb The callback to execute when the gesture simulation
-     *      is completed.
-     * @param {Array} center A center point where the pinch gesture of two fingers
-     *      should happen. It is relative to the top left corner of the target
-     *      node element.
-     * @param {Number} startRadius A radius of start circle where 2 fingers are
-     *      on when the gesture starts. This is optional. The default is a fourth of
-     *      either target node width or height whichever is smaller.
-     * @param {Number} endRadius A radius of end circle where 2 fingers will be on when
-     *      the pinch or spread gestures are completed. This is optional.
-     *      The default is a fourth of either target node width or height whichever is less.
-     * @param {Number} duration A duration of the gesture in millisecond.
-     * @param {Number} start A start angle(0 degree at 12 o'clock) where the
-     *      gesture should start. Default is 0.
-     * @param {Number} rotation A rotation in degree. It is required.
-     */
-    rotate: function(cb, center, startRadius, endRadius, duration, start, rotation) {
-        var radius,
-            r1 = startRadius,   // optional
-            r2 = endRadius;     // optional
-
-        if(!Y.Lang.isNumber(r1) || !Y.Lang.isNumber(r2) || r1<0 || r2<0) {
-            radius = (this.target.offsetWidth < this.target.offsetHeight)?
-                this.target.offsetWidth/4 : this.target.offsetHeight/4;
-            r1 = radius;
-            r2 = radius;
-        }
-
-        // required
-        if(!Y.Lang.isNumber(rotation)) {
-            Y.error(NAME+'Invalid rotation detected.');
-        }
-
-        this.pinch(cb, center, r1, r2, duration, start, rotation);
-    },
-
-    /**
-     * The "rotate" and "pinch" methods are essencially same with the exact same
-     * arguments. Only difference is the required parameters. The rotate method
-     * requires "rotation" parameter while the pinch method requires "startRadius"
-     * and "endRadius" parameters.
-     *
-     * The "pinch" gesture can simulate various 2 finger gestures such as pinch,
-     * spread and/or rotation. The "startRadius" and "endRadius" are required.
-     * If endRadius is larger than startRadius, it becomes a spread gesture
-     * otherwise a pinch gesture.
-     *
-     * @method pinch
-     * @param {Function} cb The callback to execute when the gesture simulation
-     *      is completed.
-     * @param {Array} center A center point where the pinch gesture of two fingers
-     *      should happen. It is relative to the top left corner of the target
-     *      node element.
-     * @param {Number} startRadius A radius of start circle where 2 fingers are
-     *      on when the gesture starts. This paramenter is required.
-     * @param {Number} endRadius A radius of end circle where 2 fingers will be on when
-     *      the pinch or spread gestures are completed. This parameter is required.
-     * @param {Number} duration A duration of the gesture in millisecond.
-     * @param {Number} start A start angle(0 degree at 12 o'clock) where the
-     *      gesture should start. Default is 0.
-     * @param {Number} rotation If rotation is desired during the pinch or
-     *      spread gestures, this parameter can be used. Default is 0 degree.
-     */
-    pinch: function(cb, center, startRadius, endRadius, duration, start, rotation) {
-        var eventQueue,
-            i,
-            interval = EVENT_INTERVAL,
-            touches,
-            id = 0,
-            r1 = startRadius,   // required
-            r2 = endRadius,     // required
-            radiusPerStep,
-            centerX, centerY,
-            startScale, endScale, scalePerStep,
-            startRot, endRot, rotPerStep,
-            path1 = {start: [], end: []}, // paths for 1st and 2nd fingers.
-            path2 = {start: [], end: []},
-            steps,
-            touchMove;
-
-        center = this._calculateDefaultPoint(center);
-
-        if(!Y.Lang.isNumber(r1) || !Y.Lang.isNumber(r2) || r1<0 || r2<0) {
-            Y.error(NAME+'Invalid startRadius and endRadius detected.');
-        }
-
-        if(!Y.Lang.isNumber(duration) || duration <= 0) {
-            duration = DEFAULTS.DURATION_PINCH;
-        }
-
-        if(!Y.Lang.isNumber(start)) {
-            start = 0.0;
-        } else {
-            start = start%360;
-            while(start < 0) {
-                start += 360;
-            }
-        }
-
-        if(!Y.Lang.isNumber(rotation)) {
-            rotation = 0.0;
-        }
-
-        Y.AsyncQueue.defaults.timeout = interval;
-        eventQueue = new Y.AsyncQueue();
-
-        // range determination
-        centerX = center[0];
-        centerY = center[1];
-
-        startRot = start;
-        endRot = start + rotation;
-
-        // 1st finger path
-        path1.start = [
-            centerX + r1*Math.sin(this._toRadian(startRot)),
-            centerY - r1*Math.cos(this._toRadian(startRot))
-        ];
-        path1.end   = [
-            centerX + r2*Math.sin(this._toRadian(endRot)),
-            centerY - r2*Math.cos(this._toRadian(endRot))
-        ];
-
-        // 2nd finger path
-        path2.start = [
-            centerX - r1*Math.sin(this._toRadian(startRot)),
-            centerY + r1*Math.cos(this._toRadian(startRot))
-        ];
-        path2.end   = [
-            centerX - r2*Math.sin(this._toRadian(endRot)),
-            centerY + r2*Math.cos(this._toRadian(endRot))
-        ];
-
-        startScale = 1.0;
-        endScale = endRadius/startRadius;
-
-        // touch/gesture start
-        eventQueue.add({
-            fn: function() {
-                var coord1, coord2, coord, touches;
-
-                // coordinate for each touch object.
-                coord1 = {
-                    pageX: path1.start[0],
-                    pageY: path1.start[1],
-                    clientX: path1.start[0],
-                    clientY: path1.start[1]
-                };
-                coord2 = {
-                    pageX: path2.start[0],
-                    pageY: path2.start[1],
-                    clientX: path2.start[0],
-                    clientY: path2.start[1]
-                };
-                touches = this._createTouchList([Y.merge({
-                    identifier: (id++)
-                }, coord1), Y.merge({
-                    identifier: (id++)
-                }, coord2)]);
-
-                // coordinate for top level event
-                coord = {
-                    pageX: (path1.start[0] + path2.start[0])/2,
-                    pageY: (path1.start[0] + path2.start[1])/2,
-                    clientX: (path1.start[0] + path2.start[0])/2,
-                    clientY: (path1.start[0] + path2.start[1])/2
-                };
-
-                this._simulateEvent(this.target, TOUCH_START, Y.merge({
-                    touches: touches,
-                    targetTouches: touches,
-                    changedTouches: touches,
-                    scale: startScale,
-                    rotation: startRot
-                }, coord));
-
-                if(Y.UA.ios >= 2.0) {
-                    /* gesture starts when the 2nd finger touch starts.
-                    * The implementation will fire 1 touch start event for both fingers,
-                    * simulating 2 fingers touched on the screen at the same time.
-                    */
-                    this._simulateEvent(this.target, GESTURE_START, Y.merge({
-                        scale: startScale,
-                        rotation: startRot
-                    }, coord));
-                }
-            },
-            timeout: 0,
-            context: this
-        });
-
-        // gesture change
-        steps = Math.floor(duration/interval);
-        radiusPerStep = (r2 - r1)/steps;
-        scalePerStep = (endScale - startScale)/steps;
-        rotPerStep = (endRot - startRot)/steps;
-
-        touchMove = function(step) {
-            var radius = r1 + (radiusPerStep)*step,
-                px1 = centerX + radius*Math.sin(this._toRadian(startRot + rotPerStep*step)),
-                py1 = centerY - radius*Math.cos(this._toRadian(startRot + rotPerStep*step)),
-                px2 = centerX - radius*Math.sin(this._toRadian(startRot + rotPerStep*step)),
-                py2 = centerY + radius*Math.cos(this._toRadian(startRot + rotPerStep*step)),
-                px = (px1+px2)/2,
-                py = (py1+py2)/2,
-                coord1, coord2, coord, touches;
-
-            // coordinate for each touch object.
-            coord1 = {
-                pageX: px1,
-                pageY: py1,
-                clientX: px1,
-                clientY: py1
-            };
-            coord2 = {
-                pageX: px2,
-                pageY: py2,
-                clientX: px2,
-                clientY: py2
-            };
-            touches = this._createTouchList([Y.merge({
-                identifier: (id++)
-            }, coord1), Y.merge({
-                identifier: (id++)
-            }, coord2)]);
-
-            // coordinate for top level event
-            coord = {
-                pageX: px,
-                pageY: py,
-                clientX: px,
-                clientY: py
-            };
-
-            this._simulateEvent(this.target, TOUCH_MOVE, Y.merge({
-                touches: touches,
-                targetTouches: touches,
-                changedTouches: touches,
-                scale: startScale + scalePerStep*step,
-                rotation: startRot + rotPerStep*step
-            }, coord));
-
-            if(Y.UA.ios >= 2.0) {
-                this._simulateEvent(this.target, GESTURE_CHANGE, Y.merge({
-                    scale: startScale + scalePerStep*step,
-                    rotation: startRot + rotPerStep*step
-                }, coord));
-            }
-        };
-
-        for (i=0; i < steps; i++) {
-            eventQueue.add({
-                fn: touchMove,
-                args: [i],
-                context: this
-            });
-        }
-
-        // gesture end
-        eventQueue.add({
-            fn: function() {
-                var emptyTouchList = this._getEmptyTouchList(),
-                    coord1, coord2, coord, touches;
-
-                // coordinate for each touch object.
-                coord1 = {
-                    pageX: path1.end[0],
-                    pageY: path1.end[1],
-                    clientX: path1.end[0],
-                    clientY: path1.end[1]
-                };
-                coord2 = {
-                    pageX: path2.end[0],
-                    pageY: path2.end[1],
-                    clientX: path2.end[0],
-                    clientY: path2.end[1]
-                };
-                touches = this._createTouchList([Y.merge({
-                    identifier: (id++)
-                }, coord1), Y.merge({
-                    identifier: (id++)
-                }, coord2)]);
-
-                // coordinate for top level event
-                coord = {
-                    pageX: (path1.end[0] + path2.end[0])/2,
-                    pageY: (path1.end[0] + path2.end[1])/2,
-                    clientX: (path1.end[0] + path2.end[0])/2,
-                    clientY: (path1.end[0] + path2.end[1])/2
-                };
-
-                if(Y.UA.ios >= 2.0) {
-                    this._simulateEvent(this.target, GESTURE_END, Y.merge({
-                        scale: endScale,
-                        rotation: endRot
-                    }, coord));
-                }
-
-                this._simulateEvent(this.target, TOUCH_END, Y.merge({
-                    touches: emptyTouchList,
-                    targetTouches: emptyTouchList,
-                    changedTouches: touches,
-                    scale: endScale,
-                    rotation: endRot
-                }, coord));
-            },
-            context: this
-        });
-
-        if(cb && Y.Lang.isFunction(cb)) {
-            eventQueue.add({
-                fn: cb,
-
-                // by default, the callback runs the node context where
-                // simulateGesture method is called.
-                context: this.node
-
-                //TODO: Use args to pass error object as 1st param if there is an error.
-                //args:
-            });
-        }
-
-        eventQueue.run();
-    },
-
-    /**
-     * The "tap" gesture can be used for various single touch point gestures
-     * such as single tap, N number of taps, long press. The default is a single
-     * tap.
-     *
-     * @method tap
-     * @param {Function} cb The callback to execute when the gesture simulation
-     *      is completed.
-     * @param {Array} point A point(relative to the top left corner of the
-     *      target node element) where the tap gesture should start. The default
-     *      is the center of the taget node.
-     * @param {Number} times The number of taps. Default is 1.
-     * @param {Number} hold The hold time in milliseconds between "touchstart" and
-     *      "touchend" event generation. Default is 10ms.
-     * @param {Number} delay The time gap in millisecond between taps if this
-     *      gesture has more than 1 tap. Default is 10ms.
-     */
-    tap: function(cb, point, times, hold, delay) {
-        var eventQueue = new Y.AsyncQueue(),
-            emptyTouchList = this._getEmptyTouchList(),
-            touches,
-            coord,
-            i,
-            touchStart,
-            touchEnd;
-
-        point = this._calculateDefaultPoint(point);
-
-        if(!Y.Lang.isNumber(times) || times < 1) {
-            times = 1;
-        }
-
-        if(!Y.Lang.isNumber(hold)) {
-            hold = DEFAULTS.HOLD_TAP;
-        }
-
-        if(!Y.Lang.isNumber(delay)) {
-            delay = DEFAULTS.DELAY_TAP;
-        }
-
-        coord = {
-            pageX: point[0],
-            pageY: point[1],
-            clientX: point[0],
-            clientY: point[1]
-        };
-
-        touches = this._createTouchList([Y.merge({identifier: 0}, coord)]);
-
-        touchStart = function() {
-            this._simulateEvent(this.target, TOUCH_START, Y.merge({
-                touches: touches,
-                targetTouches: touches,
-                changedTouches: touches
-            }, coord));
-        };
-
-        touchEnd = function() {
-            this._simulateEvent(this.target, TOUCH_END, Y.merge({
-                touches: emptyTouchList,
-                targetTouches: emptyTouchList,
-                changedTouches: touches
-            }, coord));
-        };
-
-        for (i=0; i < times; i++) {
-            eventQueue.add({
-                fn: touchStart,
-                context: this,
-                timeout: (i === 0)? 0 : delay
-            });
-
-            eventQueue.add({
-                fn: touchEnd,
-                context: this,
-                timeout: hold
-            });
-        }
-
-        if(times > 1 && !SUPPORTS_TOUCH) {
-            eventQueue.add({
-                fn: function() {
-                    this._simulateEvent(this.target, MOUSE_DBLCLICK, coord);
-                },
-                context: this
-            });
-        }
-
-        if(cb && Y.Lang.isFunction(cb)) {
-            eventQueue.add({
-                fn: cb,
-
-                // by default, the callback runs the node context where
-                // simulateGesture method is called.
-                context: this.node
-
-                //TODO: Use args to pass error object as 1st param if there is an error.
-                //args:
-            });
-        }
-
-        eventQueue.run();
-    },
-
-    /**
-     * The "flick" gesture is a specialized "move" that has some velocity
-     * and the movement always runs either x or y axis. The velocity is calculated
-     * with "distance" and "duration" arguments. If the calculated velocity is
-     * below than the minimum velocity, the given duration will be ignored and
-     * new duration will be created to make a valid flick gesture.
-     *
-     * @method flick
-     * @param {Function} cb The callback to execute when the gesture simulation
-     *      is completed.
-     * @param {Array} point A point(relative to the top left corner of the
-     *      target node element) where the flick gesture should start. The default
-     *      is the center of the taget node.
-     * @param {String} axis Either "x" or "y".
-     * @param {Number} distance A distance in pixels to flick.
-     * @param {Number} duration A duration of the gesture in millisecond.
-     *
-     */
-    flick: function(cb, point, axis, distance, duration) {
-        var path;
-
-        point = this._calculateDefaultPoint(point);
-
-        if(!Y.Lang.isString(axis)) {
-            axis = X_AXIS;
-        } else {
-            axis = axis.toLowerCase();
-            if(axis !== X_AXIS && axis !== Y_AXIS) {
-                Y.error(NAME+'(flick): Only x or y axis allowed');
-            }
-        }
-
-        if(!Y.Lang.isNumber(distance)) {
-            distance = DEFAULTS.DISTANCE_FLICK;
-        }
-
-        if(!Y.Lang.isNumber(duration)){
-            duration = DEFAULTS.DURATION_FLICK; // ms
-        } else {
-            if(duration > DEFAULTS.MAX_DURATION_FLICK) {
-                duration = DEFAULTS.MAX_DURATION_FLICK;
-            }
-        }
-
-        /*
-         * Check if too slow for a flick.
-         * Adjust duration if the calculated velocity is less than
-         * the minimum velcocity to be claimed as a flick.
-         */
-        if(Math.abs(distance)/duration < DEFAULTS.MIN_VELOCITY_FLICK) {
-            duration = Math.abs(distance)/DEFAULTS.MIN_VELOCITY_FLICK;
-        }
-
-        path = {
-            start: Y.clone(point),
-            end: [
-                (axis === X_AXIS) ? point[0]+distance : point[0],
-                (axis === Y_AXIS) ? point[1]+distance : point[1]
-            ]
-        };
-
-        this._move(cb, path, duration);
-    },
-
-    /**
-     * The "move" gesture simulate the movement of any direction between
-     * the straight line of start and end point for the given duration.
-     * The path argument is an object with "point", "xdist" and "ydist" properties.
-     * The "point" property is an array with x and y coordinations(relative to the
-     * top left corner of the target node element) while "xdist" and "ydist"
-     * properties are used for the distance along the x and y axis. A negative
-     * distance number can be used to drag either left or up direction.
-     *
-     * If no arguments are given, it will simulate the default move, which
-     * is moving 200 pixels from the center of the element to the positive X-axis
-     * direction for 1 sec.
-     *
-     * @method move
-     * @param {Function} cb The callback to execute when the gesture simulation
-     *      is completed.
-     * @param {Object} path An object with "point", "xdist" and "ydist".
-     * @param {Number} duration A duration of the gesture in millisecond.
-     */
-    move: function(cb, path, duration) {
-        var convertedPath;
-
-        if(!Y.Lang.isObject(path)) {
-            path = {
-                point: this._calculateDefaultPoint([]),
-                xdist: DEFAULTS.DISTANCE_MOVE,
-                ydist: 0
-            };
-        } else {
-            // convert to the page coordination
-            if(!Y.Lang.isArray(path.point)) {
-                path.point = this._calculateDefaultPoint([]);
-            } else {
-                path.point = this._calculateDefaultPoint(path.point);
-            }
-
-            if(!Y.Lang.isNumber(path.xdist)) {
-                path.xdist = DEFAULTS.DISTANCE_MOVE;
-            }
-
-            if(!Y.Lang.isNumber(path.ydist)) {
-                path.ydist = 0;
-            }
-        }
-
-        if(!Y.Lang.isNumber(duration)){
-            duration = DEFAULTS.DURATION_MOVE; // ms
-        } else {
-            if(duration > DEFAULTS.MAX_DURATION_MOVE) {
-                duration = DEFAULTS.MAX_DURATION_MOVE;
-            }
-        }
-
-        convertedPath = {
-            start: Y.clone(path.point),
-            end: [path.point[0]+path.xdist, path.point[1]+path.ydist]
-        };
-
-        this._move(cb, convertedPath, duration);
-    },
-
-    /**
-     * A base method on top of "move" and "flick" methods. The method takes
-     * the path with start/end properties and duration to generate a set of
-     * touch events for the movement gesture.
-     *
-     * @method _move
-     * @private
-     * @param {Function} cb The callback to execute when the gesture simulation
-     *      is completed.
-     * @param {Object} path An object with "start" and "end" properties. Each
-     *      property should be an array with x and y coordination (e.g. start: [100, 50])
-     * @param {Number} duration A duration of the gesture in millisecond.
-     */
-    _move: function(cb, path, duration) {
-        var eventQueue,
-            i,
-            interval = EVENT_INTERVAL,
-            steps, stepX, stepY,
-            id = 0,
-            touchMove;
-
-        if(!Y.Lang.isNumber(duration)){
-            duration = DEFAULTS.DURATION_MOVE; // ms
-        } else {
-            if(duration > DEFAULTS.MAX_DURATION_MOVE) {
-                duration = DEFAULTS.MAX_DURATION_MOVE;
-            }
-        }
-
-        if(!Y.Lang.isObject(path)) {
-            path = {
-                start: [
-                    START_PAGEX,
-                    START_PAGEY
-                ],
-                end: [
-                    START_PAGEX + DEFAULTS.DISTANCE_MOVE,
-                    START_PAGEY
-                ]
-            };
-        } else {
-            if(!Y.Lang.isArray(path.start)) {
-                path.start = [
-                    START_PAGEX,
-                    START_PAGEY
-                ];
-            }
-            if(!Y.Lang.isArray(path.end)) {
-                path.end = [
-                    START_PAGEX + DEFAULTS.DISTANCE_MOVE,
-                    START_PAGEY
-                ];
-            }
-        }
-
-        Y.AsyncQueue.defaults.timeout = interval;
-        eventQueue = new Y.AsyncQueue();
-
-        // start
-        eventQueue.add({
-            fn: function() {
-                var coord = {
-                        pageX: path.start[0],
-                        pageY: path.start[1],
-                        clientX: path.start[0],
-                        clientY: path.start[1]
-                    },
-                    touches = this._createTouchList([
-                        Y.merge({identifier: (id++)}, coord)
-                    ]);
-
-                this._simulateEvent(this.target, TOUCH_START, Y.merge({
-                    touches: touches,
-                    targetTouches: touches,
-                    changedTouches: touches
-                }, coord));
-            },
-            timeout: 0,
-            context: this
-        });
-
-        // move
-        steps = Math.floor(duration/interval);
-        stepX = (path.end[0] - path.start[0])/steps;
-        stepY = (path.end[1] - path.start[1])/steps;
-
-        touchMove = function(step) {
-            var px = path.start[0]+(stepX * step),
-                py = path.start[1]+(stepY * step),
-                coord = {
-                    pageX: px,
-                    pageY: py,
-                    clientX: px,
-                    clientY: py
-                },
-                touches = this._createTouchList([
-                    Y.merge({identifier: (id++)}, coord)
-                ]);
-
-            this._simulateEvent(this.target, TOUCH_MOVE, Y.merge({
-                touches: touches,
-                targetTouches: touches,
-                changedTouches: touches
-            }, coord));
-        };
-
-        for (i=0; i < steps; i++) {
-            eventQueue.add({
-                fn: touchMove,
-                args: [i],
-                context: this
-            });
-        }
-
-        // last move
-        eventQueue.add({
-            fn: function() {
-                var coord = {
-                        pageX: path.end[0],
-                        pageY: path.end[1],
-                        clientX: path.end[0],
-                        clientY: path.end[1]
-                    },
-                    touches = this._createTouchList([
-                        Y.merge({identifier: id}, coord)
-                    ]);
-
-                this._simulateEvent(this.target, TOUCH_MOVE, Y.merge({
-                    touches: touches,
-                    targetTouches: touches,
-                    changedTouches: touches
-                }, coord));
-            },
-            timeout: 0,
-            context: this
-        });
-
-        // end
-        eventQueue.add({
-            fn: function() {
-                var coord = {
-                    pageX: path.end[0],
-                    pageY: path.end[1],
-                    clientX: path.end[0],
-                    clientY: path.end[1]
-                },
-                emptyTouchList = this._getEmptyTouchList(),
-                touches = this._createTouchList([
-                    Y.merge({identifier: id}, coord)
-                ]);
-
-                this._simulateEvent(this.target, TOUCH_END, Y.merge({
-                    touches: emptyTouchList,
-                    targetTouches: emptyTouchList,
-                    changedTouches: touches
-                }, coord));
-            },
-            context: this
-        });
-
-        if(cb && Y.Lang.isFunction(cb)) {
-            eventQueue.add({
-                fn: cb,
-
-                // by default, the callback runs the node context where
-                // simulateGesture method is called.
-                context: this.node
-
-                //TODO: Use args to pass error object as 1st param if there is an error.
-                //args:
-            });
-        }
-
-        eventQueue.run();
-    },
-
-    /**
-     * Helper method to return a singleton instance of empty touch list.
-     *
-     * @method _getEmptyTouchList
-     * @private
-     * @return {TouchList | Array} An empty touch list object.
-     */
-    _getEmptyTouchList: function() {
-        if(!emptyTouchList) {
-            emptyTouchList = this._createTouchList([]);
-        }
-
-        return emptyTouchList;
-    },
-
-    /**
-     * Helper method to convert an array with touch points to TouchList object as
-     * defined in http://www.w3.org/TR/touch-events/
-     *
-     * @method _createTouchList
-     * @private
-     * @param {Array} touchPoints
-     * @return {TouchList | Array} If underlaying platform support creating touch list
-     *      a TouchList object will be returned otherwise a fake Array object
-     *      will be returned.
-     */
-    _createTouchList: function(touchPoints) {
-        /*
-        * Android 4.0.3 emulator:
-        * Native touch api supported starting in version 4.0 (Ice Cream Sandwich).
-        * However the support seems limited. In Android 4.0.3 emulator, I got
-        * "TouchList is not defined".
-        */
-        var touches = [],
-            touchList,
-            self = this;
-
-        if(!!touchPoints && Y.Lang.isArray(touchPoints)) {
-            if(Y.UA.android && Y.UA.android >= 4.0 || Y.UA.ios && Y.UA.ios >= 2.0) {
-                Y.each(touchPoints, function(point) {
-                    if(!point.identifier) {point.identifier = 0;}
-                    if(!point.pageX) {point.pageX = 0;}
-                    if(!point.pageY) {point.pageY = 0;}
-                    if(!point.screenX) {point.screenX = 0;}
-                    if(!point.screenY) {point.screenY = 0;}
-
-                    touches.push(document.createTouch(Y.config.win,
-                        self.target,
-                        point.identifier,
-                        point.pageX, point.pageY,
-                        point.screenX, point.screenY));
-                });
-
-                touchList = document.createTouchList.apply(document, touches);
-            } else if(Y.UA.ios && Y.UA.ios < 2.0) {
-                Y.error(NAME+': No touch event simulation framework present.');
-            } else {
-                // this will inclide android(Y.UA.android && Y.UA.android < 4.0)
-                // and desktops among all others.
-
-                /*
-                 * Touch APIs are broken in androids older than 4.0. We will use
-                 * simulated touch apis for these versions.
-                 */
-                touchList = [];
-                Y.each(touchPoints, function(point) {
-                    if(!point.identifier) {point.identifier = 0;}
-                    if(!point.clientX)  {point.clientX = 0;}
-                    if(!point.clientY)  {point.clientY = 0;}
-                    if(!point.pageX)    {point.pageX = 0;}
-                    if(!point.pageY)    {point.pageY = 0;}
-                    if(!point.screenX)  {point.screenX = 0;}
-                    if(!point.screenY)  {point.screenY = 0;}
-
-                    touchList.push({
-                        target: self.target,
-                        identifier: point.identifier,
-                        clientX: point.clientX,
-                        clientY: point.clientY,
-                        pageX: point.pageX,
-                        pageY: point.pageY,
-                        screenX: point.screenX,
-                        screenY: point.screenY
-                    });
-                });
-
-                touchList.item = function(i) {
-                    return touchList[i];
-                };
-            }
-        } else {
-            Y.error(NAME+': Invalid touchPoints passed');
-        }
-
-        return touchList;
-    },
-
-    /**
-     * @method _simulateEvent
-     * @private
-     * @param {HTMLElement} target The DOM element that's the target of the event.
-     * @param {String} type The type of event or name of the supported gesture to simulate
-     *      (i.e., "click", "doubletap", "flick").
-     * @param {Object} options (Optional) Extra options to copy onto the event object.
-     *      For gestures, options are used to refine the gesture behavior.
-     */
-    _simulateEvent: function(target, type, options) {
-        var touches;
-
-        if (touchEvents[type]) {
-            if(SUPPORTS_TOUCH) {
-                Y.Event.simulate(target, type, options);
-            } else {
-                // simulate using mouse events if touch is not applicable on this platform.
-                // but only single touch event can be simulated.
-                if(this._isSingleTouch(options.touches, options.targetTouches, options.changedTouches)) {
-                    type = {
-                        touchstart: MOUSE_DOWN,
-                        touchmove: MOUSE_MOVE,
-                        touchend: MOUSE_UP
-                    }[type];
-
-                    options.button = 0;
-                    options.relatedTarget = null; // since we are not using mouseover event.
-
-                    // touchend has none in options.touches.
-                    touches = (type === MOUSE_UP)? options.changedTouches : options.touches;
-
-                    options = Y.mix(options, {
-                        screenX: touches.item(0).screenX,
-                        screenY: touches.item(0).screenY,
-                        clientX: touches.item(0).clientX,
-                        clientY: touches.item(0).clientY
-                    }, true);
-
-                    Y.Event.simulate(target, type, options);
-
-                    if(type == MOUSE_UP) {
-                        Y.Event.simulate(target, MOUSE_CLICK, options);
-                    }
-                } else {
-                    Y.error("_simulateEvent(): Event '" + type + "' has multi touch objects that can't be simulated in your platform.");
-                }
-            }
-        } else {
-            // pass thru for all non touch events
-            Y.Event.simulate(target, type, options);
-        }
-    },
-
-    /**
-     * Helper method to check the single touch.
-     * @method _isSingleTouch
-     * @private
-     * @param {TouchList} touches
-     * @param {TouchList} targetTouches
-     * @param {TouchList} changedTouches
-     */
-    _isSingleTouch: function(touches, targetTouches, changedTouches) {
-        return (touches && (touches.length <= 1)) &&
-            (targetTouches && (targetTouches.length <= 1)) &&
-            (changedTouches && (changedTouches.length <= 1));
-    }
-};
-
-/*
- * A gesture simulation class.
- */
-Y.GestureSimulation = Simulations;
-
-/*
- * Various simulation default behavior properties. If user override
- * Y.GestureSimulation.defaults, overriden values will be used and this
- * should be done before the gesture simulation.
- */
-Y.GestureSimulation.defaults = DEFAULTS;
-
-/*
- * The high level gesture names that YUI knows how to simulate.
- */
-Y.GestureSimulation.GESTURES = gestureNames;
-
-/**
- * Simulates the higher user level gesture of the given name on a target.
- * This method generates a set of low level touch events(Apple specific gesture
- * events as well for the iOS platforms) asynchronously. Note that gesture
- * simulation is relying on `Y.Event.simulate()` method to generate
- * the touch events under the hood. The `Y.Event.simulate()` method
- * itself is a synchronous method.
- *
- * Users are suggested to use `Node.simulateGesture()` method which
- * basically calls this method internally. Supported gestures are `tap`,
- * `doubletap`, `press`, `move`, `flick`, `pinch` and `rotate`.
- *
- * The `pinch` gesture is used to simulate the pinching and spreading of two
- * fingers. During a pinch simulation, rotation is also possible. Essentially
- * `pinch` and `rotate` simulations share the same base implementation to allow
- * both pinching and rotation at the same time. The only difference is `pinch`
- * requires `start` and `end` option properties while `rotate` requires `rotation`
- * option property.
- *
- * The `pinch` and `rotate` gestures can be described as placing 2 fingers along a
- * circle. Pinching and spreading can be described by start and end circles while
- * rotation occurs on a single circle. If the radius of the start circle is greater
- * than the end circle, the gesture becomes a pinch, otherwise it is a spread spread.
- *
- * @example
- *
- *     var node = Y.one("#target");
- *
- *     // double tap example
- *     node.simulateGesture("doubletap", function() {
- *         // my callback function
- *     });
- *
- *     // flick example from the center of the node, move 50 pixels down for 50ms)
- *     node.simulateGesture("flick", {
- *         axis: y,
- *         distance: -100
- *         duration: 50
- *     }, function() {
- *         // my callback function
- *     });
- *
- *     // simulate rotating a node 75 degrees counter-clockwise
- *     node.simulateGesture("rotate", {
- *         rotation: -75
- *     });
- *
- *     // simulate a pinch and a rotation at the same time.
- *     // fingers start on a circle of radius 100 px, placed at top/bottom
- *     // fingers end on a circle of radius 50px, placed at right/left
- *     node.simulateGesture("pinch", {
- *         r1: 100,
- *         r2: 50,
- *         start: 0
- *         rotation: 90
- *     });
- *
- * @method simulateGesture
- * @param {HTMLElement|Node} node The YUI node or HTML element that's the target
- *      of the event.
- * @param {String} name The name of the supported gesture to simulate. The
- *      supported gesture name is one of "tap", "doubletap", "press", "move",
- *      "flick", "pinch" and "rotate".
- * @param {Object} [options] Extra options used to define the gesture behavior:
- *
- *      Valid options properties for the `tap` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x,y] coordinates
- *        where the tap should be simulated. Default is the center of the node
- *        element.
- *      @param {Number} [options.hold=10] (Optional) The hold time in milliseconds.
- *        This is the time between `touchstart` and `touchend` event generation.
- *      @param {Number} [options.times=1] (Optional) Indicates the number of taps.
- *      @param {Number} [options.delay=10] (Optional) The number of milliseconds
- *        before the next tap simulation happens. This is valid only when `times`
- *        is more than 1.
- *
- *      Valid options properties for the `doubletap` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x,y] coordinates
- *        where the doubletap should be simulated. Default is the center of the
- *        node element.
- *
- *      Valid options properties for the `press` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x,y] coordinates
- *        where the press should be simulated. Default is the center of the node
- *        element.
- *      @param {Number} [options.hold=3000] (Optional) The hold time in milliseconds.
- *        This is the time between `touchstart` and `touchend` event generation.
- *        Default is 3000ms (3 seconds).
- *
- *      Valid options properties for the `move` gesture:
- *
- *      @param {Object} [options.path] (Optional) Indicates the path of the finger
- *        movement. It's an object with three optional properties: `point`,
- *        `xdist` and  `ydist`.
- *        @param {Array} [options.path.point] A starting point of the gesture.
- *          Default is the center of the node element.
- *        @param {Number} [options.path.xdist=200] A distance to move in pixels
- *          along the X axis. A negative distance value indicates moving left.
- *        @param {Number} [options.path.ydist=0] A distance to move in pixels
- *          along the Y axis. A negative distance value indicates moving up.
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds.
- *
- *      Valid options properties for the `flick` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x, y] coordinates
- *        where the flick should be simulated. Default is the center of the
- *        node element.
- *      @param {String} [options.axis='x'] (Optional) Valid values are either
- *        "x" or "y". Indicates axis to move along. The flick can move to one of
- *        4 directions(left, right, up and down).
- *      @param {Number} [options.distance=200] (Optional) Distance to move in pixels
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds. User given value could be automatically
- *        adjusted by the framework if it is below the minimum velocity to be
- *        a flick gesture.
- *
- *      Valid options properties for the `pinch` gesture:
- *
- *      @param {Array} [options.center] (Optional) The center of the circle where
- *        two fingers are placed. Default is the center of the node element.
- *      @param {Number} [options.r1] (Required) Pixel radius of the start circle
- *        where 2 fingers will be on when the gesture starts. The circles are
- *        centered at the center of the element.
- *      @param {Number} [options.r2] (Required) Pixel radius of the end circle
- *        when this gesture ends.
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds.
- *      @param {Number} [options.start=0] (Optional) Starting degree of the first
- *        finger. The value is relative to the path of the north. Default is 0
- *        (i.e., 12:00 on a clock).
- *      @param {Number} [options.rotation=0] (Optional) Degrees to rotate from
- *        the starting degree. A negative value means rotation to the
- *        counter-clockwise direction.
- *
- *      Valid options properties for the `rotate` gesture:
- *
- *      @param {Array} [options.center] (Optional) The center of the circle where
- *        two fingers are placed. Default is the center of the node element.
- *      @param {Number} [options.r1] (Optional) Pixel radius of the start circle
- *        where 2 fingers will be on when the gesture starts. The circles are
- *        centered at the center of the element. Default is a fourth of the node
- *        element width or height, whichever is smaller.
- *      @param {Number} [options.r2] (Optional) Pixel radius of the end circle
- *        when this gesture ends. Default is a fourth of the node element width or
- *        height, whichever is smaller.
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds.
- *      @param {Number} [options.start=0] (Optional) Starting degree of the first
- *        finger. The value is relative to the path of the north. Default is 0
- *        (i.e., 12:00 on a clock).
- *      @param {Number} [options.rotation] (Required) Degrees to rotate from
- *        the starting degree. A negative value means rotation to the
- *        counter-clockwise direction.
- *
- * @param {Function} [cb] The callback to execute when the asynchronouse gesture
- *      simulation is completed.
- *      @param {Error} cb.err An error object if the simulation is failed.
- * @for Event
- * @static
- */
-Y.Event.simulateGesture = function(node, name, options, cb) {
-
-    node = Y.one(node);
-
-    var sim = new Y.GestureSimulation(node);
-    name = name.toLowerCase();
-
-    if(!cb && Y.Lang.isFunction(options)) {
-        cb = options;
-        options = {};
-    }
-
-    options = options || {};
-
-    if (gestureNames[name]) {
-        switch(name) {
-            // single-touch: point gestures
-            case 'tap':
-                sim.tap(cb, options.point, options.times, options.hold, options.delay);
-                break;
-            case 'doubletap':
-                sim.tap(cb, options.point, 2);
-                break;
-            case 'press':
-                if(!Y.Lang.isNumber(options.hold)) {
-                    options.hold = DEFAULTS.HOLD_PRESS;
-                } else if(options.hold < DEFAULTS.MIN_HOLD_PRESS) {
-                    options.hold = DEFAULTS.MIN_HOLD_PRESS;
-                } else if(options.hold > DEFAULTS.MAX_HOLD_PRESS) {
-                    options.hold = DEFAULTS.MAX_HOLD_PRESS;
-                }
-                sim.tap(cb, options.point, 1, options.hold);
-                break;
-
-            // single-touch: move gestures
-            case 'move':
-                sim.move(cb, options.path, options.duration);
-                break;
-            case 'flick':
-                sim.flick(cb, options.point, options.axis, options.distance,
-                    options.duration);
-                break;
-
-            // multi-touch: pinch/rotation gestures
-            case 'pinch':
-                sim.pinch(cb, options.center, options.r1, options.r2,
-                    options.duration, options.start, options.rotation);
-                break;
-            case 'rotate':
-                sim.rotate(cb, options.center, options.r1, options.r2,
-                    options.duration, options.start, options.rotation);
-                break;
-        }
-    } else {
-        Y.error(NAME+': Not a supported gesture simulation: '+name);
-    }
-};
-
-
-}, '3.16.0', {"requires": ["async-queue", "event-simulate", "node-screen"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-event-simulate', function (Y, NAME) {
-
-/**
- * Adds functionality to simulate events.
- * @module node
- * @submodule node-event-simulate
- */
-
-/**
- * Simulates an event on the node.
- * @param {String} type The type of event (i.e., "click").
- * @param {Object} options (Optional) Extra options to copy onto the event object.
- * @for Node
- * @method simulate
- */
-Y.Node.prototype.simulate = function (type, options) {
-
-    Y.Event.simulate(Y.Node.getDOMNode(this), type, options);
-};
-
-/**
- * Simulates the higher user level gesture of the given name on this node.
- * This method generates a set of low level touch events(Apple specific gesture
- * events as well for the iOS platforms) asynchronously. Note that gesture
- * simulation is relying on `Y.Event.simulate()` method to generate
- * the touch events under the hood. The `Y.Event.simulate()` method
- * itself is a synchronous method.
- *
- * Supported gestures are `tap`, `doubletap`, `press`, `move`, `flick`, `pinch`
- * and `rotate`.
- *
- * The `pinch` gesture is used to simulate the pinching and spreading of two
- * fingers. During a pinch simulation, rotation is also possible. Essentially
- * `pinch` and `rotate` simulations share the same base implementation to allow
- * both pinching and rotation at the same time. The only difference is `pinch`
- * requires `start` and `end` option properties while `rotate` requires `rotation`
- * option property.
- *
- * The `pinch` and `rotate` gestures can be described as placing 2 fingers along a
- * circle. Pinching and spreading can be described by start and end circles while
- * rotation occurs on a single circle. If the radius of the start circle is greater
- * than the end circle, the gesture becomes a pinch, otherwise it is a spread spread.
- *
- * @example
- *
- *     var node = Y.one("#target");
- *
- *     // double tap example
- *     node.simulateGesture("doubletap", function() {
- *         // my callback function
- *     });
- *
- *     // flick example from the center of the node, move 50 pixels down for 50ms)
- *     node.simulateGesture("flick", {
- *         axis: y,
- *         distance: -100
- *         duration: 50
- *     }, function() {
- *         // my callback function
- *     });
- *
- *     // simulate rotating a node 75 degrees counter-clockwise
- *     node.simulateGesture("rotate", {
- *         rotation: -75
- *     });
- *
- *     // simulate a pinch and a rotation at the same time.
- *     // fingers start on a circle of radius 100 px, placed at top/bottom
- *     // fingers end on a circle of radius 50px, placed at right/left
- *     node.simulateGesture("pinch", {
- *         r1: 100,
- *         r2: 50,
- *         start: 0
- *         rotation: 90
- *     });
- *
- * @method simulateGesture
- * @param {String} name The name of the supported gesture to simulate. The
- *      supported gesture name is one of "tap", "doubletap", "press", "move",
- *      "flick", "pinch" and "rotate".
- * @param {Object} [options] Extra options used to define the gesture behavior:
- *
- *      Valid options properties for the `tap` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x,y] coordinates
- *        where the tap should be simulated. Default is the center of the node
- *        element.
- *      @param {Number} [options.hold=10] (Optional) The hold time in milliseconds.
- *        This is the time between `touchstart` and `touchend` event generation.
- *      @param {Number} [options.times=1] (Optional) Indicates the number of taps.
- *      @param {Number} [options.delay=10] (Optional) The number of milliseconds
- *        before the next tap simulation happens. This is valid only when `times`
- *        is more than 1.
- *
- *      Valid options properties for the `doubletap` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x,y] coordinates
- *        where the doubletap should be simulated. Default is the center of the
- *        node element.
- *
- *      Valid options properties for the `press` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x,y] coordinates
- *        where the press should be simulated. Default is the center of the node
- *        element.
- *      @param {Number} [options.hold=3000] (Optional) The hold time in milliseconds.
- *        This is the time between `touchstart` and `touchend` event generation.
- *        Default is 3000ms (3 seconds).
- *
- *      Valid options properties for the `move` gesture:
- *
- *      @param {Object} [options.path] (Optional) Indicates the path of the finger
- *        movement. It's an object with three optional properties: `point`,
- *        `xdist` and  `ydist`.
- *        @param {Array} [options.path.point] A starting point of the gesture.
- *          Default is the center of the node element.
- *        @param {Number} [options.path.xdist=200] A distance to move in pixels
- *          along the X axis. A negative distance value indicates moving left.
- *        @param {Number} [options.path.ydist=0] A distance to move in pixels
- *          along the Y axis. A negative distance value indicates moving up.
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds.
- *
- *      Valid options properties for the `flick` gesture:
- *
- *      @param {Array} [options.point] (Optional) Indicates the [x, y] coordinates
- *        where the flick should be simulated. Default is the center of the
- *        node element.
- *      @param {String} [options.axis='x'] (Optional) Valid values are either
- *        "x" or "y". Indicates axis to move along. The flick can move to one of
- *        4 directions(left, right, up and down).
- *      @param {Number} [options.distance=200] (Optional) Distance to move in pixels
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds. User given value could be automatically
- *        adjusted by the framework if it is below the minimum velocity to be
- *        a flick gesture.
- *
- *      Valid options properties for the `pinch` gesture:
- *
- *      @param {Array} [options.center] (Optional) The center of the circle where
- *        two fingers are placed. Default is the center of the node element.
- *      @param {Number} [options.r1] (Required) Pixel radius of the start circle
- *        where 2 fingers will be on when the gesture starts. The circles are
- *        centered at the center of the element.
- *      @param {Number} [options.r2] (Required) Pixel radius of the end circle
- *        when this gesture ends.
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds.
- *      @param {Number} [options.start=0] (Optional) Starting degree of the first
- *        finger. The value is relative to the path of the north. Default is 0
- *        (i.e., 12:00 on a clock).
- *      @param {Number} [options.rotation=0] (Optional) Degrees to rotate from
- *        the starting degree. A negative value means rotation to the
- *        counter-clockwise direction.
- *
- *      Valid options properties for the `rotate` gesture:
- *
- *      @param {Array} [options.center] (Optional) The center of the circle where
- *        two fingers are placed. Default is the center of the node element.
- *      @param {Number} [options.r1] (Optional) Pixel radius of the start circle
- *        where 2 fingers will be on when the gesture starts. The circles are
- *        centered at the center of the element. Default is a fourth of the node
- *        element width or height, whichever is smaller.
- *      @param {Number} [options.r2] (Optional) Pixel radius of the end circle
- *        when this gesture ends. Default is a fourth of the node element width or
- *        height, whichever is smaller.
- *      @param {Number} [options.duration=1000] (Optional) The duration of the
- *        gesture in milliseconds.
- *      @param {Number} [options.start=0] (Optional) Starting degree of the first
- *        finger. The value is relative to the path of the north. Default is 0
- *        (i.e., 12:00 on a clock).
- *      @param {Number} [options.rotation] (Required) Degrees to rotate from
- *        the starting degree. A negative value means rotation to the
- *        counter-clockwise direction.
- *
- * @param {Function} [cb] The callback to execute when the asynchronouse gesture
- *      simulation is completed.
- *      @param {Error} cb.err An error object if the simulation is failed.
- * @for Node
- */
-Y.Node.prototype.simulateGesture = function (name, options, cb) {
-
-    Y.Event.simulateGesture(this, name, options, cb);
-};
-
-
-}, '3.16.0', {"requires": ["node-base", "event-simulate", "gesture-simulate"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('base-build', function (Y, NAME) {
-
-    /**
-     * The base-build submodule provides Base.build functionality, which
-     * can be used to create custom classes, by aggregating extensions onto
-     * a main class.
-     *
-     * @module base
-     * @submodule base-build
-     * @for Base
-     */
-    var BaseCore = Y.BaseCore,
-        Base     = Y.Base,
-        L        = Y.Lang,
-
-        INITIALIZER = "initializer",
-        DESTRUCTOR  = "destructor",
-        AGGREGATES  = ["_PLUG", "_UNPLUG"],
-
-        build;
-
-    // Utility function used in `_buildCfg` to aggregate array values into a new
-    // array from the sender constructor to the receiver constructor.
-    function arrayAggregator(prop, r, s) {
-        if (s[prop]) {
-            r[prop] = (r[prop] || []).concat(s[prop]);
-        }
-    }
-
-    // Utility function used in `_buildCfg` to aggregate `_ATTR_CFG` array
-    // values from the sender constructor into a new array on receiver's
-    // constructor, and clear the cached hash.
-    function attrCfgAggregator(prop, r, s) {
-        if (s._ATTR_CFG) {
-            // Clear cached hash.
-            r._ATTR_CFG_HASH = null;
-
-            arrayAggregator.apply(null, arguments);
-        }
-    }
-
-    // Utility function used in `_buildCfg` to aggregate ATTRS configs from one
-    // the sender constructor to the receiver constructor.
-    function attrsAggregator(prop, r, s) {
-        BaseCore.modifyAttrs(r, s.ATTRS);
-    }
-
-    Base._build = function(name, main, extensions, px, sx, cfg) {
-
-        var build = Base._build,
-
-            builtClass = build._ctor(main, cfg),
-            buildCfg = build._cfg(main, cfg, extensions),
-
-            _mixCust = build._mixCust,
-
-            dynamic = builtClass._yuibuild.dynamic,
-
-            i, l, extClass, extProto,
-            initializer,
-            destructor;
-
-        // Augment/Aggregate
-        for (i = 0, l = extensions.length; i < l; i++) {
-            extClass = extensions[i];
-
-            extProto = extClass.prototype;
-
-            initializer = extProto[INITIALIZER];
-            destructor = extProto[DESTRUCTOR];
-            delete extProto[INITIALIZER];
-            delete extProto[DESTRUCTOR];
-
-            // Prototype, old non-displacing augment
-            Y.mix(builtClass, extClass, true, null, 1);
-
-            // Custom Statics
-            _mixCust(builtClass, extClass, buildCfg);
-
-            if (initializer) {
-                extProto[INITIALIZER] = initializer;
-            }
-
-            if (destructor) {
-                extProto[DESTRUCTOR] = destructor;
-            }
-
-            builtClass._yuibuild.exts.push(extClass);
-        }
-
-        if (px) {
-            Y.mix(builtClass.prototype, px, true);
-        }
-
-        if (sx) {
-            Y.mix(builtClass, build._clean(sx, buildCfg), true);
-            _mixCust(builtClass, sx, buildCfg);
-        }
-
-        builtClass.prototype.hasImpl = build._impl;
-
-        if (dynamic) {
-            builtClass.NAME = name;
-            builtClass.prototype.constructor = builtClass;
-
-            // Carry along the reference to `modifyAttrs()` from `main`.
-            builtClass.modifyAttrs = main.modifyAttrs;
-        }
-
-        return builtClass;
-    };
-
-    build = Base._build;
-
-    Y.mix(build, {
-
-        _mixCust: function(r, s, cfg) {
-
-            var aggregates,
-                custom,
-                statics,
-                aggr,
-                l,
-                i;
-
-            if (cfg) {
-                aggregates = cfg.aggregates;
-                custom = cfg.custom;
-                statics = cfg.statics;
-            }
-
-            if (statics) {
-                Y.mix(r, s, true, statics);
-            }
-
-            if (aggregates) {
-                for (i = 0, l = aggregates.length; i < l; i++) {
-                    aggr = aggregates[i];
-                    if (!r.hasOwnProperty(aggr) && s.hasOwnProperty(aggr)) {
-                        r[aggr] = L.isArray(s[aggr]) ? [] : {};
-                    }
-                    Y.aggregate(r, s, true, [aggr]);
-                }
-            }
-
-            if (custom) {
-                for (i in custom) {
-                    if (custom.hasOwnProperty(i)) {
-                        custom[i](i, r, s);
-                    }
-                }
-            }
-
-        },
-
-        _tmpl: function(main) {
-
-            function BuiltClass() {
-                BuiltClass.superclass.constructor.apply(this, arguments);
-            }
-            Y.extend(BuiltClass, main);
-
-            return BuiltClass;
-        },
-
-        _impl : function(extClass) {
-            var classes = this._getClasses(), i, l, cls, exts, ll, j;
-            for (i = 0, l = classes.length; i < l; i++) {
-                cls = classes[i];
-                if (cls._yuibuild) {
-                    exts = cls._yuibuild.exts;
-                    ll = exts.length;
-
-                    for (j = 0; j < ll; j++) {
-                        if (exts[j] === extClass) {
-                            return true;
-                        }
-                    }
-                }
-            }
-            return false;
-        },
-
-        _ctor : function(main, cfg) {
-
-           var dynamic = (cfg && false === cfg.dynamic) ? false : true,
-               builtClass = (dynamic) ? build._tmpl(main) : main,
-               buildCfg = builtClass._yuibuild;
-
-            if (!buildCfg) {
-                buildCfg = builtClass._yuibuild = {};
-            }
-
-            buildCfg.id = buildCfg.id || null;
-            buildCfg.exts = buildCfg.exts || [];
-            buildCfg.dynamic = dynamic;
-
-            return builtClass;
-        },
-
-        _cfg : function(main, cfg, exts) {
-            var aggr = [],
-                cust = {},
-                statics = [],
-                buildCfg,
-                cfgAggr = (cfg && cfg.aggregates),
-                cfgCustBuild = (cfg && cfg.custom),
-                cfgStatics = (cfg && cfg.statics),
-                c = main,
-                i,
-                l;
-
-            // Prototype Chain
-            while (c && c.prototype) {
-                buildCfg = c._buildCfg;
-                if (buildCfg) {
-                    if (buildCfg.aggregates) {
-                        aggr = aggr.concat(buildCfg.aggregates);
-                    }
-                    if (buildCfg.custom) {
-                        Y.mix(cust, buildCfg.custom, true);
-                    }
-                    if (buildCfg.statics) {
-                        statics = statics.concat(buildCfg.statics);
-                    }
-                }
-                c = c.superclass ? c.superclass.constructor : null;
-            }
-
-            // Exts
-            if (exts) {
-                for (i = 0, l = exts.length; i < l; i++) {
-                    c = exts[i];
-                    buildCfg = c._buildCfg;
-                    if (buildCfg) {
-                        if (buildCfg.aggregates) {
-                            aggr = aggr.concat(buildCfg.aggregates);
-                        }
-                        if (buildCfg.custom) {
-                            Y.mix(cust, buildCfg.custom, true);
-                        }
-                        if (buildCfg.statics) {
-                            statics = statics.concat(buildCfg.statics);
-                        }
-                    }
-                }
-            }
-
-            if (cfgAggr) {
-                aggr = aggr.concat(cfgAggr);
-            }
-
-            if (cfgCustBuild) {
-                Y.mix(cust, cfg.cfgBuild, true);
-            }
-
-            if (cfgStatics) {
-                statics = statics.concat(cfgStatics);
-            }
-
-            return {
-                aggregates: aggr,
-                custom: cust,
-                statics: statics
-            };
-        },
-
-        _clean : function(sx, cfg) {
-            var prop, i, l, sxclone = Y.merge(sx),
-                aggregates = cfg.aggregates,
-                custom = cfg.custom;
-
-            for (prop in custom) {
-                if (sxclone.hasOwnProperty(prop)) {
-                    delete sxclone[prop];
-                }
-            }
-
-            for (i = 0, l = aggregates.length; i < l; i++) {
-                prop = aggregates[i];
-                if (sxclone.hasOwnProperty(prop)) {
-                    delete sxclone[prop];
-                }
-            }
-
-            return sxclone;
-        }
-    });
-
-    /**
-     * <p>
-     * Builds a custom constructor function (class) from the
-     * main function, and array of extension functions (classes)
-     * provided. The NAME field for the constructor function is
-     * defined by the first argument passed in.
-     * </p>
-     * <p>
-     * The cfg object supports the following properties
-     * </p>
-     * <dl>
-     *    <dt>dynamic &#60;boolean&#62;</dt>
-     *    <dd>
-     *    <p>If true (default), a completely new class
-     *    is created which extends the main class, and acts as the
-     *    host on which the extension classes are augmented.</p>
-     *    <p>If false, the extensions classes are augmented directly to
-     *    the main class, modifying the main class' prototype.</p>
-     *    </dd>
-     *    <dt>aggregates &#60;String[]&#62;</dt>
-     *    <dd>An array of static property names, which will get aggregated
-     *    on to the built class, in addition to the default properties build
-     *    will always aggregate as defined by the main class' static _buildCfg
-     *    property.
-     *    </dd>
-     * </dl>
-     *
-     * @method build
-     * @deprecated Use the more convenient Base.create and Base.mix methods instead
-     * @static
-     * @param {Function} name The name of the new class. Used to define the NAME property for the new class.
-     * @param {Function} main The main class on which to base the built class
-     * @param {Function[]} extensions The set of extension classes which will be
-     * augmented/aggregated to the built class.
-     * @param {Object} cfg Optional. Build configuration for the class (see description).
-     * @return {Function} A custom class, created from the provided main and extension classes
-     */
-    Base.build = function(name, main, extensions, cfg) {
-        return build(name, main, extensions, null, null, cfg);
-    };
-
-    /**
-     * Creates a new class (constructor function) which extends the base class passed in as the second argument,
-     * and mixes in the array of extensions provided.
-     *
-     * Prototype properties or methods can be added to the new class, using the px argument (similar to Y.extend).
-     *
-     * Static properties or methods can be added to the new class, using the sx argument (similar to Y.extend).
-     *
-     * **NOTE FOR COMPONENT DEVELOPERS**: Both the `base` class, and `extensions` can define static a `_buildCfg`
-     * property, which acts as class creation meta-data, and drives how special static properties from the base
-     * class, or extensions should be copied, aggregated or (custom) mixed into the newly created class.
-     *
-     * The `_buildCfg` property is a hash with 3 supported properties: `statics`, `aggregates` and `custom`, e.g:
-     *
-     *     // If the Base/Main class is the thing introducing the property:
-     *
-     *     MyBaseClass._buildCfg = {
-     *
-     *        // Static properties/methods to copy (Alias) to the built class.
-     *        statics: ["CopyThisMethod", "CopyThisProperty"],
-     *
-     *        // Static props to aggregate onto the built class.
-     *        aggregates: ["AggregateThisProperty"],
-     *
-     *        // Static properties which need custom handling (e.g. deep merge etc.)
-     *        custom: {
-     *           "CustomProperty" : function(property, Receiver, Supplier) {
-     *              ...
-     *              var triggers = Receiver.CustomProperty.triggers;
-     *              Receiver.CustomProperty.triggers = triggers.concat(Supplier.CustomProperty.triggers);
-     *              ...
-     *           }
-     *        }
-     *     };
-     *
-     *     MyBaseClass.CopyThisMethod = function() {...};
-     *     MyBaseClass.CopyThisProperty = "foo";
-     *     MyBaseClass.AggregateThisProperty = {...};
-     *     MyBaseClass.CustomProperty = {
-     *        triggers: [...]
-     *     }
-     *
-     *     // Or, if the Extension is the thing introducing the property:
-     *
-     *     MyExtension._buildCfg = {
-     *         statics : ...
-     *         aggregates : ...
-     *         custom : ...
-     *     }
-     *
-     * This way, when users pass your base or extension class to `Y.Base.create` or `Y.Base.mix`, they don't need to
-     * know which properties need special handling. `Y.Base` has a buildCfg which defines `ATTRS` for custom mix handling
-     * (to protect the static config objects), and `Y.Widget` has a buildCfg which specifies `HTML_PARSER` for
-     * straight up aggregation.
-     *
-     * @method create
-     * @static
-     * @param {String} name The name of the newly created class. Used to define the NAME property for the new class.
-     * @param {Function} main The base class which the new class should extend.
-     * This class needs to be Base or a class derived from base (e.g. Widget).
-     * @param {Function[]} extensions The list of extensions which will be mixed into the built class.
-     * @param {Object} px The set of prototype properties/methods to add to the built class.
-     * @param {Object} sx The set of static properties/methods to add to the built class.
-     * @return {Function} The newly created class.
-     */
-    Base.create = function(name, base, extensions, px, sx) {
-        return build(name, base, extensions, px, sx);
-    };
-
-    /**
-     * <p>Mixes in a list of extensions to an existing class.</p>
-     * @method mix
-     * @static
-     * @param {Function} main The existing class into which the extensions should be mixed.
-     * The class needs to be Base or a class derived from Base (e.g. Widget)
-     * @param {Function[]} extensions The set of extension classes which will mixed into the existing main class.
-     * @return {Function} The modified main class, with extensions mixed in.
-     */
-    Base.mix = function(main, extensions) {
-
-        if (main._CACHED_CLASS_DATA) {
-            main._CACHED_CLASS_DATA = null;
-        }
-
-        return build(null, main, extensions, null, null, {dynamic:false});
-    };
-
-    /**
-     * The build configuration for the Base class.
-     *
-     * Defines the static fields which need to be aggregated when the Base class
-     * is used as the main class passed to the
-     * <a href="#method_Base.build">Base.build</a> method.
-     *
-     * @property _buildCfg
-     * @type Object
-     * @static
-     * @final
-     * @private
-     */
-    BaseCore._buildCfg = {
-        aggregates: AGGREGATES.concat(),
-
-        custom: {
-            ATTRS         : attrsAggregator,
-            _ATTR_CFG     : attrCfgAggregator,
-            _NON_ATTRS_CFG: arrayAggregator
-        }
-    };
-
-    // Makes sure Base and BaseCore use separate `_buildCfg` objects.
-    Base._buildCfg = {
-        aggregates: AGGREGATES.concat(),
-
-        custom: {
-            ATTRS         : attrsAggregator,
-            _ATTR_CFG     : attrCfgAggregator,
-            _NON_ATTRS_CFG: arrayAggregator
-        }
-    };
-
-
-}, '3.16.0', {"requires": ["base-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('file-html5', function (Y, NAME) {
-
-    /**
-     * The FileHTML5 class provides a wrapper for a file pointer in an HTML5 The File wrapper
-     * also implements the mechanics for uploading a file and tracking its progress.
-     * @module file-html5
-     */
-
-    /**
-     * The class provides a wrapper for a file pointer.
-     * @class FileHTML5
-     * @extends Base
-     * @constructor
-     * @param {Object} config Configuration object.
-     */
-    var Lang = Y.Lang,
-        Bind = Y.bind,
-        Win = Y.config.win;
-
-    var FileHTML5 = function(o) {
-
-        var file = null;
-
-        if (FileHTML5.isValidFile(o)) {
-            file = o;
-        }
-        else if (FileHTML5.isValidFile(o.file)) {
-            file = o.file;
-        }
-        else {
-            file = false;
-        }
-
-        FileHTML5.superclass.constructor.apply(this, arguments);
-
-        if (file && FileHTML5.canUpload()) {
-           if (!this.get("file")) {
-               this._set("file", file);
-           }
-
-           if (!this.get("name")) {
-           this._set("name", file.name || file.fileName);
-           }
-
-           if (this.get("size") != (file.size || file.fileSize)) {
-           this._set("size", file.size || file.fileSize);
-           }
-
-           if (!this.get("type")) {
-           this._set("type", file.type);
-           }
-
-           if (file.hasOwnProperty("lastModifiedDate") && !this.get("dateModified")) {
-               this._set("dateModified", file.lastModifiedDate);
-           }
-        }
-    };
-
-
-    Y.extend(FileHTML5, Y.Base, {
-
-       /**
-        * Construction logic executed during FileHTML5 instantiation.
-        *
-        * @method initializer
-        * @protected
-        */
-        initializer : function (cfg) {
-            if (!this.get("id")) {
-                this._set("id", Y.guid("file"));
-            }
-        },
-
-       /**
-        * Handler of events dispatched by the XMLHTTPRequest.
-        *
-        * @method _uploadEventHandler
-        * @param {Event} event The event object received from the XMLHTTPRequest.
-        * @protected
-        */
-        _uploadEventHandler: function (event) {
-            var xhr = this.get("xhr");
-
-            switch (event.type) {
-                case "progress":
-                  /**
-                   * Signals that progress has been made on the upload of this file.
-                   *
-                   * @event uploadprogress
-                   * @param event {Event} The event object for the `uploadprogress` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the XMLHttpRequest instance.</dd>
-                   *      <dt>bytesLoaded</dt>
-                   *          <dd>The number of bytes of the file that has been uploaded.</dd>
-                   *      <dt>bytesTotal</dt>
-                   *          <dd>The total number of bytes in the file (the file size)</dd>
-                   *      <dt>percentLoaded</dt>
-                   *          <dd>The fraction of the file that has been uploaded, out of 100.</dd>
-                   *  </dl>
-                   */
-                   this.fire("uploadprogress", {originEvent: event,
-                                               bytesLoaded: event.loaded,
-                                               bytesTotal: this.get("size"),
-                                               percentLoaded: Math.min(100, Math.round(10000*event.loaded/this.get("size"))/100)
-                                               });
-                   this._set("bytesUploaded", event.loaded);
-                   break;
-
-                case "load":
-                  /**
-                   * Signals that this file's upload has completed and data has been received from the server.
-                   *
-                   * @event uploadcomplete
-                   * @param event {Event} The event object for the `uploadcomplete` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the XMLHttpRequest instance.</dd>
-                   *      <dt>data</dt>
-                   *          <dd>The data returned by the server.</dd>
-                   *  </dl>
-                   */
-
-                   if (xhr.status >= 200 && xhr.status <= 299) {
-                        this.fire("uploadcomplete", {originEvent: event,
-                                                     data: event.target.responseText});
-                        var xhrupload = xhr.upload,
-                            boundEventHandler = this.get("boundEventHandler");
-
-                        xhrupload.removeEventListener ("progress", boundEventHandler);
-                        xhrupload.removeEventListener ("error", boundEventHandler);
-                        xhrupload.removeEventListener ("abort", boundEventHandler);
-                        xhr.removeEventListener ("load", boundEventHandler);
-                        xhr.removeEventListener ("error", boundEventHandler);
-                        xhr.removeEventListener ("readystatechange", boundEventHandler);
-
-                        this._set("xhr", null);
-                   }
-                   else {
-                        this.fire("uploaderror", {originEvent: event,
-                                                  data: xhr.responseText,
-                                                  status: xhr.status,
-                                                  statusText: xhr.statusText,
-                                                  source: "http"});
-                   }
-                   break;
-
-                case "error":
-                  /**
-                   * Signals that this file's upload has encountered an error.
-                   *
-                   * @event uploaderror
-                   * @param event {Event} The event object for the `uploaderror` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the XMLHttpRequest instance.</dd>
-                   *      <dt>data</dt>
-                   *          <dd>The data returned by the server.</dd>
-                   *      <dt>status</dt>
-                   *          <dd>The status code reported by the XMLHttpRequest. If it's an HTTP error,
-                                  then this corresponds to the HTTP status code received by the uploader.</dd>
-                   *      <dt>statusText</dt>
-                   *          <dd>The text of the error event reported by the XMLHttpRequest instance</dd>
-                   *      <dt>source</dt>
-                   *          <dd>Either "http" (if it's an HTTP error), or "io" (if it's a network transmission
-                   *              error.)</dd>
-                   *
-                   *  </dl>
-                   */
-                   this.fire("uploaderror", {originEvent: event,
-                                                  data: xhr.responseText,
-                                                  status: xhr.status,
-                                                  statusText: xhr.statusText,
-                                                  source: "io"});
-                   break;
-
-                case "abort":
-
-                  /**
-                   * Signals that this file's upload has been cancelled.
-                   *
-                   * @event uploadcancel
-                   * @param event {Event} The event object for the `uploadcancel` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the XMLHttpRequest instance.</dd>
-                   *  </dl>
-                   */
-                   this.fire("uploadcancel", {originEvent: event});
-                   break;
-
-                case "readystatechange":
-
-                  /**
-                   * Signals that XMLHttpRequest has fired a readystatechange event.
-                   *
-                   * @event readystatechange
-                   * @param event {Event} The event object for the `readystatechange` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>readyState</dt>
-                   *          <dd>The readyState code reported by the XMLHttpRequest instance.</dd>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the XMLHttpRequest instance.</dd>
-                   *  </dl>
-                   */
-                   this.fire("readystatechange", {readyState: event.target.readyState,
-                                                  originEvent: event});
-                   break;
-            }
-        },
-
-       /**
-        * Starts the upload of a specific file.
-        *
-        * @method startUpload
-        * @param url {String} The URL to upload the file to.
-        * @param parameters {Object} (optional) A set of key-value pairs to send as variables along with the file upload HTTP request.
-        * @param fileFieldName {String} (optional) The name of the POST variable that should contain the uploaded file ('Filedata' by default)
-        */
-        startUpload: function(url, parameters, fileFieldName) {
-
-            this._set("bytesUploaded", 0);
-
-            this._set("xhr", new XMLHttpRequest());
-            this._set("boundEventHandler", Bind(this._uploadEventHandler, this));
-
-            var uploadData = new FormData(),
-                fileField = fileFieldName || "Filedata",
-                xhr = this.get("xhr"),
-                xhrupload = this.get("xhr").upload,
-                boundEventHandler = this.get("boundEventHandler");
-
-            Y.each(parameters, function (value, key) {uploadData.append(key, value);});
-            uploadData.append(fileField, this.get("file"));
-
-
-
-
-            xhr.addEventListener ("loadstart", boundEventHandler, false);
-            xhrupload.addEventListener ("progress", boundEventHandler, false);
-            xhr.addEventListener ("load", boundEventHandler, false);
-            xhr.addEventListener ("error", boundEventHandler, false);
-            xhrupload.addEventListener ("error", boundEventHandler, false);
-            xhrupload.addEventListener ("abort", boundEventHandler, false);
-            xhr.addEventListener ("abort", boundEventHandler, false);
-            xhr.addEventListener ("loadend", boundEventHandler, false);
-            xhr.addEventListener ("readystatechange", boundEventHandler, false);
-
-            xhr.open("POST", url, true);
-
-            xhr.withCredentials = this.get("xhrWithCredentials");
-
-            Y.each(this.get("xhrHeaders"), function (value, key) {
-                 xhr.setRequestHeader(key, value);
-            });
-
-            xhr.send(uploadData);
-
-            /**
-             * Signals that this file's upload has started.
-             *
-             * @event uploadstart
-             * @param event {Event} The event object for the `uploadstart` with the
-             *                      following payload:
-             *  <dl>
-             *      <dt>xhr</dt>
-             *          <dd>The XMLHttpRequest instance handling the file upload.</dd>
-             *  </dl>
-             */
-             this.fire("uploadstart", {xhr: xhr});
-
-        },
-
-       /**
-        * Cancels the upload of a specific file, if currently in progress.
-        *
-        * @method cancelUpload
-        */
-        cancelUpload: function () {
-            var xhr = this.get('xhr');
-            if (xhr) {
-                xhr.abort();
-            }
-        }
-
-
-    }, {
-
-       /**
-        * The identity of the class.
-        *
-        * @property NAME
-        * @type String
-        * @default 'file'
-        * @readOnly
-        * @protected
-        * @static
-        */
-        NAME: 'file',
-
-       /**
-        * The type of transport.
-        *
-        * @property TYPE
-        * @type String
-        * @default 'html5'
-        * @readOnly
-        * @protected
-        * @static
-        */
-        TYPE: 'html5',
-
-       /**
-        * Static property used to define the default attribute configuration of
-        * the File.
-        *
-        * @property ATTRS
-        * @type {Object}
-        * @protected
-        * @static
-        */
-        ATTRS: {
-
-       /**
-        * A String containing the unique id of the file wrapped by the FileFlash instance.
-        * The id is supplied by the Flash player uploader.
-        *
-        * @attribute id
-        * @type {String}
-        * @initOnly
-        */
-        id: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The size of the file wrapped by FileHTML5. This value is supplied by the instance of File().
-        *
-        * @attribute size
-        * @type {Number}
-        * @initOnly
-        */
-        size: {
-            writeOnce: "initOnly",
-            value: 0
-        },
-
-       /**
-        * The name of the file wrapped by FileHTML5. This value is supplied by the instance of File().
-        *
-        * @attribute name
-        * @type {String}
-        * @initOnly
-        */
-        name: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The date that the file wrapped by FileHTML5 was created on. This value is supplied by the instance of File().
-        *
-        * @attribute dateCreated
-        * @type {Date}
-        * @initOnly
-        * @default null
-        */
-        dateCreated: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The date that the file wrapped by FileHTML5 was last modified on. This value is supplied by the instance of File().
-        *
-        * @attribute dateModified
-        * @type {Date}
-        * @initOnly
-        */
-        dateModified: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The number of bytes of the file that has been uploaded to the server. This value is
-        * non-zero only while a file is being uploaded.
-        *
-        * @attribute bytesUploaded
-        * @type {Date}
-        * @readOnly
-        */
-        bytesUploaded: {
-            readOnly: true,
-            value: 0
-        },
-
-       /**
-        * The type of the file wrapped by FileHTML. This value is provided by the instance of File()
-        *
-        * @attribute type
-        * @type {String}
-        * @initOnly
-        */
-        type: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The pointer to the instance of File() wrapped by FileHTML5.
-        *
-        * @attribute file
-        * @type {File}
-        * @initOnly
-        */
-        file: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The pointer to the instance of XMLHttpRequest used by FileHTML5 to upload the file.
-        *
-        * @attribute xhr
-        * @type {XMLHttpRequest}
-        * @initOnly
-        */
-        xhr: {
-            readOnly: true,
-            value: null
-        },
-
-       /**
-        * The dictionary of headers that should be set on the XMLHttpRequest object before
-        * sending it.
-        *
-        * @attribute xhrHeaders
-        * @type {Object}
-        * @initOnly
-        */
-        xhrHeaders: {
-            value: {}
-        },
-
-       /**
-        * A Boolean indicating whether the XMLHttpRequest should be sent with user credentials.
-        * This does not affect same-site requests.
-        *
-        * @attribute xhrWithCredentials
-        * @type {Boolean}
-        * @initOnly
-        */
-        xhrWithCredentials: {
-            value: true
-        },
-
-       /**
-        * The bound event handler used to handle events from XMLHttpRequest.
-        *
-        * @attribute boundEventHandler
-        * @type {Function}
-        * @initOnly
-        */
-        boundEventHandler: {
-            readOnly: true,
-            value: null
-        }
-        },
-
-       /**
-        * Checks whether a specific native file instance is valid
-        *
-        * @method isValidFile
-        * @param file {File} A native File() instance.
-        * @static
-        */
-        isValidFile: function (file) {
-            return (Win && Win.File && file instanceof File);
-        },
-
-       /**
-        * Checks whether the browser has a native upload capability
-        * via XMLHttpRequest Level 2.
-        *
-        * @method canUpload
-        * @static
-        */
-        canUpload: function () {
-            return (Win && Win.FormData && Win.XMLHttpRequest);
-        }
-    });
-
-    Y.FileHTML5 = FileHTML5;
-
-
-}, '3.16.0', {"requires": ["base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('uploader-queue', function (Y, NAME) {
-
-/**
-* The class manages a queue of files that should be uploaded to the server.
-* It initializes the required number of uploads, tracks them as they progress,
-* and automatically advances to the next upload when a preceding one has completed.
-* @module uploader-queue
-*/
-
-
-
-/**
-* This class manages a queue of files to be uploaded to the server.
-* @class Uploader.Queue
-* @extends Base
-* @constructor
-*/
-var UploaderQueue = function() {
-    this.queuedFiles = [];
-    this.uploadRetries = {};
-    this.numberOfUploads = 0;
-    this.currentUploadedByteValues = {};
-    this.currentFiles = {};
-    this.totalBytesUploaded = 0;
-    this.totalBytes = 0;
-
-    UploaderQueue.superclass.constructor.apply(this, arguments);
-};
-
-
-Y.extend(UploaderQueue, Y.Base, {
-
-    /**
-    * Stored value of the current queue state
-    * @property _currentState
-    * @type {String}
-    * @protected
-    * @default UploaderQueue.STOPPED
-    */
-    _currentState: UploaderQueue.STOPPED,
-
-    /**
-    * Construction logic executed during UploaderQueue instantiation.
-    *
-    * @method initializer
-    * @protected
-    */
-    initializer : function () {},
-
-    /**
-    * Handles and retransmits upload start event.
-    *
-    * @method _uploadStartHandler
-    * @param event The event dispatched during the upload process.
-    * @private
-    */
-    _uploadStartHandler : function (event) {
-        var updatedEvent = event;
-        updatedEvent.file = event.target;
-        updatedEvent.originEvent = event;
-
-        this.fire("uploadstart", updatedEvent);
-    },
-
-    /**
-    * Handles and retransmits upload error event.
-    *
-    * @method _uploadErrorHandler
-    * @param event The event dispatched during the upload process.
-    * @private
-    */
-    _uploadErrorHandler : function (event) {
-        var errorAction = this.get("errorAction"),
-            updatedEvent = event,
-            fileid,
-            retries;
-
-        updatedEvent.file = event.target;
-        updatedEvent.originEvent = event;
-
-        this.numberOfUploads-=1;
-        delete this.currentFiles[event.target.get("id")];
-        this._detachFileEvents(event.target);
-
-        event.target.cancelUpload();
-
-        if (errorAction === UploaderQueue.STOP) {
-            this.pauseUpload();
-        }
-
-        else if (errorAction === UploaderQueue.RESTART_ASAP) {
-            fileid = event.target.get("id");
-            retries = this.uploadRetries[fileid] || 0;
-
-            if (retries < this.get("retryCount")) {
-                this.uploadRetries[fileid] = retries + 1;
-                this.addToQueueTop(event.target);
-            }
-            this._startNextFile();
-        }
-        else if (errorAction === UploaderQueue.RESTART_AFTER) {
-            fileid = event.target.get("id");
-            retries = this.uploadRetries[fileid] || 0;
-
-            if (retries < this.get("retryCount")) {
-                this.uploadRetries[fileid] = retries + 1;
-                this.addToQueueBottom(event.target);
-            }
-            this._startNextFile();
-        }
-
-        this.fire("uploaderror", updatedEvent);
-    },
-
-    /**
-    * Launches the upload of the next file in the queue.
-    *
-    * @method _startNextFile
-    * @private
-    */
-    _startNextFile : function () {
-        if (this.queuedFiles.length > 0) {
-            var currentFile = this.queuedFiles.shift(),
-                fileId = currentFile.get("id"),
-                parameters = this.get("perFileParameters"),
-                fileParameters = parameters.hasOwnProperty(fileId) ? parameters[fileId] : parameters;
-
-            this.currentUploadedByteValues[fileId] = 0;
-
-            currentFile.on("uploadstart", this._uploadStartHandler, this);
-            currentFile.on("uploadprogress", this._uploadProgressHandler, this);
-            currentFile.on("uploadcomplete", this._uploadCompleteHandler, this);
-            currentFile.on("uploaderror", this._uploadErrorHandler, this);
-            currentFile.on("uploadcancel", this._uploadCancelHandler, this);
-
-            currentFile.set("xhrHeaders", this.get("uploadHeaders"));
-            currentFile.set("xhrWithCredentials", this.get("withCredentials"));
-
-            currentFile.startUpload(this.get("uploadURL"), fileParameters, this.get("fileFieldName"));
-
-            this._registerUpload(currentFile);
-        }
-    },
-
-    /**
-    * Register a new upload process.
-    *
-    * @method _registerUpload
-    * @private
-    */
-    _registerUpload : function (file) {
-        this.numberOfUploads += 1;
-        this.currentFiles[file.get("id")] = file;
-    },
-
-    /**
-    * Unregisters a new upload process.
-    *
-    * @method _unregisterUpload
-    * @private
-    */
-    _unregisterUpload : function (file) {
-        if (this.numberOfUploads > 0) {
-            this.numberOfUploads -= 1;
-        }
-
-        delete this.currentFiles[file.get("id")];
-        delete this.uploadRetries[file.get("id")];
-
-        this._detachFileEvents(file);
-    },
-
-    _detachFileEvents : function (file) {
-        file.detach("uploadstart", this._uploadStartHandler);
-        file.detach("uploadprogress", this._uploadProgressHandler);
-        file.detach("uploadcomplete", this._uploadCompleteHandler);
-        file.detach("uploaderror", this._uploadErrorHandler);
-        file.detach("uploadcancel", this._uploadCancelHandler);
-    },
-
-    /**
-    * Handles and retransmits upload complete event.
-    *
-    * @method _uploadCompleteHandler
-    * @param event The event dispatched during the upload process.
-    * @private
-    */
-    _uploadCompleteHandler : function (event) {
-
-        this._unregisterUpload(event.target);
-
-        this.totalBytesUploaded += event.target.get("size");
-        delete this.currentUploadedByteValues[event.target.get("id")];
-
-
-        if (this.queuedFiles.length > 0 && this._currentState === UploaderQueue.UPLOADING) {
-            this._startNextFile();
-        }
-
-        var updatedEvent = event,
-            uploadedTotal = this.totalBytesUploaded,
-            percentLoaded = Math.min(100, Math.round(10000*uploadedTotal/this.totalBytes) / 100);
-
-        updatedEvent.file = event.target;
-        updatedEvent.originEvent = event;
-
-        Y.each(this.currentUploadedByteValues, function (value) {
-            uploadedTotal += value;
-        });
-
-        this.fire("totaluploadprogress", {
-            bytesLoaded: uploadedTotal,
-            bytesTotal: this.totalBytes,
-            percentLoaded: percentLoaded
-        });
-
-        this.fire("uploadcomplete", updatedEvent);
-
-        if (this.queuedFiles.length === 0 && this.numberOfUploads <= 0) {
-            this.fire("alluploadscomplete");
-            this._currentState = UploaderQueue.STOPPED;
-        }
-    },
-
-    /**
-    * Handles and retransmits upload cancel event.
-    *
-    * @method _uploadCancelHandler
-    * @param event The event dispatched during the upload process.
-    * @private
-    */
-    _uploadCancelHandler : function (event) {
-
-        var updatedEvent = event;
-        updatedEvent.originEvent = event;
-        updatedEvent.file = event.target;
-
-        this.fire("uploadcancel", updatedEvent);
-    },
-
-
-
-    /**
-    * Handles and retransmits upload progress event.
-    *
-    * @method _uploadProgressHandler
-    * @param event The event dispatched during the upload process.
-    * @private
-    */
-    _uploadProgressHandler : function (event) {
-
-        this.currentUploadedByteValues[event.target.get("id")] = event.bytesLoaded;
-
-        var updatedEvent = event,
-            uploadedTotal = this.totalBytesUploaded,
-            percentLoaded = Math.min(100, Math.round(10000*uploadedTotal/this.totalBytes) / 100);
-
-        updatedEvent.originEvent = event;
-        updatedEvent.file = event.target;
-
-        this.fire("uploadprogress", updatedEvent);
-
-        Y.each(this.currentUploadedByteValues, function (value) {
-            uploadedTotal += value;
-        });
-
-        this.fire("totaluploadprogress", {
-            bytesLoaded: uploadedTotal,
-            bytesTotal: this.totalBytes,
-            percentLoaded: percentLoaded
-        });
-    },
-
-    /**
-    * Starts uploading the queued up file list.
-    *
-    * @method startUpload
-    */
-    startUpload: function() {
-        this.queuedFiles = this.get("fileList").slice(0);
-        this.numberOfUploads = 0;
-        this.currentUploadedByteValues = {};
-        this.currentFiles = {};
-        this.totalBytesUploaded = 0;
-
-        this._currentState = UploaderQueue.UPLOADING;
-
-        while (this.numberOfUploads < this.get("simUploads") && this.queuedFiles.length > 0) {
-            this._startNextFile();
-        }
-    },
-
-    /**
-    * Pauses the upload process. The ongoing file uploads
-    * will complete after this method is called, but no
-    * new ones will be launched.
-    *
-    * @method pauseUpload
-    */
-    pauseUpload: function () {
-        this._currentState = UploaderQueue.STOPPED;
-    },
-
-    /**
-    * Restarts a paused upload process.
-    *
-    * @method restartUpload
-    */
-    restartUpload: function () {
-        this._currentState = UploaderQueue.UPLOADING;
-        while (this.numberOfUploads < this.get("simUploads")) {
-             this._startNextFile();
-        }
-    },
-
-    /**
-    * If a particular file is stuck in an ongoing upload without
-    * any progress events, this method allows to force its reupload
-    * by cancelling its upload and immediately relaunching it.
-    *
-    * @method forceReupload
-    * @param file {File} The file to force reupload on.
-    */
-    forceReupload : function (file) {
-        var id = file.get("id");
-        if (this.currentFiles.hasOwnProperty(id)) {
-            file.cancelUpload();
-            this._unregisterUpload(file);
-            this.addToQueueTop(file);
-            this._startNextFile();
-        }
-    },
-
-    /**
-    * Add a new file to the top of the queue (the upload will be
-    * launched as soon as the current number of uploading files
-    * drops below the maximum permissible value).
-    *
-    * @method addToQueueTop
-    * @param file {File} The file to add to the top of the queue.
-    */
-    addToQueueTop: function (file) {
-            this.queuedFiles.unshift(file);
-    },
-
-    /**
-    * Add a new file to the bottom of the queue (the upload will be
-    * launched after all the other queued files are uploaded.)
-    *
-    * @method addToQueueBottom
-    * @param file {File} The file to add to the bottom of the queue.
-    */
-    addToQueueBottom: function (file) {
-            this.queuedFiles.push(file);
-    },
-
-    /**
-    * Cancels a specific file's upload. If no argument is passed,
-    * all ongoing uploads are cancelled and the upload process is
-    * stopped.
-    *
-    * @method cancelUpload
-    * @param file {File} An optional parameter - the file whose upload
-    * should be cancelled.
-    */
-    cancelUpload: function (file) {
-        var id,
-            i,
-            fid;
-
-        if (file) {
-            id = file.get("id");
-
-            if (this.currentFiles[id]) {
-                this.currentFiles[id].cancelUpload();
-                this._unregisterUpload(this.currentFiles[id]);
-                if (this._currentState === UploaderQueue.UPLOADING) {
-                    this._startNextFile();
-                }
-            }
-            else {
-                for (i = 0, len = this.queuedFiles.length; i < len; i++) {
-                    if (this.queuedFiles[i].get("id") === id) {
-                        this.queuedFiles.splice(i, 1);
-                        break;
-                    }
-                }
-            }
-        }
-        else {
-            for (fid in this.currentFiles) {
-                this.currentFiles[fid].cancelUpload();
-                this._unregisterUpload(this.currentFiles[fid]);
-            }
-
-            this.currentUploadedByteValues = {};
-            this.currentFiles = {};
-            this.totalBytesUploaded = 0;
-            this.fire("alluploadscancelled");
-            this._currentState = UploaderQueue.STOPPED;
-        }
-    }
-}, {
-    /**
-    * Static constant for the value of the `errorAction` attribute:
-    * prescribes the queue to continue uploading files in case of
-    * an error.
-    * @property CONTINUE
-    * @readOnly
-    * @type {String}
-    * @static
-    */
-    CONTINUE: "continue",
-
-    /**
-    * Static constant for the value of the `errorAction` attribute:
-    * prescribes the queue to stop uploading files in case of
-    * an error.
-    * @property STOP
-    * @readOnly
-    * @type {String}
-    * @static
-    */
-    STOP: "stop",
-
-    /**
-    * Static constant for the value of the `errorAction` attribute:
-    * prescribes the queue to restart a file upload immediately in case of
-    * an error.
-    * @property RESTART_ASAP
-    * @readOnly
-    * @type {String}
-    * @static
-    */
-    RESTART_ASAP: "restartasap",
-
-    /**
-    * Static constant for the value of the `errorAction` attribute:
-    * prescribes the queue to restart an errored out file upload after
-    * other files have finished uploading.
-    * @property RESTART_AFTER
-    * @readOnly
-    * @type {String}
-    * @static
-    */
-    RESTART_AFTER: "restartafter",
-
-    /**
-    * Static constant for the value of the `_currentState` property:
-    * implies that the queue is currently not uploading files.
-    * @property STOPPED
-    * @readOnly
-    * @type {String}
-    * @static
-    */
-    STOPPED: "stopped",
-
-    /**
-    * Static constant for the value of the `_currentState` property:
-    * implies that the queue is currently uploading files.
-    * @property UPLOADING
-    * @readOnly
-    * @type {String}
-    * @static
-    */
-    UPLOADING: "uploading",
-
-    /**
-    * The identity of the class.
-    *
-    * @property NAME
-    * @type String
-    * @default 'uploaderqueue'
-    * @readOnly
-    * @protected
-    * @static
-    */
-    NAME: 'uploaderqueue',
-
-    /**
-    * Static property used to define the default attribute configuration of
-    * the class.
-    *
-    * @property ATTRS
-    * @type {Object}
-    * @protected
-    * @static
-    */
-    ATTRS: {
-
-        /**
-        * Maximum number of simultaneous uploads; must be in the
-        * range between 1 and 5. The value of `2` is default. It
-        * is recommended that this value does not exceed 3.
-        * @attribute simUploads
-        * @type Number
-        * @default 2
-        */
-         simUploads: {
-                 value: 2,
-                 validator: function (val) {
-                         return (val >= 1 && val <= 5);
-                 }
-         },
-
-        /**
-        * The action to take in case of error. The valid values for this attribute are:
-        * `Y.Uploader.Queue.CONTINUE` (the upload process should continue on other files,
-        * ignoring the error), `Y.Uploader.Queue.STOP` (the upload process
-        * should stop completely), `Y.Uploader.Queue.RESTART_ASAP` (the upload
-        * should restart immediately on the errored out file and continue as planned), or
-        * Y.Uploader.Queue.RESTART_AFTER (the upload of the errored out file should restart
-        * after all other files have uploaded)
-        * @attribute errorAction
-        * @type String
-        * @default Y.Uploader.Queue.CONTINUE
-        */
-        errorAction: {
-            value: "continue",
-                validator: function (val) {
-                return (
-                    val === UploaderQueue.CONTINUE ||
-                    val === UploaderQueue.STOP ||
-                    val === UploaderQueue.RESTART_ASAP ||
-                    val === UploaderQueue.RESTART_AFTER
-                );
-            }
-        },
-
-        /**
-        * The total number of bytes that has been uploaded.
-        * @attribute bytesUploaded
-        * @type Number
-        */
-        bytesUploaded: {
-            readOnly: true,
-            value: 0
-        },
-
-        /**
-        * The total number of bytes in the queue.
-        * @attribute bytesTotal
-        * @type Number
-        */
-        bytesTotal: {
-            readOnly: true,
-            value: 0
-        },
-
-        /**
-        * The queue file list. This file list should only be modified
-        * before the upload has been started; modifying it after starting
-        * the upload has no effect, and `addToQueueTop` or `addToQueueBottom` methods
-        * should be used instead.
-        * @attribute fileList
-        * @type Array
-        */
-        fileList: {
-            value: [],
-            lazyAdd: false,
-            setter: function (val) {
-                var newValue = val;
-                Y.Array.each(newValue, function (value) {
-                    this.totalBytes += value.get("size");
-                }, this);
-
-                return val;
-            }
-        },
-
-        /**
-        * A String specifying what should be the POST field name for the file
-        * content in the upload request.
-        *
-        * @attribute fileFieldName
-        * @type {String}
-        * @default Filedata
-        */
-        fileFieldName: {
-            value: "Filedata"
-        },
-
-        /**
-        * The URL to POST the file upload requests to.
-        *
-        * @attribute uploadURL
-        * @type {String}
-        * @default ""
-        */
-        uploadURL: {
-            value: ""
-        },
-
-        /**
-        * Additional HTTP headers that should be included
-        * in the upload request. Due to Flash Player security
-        * restrictions, this attribute is only honored in the
-        * HTML5 Uploader.
-        *
-        * @attribute uploadHeaders
-        * @type {Object}
-        * @default {}
-        */
-        uploadHeaders: {
-            value: {}
-        },
-
-        /**
-        * A Boolean that specifies whether the file should be
-        * uploaded with the appropriate user credentials for the
-        * domain. Due to Flash Player security restrictions, this
-        * attribute is only honored in the HTML5 Uploader.
-        *
-        * @attribute withCredentials
-        * @type {Boolean}
-        * @default true
-        */
-        withCredentials: {
-            value: true
-        },
-
-
-        /**
-        * An object, keyed by `fileId`, containing sets of key-value pairs
-        * that should be passed as POST variables along with each corresponding
-        * file.
-        *
-        * @attribute perFileParameters
-        * @type {Object}
-        * @default {}
-        */
-        perFileParameters: {
-            value: {}
-        },
-
-        /**
-        * The number of times to try re-uploading a file that failed to upload before
-        * cancelling its upload.
-        *
-        * @attribute retryCount
-        * @type {Number}
-        * @default 3
-        */
-        retryCount: {
-            value: 3
-        }
-
-    }
-});
-
-
-Y.namespace('Uploader');
-Y.Uploader.Queue = UploaderQueue;
-
-
-}, '3.16.0', {"requires": ["base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('uploader-html5', function (Y, NAME) {
-
-/**
-* This module provides a UI for file selection and multiple file upload capability using
-* HTML5 XMLHTTPRequest Level 2 as a transport engine.
-* The supported features include: automatic upload queue management, upload progress
-* tracking, drag-and-drop support, server response retrieval and error reporting.
-*
-* @module uploader-html5
-*/
-
-// Shorthands for the external modules
-var  substitute  = Y.Lang.sub,
-     UploaderQueue = Y.Uploader.Queue;
-
-/**
-* This module provides a UI for file selection and multiple file upload capability using
-* HTML5 XMLHTTPRequest Level 2 as a transport engine.
-* @class UploaderHTML5
-* @extends Widget
-* @constructor
-*/
-function UploaderHTML5() {
-    UploaderHTML5.superclass.constructor.apply ( this, arguments );
-}
-
-
-
-Y.UploaderHTML5 = Y.extend( UploaderHTML5, Y.Widget, {
-
-    /**
-    * Stored reference to the instance of the file input field used to
-    * initiate the file selection dialog.
-    *
-    * @property _fileInputField
-    * @type {Node}
-    * @protected
-    */
-    _fileInputField: null,
-
-    /**
-    * Stored reference to the click event binding of the `Select Files`
-    * button.
-    *
-    * @property _buttonBinding
-    * @type {EventHandle}
-    * @protected
-    */
-    _buttonBinding: null,
-
-    /**
-    * Stored reference to the instance of Uploader.Queue used to manage
-    * the upload process. This is a read-only property that only exists
-    * during an active upload process. Only one queue can be active at
-    * a time; if an upload start is attempted while a queue is active,
-    * it will be ignored.
-    *
-    * @property queue
-    * @type {Uploader.Queue}
-    */
-    queue: null,
-
-    // Y.UploaderHTML5 prototype
-
-    /**
-    * Construction logic executed during UploaderHTML5 instantiation.
-    *
-    * @method initializer
-    * @protected
-    */
-    initializer : function () {
-
-        this._fileInputField = null;
-        this.queue = null;
-        this._buttonBinding = null;
-        this._fileList = [];
-
-        // Publish available events
-
-        /**
-        * Signals that files have been selected.
-        *
-        * @event fileselect
-        * @param event {Event} The event object for the `fileselect` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>fileList</dt>
-        *          <dd>An `Array` of files selected by the user, encapsulated
-        *              in Y.FileHTML5 objects.</dd>
-        *  </dl>
-        */
-        this.publish("fileselect");
-
-        /**
-        * Signals that an upload of multiple files has been started.
-        *
-        * @event uploadstart
-        * @param event {Event} The event object for the `uploadstart`.
-        */
-        this.publish("uploadstart");
-
-        /**
-        * Signals that an upload of a specific file has started.
-        *
-        * @event fileuploadstart
-        * @param event {Event} The event object for the `fileuploadstart` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>file</dt>
-        *          <dd>A reference to the Y.File that dispatched the event.</dd>
-        *      <dt>originEvent</dt>
-        *          <dd>The original event dispatched by Y.File.</dd>
-        *  </dl>
-        */
-        this.publish("fileuploadstart");
-
-        /**
-        * Reports on upload progress of a specific file.
-        *
-        * @event uploadprogress
-        * @param event {Event} The event object for the `uploadprogress` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>file</dt>
-        *          <dd>The pointer to the instance of `Y.File` that dispatched the event.</dd>
-        *      <dt>bytesLoaded</dt>
-        *          <dd>The number of bytes of the file that has been uploaded</dd>
-        *      <dt>bytesTotal</dt>
-        *          <dd>The total number of bytes in the file</dd>
-        *      <dt>percentLoaded</dt>
-        *          <dd>The fraction of the file that has been uploaded, out of 100</dd>
-        *      <dt>originEvent</dt>
-        *          <dd>The original event dispatched by the HTML5 uploader</dd>
-        *  </dl>
-        */
-        this.publish("uploadprogress");
-
-        /**
-        * Reports on the total upload progress of the file list.
-        *
-        * @event totaluploadprogress
-        * @param event {Event} The event object for the `totaluploadprogress` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>bytesLoaded</dt>
-        *          <dd>The number of bytes of the file list that has been uploaded</dd>
-        *      <dt>bytesTotal</dt>
-        *          <dd>The total number of bytes in the file list</dd>
-        *      <dt>percentLoaded</dt>
-        *          <dd>The fraction of the file list that has been uploaded, out of 100</dd>
-        *  </dl>
-        */
-        this.publish("totaluploadprogress");
-
-        /**
-        * Signals that a single file upload has been completed.
-        *
-        * @event uploadcomplete
-        * @param event {Event} The event object for the `uploadcomplete` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>file</dt>
-        *          <dd>The pointer to the instance of `Y.File` whose upload has been completed.</dd>
-        *      <dt>originEvent</dt>
-        *          <dd>The original event fired by the SWF Uploader</dd>
-        *      <dt>data</dt>
-        *          <dd>Data returned by the server.</dd>
-        *  </dl>
-        */
-        this.publish("uploadcomplete");
-
-        /**
-        * Signals that the upload process of the entire file list has been completed.
-        *
-        * @event alluploadscomplete
-        * @param event {Event} The event object for the `alluploadscomplete`.
-        */
-        this.publish("alluploadscomplete");
-
-        /**
-        * Signals that a error has occurred in a specific file's upload process.
-        *
-        * @event uploaderror
-        * @param event {Event} The event object for the `uploaderror` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>originEvent</dt>
-        *          <dd>The original error event fired by the HTML5 Uploader. </dd>
-        *      <dt>file</dt>
-        *          <dd>The pointer at the instance of Y.File that returned the error.</dd>
-        *      <dt>status</dt>
-        *          <dd>The status reported by the XMLHttpRequest object.</dd>
-        *      <dt>statusText</dt>
-        *          <dd>The statusText reported by the XMLHttpRequest object.</dd>
-        *  </dl>
-        */
-        this.publish("uploaderror");
-
-        /**
-        * Signals that a dragged object has entered into the uploader's associated drag-and-drop area.
-        *
-        * @event dragenter
-        * @param event {Event} The event object for the `dragenter`.
-        */
-        this.publish("dragenter");
-
-        /**
-        * Signals that an object has been dragged over the uploader's associated drag-and-drop area.
-        *
-        * @event dragover
-        * @param event {Event} The event object for the `dragover`.
-        */
-        this.publish("dragover");
-
-        /**
-        * Signals that an object has been dragged off of the uploader's associated drag-and-drop area.
-        *
-        * @event dragleave
-        * @param event {Event} The event object for the `dragleave`.
-        */
-        this.publish("dragleave");
-
-        /**
-        * Signals that an object has been dropped over the uploader's associated drag-and-drop area.
-        *
-        * @event drop
-        * @param event {Event} The event object for the `drop` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>fileList</dt>
-        *          <dd>An `Array` of files dropped by the user, encapsulated
-        *              in Y.FileHTML5 objects.</dd>
-        *  </dl>
-        */
-        this.publish("drop");
-
-    },
-
-    /**
-    * Create the DOM structure for the UploaderHTML5.
-    * UploaderHTML5's DOM structure consists of a "Select Files" button that can
-    * be replaced by the developer's widget of choice; and a hidden file input field
-    * that is used to instantiate the File Select dialog.
-    *
-    * @method renderUI
-    * @protected
-    */
-    renderUI : function () {
-        var contentBox = this.get('contentBox'),
-            selButton = this.get("selectFilesButton");
-
-        selButton.setStyles({width:"100%", height:"100%"});
-        contentBox.append(selButton);
-        this._fileInputField = Y.Node.create(UploaderHTML5.HTML5FILEFIELD_TEMPLATE);
-        contentBox.append(this._fileInputField);
-    },
-
-    /**
-    * Binds to the UploaderHTML5 UI and subscribes to the necessary events.
-    *
-    * @method bindUI
-    * @protected
-    */
-    bindUI : function () {
-
-        this._bindSelectButton();
-        this._setMultipleFiles();
-        this._setFileFilters();
-        this._bindDropArea();
-        this._triggerEnabled();
-
-        this.after("multipleFilesChange", this._setMultipleFiles, this);
-        this.after("fileFiltersChange", this._setFileFilters, this);
-        this.after("enabledChange", this._triggerEnabled, this);
-        this.after("selectFilesButtonChange", this._bindSelectButton, this);
-        this.after("dragAndDropAreaChange", this._bindDropArea, this);
-        this.after("tabIndexChange", function () {
-            this.get("selectFilesButton").set("tabIndex", this.get("tabIndex"));
-        }, this);
-        this._fileInputField.on("change", this._updateFileList, this);
-        this._fileInputField.on("click", function(event) {
-            event.stopPropagation();
-        }, this);
-
-        this.get("selectFilesButton").set("tabIndex", this.get("tabIndex"));
-    },
-
-
-    /**
-    * Recreates the file field to null out the previous list of files and
-    * thus allow for an identical file list selection.
-    *
-    * @method _rebindFileField
-    * @protected
-    */
-    _rebindFileField : function () {
-        this._fileInputField.remove(true);
-        this._fileInputField = Y.Node.create(UploaderHTML5.HTML5FILEFIELD_TEMPLATE);
-        this.get("contentBox").append(this._fileInputField);
-        this._fileInputField.on("change", this._updateFileList, this);
-        this._setMultipleFiles();
-        this._setFileFilters();
-    },
-
-
-    /**
-    * Binds the specified drop area's drag and drop events to the
-    * uploader's custom handler.
-    *
-    * @method _bindDropArea
-    * @protected
-    */
-    _bindDropArea : function (event) {
-        var ev = event || {prevVal: null},
-            ddArea = this.get("dragAndDropArea");
-
-        if (ev.prevVal !== null) {
-            ev.prevVal.detach('drop', this._ddEventHandler);
-            ev.prevVal.detach('dragenter', this._ddEventHandler);
-            ev.prevVal.detach('dragover', this._ddEventHandler);
-            ev.prevVal.detach('dragleave', this._ddEventHandler);
-        }
-
-        if (ddArea !== null) {
-            ddArea.on('drop', this._ddEventHandler, this);
-            ddArea.on('dragenter', this._ddEventHandler, this);
-            ddArea.on('dragover', this._ddEventHandler, this);
-            ddArea.on('dragleave', this._ddEventHandler, this);
-        }
-    },
-
-    /**
-    * Binds the instantiation of the file select dialog to the current file select
-    * control.
-    *
-    * @method _bindSelectButton
-    * @protected
-    */
-    _bindSelectButton : function () {
-       this._buttonBinding = this.get("selectFilesButton").on("click", this.openFileSelectDialog, this);
-    },
-
-    /**
-    * Handles the drag and drop events from the uploader's specified drop
-    * area.
-    *
-    * @method _ddEventHandler
-    * @protected
-    */
-    _ddEventHandler : function (event) {
-
-
-        event.stopPropagation();
-        event.preventDefault();
-
-        if (Y.Array.indexOf(event._event.dataTransfer.types, 'Files') > -1) {
-            switch (event.type) {
-                case "dragenter":
-                    this.fire("dragenter");
-                    break;
-                case "dragover":
-                    this.fire("dragover");
-                    break;
-                case "dragleave":
-                    this.fire("dragleave");
-                    break;
-                case "drop":
-
-                    var newfiles = event._event.dataTransfer.files,
-                        parsedFiles = [],
-                        filterFunc = this.get("fileFilterFunction"),
-                        oldfiles;
-
-                    if (filterFunc) {
-                        Y.each(newfiles, function (value) {
-                            var newfile = new Y.FileHTML5(value);
-                            if (filterFunc(newfile)) {
-                                parsedFiles.push(newfile);
-                            }
-                        });
-                    }
-                    else {
-                        Y.each(newfiles, function (value) {
-                            parsedFiles.push(new Y.FileHTML5(value));
-                        });
-                    }
-
-                    if (parsedFiles.length > 0) {
-                        oldfiles = this.get("fileList");
-                        this.set("fileList",
-                        this.get("appendNewFiles") ? oldfiles.concat(parsedFiles) : parsedFiles);
-                        this.fire("fileselect", {fileList: parsedFiles});
-                    }
-
-                    this.fire("drop", {fileList: parsedFiles});
-                    break;
-            }
-        }
-    },
-
-    /**
-    * Adds or removes a specified state CSS class to the underlying uploader button.
-    *
-    * @method _setButtonClass
-    * @protected
-    * @param state {String} The name of the state enumerated in `buttonClassNames` attribute
-    * from which to derive the needed class name.
-    * @param add {Boolean} A Boolean indicating whether to add or remove the class.
-    */
-    _setButtonClass : function (state, add) {
-        if (add) {
-            this.get("selectFilesButton").addClass(this.get("buttonClassNames")[state]);
-        }
-        else {
-            this.get("selectFilesButton").removeClass(this.get("buttonClassNames")[state]);
-        }
-    },
-
-    /**
-    * Syncs the state of the `multipleFiles` attribute between this class
-    * and the file input field.
-    *
-    * @method _setMultipleFiles
-    * @protected
-    */
-    _setMultipleFiles : function () {
-        if (this.get("multipleFiles") === true) {
-            this._fileInputField.set("multiple", "multiple");
-        }
-        else {
-            this._fileInputField.set("multiple", "");
-        }
-    },
-
-    /**
-    * Syncs the state of the `fileFilters` attribute between this class
-    * and the file input field.
-    *
-    * @method _setFileFilters
-    * @protected
-    */
-    _setFileFilters : function () {
-        if (this.get("fileFilters").length > 0) {
-            this._fileInputField.set("accept", this.get("fileFilters").join(","));
-        }
-        else {
-            this._fileInputField.set("accept", "");
-        }
-    },
-
-
-    /**
-    * Syncs the state of the `enabled` attribute between this class
-    * and the underlying button.
-    *
-    * @method _triggerEnabled
-    * @private
-    */
-    _triggerEnabled : function () {
-        if (this.get("enabled") && this._buttonBinding === null) {
-            this._bindSelectButton();
-            this._setButtonClass("disabled", false);
-            this.get("selectFilesButton").setAttribute("aria-disabled", "false");
-        }
-        else if (!this.get("enabled") && this._buttonBinding) {
-            this._buttonBinding.detach();
-            this._buttonBinding = null;
-            this._setButtonClass("disabled", true);
-            this.get("selectFilesButton").setAttribute("aria-disabled", "true");
-        }
-    },
-
-    /**
-    * Getter for the `fileList` attribute
-    *
-    * @method _getFileList
-    * @private
-    */
-    _getFileList : function () {
-        return this._fileList.concat();
-    },
-
-    /**
-    * Setter for the `fileList` attribute
-    *
-    * @method _setFileList
-    * @private
-    */
-    _setFileList : function (val) {
-        this._fileList = val.concat();
-        return this._fileList.concat();
-    },
-
-    /**
-    * Adjusts the content of the `fileList` based on the results of file selection
-    * and the `appendNewFiles` attribute. If the `appendNewFiles` attribute is true,
-    * then selected files are appended to the existing list; otherwise, the list is
-    * cleared and populated with the newly selected files.
-    *
-    * @method _updateFileList
-    * @param ev {Event} The file selection event received from the uploader.
-    * @protected
-    */
-    _updateFileList : function (ev) {
-        var newfiles = ev.target.getDOMNode().files,
-            parsedFiles = [],
-            filterFunc = this.get("fileFilterFunction"),
-            oldfiles;
-
-        if (filterFunc) {
-            Y.each(newfiles, function (value) {
-                var newfile = new Y.FileHTML5(value);
-                if (filterFunc(newfile)) {
-                    parsedFiles.push(newfile);
-                }
-            });
-        }
-        else {
-            Y.each(newfiles, function (value) {
-                parsedFiles.push(new Y.FileHTML5(value));
-            });
-        }
-
-        if (parsedFiles.length > 0) {
-            oldfiles = this.get("fileList");
-
-            this.set("fileList",
-                    this.get("appendNewFiles") ? oldfiles.concat(parsedFiles) : parsedFiles );
-
-            this.fire("fileselect", {fileList: parsedFiles});
-        }
-
-        this._rebindFileField();
-    },
-
-
-    /**
-    * Handles and retransmits events fired by `Y.File` and `Y.Uploader.Queue`.
-    *
-    * @method _uploadEventHandler
-    * @param event The event dispatched during the upload process.
-    * @protected
-    */
-    _uploadEventHandler : function (event) {
-
-        switch (event.type) {
-            case "file:uploadstart":
-                this.fire("fileuploadstart", event);
-                break;
-            case "file:uploadprogress":
-                this.fire("uploadprogress", event);
-                break;
-            case "uploaderqueue:totaluploadprogress":
-                this.fire("totaluploadprogress", event);
-                break;
-            case "file:uploadcomplete":
-                this.fire("uploadcomplete", event);
-                break;
-            case "uploaderqueue:alluploadscomplete":
-                this.queue = null;
-                this.fire("alluploadscomplete", event);
-                break;
-            case "file:uploaderror": // overflow intentional
-            case "uploaderqueue:uploaderror":
-                this.fire("uploaderror", event);
-                break;
-            case "file:uploadcancel": // overflow intentional
-            case "uploaderqueue:uploadcancel":
-                this.fire("uploadcancel", event);
-                break;
-        }
-
-    },
-
-    /**
-    * Opens the File Selection dialog by simulating a click on the file input field.
-    *
-    * @method openFileSelectDialog
-    */
-    openFileSelectDialog : function () {
-        var fileDomNode = this._fileInputField.getDOMNode();
-        if (fileDomNode.click) {
-            fileDomNode.click();
-        }
-    },
-
-    /**
-    * Starts the upload of a specific file.
-    *
-    * @method upload
-    * @param file {File} Reference to the instance of the file to be uploaded.
-    * @param url {String} The URL to upload the file to.
-    * @param postVars {Object} (optional) A set of key-value pairs to send as variables along with the file upload HTTP request.
-    *                          If not specified, the values from the attribute `postVarsPerFile` are used instead.
-    */
-    upload : function (file, url, postvars) {
-
-        var uploadURL = url || this.get("uploadURL"),
-            postVars = postvars || this.get("postVarsPerFile"),
-            fileId = file.get("id");
-
-        postVars = postVars.hasOwnProperty(fileId) ? postVars[fileId] : postVars;
-
-        if (file instanceof Y.FileHTML5) {
-
-            file.on("uploadstart", this._uploadEventHandler, this);
-            file.on("uploadprogress", this._uploadEventHandler, this);
-            file.on("uploadcomplete", this._uploadEventHandler, this);
-            file.on("uploaderror", this._uploadEventHandler, this);
-            file.on("uploadcancel", this._uploadEventHandler, this);
-
-            file.startUpload(uploadURL, postVars, this.get("fileFieldName"));
-        }
-    },
-
-   /**
-    * Starts the upload of all files on the file list, using an automated queue.
-    *
-    * @method uploadAll
-    * @param url {String} The URL to upload the files to.
-    * @param [postVars] {Object} A set of key-value pairs to send as variables along with the file upload HTTP request.
-    *                          If not specified, the values from the attribute `postVarsPerFile` are used instead.
-    */
-    uploadAll : function (url, postvars) {
-        this.uploadThese(this.get("fileList"), url, postvars);
-    },
-
-    /**
-    * Starts the upload of the files specified in the first argument, using an automated queue.
-    *
-    * @method uploadThese
-    * @param files {Array} The list of files to upload.
-    * @param url {String} The URL to upload the files to.
-    * @param [postVars] {Object} A set of key-value pairs to send as variables along with the file upload HTTP request.
-    *                          If not specified, the values from the attribute `postVarsPerFile` are used instead.
-    */
-    uploadThese : function (files, url, postvars) {
-        if (!this.queue) {
-            var uploadURL = url || this.get("uploadURL"),
-                postVars = postvars || this.get("postVarsPerFile");
-
-            this.queue = new UploaderQueue({
-                simUploads: this.get("simLimit"),
-                errorAction: this.get("errorAction"),
-                fileFieldName: this.get("fileFieldName"),
-                fileList: files,
-                uploadURL: uploadURL,
-                perFileParameters: postVars,
-                retryCount: this.get("retryCount"),
-                uploadHeaders: this.get("uploadHeaders"),
-                withCredentials: this.get("withCredentials")
-            });
-
-            this.queue.on("uploadstart", this._uploadEventHandler, this);
-            this.queue.on("uploadprogress", this._uploadEventHandler, this);
-            this.queue.on("totaluploadprogress", this._uploadEventHandler, this);
-            this.queue.on("uploadcomplete", this._uploadEventHandler, this);
-            this.queue.on("alluploadscomplete", this._uploadEventHandler, this);
-            this.queue.on("uploadcancel", this._uploadEventHandler, this);
-            this.queue.on("uploaderror", this._uploadEventHandler, this);
-            this.queue.startUpload();
-
-            this.fire("uploadstart");
-       }
-       else if (this.queue._currentState === UploaderQueue.UPLOADING) {
-            this.queue.set("perFileParameters", this.get("postVarsPerFile"));
-            Y.each(files, function (file) {
-                this.queue.addToQueueBottom(file);
-            }, this);
-       }
-    }
-}, {
-
-    /**
-    * The template for the hidden file input field container. The file input field will only
-    * accept clicks if its visibility is set to hidden (and will not if it's `display` value
-    * is set to `none`)
-    *
-    * @property HTML5FILEFIELD_TEMPLATE
-    * @type {String}
-    * @static
-    */
-    HTML5FILEFIELD_TEMPLATE: "<input type='file' style='visibility:hidden; width:0px; height: 0px;'>",
-
-    /**
-    * The template for the "Select Files" button.
-    *
-    * @property SELECT_FILES_BUTTON
-    * @type {String}
-    * @static
-    * @default '<button type="button" class="yui3-button" role="button" aria-label="{selectButtonLabel}"
-    *           tabindex="{tabIndex}">{selectButtonLabel}</button>'
-    */
-    SELECT_FILES_BUTTON: '<button type="button" class="yui3-button" role="button" aria-label="{selectButtonLabel}" ' +
-                         'tabindex="{tabIndex}">{selectButtonLabel}</button>',
-
-    /**
-    * The static property reflecting the type of uploader that `Y.Uploader`
-    * aliases. The UploaderHTML5 value is `"html5"`.
-    *
-    * @property TYPE
-    * @type {String}
-    * @static
-    */
-    TYPE: "html5",
-
-    /**
-    * The identity of the widget.
-    *
-    * @property NAME
-    * @type String
-    * @default 'uploader'
-    * @readOnly
-    * @protected
-    * @static
-    */
-    NAME: "uploader",
-
-    /**
-    * Static property used to define the default attribute configuration of
-    * the Widget.
-    *
-    * @property ATTRS
-    * @type {Object}
-    * @protected
-    * @static
-    */
-    ATTRS: {
-
-        /**
-        * A Boolean indicating whether newly selected files should be appended
-        * to the existing file list, or whether they should replace it.
-        *
-        * @attribute appendNewFiles
-        * @type {Boolean}
-        * @default true
-        */
-        appendNewFiles : {
-            value: true
-        },
-
-        /**
-        * The names of CSS classes that correspond to different button states
-        * of the "Select Files" control. These classes are assigned to the
-        * "Select Files" control based on the configuration of the uploader.
-        * Currently, the only class name used is that corresponding to the
-        * `disabled` state of the uploader. Other button states should be managed
-        * directly via CSS selectors.
-        * <ul>
-        *   <li> <strong>`disabled`</strong>: the class corresponding to the disabled state
-        *      of the "Select Files" button.</li>
-        * </ul>
-        * @attribute buttonClassNames
-        * @type {Object}
-        * @default {
-        *            disabled: "yui3-button-disabled"
-        *          }
-        */
-        buttonClassNames: {
-            value: {
-                "hover": "yui3-button-hover",
-                "active": "yui3-button-active",
-                "disabled": "yui3-button-disabled",
-                "focus": "yui3-button-selected"
-            }
-        },
-
-        /**
-        * The node that serves as the drop target for files.
-        *
-        * @attribute dragAndDropArea
-        * @type {Node}
-        * @default null
-        */
-        dragAndDropArea: {
-            value: null,
-            setter: function (val) {
-                return Y.one(val);
-            }
-        },
-
-        /**
-        * A Boolean indicating whether the uploader is enabled or disabled for user input.
-        *
-        * @attribute enabled
-        * @type {Boolean}
-        * @default true
-        */
-        enabled : {
-            value: true
-        },
-
-        /**
-        * The action  performed when an upload error occurs for a specific file being uploaded.
-        * The possible values are:
-        * <ul>
-        *   <li> <strong>`UploaderQueue.CONTINUE`</strong>: the error is ignored and the upload process is continued.</li>
-        *   <li> <strong>`UploaderQueue.STOP`</strong>: the upload process is stopped as soon as any other parallel file
-        *     uploads are finished.</li>
-        *   <li> <strong>`UploaderQueue.RESTART_ASAP`</strong>: the file is added back to the front of the queue.</li>
-        *   <li> <strong>`UploaderQueue.RESTART_AFTER`</strong>: the file is added to the back of the queue.</li>
-        * </ul>
-        * @attribute errorAction
-        * @type {String}
-        * @default UploaderQueue.CONTINUE
-        */
-        errorAction: {
-            value: "continue",
-            validator: function (val) {
-                return (
-                    val === UploaderQueue.CONTINUE ||
-                    val === UploaderQueue.STOP ||
-                    val === UploaderQueue.RESTART_ASAP ||
-                    val === UploaderQueue.RESTART_AFTER
-                );
-            }
-        },
-
-        /**
-        * An array indicating what fileFilters should be applied to the file
-        * selection dialog. Each element in the array should be a string
-        * indicating the Media (MIME) type for the files that should be supported
-        * for selection. The Media type strings should be properly formatted
-        * or this parameter will be ignored. Examples of valid strings include:
-        * "audio/*", "video/*", "application/pdf", etc. More information
-        * on valid Media type strings is available here:
-        * http://www.iana.org/assignments/media-types/index.html
-        * @attribute fileFilters
-        * @type {Array}
-        * @default []
-        */
-        fileFilters: {
-            value: []
-        },
-
-        /**
-        * A filtering function that is applied to every file selected by the user.
-        * The function receives the `Y.File` object and must return a Boolean value.
-        * If a `false` value is returned, the file in question is not added to the
-        * list of files to be uploaded.
-        * Use this function to put limits on file sizes or check the file names for
-        * correct extension, but make sure that a server-side check is also performed,
-        * since any client-side restrictions are only advisory and can be circumvented.
-        *
-        * @attribute fileFilterFunction
-        * @type {Function}
-        * @default null
-        */
-        fileFilterFunction: {
-            value: null
-        },
-
-        /**
-        * A String specifying what should be the POST field name for the file
-        * content in the upload request.
-        *
-        * @attribute fileFieldName
-        * @type {String}
-        * @default Filedata
-        */
-        fileFieldName: {
-            value: "Filedata"
-        },
-
-        /**
-        * The array of files to be uploaded. All elements in the array
-        * must be instances of `Y.File` and be instantiated with an instance
-        * of native JavaScript File() class.
-        *
-        * @attribute fileList
-        * @type {Array}
-        * @default []
-        */
-        fileList: {
-            value: [],
-            getter: "_getFileList",
-            setter: "_setFileList"
-        },
-
-        /**
-        * A Boolean indicating whether multiple file selection is enabled.
-        *
-        * @attribute multipleFiles
-        * @type {Boolean}
-        * @default false
-        */
-        multipleFiles: {
-            value: false
-        },
-
-        /**
-        * An object, keyed by `fileId`, containing sets of key-value pairs
-        * that should be passed as POST variables along with each corresponding
-        * file. This attribute is only used if no POST variables are specifed
-        * in the upload method call.
-        *
-        * @attribute postVarsPerFile
-        * @type {Object}
-        * @default {}
-        */
-        postVarsPerFile: {
-            value: {}
-        },
-
-        /**
-        * The label for the "Select Files" widget. This is the value that replaces the
-        * `{selectButtonLabel}` token in the `SELECT_FILES_BUTTON` template.
-        *
-        * @attribute selectButtonLabel
-        * @type {String}
-        * @default "Select Files"
-        */
-        selectButtonLabel: {
-            value: "Select Files"
-        },
-
-        /**
-        * The widget that serves as the "Select Files control for the file uploader
-        *
-        *
-        * @attribute selectFilesButton
-        * @type {Node | Widget}
-        * @default A standard HTML button with YUI CSS Button skin.
-        */
-        selectFilesButton : {
-            valueFn: function () {
-                return Y.Node.create(substitute(Y.UploaderHTML5.SELECT_FILES_BUTTON, {
-                    selectButtonLabel: this.get("selectButtonLabel"),
-                    tabIndex: this.get("tabIndex")
-                }));
-            }
-        },
-
-        /**
-        * The number of files that can be uploaded
-        * simultaneously if the automatic queue management
-        * is used. This value can be in the range between 2
-        * and 5.
-        *
-        * @attribute simLimit
-        * @type {Number}
-        * @default 2
-        */
-        simLimit: {
-            value: 2,
-            validator: function (val) {
-                return (val >= 1 && val <= 5);
-            }
-        },
-
-        /**
-        * The URL to which file upload requested are POSTed. Only used if a different url is not passed to the upload method call.
-        *
-        * @attribute uploadURL
-        * @type {String}
-        * @default ""
-        */
-        uploadURL: {
-            value: ""
-        },
-
-        /**
-        * Additional HTTP headers that should be included
-        * in the upload request.
-        *
-        *
-        * @attribute uploadHeaders
-        * @type {Object}
-        * @default {}
-        */
-        uploadHeaders: {
-            value: {}
-        },
-
-        /**
-        * A Boolean that specifies whether the file should be
-        * uploaded with the appropriate user credentials for the
-        * domain.
-        *
-        * @attribute withCredentials
-        * @type {Boolean}
-        * @default true
-        */
-        withCredentials: {
-            value: true
-        },
-
-        /**
-        * The number of times to try re-uploading a file that failed to upload before
-        * cancelling its upload.
-        *
-        * @attribute retryCount
-        * @type {Number}
-        * @default 3
-        */
-        retryCount: {
-            value: 3
-        }
-    }
-});
-
-Y.UploaderHTML5.Queue = UploaderQueue;
-
-
-
-}, '3.16.0', {"requires": ["widget", "node-event-simulate", "file-html5", "uploader-queue"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('swfdetect', function (Y, NAME) {
-
-/**
- * Utility for Flash version detection
- * @module swfdetect
- */
-
-// Shortcuts and helper methods
-var version = 0,
-    uA = Y.UA,
-    lG = Y.Lang,
-    sF = "ShockwaveFlash",
-    mF, eP, vS, ax6, ax;
-
-function makeInt(n) {
-    return parseInt(n, 10);
-}
-
-function parseFlashVersion (flashVer) {
-    if (lG.isNumber(makeInt(flashVer[0]))) {
-        uA.flashMajor = flashVer[0];
-    }
-
-    if (lG.isNumber(makeInt(flashVer[1]))) {
-        uA.flashMinor = flashVer[1];
-    }
-
-    if (lG.isNumber(makeInt(flashVer[2]))) {
-        uA.flashRev = flashVer[2];
-    }
-}
-
-if (uA.gecko || uA.webkit || uA.opera) {
-   if ((mF = navigator.mimeTypes['application/x-shockwave-flash'])) {
-      if ((eP = mF.enabledPlugin)) {
-         vS = eP.description.replace(/\s[rd]/g, '.').replace(/[A-Za-z\s]+/g, '').split('.');
-         parseFlashVersion(vS);
-      }
-   }
-}
-else if(uA.ie) {
-    try
-    {
-        ax6 = new ActiveXObject(sF + "." + sF + ".6");
-        ax6.AllowScriptAccess = "always";
-    }
-    catch (e)
-    {
-        if(ax6 !== null)
-        {
-            version = 6.0;
-        }
-    }
-    if (version === 0) {
-    try
-    {
-        ax = new ActiveXObject(sF + "." + sF);
-        vS = ax.GetVariable("$version").replace(/[A-Za-z\s]+/g, '').split(',');
-        parseFlashVersion(vS);
-    } catch (e2) {}
-    }
-}
-
-/** Create a calendar view to represent a single or multiple
-  * month range of dates, rendered as a grid with date and
-  * weekday labels.
-  *
-  * @class SWFDetect
-  * @constructor
-  */
-
-
-Y.SWFDetect = {
-
-    /**
-     * Returns the version of either the Flash Player plugin (in Mozilla/WebKit/Opera browsers),
-     * or the Flash Player ActiveX control (in IE), as a String of the form "MM.mm.rr", where
-     * MM is the major version, mm is the minor version, and rr is the revision.
-     * @method getFlashVersion
-     */
-
-    getFlashVersion : function () {
-        return (String(uA.flashMajor) + "." + String(uA.flashMinor) + "." + String(uA.flashRev));
-    },
-
-    /**
-     * Checks whether the version of the Flash player installed on the user's machine is greater
-     * than or equal to the one specified. If it is, this method returns true; it is false otherwise.
-     * @method isFlashVersionAtLeast
-     * @return {Boolean} Whether the Flash player version is greater than or equal to the one specified.
-     * @param flashMajor {Number} The Major version of the Flash player to compare against.
-     * @param flashMinor {Number} The Minor version of the Flash player to compare against.
-     * @param flashRev {Number} The Revision version of the Flash player to compare against.
-     */
-    isFlashVersionAtLeast : function (flashMajor, flashMinor, flashRev) {
-        var uaMajor    = makeInt(uA.flashMajor),
-            uaMinor    = makeInt(uA.flashMinor),
-            uaRev      = makeInt(uA.flashRev);
-
-        flashMajor = makeInt(flashMajor || 0);
-        flashMinor = makeInt(flashMinor || 0);
-        flashRev   = makeInt(flashRev || 0);
-
-        if (flashMajor === uaMajor) {
-            if (flashMinor === uaMinor) {
-                return flashRev <= uaRev;
-            }
-            return flashMinor < uaMinor;
-        }
-        return flashMajor < uaMajor;
-    }
-};
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('escape', function (Y, NAME) {
-
-/**
-Provides utility methods for escaping strings.
-
-@module escape
-@class Escape
-@static
-@since 3.3.0
-**/
-
-var HTML_CHARS = {
-        '&': '&amp;',
-        '<': '&lt;',
-        '>': '&gt;',
-        '"': '&quot;',
-        "'": '&#x27;',
-        '/': '&#x2F;',
-        '`': '&#x60;'
-    },
-
-Escape = {
-    // -- Public Static Methods ------------------------------------------------
-
-    /**
-    Returns a copy of the specified string with special HTML characters
-    escaped. The following characters will be converted to their
-    corresponding character entities:
-
-        & < > " ' / `
-
-    This implementation is based on the [OWASP HTML escaping
-    recommendations][1]. In addition to the characters in the OWASP
-    recommendations, we also escape the <code>&#x60;</code> character, since IE
-    interprets it as an attribute delimiter.
-
-    If _string_ is not already a string, it will be coerced to a string.
-
-    [1]: http://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet
-
-    @method html
-    @param {String} string String to escape.
-    @return {String} Escaped string.
-    @static
-    **/
-    html: function (string) {
-        return (string + '').replace(/[&<>"'\/`]/g, Escape._htmlReplacer);
-    },
-
-    /**
-    Returns a copy of the specified string with special regular expression
-    characters escaped, allowing the string to be used safely inside a regex.
-    The following characters, and all whitespace characters, are escaped:
-
-        - $ ^ * ( ) + [ ] { } | \ , . ?
-
-    If _string_ is not already a string, it will be coerced to a string.
-
-    @method regex
-    @param {String} string String to escape.
-    @return {String} Escaped string.
-    @static
-    **/
-    regex: function (string) {
-        // There's no need to escape !, =, and : since they only have meaning
-        // when they follow a parenthesized ?, as in (?:...), and we already
-        // escape parens and question marks.
-        return (string + '').replace(/[\-$\^*()+\[\]{}|\\,.?\s]/g, '\\$&');
-    },
-
-    // -- Protected Static Methods ---------------------------------------------
-
-    /**
-     * Regex replacer for HTML escaping.
-     *
-     * @method _htmlReplacer
-     * @param {String} match Matched character (must exist in HTML_CHARS).
-     * @return {String} HTML entity.
-     * @static
-     * @protected
-     */
-    _htmlReplacer: function (match) {
-        return HTML_CHARS[match];
-    }
-};
-
-Escape.regexp = Escape.regex;
-
-Y.Escape = Escape;
-
-
-}, '3.16.0', {"requires": ["yui-base"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('node-pluginhost', function (Y, NAME) {
-
-/**
- * @module node
- * @submodule node-pluginhost
- */
-
-/**
- * Registers plugins to be instantiated at the class level (plugins
- * which should be plugged into every instance of Node by default).
- *
- * @method plug
- * @static
- * @for Node
- * @param {Function | Array} plugin Either the plugin class, an array of plugin classes or an array of objects (with fn and cfg properties defined)
- * @param {Object} config (Optional) If plugin is the plugin class, the configuration for the plugin
- */
-Y.Node.plug = function() {
-    var args = Y.Array(arguments);
-    args.unshift(Y.Node);
-    Y.Plugin.Host.plug.apply(Y.Base, args);
-    return Y.Node;
-};
-
-/**
- * Unregisters any class level plugins which have been registered by the Node
- *
- * @method unplug
- * @static
- *
- * @param {Function | Array} plugin The plugin class, or an array of plugin classes
- */
-Y.Node.unplug = function() {
-    var args = Y.Array(arguments);
-    args.unshift(Y.Node);
-    Y.Plugin.Host.unplug.apply(Y.Base, args);
-    return Y.Node;
-};
-
-Y.mix(Y.Node, Y.Plugin.Host, false, null, 1);
-
-// run PluginHost constructor on cached Node instances
-Y.Object.each(Y.Node._instances, function (node) {
-    Y.Plugin.Host.apply(node);
-});
-
-// allow batching of plug/unplug via NodeList
-// doesn't use NodeList.importMethod because we need real Nodes (not tmpNode)
-/**
- * Adds a plugin to each node in the NodeList.
- * This will instantiate the plugin and attach it to the configured namespace on each node
- * @method plug
- * @for NodeList
- * @param P {Function | Object |Array} Accepts the plugin class, or an
- * object with a "fn" property specifying the plugin class and
- * a "cfg" property specifying the configuration for the Plugin.
- * <p>
- * Additionally an Array can also be passed in, with the above function or
- * object values, allowing the user to add multiple plugins in a single call.
- * </p>
- * @param config (Optional) If the first argument is the plugin class, the second argument
- * can be the configuration for the plugin.
- * @chainable
- */
-Y.NodeList.prototype.plug = function() {
-    var args = arguments;
-    Y.NodeList.each(this, function(node) {
-        Y.Node.prototype.plug.apply(Y.one(node), args);
-    });
-    return this;
-};
-
-/**
- * Removes a plugin from all nodes in the NodeList. This will destroy the
- * plugin instance and delete the namespace each node.
- * @method unplug
- * @for NodeList
- * @param {String | Function} plugin The namespace of the plugin, or the plugin class with the static NS namespace property defined. If not provided,
- * all registered plugins are unplugged.
- * @chainable
- */
-Y.NodeList.prototype.unplug = function() {
-    var args = arguments;
-    Y.NodeList.each(this, function(node) {
-        Y.Node.prototype.unplug.apply(Y.one(node), args);
-    });
-    return this;
-};
-
-
-}, '3.16.0', {"requires": ["node-base", "pluginhost"]});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('uploader-flash', function (Y, NAME) {
-
-/**
-* This module provides a UI for file selection and multiple file upload capability using
-* Flash as a transport engine.
-* The supported features include: automatic upload queue management, upload progress
-* tracking, file filtering, server response retrieval and error reporting.
-*
-* @module uploader-flash
-* @deprecated
-*/
-
-// Shorthands for external modules
-var substitute            = Y.Lang.sub,
-    UploaderQueue         = Y.Uploader.Queue;
-
-
-/**
- * Embed a Flash applications in a standard manner and communicate with it
- * via External Interface.
- * @module swf
- */
-
-    var Event = Y.Event,
-        SWFDetect = Y.SWFDetect,
-        Lang = Y.Lang,
-        uA = Y.UA,
-        Node = Y.Node,
-        Escape = Y.Escape,
-
-        // private
-        FLASH_CID = "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000",
-        FLASH_TYPE = "application/x-shockwave-flash",
-        FLASH_VER = "10.0.22",
-        EXPRESS_INSTALL_URL = "http://fpdownload.macromedia.com/pub/flashplayer/update/current/swf/autoUpdater.swf?" + Math.random(),
-        EVENT_HANDLER = "SWF.eventHandler",
-        possibleAttributes = {align:"", allowFullScreen:"", allowNetworking:"", allowScriptAccess:"", base:"", bgcolor:"", loop:"", menu:"", name:"", play: "", quality:"", salign:"", scale:"", tabindex:"", wmode:""};
-
-        /**
-         * The SWF utility is a tool for embedding Flash applications in HTML pages.
-         * @module swf
-         * @title SWF Utility
-         * @requires event-custom, node, swfdetect
-         */
-
-        /**
-         * Creates the SWF instance and keeps the configuration data
-         *
-         * @class SWF
-         * @uses Y.Event.Target
-         * @constructor
-         * @param {String|HTMLElement} id The id of the element, or the element itself that the SWF will be inserted into.
-         *        The width and height of the SWF will be set to the width and height of this container element.
-         * @param {String} swfURL The URL of the SWF to be embedded into the page.
-         * @param {Object} p_oAttributes (optional) Configuration parameters for the Flash application and values for Flashvars
-         *        to be passed to the SWF. The p_oAttributes object allows the following additional properties:
-         *        <dl>
-         *          <dt>version : String</dt>
-         *          <dd>The minimum version of Flash required on the user's machine.</dd>
-         *          <dt>fixedAttributes : Object</dt>
-         *          <dd>An object literal containing one or more of the following String keys and their values: <code>align,
-         *              allowFullScreen, allowNetworking, allowScriptAccess, base, bgcolor, menu, name, quality, salign, scale,
-         *              tabindex, wmode.</code> event from the thumb</dd>
-         *        </dl>
-         */
-
-function SWF (p_oElement /*:String*/, swfURL /*:String*/, p_oAttributes /*:Object*/ ) {
-
-    this._id = Y.guid("yuiswf");
-
-
-    var _id = this._id;
-    var oElement = Node.one(p_oElement);
-
-    var p_oAttributes = p_oAttributes || {};
-
-    var flashVersion = p_oAttributes.version || FLASH_VER;
-
-    var flashVersionSplit = (flashVersion + '').split(".");
-    var isFlashVersionRight = SWFDetect.isFlashVersionAtLeast(parseInt(flashVersionSplit[0], 10), parseInt(flashVersionSplit[1], 10), parseInt(flashVersionSplit[2], 10));
-    var canExpressInstall = (SWFDetect.isFlashVersionAtLeast(8,0,0));
-    var shouldExpressInstall = canExpressInstall && !isFlashVersionRight && p_oAttributes.useExpressInstall;
-    var flashURL = (shouldExpressInstall)?EXPRESS_INSTALL_URL:swfURL;
-    var objstring = '<object ';
-    var w, h;
-    var flashvarstring = "yId=" + Y.id + "&YUISwfId=" + _id + "&YUIBridgeCallback=" + EVENT_HANDLER + "&allowedDomain=" + document.location.hostname;
-
-    Y.SWF._instances[_id] = this;
-    if (oElement && (isFlashVersionRight || shouldExpressInstall) && flashURL) {
-        objstring += 'id="' + _id + '" ';
-        if (uA.ie) {
-            objstring += 'classid="' + FLASH_CID + '" ';
-        } else {
-            objstring += 'type="' + FLASH_TYPE + '" data="' + Escape.html(flashURL) + '" ';
-        }
-
-        w = "100%";
-        h = "100%";
-
-        objstring += 'width="' + w + '" height="' + h + '">';
-
-        if (uA.ie) {
-            objstring += '<param name="movie" value="' + Escape.html(flashURL) + '"/>';
-        }
-
-        for (var attribute in p_oAttributes.fixedAttributes) {
-            if (possibleAttributes.hasOwnProperty(attribute)) {
-                objstring += '<param name="' + Escape.html(attribute) + '" value="' + Escape.html(p_oAttributes.fixedAttributes[attribute]) + '"/>';
-            }
-        }
-
-        for (var flashvar in p_oAttributes.flashVars) {
-            var fvar = p_oAttributes.flashVars[flashvar];
-            if (Lang.isString(fvar)) {
-                flashvarstring += "&" + Escape.html(flashvar) + "=" + Escape.html(encodeURIComponent(fvar));
-            }
-        }
-
-        if (flashvarstring) {
-            objstring += '<param name="flashVars" value="' + flashvarstring + '"/>';
-        }
-
-        objstring += "</object>";
-        //using innerHTML as setHTML/setContent causes some issues with ExternalInterface for IE versions of the player
-        oElement.set("innerHTML", objstring);
-
-        this._swf = Node.one("#" + _id);
-    } else {
-        /**
-         * Fired when the Flash player version on the user's machine is
-         * below the required value.
-         *
-         * @event wrongflashversion
-         */
-        var event = {};
-        event.type = "wrongflashversion";
-        this.publish("wrongflashversion", {fireOnce:true});
-        this.fire("wrongflashversion", event);
-    }
-}
-
-/**
- * @private
- * The static collection of all instances of the SWFs on the page.
- * @property _instances
- * @type Object
- */
-
-SWF._instances = SWF._instances || {};
-
-/**
- * @private
- * Handles an event coming from within the SWF and delegate it
- * to a specific instance of SWF.
- * @method eventHandler
- * @param swfid {String} the id of the SWF dispatching the event
- * @param event {Object} the event being transmitted.
- */
-SWF.eventHandler = function (swfid, event) {
-    SWF._instances[swfid]._eventHandler(event);
-};
-
-SWF.prototype = {
-    /**
-     * @private
-     * Propagates a specific event from Flash to JS.
-     * @method _eventHandler
-     * @param event {Object} The event to be propagated from Flash.
-     */
-    _eventHandler: function(event) {
-        if (event.type === "swfReady") {
-            this.publish("swfReady", {fireOnce:true});
-            this.fire("swfReady", event);
-        } else if(event.type === "log") {
-        } else {
-            this.fire(event.type, event);
-        }
-    },
-
-        /**
-     * Calls a specific function exposed by the SWF's
-     * ExternalInterface.
-     * @method callSWF
-     * @param func {String} the name of the function to call
-     * @param args {Array} the set of arguments to pass to the function.
-     */
-
-    callSWF: function (func, args)
-    {
-    if (!args) {
-          args= [];
-    }
-        if (this._swf._node[func]) {
-        return(this._swf._node[func].apply(this._swf._node, args));
-        } else {
-        return null;
-        }
-    },
-
-    /**
-     * Public accessor to the unique name of the SWF instance.
-     *
-     * @method toString
-     * @return {String} Unique name of the SWF instance.
-     */
-    toString: function()
-    {
-        return "SWF " + this._id;
-    }
-};
-
-Y.augment(SWF, Y.EventTarget);
-
-Y.SWF = SWF;
-    /**
-     * The FileFlash class provides a wrapper for a file pointer stored in Flash. The File wrapper
-     * also implements the mechanics for uploading a file and tracking its progress.
-     * @module file-flash
-     */
-    /**
-     * The class provides a wrapper for a file pointer in Flash.
-     * @class FileFlash
-     * @extends Base
-     * @constructor
-     * @param {Object} config Configuration object.
-     */
-
-    var FileFlash = function(o) {
-        FileFlash.superclass.constructor.apply(this, arguments);
-    };
-
-    Y.extend(FileFlash, Y.Base, {
-
-       /**
-        * Construction logic executed during FileFlash instantiation.
-        *
-        * @method initializer
-        * @protected
-        */
-        initializer : function (cfg) {
-            if (!this.get("id")) {
-                this._set("id", Y.guid("file"));
-            }
-        },
-
-       /**
-        * Handler of events dispatched by the Flash player.
-        *
-        * @method _swfEventHandler
-        * @param {Event} event The event object received from the Flash player.
-        * @protected
-        */
-        _swfEventHandler: function (event) {
-          if (event.id === this.get("id")) {
-          switch (event.type) {
-            /**
-             * Signals that this file's upload has started.
-             *
-             * @event uploadstart
-             * @param event {Event} The event object for the `uploadstart` with the
-             *                      following payload:
-             *  <dl>
-             *      <dt>uploader</dt>
-             *          <dd>The Y.SWF instance of Flash uploader that's handling the upload.</dd>
-             *  </dl>
-             */
-            case "uploadstart":
-                 this.fire("uploadstart", {uploader: this.get("uploader")});
-                 break;
-            case "uploadprogress":
-
-                  /**
-                   * Signals that progress has been made on the upload of this file.
-                   *
-                   * @event uploadprogress
-                   * @param event {Event} The event object for the `uploadprogress` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the Flash uploader instance.</dd>
-                   *      <dt>bytesLoaded</dt>
-                   *          <dd>The number of bytes of the file that has been uploaded.</dd>
-                   *      <dt>bytesTotal</dt>
-                   *          <dd>The total number of bytes in the file (the file size)</dd>
-                   *      <dt>percentLoaded</dt>
-                   *          <dd>The fraction of the file that has been uploaded, out of 100.</dd>
-                   *  </dl>
-                   */
-                 this.fire("uploadprogress", {originEvent: event,
-                                              bytesLoaded: event.bytesLoaded,
-                                              bytesTotal: event.bytesTotal,
-                                              percentLoaded: Math.min(100, Math.round(10000*event.bytesLoaded/event.bytesTotal)/100)
-                                             });
-                 this._set("bytesUploaded", event.bytesLoaded);
-                 break;
-            case "uploadcomplete":
-
-                  /**
-                   * Signals that this file's upload has completed, but data has not yet been received from the server.
-                   *
-                   * @event uploadfinished
-                   * @param event {Event} The event object for the `uploadfinished` with the
-                   *                      following payload:
-                   *  <dl>
-                   *      <dt>originEvent</dt>
-                   *          <dd>The original event fired by the Flash player instance.</dd>
-                   *  </dl>
-                   */
-                 this.fire("uploadfinished", {originEvent: event});
-                 break;
-            case "uploadcompletedata":
-                /**
-                 * Signals that this file's upload has completed and data has been received from the server.
-                 *
-                 * @event uploadcomplete
-                 * @param event {Event} The event object for the `uploadcomplete` with the
-                 *                      following payload:
-                 *  <dl>
-                 *      <dt>originEvent</dt>
-                 *          <dd>The original event fired by the Flash player instance.</dd>
-                 *      <dt>data</dt>
-                 *          <dd>The data returned by the server.</dd>
-                 *  </dl>
-                 */
-                 this.fire("uploadcomplete", {originEvent: event,
-                                              data: event.data});
-                 break;
-            case "uploadcancel":
-
-                /**
-                 * Signals that this file's upload has been cancelled.
-                 *
-                 * @event uploadcancel
-                 * @param event {Event} The event object for the `uploadcancel` with the
-                 *                      following payload:
-                 *  <dl>
-                 *      <dt>originEvent</dt>
-                 *          <dd>The original event fired by the Flash player instance.</dd>
-                 *  </dl>
-                 */
-                 this.fire("uploadcancel", {originEvent: event});
-                 break;
-            case "uploaderror":
-
-                /**
-                 * Signals that this file's upload has encountered an error.
-                 *
-                 * @event uploaderror
-                 * @param event {Event} The event object for the `uploaderror` with the
-                 *                      following payload:
-                 *  <dl>
-                 *      <dt>originEvent</dt>
-                 *          <dd>The original event fired by the Flash player instance.</dd>
-                 *      <dt>status</dt>
-                 *          <dd>The status code reported by the Flash Player. If it's an HTTP error,
-                 *                then this corresponds to the HTTP status code received by the uploader.</dd>
-                 *      <dt>statusText</dt>
-                 *          <dd>The text of the error event reported by the Flash Player.</dd>
-                 *      <dt>source</dt>
-                 *          <dd>Either "http" (if it's an HTTP error), or "io" (if it's a network transmission
-                 *              error.)</dd>
-                 *  </dl>
-                 */
-                 this.fire("uploaderror", {originEvent: event, status: event.status, statusText: event.message, source: event.source});
-
-          }
-        }
-        },
-
-       /**
-        * Starts the upload of a specific file.
-        *
-        * @method startUpload
-        * @param url {String} The URL to upload the file to.
-        * @param parameters {Object} (optional) A set of key-value pairs to send as variables along with the file upload HTTP request.
-        * @param fileFieldName {String} (optional) The name of the POST variable that should contain the uploaded file ('Filedata' by default)
-        */
-        startUpload: function(url, parameters, fileFieldName) {
-
-        if (this.get("uploader")) {
-
-            var myUploader = this.get("uploader"),
-                fileField = fileFieldName || "Filedata",
-                id = this.get("id"),
-                params = parameters || null;
-
-            this._set("bytesUploaded", 0);
-
-            myUploader.on("uploadstart", this._swfEventHandler, this);
-            myUploader.on("uploadprogress", this._swfEventHandler, this);
-            myUploader.on("uploadcomplete", this._swfEventHandler, this);
-            myUploader.on("uploadcompletedata", this._swfEventHandler, this);
-            myUploader.on("uploaderror", this._swfEventHandler, this);
-
-            myUploader.callSWF("upload", [id, url, params, fileField]);
-         }
-
-        },
-
-       /**
-        * Cancels the upload of a specific file, if currently in progress.
-        *
-        * @method cancelUpload
-        */
-        cancelUpload: function () {
-         if (this.get("uploader")) {
-           this.get("uploader").callSWF("cancel", [this.get("id")]);
-           this.fire("uploadcancel");
-         }
-        }
-
-    }, {
-
-       /**
-        * The identity of the class.
-        *
-        * @property NAME
-        * @type String
-        * @default 'file'
-        * @readOnly
-        * @protected
-        * @static
-        */
-        NAME: 'file',
-
-       /**
-        * The type of transport.
-        *
-        * @property TYPE
-        * @type String
-        * @default 'flash'
-        * @readOnly
-        * @protected
-        * @static
-        */
-        TYPE: "flash",
-
-       /**
-        * Static property used to define the default attribute configuration of
-        * the File.
-        *
-        * @property ATTRS
-        * @type {Object}
-        * @protected
-        * @static
-        */
-        ATTRS: {
-
-       /**
-        * A String containing the unique id of the file wrapped by the FileFlash instance.
-        * The id is supplied by the Flash player uploader.
-        *
-        * @attribute id
-        * @type {String}
-        * @initOnly
-        */
-        id: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The size of the file wrapped by FileFlash. This value is supplied by the Flash player uploader.
-        *
-        * @attribute size
-        * @type {Number}
-        * @initOnly
-        */
-        size: {
-            writeOnce: "initOnly",
-            value: 0
-        },
-
-       /**
-        * The name of the file wrapped by FileFlash. This value is supplied by the Flash player uploader.
-        *
-        * @attribute name
-        * @type {String}
-        * @initOnly
-        */
-        name: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The date that the file wrapped by FileFlash was created on. This value is supplied by the Flash player uploader.
-        *
-        * @attribute dateCreated
-        * @type {Date}
-        * @initOnly
-        */
-        dateCreated: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The date that the file wrapped by FileFlash was last modified on. This value is supplied by the Flash player uploader.
-        *
-        * @attribute dateModified
-        * @type {Date}
-        * @initOnly
-        */
-        dateModified: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The number of bytes of the file that has been uploaded to the server. This value is
-        * non-zero only while a file is being uploaded.
-        *
-        * @attribute bytesUploaded
-        * @type {Date}
-        * @readOnly
-        */
-        bytesUploaded: {
-            readOnly: true,
-            value: 0
-        },
-
-       /**
-        * The type of the file wrapped by FileFlash. This value is provided by the Flash player
-        * uploader.
-        *
-        * @attribute type
-        * @type {String}
-        * @initOnly
-        */
-        type: {
-            writeOnce: "initOnly",
-            value: null
-        },
-
-       /**
-        * The instance of Y.SWF wrapping the Flash player uploader associated with this file.
-        *
-        * @attribute uploder
-        * @type {SWF}
-        * @initOnly
-        */
-        uploader: {
-            writeOnce: "initOnly",
-            value: null
-        }
-        }
-    });
-
-    Y.FileFlash = FileFlash;
-/**
-* This module provides a UI for file selection and multiple file upload capability
-* using Flash as a transport engine.
-* @class UploaderFlash
-* @extends Widget
-* @param {Object} config Configuration object.
-* @constructor
-* @deprecated
-*/
-
-function UploaderFlash() {
-    UploaderFlash.superclass.constructor.apply ( this, arguments );
-}
-
-
-
-Y.UploaderFlash = Y.extend(UploaderFlash, Y.Widget, {
-
-    /**
-    * Stored value of the current button state (based on
-    * mouse events dispatched by the Flash player)
-    * @property _buttonState
-    * @type {String}
-    * @protected
-    */
-    _buttonState: "up",
-
-    /**
-    * Stored value of the current button focus state (based
-    * on keyboard and mouse events).
-    * @property _buttonFocus
-    * @type {Boolean}
-    * @protected
-    */
-    _buttonFocus: false,
-
-    /**
-    * Stored value of the unique id for the container that holds the
-    * Flash uploader.
-    *
-    * @property _swfContainerId
-    * @type {String}
-    * @protected
-    */
-    _swfContainerId: null,
-
-    /**
-    * Stored reference to the instance of SWF used to host the
-    * Flash uploader.
-    *
-    * @property _swfReference
-    * @type {SWF}
-    * @protected
-    */
-    _swfReference: null,
-
-    /**
-    * Stored reference to the instance of Uploader.Queue used to manage
-    * the upload process. This is a read-only property that only exists
-    * during an active upload process. Only one queue can be active at
-    * a time; if an upload start is attempted while a queue is active,
-    * it will be ignored.
-    *
-    * @property queue
-    * @type {Uploader.Queue}
-    */
-    queue: null,
-
-    /**
-    * Stored event bindings for keyboard navigation to and from the uploader.
-    *
-    * @property _tabElementBindings
-    * @type {Object}
-    * @protected
-    */
-    _tabElementBindings: null,
-
-
-    /**
-    * Construction logic executed during UploaderFlash instantiation.
-    *
-    * @method initializer
-    * @protected
-    */
-    initializer : function () {
-
-        // Assign protected variable values
-        this._swfContainerId = Y.guid("uploader");
-        this._swfReference = null;
-        this.queue = null;
-        this._buttonState = "up";
-        this._buttonFocus = null;
-        this._tabElementBindings = null;
-        this._fileList = [];
-
-        // Publish available events
-
-        /**
-        * Signals that files have been selected.
-        *
-        * @event fileselect
-        * @param event {Event} The event object for the `fileselect` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>fileList</dt>
-        *          <dd>An `Array` of files selected by the user, encapsulated
-        *              in Y.FileFlash objects.</dd>
-        *  </dl>
-        */
-        this.publish("fileselect");
-
-        /**
-        * Signals that an upload of multiple files has been started.
-        *
-        * @event uploadstart
-        * @param event {Event} The event object for the `uploadstart`.
-        */
-        this.publish("uploadstart");
-
-        /**
-        * Signals that an upload of a specific file has started.
-        *
-        * @event fileuploadstart
-        * @param event {Event} The event object for the `fileuploadstart` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>file</dt>
-        *          <dd>A reference to the Y.File that dispatched the event.</dd>
-        *      <dt>originEvent</dt>
-        *          <dd>The original event dispatched by Y.File.</dd>
-        *  </dl>
-        */
-        this.publish("fileuploadstart");
-
-        /**
-        * Reports on upload progress of a specific file.
-        *
-        * @event uploadprogress
-        * @param event {Event} The event object for the `uploadprogress` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>bytesLoaded</dt>
-        *          <dd>The number of bytes of the file that has been uploaded</dd>
-        *      <dt>bytesTotal</dt>
-        *          <dd>The total number of bytes in the file</dd>
-        *      <dt>percentLoaded</dt>
-        *          <dd>The fraction of the file that has been uploaded, out of 100</dd>
-        *      <dt>originEvent</dt>
-        *          <dd>The original event dispatched by the SWF uploader</dd>
-        *  </dl>
-        */
-        this.publish("uploadprogress");
-
-        /**
-        * Reports on the total upload progress of the file list.
-        *
-        * @event totaluploadprogress
-        * @param event {Event} The event object for the `totaluploadprogress` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>bytesLoaded</dt>
-        *          <dd>The number of bytes of the file list that has been uploaded</dd>
-        *      <dt>bytesTotal</dt>
-        *          <dd>The total number of bytes in the file list</dd>
-        *      <dt>percentLoaded</dt>
-        *          <dd>The fraction of the file list that has been uploaded, out of 100</dd>
-        *  </dl>
-        */
-        this.publish("totaluploadprogress");
-
-        /**
-        * Signals that a single file upload has been completed.
-        *
-        * @event uploadcomplete
-        * @param event {Event} The event object for the `uploadcomplete` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>file</dt>
-        *          <dd>The pointer to the instance of `Y.File` whose upload has been completed.</dd>
-        *      <dt>originEvent</dt>
-        *          <dd>The original event fired by the SWF Uploader</dd>
-        *      <dt>data</dt>
-        *          <dd>Data returned by the server.</dd>
-        *  </dl>
-        */
-        this.publish("uploadcomplete");
-
-        /**
-        * Signals that the upload process of the entire file list has been completed.
-        *
-        * @event alluploadscomplete
-        * @param event {Event} The event object for the `alluploadscomplete`.
-        */
-        this.publish("alluploadscomplete");
-
-        /**
-        * Signals that a error has occurred in a specific file's upload process.
-        *
-        * @event uploaderror
-        * @param event {Event} The event object for the `uploaderror` with the
-        *                      following payload:
-        *  <dl>
-        *      <dt>originEvent</dt>
-        *          <dd>The original error event fired by the SWF Uploader. </dd>
-        *      <dt>file</dt>
-        *          <dd>The pointer at the instance of Y.FileFlash that returned the error.</dd>
-        *      <dt>source</dt>
-        *          <dd>The source of the upload error, either "io" or "http"</dd>
-        *      <dt>message</dt>
-        *          <dd>The message that accompanied the error. Corresponds to the text of
-        *              the error in cases where source is "io", and to the HTTP status for
-                                     cases where source is "http".</dd>
-        *  </dl>
-        */
-        this.publish("uploaderror");
-
-        /**
-        * Signals that a mouse has begun hovering over the `Select Files` button.
-        *
-        * @event mouseenter
-        * @param event {Event} The event object for the `mouseenter` event.
-        */
-        this.publish("mouseenter");
-
-        /**
-        * Signals that a mouse has stopped hovering over the `Select Files` button.
-        *
-        * @event mouseleave
-        * @param event {Event} The event object for the `mouseleave` event.
-        */
-        this.publish("mouseleave");
-
-        /**
-        * Signals that a mouse button has been pressed over the `Select Files` button.
-        *
-        * @event mousedown
-        * @param event {Event} The event object for the `mousedown` event.
-        */
-        this.publish("mousedown");
-
-        /**
-        * Signals that a mouse button has been released over the `Select Files` button.
-        *
-        * @event mouseup
-        * @param event {Event} The event object for the `mouseup` event.
-        */
-        this.publish("mouseup");
-
-        /**
-        * Signals that a mouse has been clicked over the `Select Files` button.
-        *
-        * @event click
-        * @param event {Event} The event object for the `click` event.
-        */
-        this.publish("click");
-    },
-
-    /**
-    * Creates the DOM structure for the UploaderFlash.
-    * UploaderFlash's DOM structure consists of two layers: the base "Select Files"
-    * button that can be replaced by the developer's widget of choice; and a transparent
-    * Flash overlay positoned above the button that captures all input events.
-    * The `position` style attribute of the `boundingBox` of the `Uploader` widget
-    * is forced to be `relative`, in order to accommodate the Flash player overlay
-    * (which is `position`ed `absolute`ly).
-    *
-    * @method renderUI
-    * @protected
-    */
-    renderUI : function () {
-        var boundingBox = this.get("boundingBox"),
-            contentBox = this.get('contentBox'),
-            selFilesButton = this.get("selectFilesButton"),
-            flashContainer = Y.Node.create(substitute(UploaderFlash.FLASH_CONTAINER, {
-                swfContainerId: this._swfContainerId
-            })),
-            params = {
-                version: "10.0.45",
-                fixedAttributes: {
-                    wmode: "transparent",
-                    allowScriptAccess:"always",
-                    allowNetworking:"all",
-                    scale: "noscale"
-                }
-            };
-
-        boundingBox.setStyle("position", "relative");
-        selFilesButton.setStyles({width: "100%", height: "100%"});
-        contentBox.append(selFilesButton);
-        contentBox.append(flashContainer);
-
-        this._swfReference = new Y.SWF(flashContainer, this.get("swfURL"), params);
-    },
-
-    /**
-    * Binds handlers to the UploaderFlash UI events and propagates attribute
-    * values to the Flash player.
-    * The propagation of initial values is set to occur once the Flash player
-    * instance is ready (as indicated by the `swfReady` event.)
-    *
-    * @method bindUI
-    * @protected
-    */
-    bindUI : function () {
-
-        this._swfReference.on("swfReady", function () {
-            this._setMultipleFiles();
-            this._setFileFilters();
-            this._triggerEnabled();
-            this._attachTabElements();
-            this.after("multipleFilesChange", this._setMultipleFiles, this);
-            this.after("fileFiltersChange", this._setFileFilters, this);
-            this.after("enabledChange", this._triggerEnabled, this);
-            this.after("tabElementsChange", this._attachTabElements);
-        }, this);
-
-        this._swfReference.on("fileselect", this._updateFileList, this);
-
-
-
-        // this._swfReference.on("trace", function (ev) {console.log(ev.message);});
-
-        this._swfReference.on("mouseenter", function () {
-            this.fire("mouseenter");
-            this._setButtonClass("hover", true);
-            if (this._buttonState === "down") {
-                this._setButtonClass("active", true);
-            }
-        }, this);
-
-        this._swfReference.on("mouseleave", function () {
-            this.fire("mouseleave");
-            this._setButtonClass("hover", false);
-            this._setButtonClass("active", false);
-        }, this);
-
-        this._swfReference.on("mousedown", function () {
-            this.fire("mousedown");
-            this._buttonState = "down";
-            this._setButtonClass("active", true);
-        }, this);
-
-        this._swfReference.on("mouseup", function () {
-            this.fire("mouseup");
-            this._buttonState = "up";
-            this._setButtonClass("active", false);
-        }, this);
-
-        this._swfReference.on("click", function () {
-            this.fire("click");
-            this._buttonFocus = true;
-            this._setButtonClass("focus", true);
-            Y.one("body").focus();
-            this._swfReference._swf.focus();
-        }, this);
-    },
-
-    /**
-    * Attaches keyboard bindings to enabling tabbing to and from the instance of the Flash
-    * player in the Uploader widget. If the previous and next elements are specified, the
-    * keyboard bindings enable the user to tab from the `tabElements["from"]` node to the
-    * Flash-powered "Select Files" button, and to the `tabElements["to"]` node.
-    *
-    * @method _attachTabElements
-    * @protected
-    * @param ev {Event} Optional event payload if called as a `tabElementsChange` handler.
-    */
-    _attachTabElements : function () {
-        if (this.get("tabElements") !== null && this.get("tabElements").from !== null && this.get("tabElements").to !== null) {
-
-            if (this._tabElementBindings !== null) {
-                this._tabElementBindings.from.detach();
-                this._tabElementBindings.to.detach();
-                this._tabElementBindings.tabback.detach();
-                this._tabElementBindings.tabforward.detach();
-                this._tabElementBindings.focus.detach();
-                this._tabElementBindings.blur.detach();
-            }
-            else {
-                this._tabElementBindings = {};
-            }
-
-            var fromElement = Y.one(this.get("tabElements").from),
-                toElement = Y.one(this.get("tabElements").to);
-
-
-            this._tabElementBindings.from = fromElement.on("keydown", function (ev) {
-                if (ev.keyCode === 9 && !ev.shiftKey) {
-                    ev.preventDefault();
-                    this._swfReference._swf.setAttribute("tabindex", 0);
-                    this._swfReference._swf.setAttribute("role", "button");
-                    this._swfReference._swf.setAttribute("aria-label", this.get("selectButtonLabel"));
-                    this._swfReference._swf.focus();
-                }
-            }, this);
-
-            this._tabElementBindings.to = toElement.on("keydown", function (ev) {
-                if (ev.keyCode === 9 && ev.shiftKey) {
-                    ev.preventDefault();
-                    this._swfReference._swf.setAttribute("tabindex", 0);
-                    this._swfReference._swf.setAttribute("role", "button");
-                    this._swfReference._swf.setAttribute("aria-label", this.get("selectButtonLabel"));
-                    this._swfReference._swf.focus();
-                }
-            }, this);
-
-            this._tabElementBindings.tabback = this._swfReference.on("tabback", function () {
-                this._swfReference._swf.blur();
-                setTimeout(function () {
-                    fromElement.focus();
-                }, 30);
-            }, this);
-
-            this._tabElementBindings.tabforward = this._swfReference.on("tabforward", function () {
-                this._swfReference._swf.blur();
-                setTimeout(function () {
-                    toElement.focus();
-                }, 30);
-            }, this);
-
-            this._tabElementBindings.focus = this._swfReference._swf.on("focus", function () {
-                this._buttonFocus = true;
-                this._setButtonClass("focus", true);
-            }, this);
-
-            this._tabElementBindings.blur = this._swfReference._swf.on("blur", function () {
-                this._buttonFocus = false;
-                this._setButtonClass("focus", false);
-            }, this);
-        }
-        else if (this._tabElementBindings !== null) {
-            this._tabElementBindings.from.detach();
-            this._tabElementBindings.to.detach();
-            this._tabElementBindings.tabback.detach();
-            this._tabElementBindings.tabforward.detach();
-            this._tabElementBindings.focus.detach();
-            this._tabElementBindings.blur.detach();
-        }
-    },
-
-
-    /**
-    * Adds or removes a specified state CSS class to the underlying uploader button.
-    *
-    * @method _setButtonClass
-    * @protected
-    * @param state {String} The name of the state enumerated in `buttonClassNames` attribute
-    * from which to derive the needed class name.
-    * @param add {Boolean} A Boolean indicating whether to add or remove the class.
-    */
-    _setButtonClass : function (state, add) {
-        if (add) {
-            this.get("selectFilesButton").addClass(this.get("buttonClassNames")[state]);
-        }
-        else {
-            this.get("selectFilesButton").removeClass(this.get("buttonClassNames")[state]);
-        }
-    },
-
-
-    /**
-    * Syncs the state of the `fileFilters` attribute between the instance of UploaderFlash
-    * and the Flash player.
-    *
-    * @method _setFileFilters
-    * @private
-    */
-    _setFileFilters : function () {
-        if (this._swfReference && this.get("fileFilters").length > 0) {
-            this._swfReference.callSWF("setFileFilters", [this.get("fileFilters")]);
-        }
-    },
-
-
-
-    /**
-    * Syncs the state of the `multipleFiles` attribute between this class
-    * and the Flash uploader.
-    *
-    * @method _setMultipleFiles
-    * @private
-    */
-    _setMultipleFiles : function () {
-        if (this._swfReference) {
-            this._swfReference.callSWF("setAllowMultipleFiles", [this.get("multipleFiles")]);
-        }
-    },
-
-    /**
-    * Syncs the state of the `enabled` attribute between this class
-    * and the Flash uploader.
-    *
-    * @method _triggerEnabled
-    * @private
-    */
-    _triggerEnabled : function () {
-        if (this.get("enabled")) {
-            this._swfReference.callSWF("enable");
-            this._swfReference._swf.setAttribute("aria-disabled", "false");
-            this._setButtonClass("disabled", false);
-        }
-        else {
-            this._swfReference.callSWF("disable");
-            this._swfReference._swf.setAttribute("aria-disabled", "true");
-            this._setButtonClass("disabled", true);
-        }
-    },
-
-    /**
-    * Getter for the `fileList` attribute
-    *
-    * @method _getFileList
-    * @private
-    */
-    _getFileList : function () {
-        return this._fileList.concat();
-    },
-
-    /**
-    * Setter for the `fileList` attribute
-    *
-    * @method _setFileList
-    * @private
-    */
-    _setFileList : function (val) {
-        this._fileList = val.concat();
-        return this._fileList.concat();
-    },
-
-    /**
-    * Adjusts the content of the `fileList` based on the results of file selection
-    * and the `appendNewFiles` attribute. If the `appendNewFiles` attribute is true,
-    * then selected files are appended to the existing list; otherwise, the list is
-    * cleared and populated with the newly selected files.
-    *
-    * @method _updateFileList
-    * @param ev {Event} The file selection event received from the uploader.
-    * @private
-    */
-    _updateFileList : function (ev) {
-
-        Y.one("body").focus();
-        this._swfReference._swf.focus();
-
-
-        var newfiles = ev.fileList,
-            fileConfObjects = [],
-            parsedFiles = [],
-            swfRef = this._swfReference,
-            filterFunc = this.get("fileFilterFunction"),
-            oldfiles;
-
-        Y.each(newfiles, function (value) {
-            var newFileConf = {};
-            newFileConf.id = value.fileId;
-            newFileConf.name = value.fileReference.name;
-            newFileConf.size = value.fileReference.size;
-            newFileConf.type = value.fileReference.type;
-            newFileConf.dateCreated = value.fileReference.creationDate;
-            newFileConf.dateModified = value.fileReference.modificationDate;
-            newFileConf.uploader = swfRef;
-
-            fileConfObjects.push(newFileConf);
-        });
-
-         if (filterFunc) {
-            Y.each(fileConfObjects, function (value) {
-                var newfile = new Y.FileFlash(value);
-                if (filterFunc(newfile)) {
-                    parsedFiles.push(newfile);
-                }
-            });
-         }
-         else {
-            Y.each(fileConfObjects, function (value) {
-                parsedFiles.push(new Y.FileFlash(value));
-            });
-         }
-
-        if (parsedFiles.length > 0) {
-            oldfiles = this.get("fileList");
-
-            this.set("fileList",
-                             this.get("appendNewFiles") ? oldfiles.concat(parsedFiles) : parsedFiles );
-
-            this.fire("fileselect", { fileList: parsedFiles });
-        }
-
-    },
-
-
-
-    /**
-    * Handles and retransmits events fired by `Y.FileFlash` and `Y.Uploader.Queue`.
-    *
-    * @method _uploadEventHandler
-    * @param event The event dispatched during the upload process.
-    * @private
-    */
-    _uploadEventHandler : function (event) {
-
-        switch (event.type) {
-            case "file:uploadstart":
-                 this.fire("fileuploadstart", event);
-                break;
-            case "file:uploadprogress":
-                 this.fire("uploadprogress", event);
-                break;
-            case "uploaderqueue:totaluploadprogress":
-                 this.fire("totaluploadprogress", event);
-                break;
-            case "file:uploadcomplete":
-                 this.fire("uploadcomplete", event);
-                break;
-            case "uploaderqueue:alluploadscomplete":
-                 this.queue = null;
-                 this.fire("alluploadscomplete", event);
-                break;
-            case "file:uploaderror": //overflow intentional
-            case "uploaderqueue:uploaderror":
-                 this.fire("uploaderror", event);
-                break;
-            case "file:uploadcancel": // overflow intentional
-            case "uploaderqueue:uploadcancel":
-                 this.fire("uploadcancel", event);
-            break;
-        }
-
-    },
-
-
-
-    /**
-    * Starts the upload of a specific file.
-    *
-    * @method upload
-    * @param file {FileFlash} Reference to the instance of the file to be uploaded.
-    * @param url {String} The URL to upload the file to.
-    * @param [postVars] {Object} A set of key-value pairs to send as variables along with the file upload HTTP request.
-    *                          If not specified, the values from the attribute `postVarsPerFile` are used instead.
-    */
-    upload : function (file, url, postvars) {
-
-        var uploadURL = url || this.get("uploadURL"),
-            postVars = postvars || this.get("postVarsPerFile"),
-            fileId = file.get("id");
-
-            postVars = postVars.hasOwnProperty(fileId) ? postVars[fileId] : postVars;
-
-        if (file instanceof Y.FileFlash) {
-
-            file.on("uploadstart", this._uploadEventHandler, this);
-            file.on("uploadprogress", this._uploadEventHandler, this);
-            file.on("uploadcomplete", this._uploadEventHandler, this);
-            file.on("uploaderror", this._uploadEventHandler, this);
-            file.on("uploadcancel", this._uploadEventHandler, this);
-
-            file.startUpload(uploadURL, postVars, this.get("fileFieldName"));
-        }
-    },
-
-    /**
-    * Starts the upload of all files on the file list, using an automated queue.
-    *
-    * @method uploadAll
-    * @param url {String} The URL to upload the files to.
-    * @param [postVars] {Object} A set of key-value pairs to send as variables along with the file upload HTTP request.
-    *                          If not specified, the values from the attribute `postVarsPerFile` are used instead.
-    */
-    uploadAll : function (url, postvars) {
-        this.uploadThese(this.get("fileList"), url, postvars);
-    },
-
-    /**
-    * Starts the upload of the files specified in the first argument, using an automated queue.
-    *
-    * @method uploadThese
-    * @param files {Array} The list of files to upload.
-    * @param url {String} The URL to upload the files to.
-    * @param [postVars] {Object} A set of key-value pairs to send as variables along with the file upload HTTP request.
-    *                          If not specified, the values from the attribute `postVarsPerFile` are used instead.
-    */
-    uploadThese : function (files, url, postvars) {
-        if (!this.queue) {
-            var uploadURL = url || this.get("uploadURL"),
-                postVars = postvars || this.get("postVarsPerFile");
-
-            this.queue = new UploaderQueue({
-                simUploads: this.get("simLimit"),
-                errorAction: this.get("errorAction"),
-                fileFieldName: this.get("fileFieldName"),
-                fileList: files,
-                uploadURL: uploadURL,
-                perFileParameters: postVars,
-                retryCount: this.get("retryCount")
-            });
-
-            this.queue.on("uploadstart", this._uploadEventHandler, this);
-            this.queue.on("uploadprogress", this._uploadEventHandler, this);
-            this.queue.on("totaluploadprogress", this._uploadEventHandler, this);
-            this.queue.on("uploadcomplete", this._uploadEventHandler, this);
-            this.queue.on("alluploadscomplete", this._uploadEventHandler, this);
-            this.queue.on("alluploadscancelled", function () {this.queue = null;}, this);
-            this.queue.on("uploaderror", this._uploadEventHandler, this);
-            this.queue.startUpload();
-
-            this.fire("uploadstart");
-        }
-    }
-},
-
-{
-    /**
-    * The template for the Flash player container. Since the Flash player container needs
-    * to completely overlay the &lquot;Select Files&rqot; control, it's positioned absolutely,
-    * with width and height set to 100% of the parent.
-    *
-    * @property FLASH_CONTAINER
-    * @type {String}
-    * @static
-    * @default '<div id="{swfContainerId}" style="position:absolute; top:0px; left: 0px; margin: 0; padding: 0;
-    *           border: 0; width:100%; height:100%"></div>'
-    */
-    FLASH_CONTAINER: '<div id="{swfContainerId}" style="position:absolute; top:0px; left: 0px; margin: 0; ' +
-                     'padding: 0; border: 0; width:100%; height:100%"></div>',
-
-    /**
-    * The template for the "Select Files" button.
-    *
-    * @property SELECT_FILES_BUTTON
-    * @type {String}
-    * @static
-    * @default "<button type='button' class='yui3-button' tabindex='-1'>{selectButtonLabel}</button>"
-    */
-    SELECT_FILES_BUTTON: "<button type='button' class='yui3-button' tabindex='-1'>{selectButtonLabel}</button>",
-
-    /**
-    * The static property reflecting the type of uploader that `Y.Uploader`
-    * aliases. The UploaderFlash value is `"flash"`.
-    *
-    * @property TYPE
-    * @type {String}
-    * @static
-    */
-    TYPE: "flash",
-
-    /**
-    * The identity of the widget.
-    *
-    * @property NAME
-    * @type String
-    * @default 'uploader'
-    * @readOnly
-    * @protected
-    * @static
-    */
-    NAME: "uploader",
-
-    /**
-    * Static property used to define the default attribute configuration of
-    * the Widget.
-    *
-    * @property ATTRS
-    * @type {Object}
-    * @protected
-    * @static
-    */
-    ATTRS: {
-
-        /**
-        * A Boolean indicating whether newly selected files should be appended
-        * to the existing file list, or whether they should replace it.
-        *
-        * @attribute appendNewFiles
-        * @type {Boolean}
-        * @default true
-        */
-        appendNewFiles : {
-            value: true
-        },
-
-        /**
-        * The names of CSS classes that correspond to different button states
-        * of the "Select Files" control. These classes are assigned to the
-        * "Select Files" control based on the mouse states reported by the
-        * Flash player. The keys for the class names are:
-        * <ul>
-        *   <li> <strong>`hover`</strong>: the class corresponding to mouse hovering over
-        *      the "Select Files" button.</li>
-        *   <li> <strong>`active`</strong>: the class corresponding to mouse down state of
-        *      the "Select Files" button.</li>
-        *   <li> <strong>`disabled`</strong>: the class corresponding to the disabled state
-        *      of the "Select Files" button.</li>
-        *   <li> <strong>`focus`</strong>: the class corresponding to the focused state of
-        *      the "Select Files" button.</li>
-        * </ul>
-        * @attribute buttonClassNames
-        * @type {Object}
-        * @default { hover: "yui3-button-hover",
-        *            active: "yui3-button-active",
-        *            disabled: "yui3-button-disabled",
-        *            focus: "yui3-button-selected"
-        *          }
-        */
-        buttonClassNames: {
-            value: {
-                "hover": "yui3-button-hover",
-                "active": "yui3-button-active",
-                "disabled": "yui3-button-disabled",
-                "focus": "yui3-button-selected"
-            }
-        },
-
-        /**
-        * A Boolean indicating whether the uploader is enabled or disabled for user input.
-        *
-        * @attribute enabled
-        * @type {Boolean}
-        * @default true
-        */
-        enabled : {
-            value: true
-        },
-
-        /**
-        * The action  performed when an upload error occurs for a specific file being uploaded.
-        * The possible values are:
-        * <ul>
-        *   <li> <strong>`UploaderQueue.CONTINUE`</strong>: the error is ignored and the upload process is continued.</li>
-        *   <li> <strong>`UploaderQueue.STOP`</strong>: the upload process is stopped as soon as any other parallel file
-        *     uploads are finished.</li>
-        *   <li> <strong>`UploaderQueue.RESTART_ASAP`</strong>: the file is added back to the front of the queue.</li>
-        *   <li> <strong>`UploaderQueue.RESTART_AFTER`</strong>: the file is added to the back of the queue.</li>
-        * </ul>
-        * @attribute errorAction
-        * @type {String}
-        * @default UploaderQueue.CONTINUE
-        */
-        errorAction: {
-            value: "continue",
-            validator: function (val) {
-                return (
-                    val === UploaderQueue.CONTINUE ||
-                    val === UploaderQueue.STOP ||
-                    val === UploaderQueue.RESTART_ASAP ||
-                    val === UploaderQueue.RESTART_AFTER
-                );
-            }
-        },
-
-        /**
-        * An array indicating what fileFilters should be applied to the file
-        * selection dialog. Each element in the array should be an object with
-        * the following key-value pairs:
-        * {
-        *   description : String
-         extensions: String of the form &lquot;*.ext1;*.ext2;*.ext3;...&rquot;
-        * }
-        * @attribute fileFilters
-        * @type {Array}
-        * @default []
-        */
-        fileFilters: {
-            value: []
-        },
-
-        /**
-        * A filtering function that is applied to every file selected by the user.
-        * The function receives the `Y.File` object and must return a Boolean value.
-        * If a `false` value is returned, the file in question is not added to the
-        * list of files to be uploaded.
-        * Use this function to put limits on file sizes or check the file names for
-        * correct extension, but make sure that a server-side check is also performed,
-        * since any client-side restrictions are only advisory and can be circumvented.
-        *
-        * @attribute fileFilterFunction
-        * @type {Function}
-        * @default null
-        */
-        fileFilterFunction: {
-            value: null
-        },
-
-        /**
-        * A String specifying what should be the POST field name for the file
-        * content in the upload request.
-        *
-        * @attribute fileFieldName
-        * @type {String}
-        * @default Filedata
-        */
-        fileFieldName: {
-            value: "Filedata"
-        },
-
-        /**
-        * The array of files to be uploaded. All elements in the array
-        * must be instances of `Y.FileFlash` and be instantiated with a `fileId`
-        * retrieved from an instance of the uploader.
-        *
-        * @attribute fileList
-        * @type {Array}
-        * @default []
-        */
-        fileList: {
-            value: [],
-            getter: "_getFileList",
-            setter: "_setFileList"
-        },
-
-        /**
-        * A Boolean indicating whether multiple file selection is enabled.
-        *
-        * @attribute multipleFiles
-        * @type {Boolean}
-        * @default false
-        */
-        multipleFiles: {
-            value: false
-        },
-
-        /**
-        * An object, keyed by `fileId`, containing sets of key-value pairs
-        * that should be passed as POST variables along with each corresponding
-        * file. This attribute is only used if no POST variables are specifed
-        * in the upload method call.
-        *
-        * @attribute postVarsPerFile
-        * @type {Object}
-        * @default {}
-        */
-        postVarsPerFile: {
-            value: {}
-        },
-
-        /**
-        * The label for the "Select Files" widget. This is the value that replaces the
-        * `{selectButtonLabel}` token in the `SELECT_FILES_BUTTON` template.
-        *
-        * @attribute selectButtonLabel
-        * @type {String}
-        * @default "Select Files"
-        */
-        selectButtonLabel: {
-            value: "Select Files"
-        },
-
-        /**
-        * The widget that serves as the "Select Files" control for the file uploader
-        *
-        *
-        * @attribute selectFilesButton
-        * @type {Node | Widget}
-        * @default A standard HTML button with YUI CSS Button skin.
-        */
-        selectFilesButton : {
-            valueFn: function () {
-                return Y.Node.create(substitute(Y.UploaderFlash.SELECT_FILES_BUTTON, {selectButtonLabel: this.get("selectButtonLabel")}));
-             }
-        },
-
-        /**
-        * The number of files that can be uploaded
-        * simultaneously if the automatic queue management
-        * is used. This value can be in the range between 2
-        * and 5.
-        *
-        * @attribute simLimit
-        * @type {Number}
-        * @default 2
-        */
-        simLimit: {
-            value: 2,
-            validator: function (val) {
-                    return (val >= 2 && val <= 5);
-            }
-        },
-
-        /**
-        * The URL to the SWF file of the flash uploader. A copy local to
-        * the server that hosts the page on which the uploader appears is
-        * recommended.
-        *
-        * @attribute swfURL
-        * @type {String}
-        * @default "flashuploader.swf" with a
-        * random GET parameter for IE (to prevent buggy behavior when the SWF
-        * is cached).
-        */
-        swfURL: {
-            valueFn: function () {
-                var prefix = "flashuploader.swf";
-
-                if (Y.UA.ie > 0) {
-                    return (prefix + "?t=" + Y.guid("uploader"));
-                }
-
-                return prefix;
-            }
-        },
-
-        /**
-        * The id's or `Node` references of the DOM elements that precede
-        * and follow the `Select Files` button in the tab order. Specifying
-        * these allows keyboard navigation to and from the Flash player
-        * layer of the uploader.
-        * The two keys corresponding to the DOM elements are:
-        <ul>
-        *   <li> `from`: the id or the `Node` reference corresponding to the
-        *     DOM element that precedes the `Select Files` button in the tab order.</li>
-        *   <li> `to`: the id or the `Node` reference corresponding to the
-        *     DOM element that follows the `Select Files` button in the tab order.</li>
-        * </ul>
-        * @attribute tabElements
-        * @type {Object}
-        * @default null
-        */
-        tabElements: {
-            value: null
-        },
-
-        /**
-        * The URL to which file upload requested are POSTed. Only used if a different url is not passed to the upload method call.
-        *
-        * @attribute uploadURL
-        * @type {String}
-        * @default ""
-        */
-        uploadURL: {
-            value: ""
-        },
-
-        /**
-        * The number of times to try re-uploading a file that failed to upload before
-        * cancelling its upload.
-        *
-        * @attribute retryCount
-        * @type {Number}
-        * @default 3
-        */
-        retryCount: {
-            value: 3
-        }
-    }
-});
-
-Y.UploaderFlash.Queue = UploaderQueue;
-
-
-}, '3.16.0', {
-    "requires": [
-        "swfdetect",
-        "escape",
-        "widget",
-        "base",
-        "cssbutton",
-        "node",
-        "event-custom",
-        "uploader-queue"
-    ]
-});
-/*
-YUI 3.16.0 (build 76f0e08)
-Copyright 2014 Yahoo! Inc. All rights reserved.
-Licensed under the BSD License.
-http://yuilibrary.com/license/
-*/
-
-YUI.add('uploader', function (Y, NAME) {
-
-/**
-* Provides UI for selecting multiple files and functionality for
-* uploading multiple files to the server with support for either
-* html5 or Flash transport mechanisms, automatic queue management,
-* upload progress monitoring, and error events.
-* @module uploader
-* @main uploader
-* @since 3.5.0
-*/
-
-/**
-* `Y.Uploader` serves as an alias for either <a href="UploaderFlash.html">`Y.UploaderFlash`</a>
-* or <a href="UploaderHTML5.html">`Y.UploaderHTML5`</a>, depending on the feature set available
-* in a specific browser. If neither HTML5 nor Flash transport layers are available, `Y.Uploader.TYPE`
-* static property is set to `"none"`.
-*
-* @class Uploader
-*/
-
-/**
-* The static property reflecting the type of uploader that `Y.Uploader`
-* aliases. The possible values are:
-* <ul>
-* <li><strong>`"html5"`</strong>: Y.Uploader is an alias for <a href="UploaderHTML5.html">Y.UploaderHTML5</a></li>
-* <li><strong>`"flash"`</strong>: Y.Uploader is an alias for <a href="UploaderFlash.html">Y.UploaderFlash</a></li>
-* <li><strong>`"none"`</strong>: Neither Flash not HTML5 are available, and Y.Uploader does
-* not reference an actual implementation.</li>
-* </ul>
-*
-* @property TYPE
-* @type {String}
-* @static
-*/
-
-var Win = Y.config.win;
-
-if (Win && Win.File && Win.FormData && Win.XMLHttpRequest) {
-    Y.Uploader = Y.UploaderHTML5;
-}
-
-else if (Y.SWFDetect.isFlashVersionAtLeast(10,0,45)) {
-    Y.Uploader = Y.UploaderFlash;
-}
-
-else {
-    Y.namespace("Uploader");
-    Y.Uploader.TYPE = "none";
+'\n                    </label>\n                    <div class="col-sm-8 hqm-existing-controls">\n                    </div>\n                </div>\n            </div>\n            <div class="modal-footer">\n                <a class="btn btn-default" data-dismiss="modal">'+
+((__t=(gettext("Close")))==null?'':_.escape(__t))+
+'</a>\n                <a class="btn btn-default disabled hqm-upload hqm-upload-confirm">\n                    <i class="fa-solid fa-cloud-arrow-up"></i>\n                    <i class="fa-solid fa-spin fa-refresh hide"></i>\n                    '+
+((__t=(gettext("Begin Upload")))==null?'':_.escape(__t))+
+'\n                </a>\n            </div>\n        </div>\n    </div>\n</div>\n';
 }
+return __p;
+}; });
 
 
-}, '3.16.0', {"requires": ["uploader-html5", "uploader-flash"]});
-
-define("yui-uploader", ["yui-base","yui-loader","css!yui-combo"], (function (global) {
-    return function () {
-        var ret, fn;
-        return ret || global.YUI;
-    };
-}(this)));
-
-var HQMediaUploaderTypes = {
-    'bulk': HQMediaBulkUploadController,
-    'file': HQMediaFileUploadController,
-};
-
-function BaseHQMediaUploadController (uploader_name, marker, options) {
-    'use strict';
-    var self = this;
-
-    // These are necessary for having multiple upload controllers on the same page.
-    self.container = "#" + uploader_name;
-    self.marker = marker + "_";
-
-    ///// YUI Uploader Specific Params
-    self.fileFilters = options.fileFilters;
-    self.isMultiFileUpload = options.isMultiFileUpload;
-
-    // Essential Selectors
-    self.selectFilesButtonContainer = self.container + " .hqm-select-files-container";
-    self.selectFilesButton = self.container + " .hqm-select";
-
-    self.uploadButtonSelector = self.container + " .hqm-upload";
-    self.confirmUploadSelector = self.container + " .hqm-upload-confirm";
-
-    self.processingFilesListSelector = self.container + " .hqm-upload-processing";
-    self.uploadedFilesListSelector = self.container + " .hqm-uploaded-files";
-    self.queueSelector = self.container + " .hqm-queue";
-    self.uploadFormSelector = self.container + " .hqm-upload-form";
-
-    self.notSupportedNotice = self.container + " .hqm-not-supported";
-
-    // behavior controls
-    self.allowCloseDuringUpload = options.allowCloseDuringUpload || false;
-
-    // Templates
-    self.queueTemplate = options.queueTemplate;
-    self.errorsTemplate = options.errorsTemplate;
-
-    // Stuff for processing the upload
-    self.uploadParams = options.uploadParams || {};
-    self.licensingParams = options.licensingParams || [];
-    self.uploadURL = options.uploadURL;
-    self.processingURL = options.processingURL;
-
-    // Polling
-    self.pollInterval = 2000;  // 2 sec
-    self.maxPollInterval = 20000;  // 20 seconds
-    self.currentPollAttempts = 0;
-    self.maxPollAttempts = 20;
-    self.allowClose = true;
-
-    $(self.container).on('hide.bs.modal', function (event) {
-        if (!self.allowClose) {
-            event.preventDefault();
-        }
-    });
-
-    self._getActiveUploadSelectors = function (file) {
-        /*
-         All the different active parts of the queued item template that the upload controller cares about.
-         file is an instance of Y.file
-         */
-        var selector = '#' + self.marker + file.get('id');
-        return {
-            selector: selector,
-            progressBarContainer: selector + ' .progress',
-            progressBar: selector + ' .progress .progress-bar',
-            cancel: selector + ' .hqm-cancel',
-            remove: selector + ' .hqm-remove',
-            beginNotice: selector + ' .hqm-begin',
-            processingQueuedNotice: selector + ' .hqm-processing-queued',
-            processingNotice: selector + ' .hqm-processing',
-            completeNotice: selector + ' .hqm-upload-completed',
-            errorNotice: selector + ' .hqm-error',
-            status: selector + ' .hqm-status',
-            details: selector + ' .hqm-details',
-        };
-    };
-
-    // templates
-    self._processQueueTemplate = function (file) {
-        /*
-            This renders the template for the queued item display.
-         */
-        var MEGABYTE = 1048576;
-        return _.template(self.queueTemplate)({
-            unique_id: self.marker + file.get('id'),
-            file_size: (file.get('size')/MEGABYTE).toFixed(3),
-            file_name: file.get('name'),
-        });
-    };
-
-
-
-    self._processErrorsTemplate = function (errors) {
-        return _.template(self.errorsTemplate)({
-            errors: errors,
-        });
-    };
-
-    // actions
-    self._cancelFileUpload = function (file) {
-        /*
-            What happens when you cancel a file from uploading.
-         */
-        return function (event) {
-            file.cancelUpload();
-            self.uploader.queue = null; // https://github.com/yui/yui3/issues/1179#issuecomment-24175982
-            var activeSelector = self._getActiveUploadSelectors(file);
-            $(activeSelector.progressBar).attr('style', 'width: 0%;');
-            $(activeSelector.cancel).addClass('hide');
-            $(activeSelector.remove).removeClass('hide');
-            event.preventDefault();
-            self.allowClose = true;
-        };
-    };
-
-    self._removeFileFromQueue = function (file) {
-        /*
-            What happens when you remove a file from the queue
-        */
-        return function (event) {
-            self._removeFileFromUploader(file);
-            self._removeFileFromUI(file);
-            event.preventDefault();
-        };
-    };
-
-
-    // UI related
-    self._startUploadUI = function () {
-        // optional: set the state of the uploader UI here when the upload starts
-    };
-
-    self._removeFileFromUI = function (file) {
-        var activeSelectors = self._getActiveUploadSelectors(file);
-        $(activeSelectors.selector).remove();
-        self._toggleUploadButton();
-    };
-
-    self._toggleUploadButton = function () {
-        var $uploadButton = $(self.uploadButtonSelector);
-        (self.filesInQueueUI.length > 0) ? $uploadButton.addClass('btn-success').removeClass('disabled') : $uploadButton.addClass('disabled').removeClass('btn-success');
-    };
-
-    self._activateQueueUI = function () {
-        for (var i=0; i < self.filesInQueueUI.length; i++) {
-            var queuedFile = self.filesInQueueUI[i];
-            var currentSelector = self._getActiveUploadSelectors(queuedFile);
-            $(currentSelector.beginNotice).addClass('hide');
-            $(currentSelector.remove).addClass('hide');
-            $(currentSelector.cancel).removeClass('hide');
-        }
-    };
-
-    self._resetUploadForm = function () {
-        var $uploadForm = $(self.uploadFormSelector);
-        $uploadForm.find('.hqm-share-media').prop('checked', false);
-        $uploadForm.find('.hqm-sharing').addClass('hide');
-        $uploadForm.find('[name="license"]').val('cc');
-        $uploadForm.find('[name="author"]').val('');
-        $uploadForm.find('[name="attribution-notes"]').val('');
-    };
-
-    self.getLicensingParams = function () {
-        var $form = $(self.uploadFormSelector),
-            params = {};
-        for (var i = 0; i < self.licensingParams.length; i++) {
-            var param_name = self.licensingParams[i];
-            var param_val = $form.find('[name="' + param_name + '"]').val();
-            if (param_val.length > 0) params[param_name] = param_val;
-        }
-        return params;
-    };
-
-    // Uploader flow
-    self.init = function () {
-        /*
-            Initialize the YUI uploader.
-            Use HTML5 version; flash version wasn't properly triggering fileselect events,
-            which are needed for app manager's bulk multimedia uploader.
-         */
-        YUI().use('uploader', function (Y) {
-            var buttonRegion = Y.one(self.selectFilesButton).get('region');
-            if (Y.Uploader.TYPE == "none") {
-                $(self.notSupportedNotice).removeClass('hide');
-                $(self.selectFilesButtonContainer).parent().addClass('hide');
-                return;
-            } else {
-                $(self.notSupportedNotice).remove();
-            }
-
-            self.uploader = new Y.Uploader({
-                width: buttonRegion.width || '100px',
-                height: buttonRegion.height || '35px',
-                selectFilesButton: Y.one(self.selectFilesButton),
-                multipleFiles: self.isMultiFileUpload,
-            });
-
-            self.uploader.on("fileselect", self._fileSelect);
-            self.uploader.on("uploadprogress", self._uploadProgress);
-            self.uploader.on("uploadcomplete", self.uploadComplete);
-            self.uploader.on("uploaderror", self._uploadError);
-
-            self.uploader.render(self.selectFilesButtonContainer);
-        });
-
-        $(function () {
-            self.resetUploader();
-            $(self.confirmUploadSelector).click(self.startUpload);
-            $(self.uploadFormSelector).find('.hqm-share-media').change(function () {
-                var $sharingOptions = $(self.uploadFormSelector).find('.hqm-sharing');
-                ($(this).prop('checked')) ? $sharingOptions.removeClass('hide') : $sharingOptions.addClass('hide');
-            });
-        });
-    };
-
-    self.resetUploader = function () {
-        /*
-            Start over.
-         */
-        self.filesInQueueUI = [];
-        self.processingIdToFile = {};
-        self.allowClose = true;
-        self._toggleUploadButton();
-        self._resetUploadForm();
-        if (!self.isMultiFileUpload) {
-            $(self.queueSelector).empty();
-        }
-    };
-
-    self._clearUploaderData = function () {
-        self.uploader.set('fileList', []);
-    };
-
-    self._removeFileFromUploader = function (file) {
-        var fileList = self.uploader.get('fileList');
-        self.uploader.set('fileList', _.without(fileList, file));
-        self.filesInQueueUI = _.without(self.filesInQueueUI, file);
-    };
-
-    self._fileSelect = function (event) {
-        /*
-            After files have been selected by the select files function, do this.
-         */
-        if (!self.isMultiFileUpload) {
-            self.resetUploader();
-            self.uploader.set('fileList', event.fileList);
-        }
-        for (var f = 0; f < event.fileList.length; f++) {
-            var queuedFile = event.fileList[f];
-            if (self.filesInQueueUI.indexOf(queuedFile) < 0) {
-                self.filesInQueueUI.push(queuedFile);
-                $(self.queueSelector).append(self._processQueueTemplate(queuedFile));
-                var activeSelector = self._getActiveUploadSelectors(queuedFile);
-                $(activeSelector.cancel).click(self._cancelFileUpload(queuedFile));
-                if ($(activeSelector.remove)) {
-                    $(activeSelector.remove).click(self._removeFileFromQueue(queuedFile));
-                }
-            }
-        }
-        self._toggleUploadButton();
-    };
-
-    self.startUpload = function (event) {
-        /*
-            Begin Upload was clicked.
-         */
-
-        // if this has been configured to disallow closing, then disable it
-        if (!self.allowCloseDuringUpload) {
-            self.allowClose = false;
-        }
-        if (!self.isMultiFileUpload) {
-            var newExtension = '.' + self.filesInQueueUI[0].get('name').split('.').pop().toLowerCase();
-            self.uploadParams.path = self.uploadParams.path.replace(/(\.[^/.]+)?$/, newExtension);
-        }
-        $(self.uploadButtonSelector).addClass('disabled').removeClass('btn-success');
-        self._startUploadUI();
-        var postParams = _.clone(self.uploadParams);
-        for (var key in self.uploadParams) {
-            if (self.uploadParams.hasOwnProperty(key)
-                && $(self.uploadFormSelector).find('[name="'+key+'"]').prop('checked')) {
-                postParams[key] = true;
-            }
-        }
-        // With YUI 3.9 you can trigger downloads on a per file basis, but for now just keep the original behavior
-        // of uploading the entire queue.
-        self.uploader.uploadAll(self.uploadURL, postParams);
-        self._activateQueueUI();
-        event.preventDefault();
-    };
-
-    self._uploadProgress = function (event) {
-        var curUpload = self._getActiveUploadSelectors(event.file);
-        $(curUpload.progressBar).attr('style', 'width: ' + event.percentLoaded + '%;');
-    };
-
-    self.uploadComplete = function (event) {
-        throw new Error("Missing implementation for uploadComplete");
-    };
-
-    self._uploadError = function (event) {
-        /*
-            An error occurred while uploading the file.
-         */
-        self.allowClose = true;
-        self.uploader.queue = null;
-        var response = JSON.parse(event.data);
-        var errors = [];
-        if (response && response.errors) {
-            errors = errors.concat(response.errors);
-        } else {
-            errors.push('Upload Failed: Issue communicating with server.  This usually means your Internet connection is not strong enough. Try again later.')
-        }
-        var curUpload = self._getActiveUploadSelectors(event.file);
-        $(curUpload.progressBarContainer).addClass('progress-danger');
-        $(curUpload.progressBar).addClass('progress-bar-danger');
-        self._showErrors(event.file, errors);
-    };
-
-    self._showErrors = function (file, errors) {
-        var curUpload = self._getActiveUploadSelectors(file);
-        (errors.length > 0) ? $(curUpload.errorNotice).removeClass('hide') : $(curUpload.errorNotice).addClass('hide');
-        $(curUpload.status).append(self._processErrorsTemplate(errors));
-    };
-
+define('tpl/tpl!vellum/templates/multimedia_upload_trigger', ['underscore'], function (_) { return function(obj){
+var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};
+with(obj||{}){
+__p+='<a href="#'+
+((__t=( uploaderId ))==null?'':__t)+
+'"\n   class="btn btn-primary"\n   data-toggle="modal">\n    '+
+((__t=( multimediaExists ? gettext("Replace") : gettext("Upload") ))==null?'':_.escape(__t))+
+' '+
+((__t=(mediaType))==null?'':__t)+
+'\n</a>\n';
 }
-
-function HQMediaBulkUploadController (uploader_name, marker, options) {
-    'use strict';
-    BaseHQMediaUploadController.call(this, uploader_name, marker, options);
-    var self = this;
-    self.confirmUploadModalSelector = "#hqm-upload-modal";
-
-    // Templates
-    self.detailsTemplate = options.detailsTemplate;
-    self.statusTemplate = options.statusTemplate;
-
-    self._processDetailsTemplate = function (images, audio, video, unknowns) {
-        return _.template(self.detailsTemplate)({
-            images: images,
-            audio: audio,
-            video: video,
-            unknowns: unknowns,
-        });
-    };
-
-    self._processStatusTemplate = function (images, audio, video) {
-        var numMatches = images.length + audio.length + video.length;
-        return _.template(self.statusTemplate)({
-            num: numMatches,
-        });
-    };
+return __p;
+}; });
 
 
-    self._startUploadUI = function () {
-        // set the state of the uploader UI here when the upload starts
-        if ($(self.confirmUploadModalSelector)) {
-            $(self.confirmUploadModalSelector).modal('hide');
-        }
-    };
+define('text/text!vellum/templates/multimedia_upload_status.html',[],function () { return '<div style="clear: both;">\n    <div class="alert alert-success" style="margin-bottom: 2px; margin-top: 10px;">\n        <i class="fa fa-check"></i> <%= file_name %> <strong>[<%= file_size %> MB]</strong>\n    </div>\n    <p class="text-success hqm-begin">\n      <%=gettext("Ready to upload. Click <strong>Begin Upload</strong> below to start.")%>\n    </p>\n    <p class="text-danger hqm-error hide">\n        <span class="label label-danger"><%-gettext("There were errors.")%></span>\n    </p>\n    <div class="hqm-errors"></div>\n</div>\n';});
 
-    // uploader
-    self.uploadComplete = function (event) {
-        var curUpload = self._getActiveUploadSelectors(event.file);
-        $(curUpload.progressBarContainer).removeClass('active');
-        $(curUpload.cancel).addClass('hide');
-        self._removeFileFromUploader(event.file);
-        var $queuedItem = $(curUpload.selector);
-        $queuedItem.remove();
-        $queuedItem.insertAfter($(self.processingFilesListSelector).find('.hqm-list-notice'));
-        self._beginProcessing(event);
-        self._toggleUploadButton();
-    };
 
-    // processing flow
-    self._beginProcessing = function(event) {
-        /*
-            The upload completed. Do this...
-         */
-        var response = JSON.parse(event.data);
-
-        var processing_id = response.processing_id;
-        self.processingIdToFile[response.processing_id] = event.file;
-        var curUpload = self._getActiveUploadSelectors(event.file);
-        $(curUpload.progressBar).addClass('hide').attr('style', 'width: 0%;'); // reset progress bar for processing
-        $(curUpload.progressBarContainer).addClass('progress-warning active');
-        $(curUpload.progressBar).addClass('progress-bar-warning');
-        $(curUpload.processingQueuedNotice).removeClass('hide');
-        self._pollProcessingQueue(processing_id)();
-    };
+define('text/text!vellum/templates/multimedia_errors.html',[],function () { return '<% if (errors.length > 0) { %>\n    <div class="alert alert-danger">\n        <% for (var e = 0; e < errors.length; e++) {\n            var error = errors[e]; %>\n            <p><%- error %></p>\n        <% } %>\n    </div>\n<% } %>\n';});
 
-    self._pollProcessingQueue = function (processing_id) {
-        return function _poll () {
-            setTimeout(function () {
-                if (processing_id in self.processingIdToFile) {
-                    $.ajax({
-                        url: self.processingURL,
-                        dataType: 'json',
-                        data: {
-                            processing_id: processing_id,
-                        },
-                        type: 'POST',
-                        success: self._processingProgress,
-                        error: self._processingError(processing_id),
-                        complete: _poll,
-                        timeout: self.pollInterval,
-                    });
-                }
-            }, self.pollInterval);
-        };
-    };
 
-    self._processingProgress = function (data) {
-        self.currentPollAttempts = 0;
-        var curUpload = self._getActiveUploadSelectors(self.processingIdToFile[data.processing_id]);
-        if (data.in_celery) {
-            $(curUpload.processingQueuedNotice).addClass('hide');
-            $(curUpload.processingNotice).removeClass('hide');
-            $(curUpload.progressBar).removeClass('hide').attr('style', 'width: ' + data.progress + '%;');
-            if (data.total_files) {
-                var $file_status = $(curUpload.processingNotice).find('.label');
-                $file_status.find('.denominator').text(data.total_files);
-                $file_status.find('.numerator').text(data.processed_files || 0);
-                $file_status.removeClass('hide');
-            }
-        }
-        if (data.complete) {
-            self._processingComplete(data);
-        }
-    };
+define('text/text!vellum/templates/multimedia_existing_image.html',[],function () { return '<p>\n    <img src="<%=url %>?thumb=100" alt="uploaded image" />\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens image in new tab.")%>"><%-gettext("View Full Size")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New Image Uploaded Successfully")%></span>\n</p>\n';});
 
-    self._processingComplete = function (data) {
-        var processingFile = self.processingIdToFile[data.processing_id];
-        delete self.processingIdToFile[data.processing_id];
-        var curUpload = self._getActiveUploadSelectors(processingFile);
-        self._stopProcessingFile(processingFile);
-        $(curUpload.progressBarContainer).addClass('progress-success');
-        $(curUpload.progressBar).addClass('progress-bar-success');
 
-        self._showMatches(processingFile, data);
-        self._showErrors(processingFile, data.errors);
-    };
+define('text/text!vellum/templates/multimedia_existing_audio.html',[],function () { return '<p>\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens file in new tab.")%>"><%-gettext("Open Audio")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New Audio Uploaded Successfully")%></span>\n</p>\n';});
 
-    self._processingError = function (processing_id) {
-        return function (data, status) {
-            if (self.pollInterval < self.maxPollInterval) {
-                // first try increasing their timeout, maybe the connection is poor
-                self.pollInterval = Math.min(self.pollInterval + 2000, self.maxPollInterval);
-            } else {
-                self.currentPollAttempts += 1;
-            }
 
-            if (self.currentPollAttempts > self.maxPollAttempts) {
-                var processingFile = self.processingIdToFile[processing_id];
-                delete self.processingIdToFile[processing_id];
-                var curUpload = self._getActiveUploadSelectors(processingFile);
-                self._stopProcessingFile(processingFile);
-                $(curUpload.progressBarContainer).addClass('progress-danger');
-                $(curUpload.progressBar).addClass('progress-bar-danger');
-                self._showErrors(processingFile, ['There was an issue communicating with the server at this time. ' +
-                    'The upload has failed.']);
-            }
-        };
-    };
+define('text/text!vellum/templates/multimedia_existing_video.html',[],function () { return '<p>\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens file in new tab.")%>"><%-gettext("Open Video")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New Video Uploaded Successfully")%></span>\n</p>\n';});
 
-    self._stopProcessingFile = function (file) {
-        var curUpload = self._getActiveUploadSelectors(file);
-        if (self.isMultiFileUpload) {
-            var $processingItem = $(curUpload.selector);
-            $processingItem.remove();
-            $processingItem.insertAfter($(self.uploadedFilesListSelector).find('.hqm-list-notice'));
-        }
 
-        $(curUpload.processingNotice).addClass('hide');
-        $(curUpload.completeNotice).removeClass('hide');
-        $(curUpload.progressBar).attr('style', 'width: 100%;');
-        $(curUpload.progressBarContainer).removeClass('active progress-warning');
-        $(curUpload.progressBar).removeClass('progress-bar-warning');
-    };
+define('text/text!vellum/templates/multimedia_existing_text.html',[],function () { return '<p>\n    <a href="<%= url %>"\n       class="btn btn-default existing-media"\n       target="_blank"\n       data-toggle="tooltip" data-title="<%-gettext("Opens file in new tab.")%>"><%-gettext("Open HTML")%></a>\n</p>\n<p class="text-success hqm-upload-completed hide">\n    <span class="label label-success"><%-gettext("New HTML Document Uploaded Successfully")%></span>\n</p>\n';});
 
-    self._showMatches = function (file, data) {
-        var curUpload = self._getActiveUploadSelectors(file);
-        if (data.type === 'zip' && data.matched_files) {
-            var images = data.matched_files.CommCareImage,
-                audio = data.matched_files.CommCareAudio,
-                video = data.matched_files.CommCareVideo,
-                unknowns = data.unmatched_files;
-            $(curUpload.status).append(self._processStatusTemplate(images, audio, video));
-
-            $(curUpload.details).html(self._processDetailsTemplate(images, audio, video, unknowns));
-            $(curUpload.details).find('.match-info').popover({
-                html: true,
-                title: 'Click to open in new tab.',
-                trigger: 'hover',
-                placement: 'bottom',
-                sanitize: false,
-            });
-        }
-    };
 
+define('tpl/tpl!vellum/templates/multimedia_nomedia', ['underscore'], function (_) { return function(obj){
+var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};
+with(obj||{}){
+__p+='<p class="fd-mm-no-ref">\n    <i class="'+
+((__t=(iconClass))==null?'':__t)+
+'"></i>\n    '+
+((__t=(gettext("No Reference")))==null?'':_.escape(__t))+
+'\n</p>\n';
 }
+return __p;
+}; });
 
-HQMediaBulkUploadController.prototype = Object.create( BaseHQMediaUploadController.prototype );
-HQMediaBulkUploadController.prototype.constructor = HQMediaBulkUploadController;
-
-
-function HQMediaFileUploadController (uploader_name, marker, options) {
-    'use strict';
-    BaseHQMediaUploadController.call(this, uploader_name, marker, options);
-    var self = this;
-    self.currentReference = null;
-    self.existingFileTemplate = options.existingFileTemplate;
-
-    self._processExistingFileTemplate = function (url) {
-        return _.template(self.existingFileTemplate)({
-            url: url,
-        });
-    };
-
-    // Essential Selectors
-    self.existingFileSelector = self.container + " .hqm-existing";
-    self.fileUploadCompleteSelector = self.existingFileSelector + ' .hqm-upload-completed';
-
-    self.updateUploadFormUI = function () {
-        var $existingFile = $(self.existingFileSelector);
-        $(self.fileUploadCompleteSelector).addClass('hide');
-
-        if (self.currentReference.getUrl() && self.currentReference.isMediaMatched()) {
-            $existingFile.removeClass('hide');
-            $existingFile.find('.hqm-existing-controls').html(self._processExistingFileTemplate(self.currentReference.getUrl()));
-        } else {
-            $existingFile.addClass('hide');
-            $existingFile.find('.hqm-existing-controls').empty();
-        }
-        $('.existing-media').tooltip({
-            placement: 'bottom',
-        });
-    };
-
-    self.uploadComplete = function (event) {
-        self.allowClose = true;
-        var curUpload = self._getActiveUploadSelectors(event.file);
-        $(curUpload.cancel).addClass('hide');
-        $(curUpload.progressBarContainer).removeClass('active').addClass('progress-success');
-        $(curUpload.progressBar).addClass('progress-bar-success');
-
-        var response = JSON.parse(event.data.replace(/\r|\n|\r\n/, '\\n'));
-        $('[data-hqmediapath^="' + self.currentReference.path.replace(/\.\w+$/, ".") + '"]').trigger('mediaUploadComplete', response);
-        if (!response.errors.length) {
-            self.updateUploadFormUI();
-            $(self.fileUploadCompleteSelector).removeClass('hide');
-            self._removeFileFromUI(event.file);
-            self.resetUploader();
-        } else {
-            self._showErrors(event.file, response.errors);
-        }
-        self._clearUploaderData();
-    };
 
+define('tpl/tpl!vellum/templates/multimedia_block', ['underscore'], function (_) { return function(obj){
+var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};
+with(obj||{}){
+__p+='<div class="control-row">\n    <div class="col-sm-12">\n        <button type="button" class="btn btn-default fd-mm-path-show pull-right">\n            <i class="fa fa-cog"></i>\n            '+
+((__t=(gettext("Advanced: Show Path")))==null?'':_.escape(__t))+
+'\n        </button>\n        <div class="fd-mm-upload-trigger"></div>\n    </div>\n</div>\n<div class="control-row">\n    <div class="fd-mm-path hide col-sm-12">\n        <button type="button" class="btn btn-default fd-mm-path-hide pull-right">'+
+((__t=(gettext("Hide Path")))==null?'':_.escape(__t))+
+'</button>\n        <div class="fd-mm-path-input"></div>\n    </div>\n</div>\n';
 }
-
-HQMediaFileUploadController.prototype = Object.create( BaseHQMediaUploadController.prototype );
-HQMediaFileUploadController.prototype.constructor = HQMediaFileUploadController;
-
-define("file-uploader", ["yui-uploader","underscore","jquery"], (function (global) {
-    return function () {
-        var ret, fn;
-        return ret || global.HQMediaFileUploadController;
-    };
-}(this)));
+return __p;
+}; });
 
 define('vellum/uploader',[
     'require',
@@ -94556,7 +55802,7 @@ define('vellum/uploader',[
     'jquery',
     'tpl!vellum/templates/multimedia_modal',
     'tpl!vellum/templates/multimedia_upload_trigger',
-    'text!vellum/templates/multimedia_queue.html',
+    'text!vellum/templates/multimedia_upload_status.html',
     'text!vellum/templates/multimedia_errors.html',
     'text!vellum/templates/multimedia_existing_image.html',
     'text!vellum/templates/multimedia_existing_audio.html',
@@ -94572,7 +55818,7 @@ define('vellum/uploader',[
     $,
     multimedia_modal,
     multimedia_upload_trigger,
-    multimedia_queue,
+    multimedia_upload_status,
     multimedia_errors,
     multimedia_existing_image,
     multimedia_existing_audio,
@@ -94583,37 +55829,12 @@ define('vellum/uploader',[
 ) {
     "use strict";
 
-    var SUPPORTED_EXTENSIONS = {
-        image: [
-            {
-                'description': gettext('Image'),
-                'extensions': '*.jpg;*.png;*.gif'
-            }
-        ],
-        audio: [
-            {
-                'description': gettext('Audio'),
-                'extensions': '*.mp3;*.wav'
-            }
-        ],
-        video: [
-            {
-                'description': gettext('Video'),
-                'extensions': '*.3gp;*.mp4'
-            }
-        ],
-        'video-inline': [
-            {
-                'description': gettext('Inline Video'),
-                'extensions': '*.3gp;*.mp4'
-            }
-        ],
-        text: [
-            {
-                'description': gettext('HTML'),
-                'extensions': '*.html'
-            }
-        ],
+    var SLUG_TO_DESCRIPTION = {
+        image: gettext('Image'),
+        audio: gettext('Audio'),
+        video: gettext('Video'),
+        'video-inline': gettext('Inline Video'),
+        text: gettext('HTML'),
     },
     PREVIEW_TEMPLATES = {
         image: multimedia_existing_image,
@@ -94641,8 +55862,8 @@ define('vellum/uploader',[
     // These functions were extracted out when separating the uploader code from
     // the JavaRosa Itext media widget code.  They could easily be made part of
     // the plugin interface in order to avoid passing around objectMap and
-    // uploadControls, but it seems fine either way.
-    var multimediaReference = function (mediaType, objectMap, uploadControls) {
+    // uploadControllers, but it seems fine either way.
+    var multimediaReference = function (mediaType, objectMap, uploadControllers) {
         var ref = {};
         ref.mediaType = mediaType;
 
@@ -94655,15 +55876,12 @@ define('vellum/uploader',[
             return _.isObject(ref.linkedObj);
         };
 
-        // gets called by uploadController
         ref.getUrl = function () {
-            return ref.linkedObj.url;
+            return ref.linkedObj ? ref.linkedObj.url : undefined;
         };
 
         ref.updateController = function (widget) {
-            // see note about poor man's promise below
-            var uploadController = uploadControls[ref.mediaType].value;
-            uploadController.resetUploader();
+            var uploadController = uploadControllers[ref.mediaType];
             uploadController.currentReference = ref;
             uploadController.updateMediaPath = function () {
                 var params = uploadController.uploadParams;
@@ -94676,15 +55894,13 @@ define('vellum/uploader',[
                 old_ref: (ref.isMediaMatched()) ? ref.linkedObj.m_id : "",
                 replace_attachment: true
             };
-            uploadController.updateUploadFormUI();
         };
 
         return ref;
     };
 
-    var addUploaderToWidget = function (widget, objectMap, uploadControls) {
-        widget.mediaRef = multimediaReference(
-            widget.form, objectMap, uploadControls);
+    var addUploaderToWidget = function (widget, objectMap, uploadControllers) {
+        widget.mediaRef = multimediaReference(widget.form, objectMap, uploadControllers);
 
         if (!widget.getBaseMediaPath) {
             throw new Error("required method not found: widget.getBaseMediaPath()");
@@ -94692,10 +55908,7 @@ define('vellum/uploader',[
 
         widget.getRandomizedMediaPath = function (oldPath) {
             // The file type extension of the path returned here is replaced by
-            // the extension of the uploaded file, so it is not strictly
-            // necessary to pass in oldPath. However, the returned path must
-            // have an extension because of the way
-            // BaseHQMediaUploadController.startUpload() replaces it.
+            // the extension of the uploaded file.
             var extension = EXT.exec(oldPath)[0].toLowerCase() || ".xyz",
                 // generates 1 or 2 duplicates in 100K samples (probably random enough)
                 rand6 = Math.random().toString(36).slice(2, 8);
@@ -94710,6 +55923,29 @@ define('vellum/uploader',[
                 .addClass('fd-mm-preview-container'),
             ICONS = widget.mug.form.vellum.data.javaRosa.ICONS;
 
+        widget.getUploaderModal = function () {
+            return $("#" + SLUG_TO_UPLOADER_SLUG[widget.form]);
+        };
+
+        widget.updateModalExistingFile = function (objectMap, isComplete) {
+            var ICONS = widget.mug.form.vellum.data.javaRosa.ICONS,
+                $uploaderModal = widget.getUploaderModal(),
+                $existingFile = $uploaderModal.find(".hqm-existing");
+            if (widget.mediaRef.getUrl() && widget.mediaRef.isMediaMatched()) {
+                $existingFile.removeClass('hide');
+                $existingFile.find('.hqm-existing-controls').html(getPreviewUI(widget, objectMap, ICONS));
+                if (isComplete) {
+                    $uploaderModal.find(".hqm-upload-completed").removeClass('hide');
+                }
+            } else {
+                $existingFile.addClass('hide');
+                $existingFile.find('.hqm-existing-controls').empty();
+            }
+            $('.existing-media').tooltip({
+                placement: 'bottom',
+            });
+        };
+
         widget.getUIElement = function () {
             $uiElem = _getParentUIElement();
             var $controlBlock = $uiElem.find('.controls'),
@@ -94724,6 +55960,7 @@ define('vellum/uploader',[
             $controlBlock.append($previewContainer);
 
             $uploadContainer.html(multimedia_block());
+
             $uploadContainer.find('.fd-mm-upload-trigger')
                 .append(getUploadButtonUI(widget, objectMap));
             $uploadContainer.find('.fd-mm-path-input')
@@ -94765,9 +56002,11 @@ define('vellum/uploader',[
                 }
                 objectMap[data.ref.path] = data.ref;
             }
+
             widget.updateMultimediaBlockUI(objectMap);
+            widget.updateModalExistingFile(objectMap, true);
         };
-        
+
         widget.updateMultimediaBlockUI = function (objectMap) {
             $previewContainer.html(getPreviewUI(widget, objectMap, ICONS))
                 .find('.existing-media').tooltip();
@@ -94813,17 +56052,20 @@ define('vellum/uploader',[
         $uploadBtn = $(multimedia_upload_trigger({
             multimediaExists: currentPath in objectMap,
             uploaderId: SLUG_TO_UPLOADER_SLUG[widget.form],
-            mediaType: SUPPORTED_EXTENSIONS[widget.form][0].description
+            mediaType: SLUG_TO_DESCRIPTION[widget.form],
         }));
         $uploadBtn.click(function () {
             widget.mediaRef.updateController(widget);
+            var $uploaderModal = widget.getUploaderModal();
+            $uploaderModal.find(".hqm-upload-status").empty();
+            widget.updateModalExistingFile(objectMap);
         });
+
         return $uploadBtn;
     };
 
     $.vellum.plugin("uploader", {
         objectMap: false,
-        sessionid: false,
         uploadUrls: {
             image: false,
             audio: false,
@@ -94836,8 +56078,7 @@ define('vellum/uploader',[
             var opts = this.opts().uploader,
                 uploadUrls = opts.uploadUrls,
                 uploadEnabled = opts.objectMap && opts.uploadUrls && 
-                    opts.uploadUrls.image,
-                sessionid = opts.sessionid;
+                    opts.uploadUrls.image;
 
             this.data.uploader.uploadEnabled = uploadEnabled;
             this.data.uploader.objectMap = opts.objectMap;
@@ -94845,39 +56086,32 @@ define('vellum/uploader',[
                 return;
             }
 
-            this.data.uploader.deferredInit = function () {
-                this.data.uploader.uploadControls = {
-                    'image': this.initUploadController({
-                        uploaderSlug: 'fd_hqimage',
-                        mediaType: 'image',
-                        sessionid: sessionid,
-                        uploadUrl: uploadUrls.image,
-                    }),
-                    'audio': this.initUploadController({
-                        uploaderSlug: 'fd_hqaudio',
-                        mediaType: 'audio',
-                        sessionid: sessionid,
-                        uploadUrl: uploadUrls.audio,
-                    }),
-                    'video': this.initUploadController({
-                        uploaderSlug: 'fd_hqvideo',
-                        mediaType: 'video',
-                        sessionid: sessionid,
-                        uploadUrl: uploadUrls.video,
-                    }),
-                    'video-inline': this.initUploadController({
-                        uploaderSlug: 'fd_hqInlineVideo',
-                        mediaType: 'video-inline',
-                        sessionid: sessionid,
-                        uploadUrl: uploadUrls.video,
-                    }),
-                    'text': this.initUploadController({
-                        uploaderSlug: 'fd_hqtext',
-                        mediaType: 'text',
-                        sessionid: sessionid,
-                        uploadUrl: uploadUrls.text,
-                    })
-                };
+            this.data.uploader.uploadControllers = {
+                'image': this.initUploadController({
+                    uploaderSlug: 'fd_hqimage',
+                    mediaType: 'image',
+                    uploadUrl: uploadUrls.image,
+                }),
+                'audio': this.initUploadController({
+                    uploaderSlug: 'fd_hqaudio',
+                    mediaType: 'audio',
+                    uploadUrl: uploadUrls.audio,
+                }),
+                'video': this.initUploadController({
+                    uploaderSlug: 'fd_hqvideo',
+                    mediaType: 'video',
+                    uploadUrl: uploadUrls.video,
+                }),
+                'video-inline': this.initUploadController({
+                    uploaderSlug: 'fd_hqInlineVideo',
+                    mediaType: 'video-inline',
+                    uploadUrl: uploadUrls.video,
+                }),
+                'text': this.initUploadController({
+                    uploaderSlug: 'fd_hqtext',
+                    mediaType: 'text',
+                    uploadUrl: uploadUrls.text,
+                })
             };
         },
         initMediaUploaderWidget: function (widget) {
@@ -94886,15 +56120,9 @@ define('vellum/uploader',[
                 return;
             }
 
-            var deferredInit = this.data.uploader.deferredInit;
-            if (deferredInit !== null) {
-                this.data.uploader.deferredInit = null;
-                deferredInit.apply(this);
-            }
-
-            addUploaderToWidget(widget, 
-                                this.data.uploader.objectMap, 
-                                this.data.uploader.uploadControls);
+            addUploaderToWidget(widget,
+                                this.data.uploader.objectMap,
+                                this.data.uploader.uploadControllers);
         },
         initUploadController: function (options) {
             var $uploaderModal = $(multimedia_modal({
@@ -94903,56 +56131,100 @@ define('vellum/uploader',[
             }));
             this.$f.find('.fd-multimedia-modal-container').append($uploaderModal);
 
-            // Load the uploader and its dependencies in the background after
-            // core dependencies are already loaded, since it's not necessary at
-            // page load.
-            // uploadControls is referenced in the initMediaUploaderWidget call
-            // path, but never actually used until the upload button is clicked.
-            // We use an object here as a poor man's promise.
-            // Feel free to undo this if it's not worth it.
-          
-            var uploadController = {value: null};
-
-            require(['file-uploader'], function (HQMediaFileUploadController) {
-                if (uploadController.value !== null) {
-                    return;
+            // Don't allow user to close modal while server is processing upload
+            var allowClose = true;
+            $uploaderModal.on('hide.bs.modal', function (event) {
+                if (!allowClose) {
+                    event.preventDefault();
                 }
-                uploadController.value = new HQMediaFileUploadController(
-                    options.uploaderSlug, 
-                    options.mediaType, 
-                    {
-                        fileFilters: SUPPORTED_EXTENSIONS[options.mediaType],
-                        uploadURL: options.uploadUrl,
-                        isMultiFileUpload: false,
-                        queueTemplate: multimedia_queue,
-                        errorsTemplate: multimedia_errors,
-                        existingFileTemplate: PREVIEW_TEMPLATES[options.mediaType],
-                        licensingParams: [
-                            'shared', 'license', 'author', 'attribution-notes'],
-                        uploadParams: {},
-                        sessionid: options.sessionid
+            });
+
+            var $fileInputTrigger = $uploaderModal.find(".btn-primary"),
+                $fileInput = $uploaderModal.find("input[type='file']"),
+                $uploadButton = $uploaderModal.find(".hqm-upload-confirm"),
+                _updateUploadButton = function (enable, spin) {
+                    if (enable) {
+                        $uploadButton.removeClass('disabled');
+                    } else {
+                        $uploadButton.addClass('disabled');
+                    }
+                    if (spin) {
+                        $uploadButton.find(".fa-spin").removeClass("hide");
+                        $uploadButton.find(".fa-cloud-arrow-up").addClass("hide");
+                    } else {
+                        $uploadButton.find(".fa-spin").addClass("hide");
+                        $uploadButton.find(".fa-cloud-arrow-up").removeClass("hide");
                     }
-                );
-                var super_startUpload = uploadController.value.startUpload;
-                uploadController.value.startUpload = function (event) {
-                    uploadController.value.updateMediaPath();
-                    return super_startUpload.call(this, event);
                 };
-                uploadController.value.init();
+
+            $fileInputTrigger.click(function () {
+                $fileInput.click();
             });
-            return uploadController;
-        },
-        destroy: function () {
-            _.each(this.data.uploader.uploadControls, function (control, key) {
-                if (control.value) {
-                    // HACK deep reach
-                    // HQMediaFileUploadController should have a destroy method
-                    control.value.uploader.destroy();
+
+            $fileInput.change(function () {
+                var MEGABYTE = 1048576,
+                    $uploadStatusContainer = $uploaderModal.find(".hqm-upload-status");
+
+                if ($fileInput.get(0).files.length) {
+                    var file = $fileInput.get(0).files[0];
+                    $uploadStatusContainer.html(_.template(multimedia_upload_status)({
+                        file_size: (file.size / MEGABYTE).toFixed(3),
+                        file_name: file.name,
+                    }));
+                    _updateUploadButton(true, false);
+                } else {
+                    $uploadStatusContainer.empty();
+                    _updateUploadButton(false, false);
                 }
-                delete control.value;
             });
-            this.__callOld();
-        }
+
+            var uploadController = {};
+            $uploadButton.click(function () {
+                _updateUploadButton(false, true);
+                allowClose = false;
+
+                var file = $fileInput.get(0).files[0],
+                    data = new FormData();
+                data.append("Filedata", file);
+                uploadController.updateMediaPath();
+
+                var newExtension = '.' + file.name.split('.').pop().toLowerCase();
+                uploadController.uploadParams.path = uploadController.uploadParams.path.replace(/(\.[^/.]+)?$/, newExtension);
+
+                _.each(uploadController.uploadParams, function (value, key) {
+                    data.append(key, value);
+                });
+
+                var $uploadStatusContainer = $uploaderModal.find(".hqm-upload-status");
+                $.ajax({
+                    url: options.uploadUrl,
+                    type: 'POST',
+                    data: data,
+                    contentType: false,
+                    processData: false,
+                    enctype: 'multipart/form-data',
+                    success: function (response) {
+                        response = JSON.parse(response);
+                        $('[data-hqmediapath^="' + response.ref.path.replace(/\.\w+$/, ".") + '"]').trigger('mediaUploadComplete', response);
+                        $uploadStatusContainer.empty();
+                        _updateUploadButton(false, false);
+                        allowClose = true;
+                    },
+                    error: function (response) {
+                        response = JSON.parse(response.responseText);
+                        $uploadStatusContainer.find(".hqm-error").show();
+                        $uploadStatusContainer.find(".hqm-errors").html(_.template(multimedia_errors)({
+                            errors: response.errors,
+                        }));
+                        $uploadStatusContainer.find(".hqm-begin").hide();
+                        _updateUploadButton(false, false);
+                        allowClose = true;
+                    },
+                });
+            });
+
+            return uploadController;
+        },
     });
 });
 
@@ -96333,19 +57605,12 @@ requirejs.config({
         'underscore': '../node_modules/underscore/underscore',
         'XMLWriter': '../node_modules/XMLWriter/XMLWriter',
 
-        // todo: should convert xpath submodule to AMD
         'xpath': '../node_modules/xpath/dist/js-xpath',
 
         'langCodes': '../node_modules/langcodes/langs.json',
 
         'save-button': '../lib/SaveButton',
 
-        'yui-base': '../node_modules/MediaUploader/yui-base',
-        'yui-combo': '../node_modules/MediaUploader/yui-combo',
-        'yui-loader': '../node_modules/MediaUploader/yui-loader',
-        'yui-uploader': '../node_modules/MediaUploader/yui-uploader',
-
-        'file-uploader': '../node_modules/MediaUploader/hqmedia.upload_controller',
         'jsdiff': '../node_modules/jsdiff/diff',
         'markdown-it': '../node_modules/markdown-it/dist/markdown-it',
         'caretjs': '../node_modules/Caret.js/dist/jquery.caret',
@@ -96382,22 +57647,6 @@ requirejs.config({
             exports: 'SaveButton'
         },
 
-        'yui-base': {
-            exports: 'YUI'
-        },
-        'yui-loader': {
-            deps: ['yui-base'],
-            exports: 'YUI'
-        },
-        'yui-uploader': {
-            deps: ['yui-base', 'yui-loader', 'css!yui-combo'],
-            exports: 'YUI'
-        },
-        'file-uploader': {
-            deps: ['yui-uploader', 'underscore', 'jquery'],
-            exports: 'HQMediaFileUploadController'
-        },
-
         'xpath': {
             exports: 'xpath'
         },
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/src/main.js b/corehq/apps/app_manager/static/app_manager/js/vellum/src/main.js
index 00313780b158..8239d4f4d40c 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/src/main.js
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/src/main.js
@@ -17,7 +17,6 @@ requirejs.config({
             "ckeditor-jquery",
             "css/css!../node_modules/codemirror/lib/codemirror",
             "css/css!../node_modules/jstree/dist/themes/default/style",
-            "css/css!yui-combo",
             "css/css!../node_modules/at.js/dist/css/jquery.atwho"
         ],
         "main-components": [
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/style.css b/corehq/apps/app_manager/static/app_manager/js/vellum/style.css
index 813fe2bc96ad..7680b6904e53 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/style.css
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/style.css
@@ -1 +1 @@
-@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.jstree-children,.jstree-container-ul,.jstree-node{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-anchor,.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:active,.jstree-anchor:hover,.jstree-anchor:link,.jstree-anchor:visited{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children,.jstree-anchor>.jstree-themeicon-hidden,.jstree-hidden,.jstree-no-icons .jstree-themeicon,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jstree-contextmenu .jstree-anchor{-webkit-user-select:none;-webkit-touch-callout:none}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon,.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin:-2.7em 0 0 -4px}.vakata-context .vakata-context-right ul,.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context .vakata-context-hover>a,.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context .vakata-contextmenu-disabled>a>i{filter:grayscale(100%)}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon{margin:0 2px 0 0}#jstree-dnd .jstree-copy,#jstree-dnd .jstree-icon{display:inline-block;text-decoration:none;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node{background-color:transparent}.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-animated,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-context,.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-disabled{color:#666}.jstree-default .jstree-disabled.jstree-hovered{box-shadow:none}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered,.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top}.jstree-default>.jstree-wholerow-ul .jstree-clicked,.jstree-default>.jstree-wholerow-ul .jstree-hovered{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok,.jstree-default .jstree-icon,.jstree-default .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default .jstree-disabled,.jstree-default .jstree-disabled.jstree-hovered,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default>.jstree-no-dots .jstree-node{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default .jstree-checked>.jstree-checkbox,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-228px -4px}.jstree-default .jstree-checked>.jstree-checkbox:hover,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok{background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default .jstree-ellipsis{overflow:hidden}.jstree-default .jstree-ellipsis .jstree-anchor{width:calc(100% - 29px);text-overflow:ellipsis;overflow:hidden}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-icon,.jstree-default-small .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small .jstree-disabled,.jstree-default-small .jstree-disabled.jstree-hovered,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small .jstree-checked>.jstree-checkbox,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small .jstree-checked>.jstree-checkbox:hover,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-er,#jstree-dnd.jstree-default-small .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small .jstree-ellipsis{overflow:hidden}.jstree-default-small .jstree-ellipsis .jstree-anchor{width:calc(100% - 23px);text-overflow:ellipsis;overflow:hidden}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-icon,.jstree-default-large .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large .jstree-disabled,.jstree-default-large .jstree-disabled.jstree-hovered,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large .jstree-checked>.jstree-checkbox,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large .jstree-checked>.jstree-checkbox:hover,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-er,#jstree-dnd.jstree-default-large .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large .jstree-ellipsis{overflow:hidden}.jstree-default-large .jstree-ellipsis .jstree-anchor{width:calc(100% - 37px);text-overflow:ellipsis;overflow:hidden}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last,span.CodeMirror-selectedtext{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-er,#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-position:-40px -200px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}.jstree-default-responsive .jstree-node{background:0 0;min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}.CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor,.cm-fat-cursor-mark{-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5)}.cm-animate-fat-cursor{width:auto;border:0;background-color:#7e7}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-50px;margin-right:-50px;padding-bottom:50px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:50px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none;outline:0}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-50px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:0!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}#yui3-css-stamp.skin-sam-widget-base,.yui3-widget-hidden{display:none}.yui3-widget-content{overflow:hidden}.yui3-widget-content-expanded{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;height:100%}.yui3-widget-tmp-forcesize{overflow:hidden!important}.yui3-button{display:inline-block;*display:inline;zoom:1;font-size:100%;*font-size:90%;*overflow:visible;padding:.4em 1em .45em;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;*color:#444;border:transparent;background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80ffffff',endColorstr='#00ffffff',GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.3)),color-stop(40%,rgba(255,255,255,.15)),to(transparent));background-image:-webkit-linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:-moz-linear-gradient(top,rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:-ms-linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:-o-linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.15);-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.15);box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.15);-webkit-transition:.1s linear -webkit-box-shadow;-moz-transition:.1s linear -moz-box-shadow;-ms-transition:.1s linear box-shadow;-o-transition:.1s linear box-shadow;transition:.1s linear box-shadow}.yui3-button,a.yui3-button{color:rgba(0,0,0,.8);color:#444;text-decoration:none}.yui3-button-hover,.yui3-button:hover{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#26000000',GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.15)));background-image:-webkit-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:-moz-linear-gradient(top,transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:-ms-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:-o-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15))}.yui3-button-active,.yui3-button:active{border:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1A000000',endColorstr='#26000000',GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(0,0,0,.1)),to(rgba(0,0,0,.15)));background-image:-webkit-linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:-moz-linear-gradient(top,rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:-ms-linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:-o-linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 4px rgba(0,0,0,.3) inset;-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 4px rgba(0,0,0,.3) inset;box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 4px rgba(0,0,0,.3) inset}.yui3-button-disabled,.yui3-button-disabled:active,.yui3-button-disabled:hover,.yui3-button[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=55);-khtml-opacity:.55;-moz-opacity:.55;opacity:.55;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset;-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset;box-shadow:0 0 0 1px rgba(0,0,0,.25) inset}#yui3-css-stamp.cssbutton,.yui3-button-hidden{display:none}.yui3-button::-moz-focus-inner{padding:0;border:0}.yui3-button:-moz-focusring{outline:thin dotted}.yui3-skin-sam .yui3-button-primary,.yui3-skin-sam .yui3-button-selected{background-color:#345fcb;color:#fff;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.17) inset,0 1px 2px rgba(0,0,0,.15);-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.17) inset,0 1px 2px rgba(0,0,0,.15);box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.17) inset,0 1px 2px rgba(0,0,0,.15)}.yui3-skin-sam .yui3-button:-moz-focusring{outline-color:rgba(0,0,0,.85)}.yui3-skin-night .yui3-button{border:0;background-color:#343536;color:#dcdcdc;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.15) inset,0 1px 2px rgba(0,0,0,.15);-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.15) inset,0 1px 2px rgba(0,0,0,.15);box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.15) inset,0 1px 2px rgba(0,0,0,.15)}.yui3-skin-night .yui3-button-primary,.yui3-skin-night .yui3-button-selected{background-color:#747576;text-shadow:0 1px 2px rgba(0,0,0,.7)}.yui3-skin-night .yui3-button:-moz-focusring{outline-color:rgba(255,255,255,.85)}.atwho-view{position:absolute;top:0;left:0;display:none;margin-top:18px;background:#fff;color:#000;border:1px solid #ddd;border-radius:3px;box-shadow:0 0 5px rgba(0,0,0,.1);min-width:120px;z-index:11110!important}.atwho-view .atwho-header{padding:5px;margin:5px;cursor:pointer;border-bottom:solid 1px #eaeff1;color:#6f8092;font-size:11px;font-weight:700}.atwho-view .atwho-header .small{color:#6f8092;float:right;padding-top:2px;margin-right:-5px;font-size:12px;font-weight:400}.atwho-view .atwho-header:hover{cursor:default}.atwho-view .cur{background:#36f;color:#fff}.atwho-view .cur small{color:#fff}.atwho-view strong{color:#36f}.atwho-view .cur strong{color:#fff;font:700}.atwho-view ul{list-style:none;padding:0;margin:auto;max-height:200px;overflow-y:auto}.atwho-view ul li{display:block;padding:5px 10px;border-bottom:1px solid #ddd;cursor:pointer}.atwho-view small{font-size:smaller;color:#777;font-weight:400}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.atwho-view ul{overflow:hidden}.atwho-jrtext{padding-left:1em;color:gray}.cur>.atwho-jrtext{padding-left:1em;color:#fff}.dropdown-menu a>i{display:inline-block;width:16px}.checklist i.fa-check{display:none;width:auto}.checklist .selected i.fa-check{display:inline-block;margin-left:-14px;margin-right:2px}.dropdown-submenu,.fd-xpath-editor .fd-xpath-editor-content fieldset{position:relative}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent transparent transparent #ccc;border-style:solid;border-width:5px 0 5px 5px;margin-top:5px;margin-right:-10px}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:hover>a:after{border-left-color:#fff}.fd-input{-moz-appearance:textfield;-webkit-appearance:textfield;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;padding:6px 12px;font-size:12px;background:#fff;vertical-align:middle;color:#555;white-space:nowrap;overflow:hidden}.fd-input:focus,.fd-textarea:focus{border-color:rgba(82,168,236,.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6)}.fd-input p,.fd-textarea p{margin:0}.fd-textarea{-webkit-appearance:textfield;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;padding:6px 12px;font-size:12px;background:#fff;vertical-align:middle;color:#555;-moz-appearance:textfield-multiline;min-height:4em;height:4.5em;overflow:auto;resize:both;white-space:normal;word-break:break-word}.fd-textarea.fd-xpath-editor-text{height:13em;font-family:monospace}.fd-search{background-color:#f2f2f1;margin-bottom:5px}.fd-search>.form-inline,.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search>form{position:relative;padding:0 12px}.fd-search>.form-inline i,.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search>form i{line-height:42px}.fd-search .control-label{padding-top:0}.fd-search .fd-search-control{position:absolute;top:5px;margin-left:18px;width:100%}.fd-commander{background-color:#f2f2f1;padding:5px}.fd-commander input{border:1px solid #d6d6d4;height:19px;width:calc(100% - 15px)}.fd-commander .fd-commander-close{background:0 0;border:0;color:#373534;position:absolute;top:8px;right:8px;cursor:pointer}.label-datanode{text-shadow:none;line-height:16px;padding:0 2px;margin:0 2px 2px;font-size:12px;border:1px solid;vertical-align:middle;font-weight:400}.label-datanode:hover{cursor:pointer;color:#fff}.label-datanode .close{color:#00799a;opacity:.4;font-weight:500;line-height:13px;font-size:18px;padding:0 5px 3px;margin-right:-3px}.label-datanode .close:hover{opacity:.9}.label-datanode .fcc{padding:0 3px;font-size:.8em}.label-datanode-internal{color:#00799a;border-color:#88d0d2;background-color:#d2edee}.label-datanode-internal .close{color:#00799a}.label-datanode-internal:hover{background-color:#1ea2a7;border-color:#1a8d92}.label-datanode-internal:hover .close{color:#d2edee}.label-datanode-external{color:#373534;border-color:#c1c1bc;background-color:#e6e6e4}.label-datanode-external .close{color:#373534}.label-datanode-external:hover{background-color:#685c53}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-max-indicator i,.label-datanode-external:hover .close{color:#d6d6d4}.label-datanode-external-unknown{color:#685300;border-color:#eed161;background-color:#f6e5a6}.label-datanode-external-unknown .close{color:#685300}.label-datanode-external-unknown:hover{background-color:#f9c700}.label-datanode-external-unknown:hover .close{color:#f8ecbd}.label-datanode-unknown{color:#812627;border-color:#c6948e;background-color:#e8d4d2}.label-datanode-unknown .close{color:#812627}.label-datanode-unknown:hover{background-color:#e53e30}.label-datanode-unknown:hover .close{color:#efcfcb}.datanode-tree-bubble{font-size:11px;color:#fff;line-height:18px;display:inline-block;padding:0 5px;border-radius:3px}.datanode-tree-bubble .fcc{font-size:9px}.datanode-tree-bubble-internal{color:#00799a;background-color:#ccf3f4}.datanode-tree-bubble-external{color:#373534;background-color:#f2f2f1}.datanode-tree-bubble-internal.on{background-color:#00bdc5;color:#fff}.datanode-tree-bubble-external.on{background-color:#685c53;color:#fff}.cke_widget_wrapper:hover>.label-datanode{outline:0!important;-webkit-box-shadow:0 0 8px #004ebc;-moz-box-shadow:0 0 8px #004ebc;box-shadow:0 0 8px #004ebc}.cke_widget_focused .label-datanode{outline:0!important;-webkit-box-shadow:0 0 8px #002c5f;-moz-box-shadow:0 0 8px #002c5f;box-shadow:0 0 8px #002c5f;border-color:#0073f8}.cke_widget_drag_handler_container{top:-2px!important;background:0 0!important}.cke_widget_drag_handler{width:100%!important;height:100%!important}.itext-block-container.has-markdown .markdown-group{display:block!important}.itext-block-container.has-markdown .fd-help,.itext-block-container.has-markdown .markdown-output:not(:empty),.itext-block-container.has-markdown .turn-markdown-off{display:inline-block!important}.itext-block-container.has-markdown .turn-markdown-on{display:none!important}.itext-block-container:not(.has-markdown) .markdown-group,.itext-block-container:not(.has-markdown) .markdown-output,.itext-block-container:not(.has-markdown) .turn-markdown-off{display:none!important}.itext-block-container:not(.has-markdown) .fd-help,.itext-block-container:not(.has-markdown) .turn-markdown-on{display:inline-block!important}.itext-block-container.markdown-ignorant .fd-help,.itext-block-container.markdown-ignorant .markdown-output,.itext-block-container.markdown-ignorant .turn-markdown-off,.itext-block-container.markdown-ignorant .turn-markdown-on{display:none!important}.markdown-output{width:100%;margin:0}.markdown-output table{padding:0}.markdown-output table tr{border-top:1px solid #ccc;background-color:#fff;margin:0;padding:0}.markdown-output table tr th{font-weight:700;border:1px solid #ccc;text-align:left;margin:0;padding:6px 13px}.markdown-output table tr td:first-child,.markdown-output table tr th:first-child{margin-top:0}.markdown-output table tr td:last-child,.markdown-output table tr th:last-child{margin-bottom:0}.markdown-output table tr td{border:1px solid #ccc;text-align:left;margin:0;padding:6px 13px}.markdown-output table tr:nth-child(2n){background-color:#f8f8f8}.fd-valid-alert-icon{color:#d83a2e}.fd-form-saving{position:fixed;top:0;bottom:0;left:0;right:0;opacity:.8;background-color:#000;z-index:2000}.fd-form-saving>div{opacity:1;position:fixed;top:calc(50% - 24px);left:calc(50% - 24px);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:48px;height:48px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#fff;padding:8px}.fd-form-saving>div>div{width:32px;height:32px;background-image:url(images/ajax-loader.gif)}.fd-full-screen-modal .modal-dialog{position:fixed;left:0;right:0;top:0;bottom:0;margin:0;width:auto}.fd-full-screen-modal .modal-dialog .modal-content{position:absolute;top:20px;bottom:20px;left:20px;right:20px}.fd-full-screen-modal .modal-dialog .modal-content .modal-body{overflow-y:auto}.formdesigner .fd-ui-container .fd-mm-preview-container{text-align:center;width:115px;float:left}.formdesigner .fd-ui-container .fd-mm-preview-container .fd-mm-no-ref,.formdesigner .fd-ui-container .fd-mm-preview-container img{border:1px solid #eee}.formdesigner .fd-ui-container .fd-mm-preview-container img{padding:.5em;background-color:#fff;margin-bottom:10px}.formdesigner .fd-ui-container .fd-mm-preview-container .fd-mm-no-ref{color:#999;background-color:#fff;padding:10px}.formdesigner .fd-ui-container .fd-mm-preview-container .fd-mm-no-ref i{display:block;font-size:56px}.formdesigner .fd-ui-container .fd-mm-upload-container{margin-left:125px}.formdesigner .fd-ui-container .fd-mm-upload-container>.control-row{margin:0 0 10px}.formdesigner .fd-ui-container .fd-mm-upload-container>.control-row:first-child{height:25px}.formdesigner .fd-ui-container .fd-mm-upload-container .fd-mm-path-input{margin-right:92px}.rich-text-popover{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word;min-width:236px;max-width:276px}.rich-text-popover .popover-title h3{font-weight:600;font-size:14px;margin:0}.rich-text-popover .popover-title .text-muted{margin-top:5px;line-height:1.3em}.rich-text-popover.bottom,.rich-text-popover.left,.rich-text-popover.right,.rich-text-popover.top{margin:0}.rich-text-popover.bottom{margin-top:5px}.rich-text-popover.top{margin-bottom:-10px}.rich-text-popover.right{margin-left:5px}.rich-text-popover .arrow,.rich-text-popover .arrow:after{display:none}.popover-content .alert{margin-bottom:0}.formdesigner .fd-ui-container .fd-props-toolbar{margin-bottom:5px;border-bottom:1px solid #f4f4f4;padding:12px}.formdesigner .fd-ui-container .fd-props-toolbar .fd-question-comment{margin-top:10px;white-space:pre-line}.formdesigner .fd-ui-container .fd-props-content{padding:0 12px}.formdesigner .fd-ui-container .fd-props-content .fd-help{width:25px;font-size:21px}.formdesigner .fd-ui-container .fd-props-content .fd-help a:hover{text-decoration:none;color:#46a546}.formdesigner .fd-ui-container .fd-props-content .fd-copy-paste-help .row{padding:0 2em;margin-bottom:2em}.formdesigner .fd-ui-container .fd-props-content .fd-copy-paste-help .copy-paste-box textarea{width:100%;height:100px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset{position:relative;min-width:0;display:table-column}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset:first-child{margin-top:20px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset:first-child legend{display:none}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset legend{min-height:30px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset legend .fd-help{right:0;top:0}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .control-label .fd-help{position:relative;top:-8px;height:15px;display:inline-block}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .control-label label{vertical-align:top}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .messages .alert{margin:10px 0 0}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .itext-block-container .btn-danger{margin:10px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-itextID-checkbox-container{width:55px;padding:0 5px;background-color:#f1f9f1;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-kv{margin-bottom:0}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-kv .fd-kv-arrow{text-align:center}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-kv .fd-kv-arrow i{margin-top:8px}body.vellum-full-screen{overflow-y:hidden}.formdesigner .fd-ui-container{top:0;width:100%;background-color:#fff}.formdesigner .fd-ui-container.full-screen{z-index:1031}.formdesigner .fd-ui-container .fd-content{float:left}.formdesigner .fd-ui-container .fd-content.fd-content-left{width:30%}.formdesigner .fd-ui-container .fd-content.fd-content-left .fd-add-question{width:100%;border-radius:0;text-align:left;border:0}.formdesigner .fd-ui-container .fd-content.fd-content-left .fd-accessory-pane{overflow-x:hidden;overflow-y:auto}.formdesigner .fd-ui-container .fd-content.fd-content-right .fd-head{height:31px}.formdesigner .fd-ui-container .fd-content.fd-content-right .fd-head h2{line-height:30px}.formdesigner .fd-ui-container .fd-content.fd-content-right .well{padding:10px}.formdesigner .fd-ui-container .fd-content.fd-content-right .well .col-sm-1{padding:0}.formdesigner .fd-ui-container .fd-content.fd-content-right .fd-form-actions{background-color:#004ebc!important;padding:5px 8px 8px}.formdesigner .fd-ui-container .fd-content .fd-default-panel{padding-left:12px}.formdesigner .fd-ui-container .fd-content .fd-head{color:#fff;background-color:#002c5f;font-size:17px;height:25px;position:relative}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-max-indicator{position:absolute;right:10px}.atwho-view .cur small,.formdesigner .fd-ui-container .fd-content .fd-head:hover .fd-head-max-indicator i{color:#fff}.formdesigner .fd-ui-container .fd-content .fd-head>h2{font-size:12.6px;padding:1px 12px 0;margin:0;font-weight:400;line-height:23px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:absolute;left:0;right:38px}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container{position:absolute;right:0;top:0;line-height:23px;font-size:12.6px;min-width:50px}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-toggle{color:#fff;cursor:pointer;display:block;padding:0 12px;text-decoration:none;background-color:#002c5f}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-toggle:hover{text-decoration:none;background-color:#004ebc}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-menu a{min-width:170px}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-menu a>.hotkey{float:right}.formdesigner .fd-ui-container .fd-content-vertical-divider{width:5px;background:#004ebc}.formdesigner .fd-ui-container .fd-content-horizontal-divider{height:5px;margin:1px 0;background:#f4f4f4;background-repeat:no-repeat;background-position:center center;background-image:url(images/ellipsis.png);background-size:auto 80%}.formdesigner .fd-ui-container .fd-messages{position:fixed;bottom:40px;left:0;width:100%}.formdesigner .fd-ui-container .fd-messages .alert{-webkit-box-shadow:0 0 10px rgba(0,0,0,.4);-moz-box-shadow:0 0 10px rgba(0,0,0,.4);box-shadow:0 0 10px rgba(0,0,0,.4);margin:20px;height:auto;overflow:auto;max-height:200px}.formdesigner .fd-ui-container .fd-scrollable,.formdesigner .fd-ui-container .fd-scrollable-minimal{overflow-x:hidden;overflow-y:auto;transform:translate3d(0,0,0)}.formdesigner .fd-ui-container .fd-scrollable{height:606px;width:100%}.formdesigner .fd-ui-container .fd-scrollable-minimal{max-height:606px}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor{color:#37475d;line-height:27px;height:26px}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor.jstree-clicked,.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor.jstree-hovered{border:0;background:#eaeff5}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor.jstree-clicked{-webkit-box-shadow:0 0 4px rgba(21,87,162,.6);-moz-box-shadow:0 0 4px rgba(21,87,162,.6);box-shadow:0 0 4px rgba(21,87,162,.6)}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor>.jstree-icon{background:0 0;font-size:.85em;color:#004ebc}.formdesigner .fd-ui-container .jstree .jstree-node .add_choice:before{background:0 0;color:#004ebc;margin-right:6px;font:14px/1 FontAwesome}.formdesigner .fd-ui-container .jstree .jstree-node .add_choice{display:block;margin-left:50px;cursor:pointer;padding:0 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;line-height:24px;height:24px}.formdesigner .fd-ui-container .jstree .jstree-node .add_choice:hover{border:0;background-color:#eaeff5;width:95px}.formdesigner .fd-ui-container .jstree .jstree-node.jstree-closed .add_choice{display:none}.formdesigner .fd-ui-container .jstree .jstree-node .fd-valid-alert-icon{margin-right:3px;margin-left:-3px}.formdesigner .fd-ui-container .fd-tree .fd-head{height:46px}.formdesigner .fd-ui-container .fd-tree .fd-head h2{line-height:46px;font-size:14px}.formdesigner .fd-ui-container .fd-tree .fd-head .fd-head-menu-container{line-height:46px}.formdesigner .fd-ui-container .fd-tree .fd-scrollable{overflow-x:auto}.formdesigner .fd-ui-container .fd-tree .fd-scrollable .jstree{margin:5px 0}.formdesigner .fd-ui-container .fd-tree .fd-undo-delete{margin-bottom:0}.formdesigner .fd-ui-container .fd-external-sources-container .fd-head.fd-head-external-sources{cursor:pointer}.formdesigner .fd-ui-container .fd-external-sources-container .fd-head.fd-head-external-sources h2{font-size:12px}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search{background-color:#f2f2f1;margin-bottom:5px}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search .fd-search-control{position:absolute;top:5px;margin-left:18px;width:100%}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-sources-tree .jstree-anchor{color:#373534}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-sources-tree .jstree-anchor.jstree-clicked{background-color:#f2f2f1;-webkit-box-shadow:0 0 4px rgba(104,92,83,.8);-moz-box-shadow:0 0 4px rgba(104,92,83,.8);box-shadow:0 0 4px rgba(104,92,83,.8)}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-sources-tree .jstree-anchor>.jstree-icon{color:#685c53}.formdesigner .fd-ui-container .fd-undo-delete p{margin-top:1em}#jstree-dnd{max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.clearfix,.fd-xpath-editor .fd-xpath-editor-content fieldset legend{*zoom:1}.clearfix:after,.clearfix:before,.fd-xpath-editor .fd-xpath-editor-content fieldset legend:after,.fd-xpath-editor .fd-xpath-editor-content fieldset legend:before{display:table;content:"";line-height:0}.clearfix:after,.fd-xpath-editor .fd-xpath-editor-content fieldset legend:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fd-xpath-editor .fd-xpath-editor-content{padding:20px}.fd-xpath-editor .fd-xpath-editor-content fieldset legend button{margin-bottom:5px}.fd-xpath-editor .fd-xpath-editor-content fieldset .fd-xpath-editor-expressions .xpath-expression-group:last-child{margin-bottom:0}.fd-xpath-editor .fd-xpath-editor-content fieldset .fd-xpath-editor-expressions .xpath-expression-group .validation-results{display:inline-block;padding:5px 25px;margin-bottom:0}.jstree-children,.jstree-container-ul,.jstree-node{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-anchor,.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:active,.jstree-anchor:hover,.jstree-anchor:link,.jstree-anchor:visited{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children,.jstree-anchor>.jstree-themeicon-hidden,.jstree-hidden,.jstree-no-icons .jstree-themeicon,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jstree-contextmenu .jstree-anchor{-webkit-user-select:none;-webkit-touch-callout:none}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon,.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin:-2.7em 0 0 -4px}.vakata-context .vakata-context-right ul,.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context .vakata-context-hover>a,.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context .vakata-contextmenu-disabled>a>i{filter:grayscale(100%)}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon{margin:0 2px 0 0}#jstree-dnd .jstree-copy,#jstree-dnd .jstree-icon{display:inline-block;text-decoration:none;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node{background-color:transparent}.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-animated,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-context,.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-disabled{color:#666}.jstree-default .jstree-disabled.jstree-hovered{box-shadow:none}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered,.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top}.jstree-default>.jstree-wholerow-ul .jstree-clicked,.jstree-default>.jstree-wholerow-ul .jstree-hovered{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok,.jstree-default .jstree-icon,.jstree-default .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default .jstree-disabled,.jstree-default .jstree-disabled.jstree-hovered,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default>.jstree-no-dots .jstree-node{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default .jstree-checked>.jstree-checkbox,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-228px -4px}.jstree-default .jstree-checked>.jstree-checkbox:hover,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok{background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default .jstree-ellipsis{overflow:hidden}.jstree-default .jstree-ellipsis .jstree-anchor{width:calc(100% - 29px);text-overflow:ellipsis;overflow:hidden}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-icon,.jstree-default-small .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small .jstree-disabled,.jstree-default-small .jstree-disabled.jstree-hovered,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small .jstree-checked>.jstree-checkbox,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small .jstree-checked>.jstree-checkbox:hover,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-er,#jstree-dnd.jstree-default-small .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small .jstree-ellipsis{overflow:hidden}.jstree-default-small .jstree-ellipsis .jstree-anchor{width:calc(100% - 23px);text-overflow:ellipsis;overflow:hidden}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-icon,.jstree-default-large .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large .jstree-disabled,.jstree-default-large .jstree-disabled.jstree-hovered,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large .jstree-checked>.jstree-checkbox,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large .jstree-checked>.jstree-checkbox:hover,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-er,#jstree-dnd.jstree-default-large .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large .jstree-ellipsis{overflow:hidden}.jstree-default-large .jstree-ellipsis .jstree-anchor{width:calc(100% - 37px);text-overflow:ellipsis;overflow:hidden}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last,span.CodeMirror-selectedtext{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-er,#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-position:-40px -200px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}.jstree-default-responsive .jstree-node{background:0 0;min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}.CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor,.cm-fat-cursor-mark{-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5)}.cm-animate-fat-cursor{width:auto;border:0;background-color:#7e7}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-50px;margin-right:-50px;padding-bottom:50px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:50px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none;outline:0}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-50px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:0!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}#yui3-css-stamp.skin-sam-widget-base,.yui3-widget-hidden{display:none}.yui3-widget-content{overflow:hidden}.yui3-widget-content-expanded{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;height:100%}.yui3-widget-tmp-forcesize{overflow:hidden!important}.yui3-button{display:inline-block;*display:inline;zoom:1;font-size:100%;*font-size:90%;*overflow:visible;padding:.4em 1em .45em;line-height:normal;white-space:nowrap;vertical-align:baseline;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;user-select:none;*color:#444;border:transparent;background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80ffffff',endColorstr='#00ffffff',GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(255,255,255,.3)),color-stop(40%,rgba(255,255,255,.15)),to(transparent));background-image:-webkit-linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:-moz-linear-gradient(top,rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:-ms-linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:-o-linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);background-image:linear-gradient(rgba(255,255,255,.3),rgba(255,255,255,.15) 40%,transparent);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.15);-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.15);box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.3) inset,0 1px 2px rgba(0,0,0,.15);-webkit-transition:.1s linear -webkit-box-shadow;-moz-transition:.1s linear -moz-box-shadow;-ms-transition:.1s linear box-shadow;-o-transition:.1s linear box-shadow;transition:.1s linear box-shadow}.yui3-button,a.yui3-button{color:rgba(0,0,0,.8);color:#444;text-decoration:none}.yui3-button-hover,.yui3-button:hover{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#26000000',GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.15)));background-image:-webkit-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:-moz-linear-gradient(top,transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:-ms-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:-o-linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15));background-image:linear-gradient(transparent,rgba(0,0,0,.05) 40%,rgba(0,0,0,.15))}.yui3-button-active,.yui3-button:active{border:transparent;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#1A000000',endColorstr='#26000000',GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(rgba(0,0,0,.1)),to(rgba(0,0,0,.15)));background-image:-webkit-linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:-moz-linear-gradient(top,rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:-ms-linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:-o-linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));background-image:linear-gradient(rgba(0,0,0,.1),rgba(0,0,0,.15));-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 4px rgba(0,0,0,.3) inset;-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 4px rgba(0,0,0,.3) inset;box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 4px rgba(0,0,0,.3) inset}.yui3-button-disabled,.yui3-button-disabled:active,.yui3-button-disabled:hover,.yui3-button[disabled]{cursor:default;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=55);-khtml-opacity:.55;-moz-opacity:.55;opacity:.55;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset;-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset;box-shadow:0 0 0 1px rgba(0,0,0,.25) inset}#yui3-css-stamp.cssbutton,.yui3-button-hidden{display:none}.yui3-button::-moz-focus-inner{padding:0;border:0}.yui3-button:-moz-focusring{outline:thin dotted}.yui3-skin-sam .yui3-button-primary,.yui3-skin-sam .yui3-button-selected{background-color:#345fcb;color:#fff;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.17) inset,0 1px 2px rgba(0,0,0,.15);-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.17) inset,0 1px 2px rgba(0,0,0,.15);box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.17) inset,0 1px 2px rgba(0,0,0,.15)}.yui3-skin-sam .yui3-button:-moz-focusring{outline-color:rgba(0,0,0,.85)}.yui3-skin-night .yui3-button{border:0;background-color:#343536;color:#dcdcdc;-webkit-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.15) inset,0 1px 2px rgba(0,0,0,.15);-moz-box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.15) inset,0 1px 2px rgba(0,0,0,.15);box-shadow:0 0 0 1px rgba(0,0,0,.25) inset,0 2px 0 rgba(255,255,255,.15) inset,0 1px 2px rgba(0,0,0,.15)}.yui3-skin-night .yui3-button-primary,.yui3-skin-night .yui3-button-selected{background-color:#747576;text-shadow:0 1px 2px rgba(0,0,0,.7)}.yui3-skin-night .yui3-button:-moz-focusring{outline-color:rgba(255,255,255,.85)}.atwho-view{position:absolute;top:0;left:0;display:none;margin-top:18px;background:#fff;color:#000;border:1px solid #ddd;border-radius:3px;box-shadow:0 0 5px rgba(0,0,0,.1);min-width:120px;z-index:11110!important}.atwho-view .atwho-header{padding:5px;margin:5px;cursor:pointer;border-bottom:solid 1px #eaeff1;color:#6f8092;font-size:11px;font-weight:700}.atwho-view .atwho-header .small{color:#6f8092;float:right;padding-top:2px;margin-right:-5px;font-size:12px;font-weight:400}.atwho-view .atwho-header:hover{cursor:default}.atwho-view .cur{background:#36f;color:#fff}.atwho-view strong{color:#36f}.atwho-view .cur strong{color:#fff;font:700}.atwho-view ul{list-style:none;padding:0;margin:auto;max-height:200px;overflow-y:auto}.atwho-view ul li{display:block;padding:5px 10px;border-bottom:1px solid #ddd;cursor:pointer}.atwho-view small{font-size:smaller;color:#777;font-weight:400}
\ No newline at end of file
+@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.jstree-children,.jstree-container-ul,.jstree-node{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-anchor,.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:active,.jstree-anchor:hover,.jstree-anchor:link,.jstree-anchor:visited{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children,.jstree-anchor>.jstree-themeicon-hidden,.jstree-hidden,.jstree-no-icons .jstree-themeicon,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jstree-contextmenu .jstree-anchor{-webkit-user-select:none;-webkit-touch-callout:none}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon,.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin:-2.7em 0 0 -4px}.vakata-context .vakata-context-right ul,.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context .vakata-context-hover>a,.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context .vakata-contextmenu-disabled>a>i{filter:grayscale(100%)}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon{margin:0 2px 0 0}#jstree-dnd .jstree-copy,#jstree-dnd .jstree-icon{display:inline-block;text-decoration:none;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node{background-color:transparent}.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-animated,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-context,.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-disabled{color:#666}.jstree-default .jstree-disabled.jstree-hovered{box-shadow:none}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered,.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top}.jstree-default>.jstree-wholerow-ul .jstree-clicked,.jstree-default>.jstree-wholerow-ul .jstree-hovered{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok,.jstree-default .jstree-icon,.jstree-default .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default .jstree-disabled,.jstree-default .jstree-disabled.jstree-hovered,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default>.jstree-no-dots .jstree-node{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default .jstree-checked>.jstree-checkbox,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-228px -4px}.jstree-default .jstree-checked>.jstree-checkbox:hover,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok{background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default .jstree-ellipsis{overflow:hidden}.jstree-default .jstree-ellipsis .jstree-anchor{width:calc(100% - 29px);text-overflow:ellipsis;overflow:hidden}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-icon,.jstree-default-small .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small .jstree-disabled,.jstree-default-small .jstree-disabled.jstree-hovered,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small .jstree-checked>.jstree-checkbox,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small .jstree-checked>.jstree-checkbox:hover,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-er,#jstree-dnd.jstree-default-small .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small .jstree-ellipsis{overflow:hidden}.jstree-default-small .jstree-ellipsis .jstree-anchor{width:calc(100% - 23px);text-overflow:ellipsis;overflow:hidden}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-icon,.jstree-default-large .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large .jstree-disabled,.jstree-default-large .jstree-disabled.jstree-hovered,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large .jstree-checked>.jstree-checkbox,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large .jstree-checked>.jstree-checkbox:hover,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-er,#jstree-dnd.jstree-default-large .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large .jstree-ellipsis{overflow:hidden}.jstree-default-large .jstree-ellipsis .jstree-anchor{width:calc(100% - 37px);text-overflow:ellipsis;overflow:hidden}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last,span.CodeMirror-selectedtext{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-er,#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-position:-40px -200px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}.jstree-default-responsive .jstree-node{background:0 0;min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}.CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor,.cm-fat-cursor-mark{-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5)}.cm-animate-fat-cursor{width:auto;border:0;background-color:#7e7}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-50px;margin-right:-50px;padding-bottom:50px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:50px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none;outline:0}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-50px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:0!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}.atwho-view{position:absolute;top:0;left:0;display:none;margin-top:18px;background:#fff;color:#000;border:1px solid #ddd;border-radius:3px;box-shadow:0 0 5px rgba(0,0,0,.1);min-width:120px;z-index:11110!important}.atwho-view .atwho-header{padding:5px;margin:5px;cursor:pointer;border-bottom:solid 1px #eaeff1;color:#6f8092;font-size:11px;font-weight:700}.atwho-view .atwho-header .small{color:#6f8092;float:right;padding-top:2px;margin-right:-5px;font-size:12px;font-weight:400}.atwho-view .atwho-header:hover{cursor:default}.atwho-view .cur{background:#36f;color:#fff}.atwho-view .cur small{color:#fff}.atwho-view strong{color:#36f}.atwho-view .cur strong{color:#fff;font:700}.atwho-view ul{list-style:none;padding:0;margin:auto;max-height:200px;overflow-y:auto}.atwho-view ul li{display:block;padding:5px 10px;border-bottom:1px solid #ddd;cursor:pointer}.atwho-view small{font-size:smaller;color:#777;font-weight:400}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.atwho-view ul{overflow:hidden}.atwho-jrtext{padding-left:1em;color:gray}.cur>.atwho-jrtext{padding-left:1em;color:#fff}.dropdown-menu a>i{display:inline-block;width:16px}.checklist i.fa-check{display:none;width:auto}.checklist .selected i.fa-check{display:inline-block;margin-left:-14px;margin-right:2px}.dropdown-submenu,.fd-xpath-editor .fd-xpath-editor-content fieldset{position:relative}.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent transparent transparent #ccc;border-style:solid;border-width:5px 0 5px 5px;margin-top:5px;margin-right:-10px}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:hover>a:after{border-left-color:#fff}.fd-input{-moz-appearance:textfield;-webkit-appearance:textfield;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;padding:6px 12px;font-size:12px;background:#fff;vertical-align:middle;color:#555;white-space:nowrap;overflow:hidden}.fd-input:focus,.fd-textarea:focus{border-color:rgba(82,168,236,.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(82,168,236,.6)}.fd-input p,.fd-textarea p{margin:0}.fd-textarea{-webkit-appearance:textfield;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;padding:6px 12px;font-size:12px;background:#fff;vertical-align:middle;color:#555;-moz-appearance:textfield-multiline;min-height:4em;height:4.5em;overflow:auto;resize:both;white-space:normal;word-break:break-word}.fd-textarea.fd-xpath-editor-text{height:13em;font-family:monospace}.fd-search{background-color:#f2f2f1;margin-bottom:5px}.fd-search>.form-inline,.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search>form{position:relative;padding:0 12px}.fd-search>.form-inline i,.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search>form i{line-height:42px}.fd-search .control-label{padding-top:0}.fd-search .fd-search-control{position:absolute;top:5px;margin-left:18px;width:100%}.fd-commander{background-color:#f2f2f1;padding:5px}.fd-commander input{border:1px solid #d6d6d4;height:19px;width:calc(100% - 15px)}.fd-commander .fd-commander-close{background:0 0;border:0;color:#373534;position:absolute;top:8px;right:8px;cursor:pointer}.label-datanode{text-shadow:none;line-height:16px;padding:0 2px;margin:0 2px 2px;font-size:12px;border:1px solid;vertical-align:middle;font-weight:400}.label-datanode:hover{cursor:pointer;color:#fff}.label-datanode .close{color:#00799a;opacity:.4;font-weight:500;line-height:13px;font-size:18px;padding:0 5px 3px;margin-right:-3px}.label-datanode .close:hover{opacity:.9}.label-datanode .fcc{padding:0 3px;font-size:.8em}.label-datanode-internal{color:#00799a;border-color:#88d0d2;background-color:#d2edee}.label-datanode-internal .close{color:#00799a}.label-datanode-internal:hover{background-color:#1ea2a7;border-color:#1a8d92}.label-datanode-internal:hover .close{color:#d2edee}.label-datanode-external{color:#373534;border-color:#c1c1bc;background-color:#e6e6e4}.label-datanode-external .close{color:#373534}.label-datanode-external:hover{background-color:#685c53}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-max-indicator i,.label-datanode-external:hover .close{color:#d6d6d4}.label-datanode-external-unknown{color:#685300;border-color:#eed161;background-color:#f6e5a6}.label-datanode-external-unknown .close{color:#685300}.label-datanode-external-unknown:hover{background-color:#f9c700}.label-datanode-external-unknown:hover .close{color:#f8ecbd}.label-datanode-unknown{color:#812627;border-color:#c6948e;background-color:#e8d4d2}.label-datanode-unknown .close{color:#812627}.label-datanode-unknown:hover{background-color:#e53e30}.label-datanode-unknown:hover .close{color:#efcfcb}.datanode-tree-bubble{font-size:11px;color:#fff;line-height:18px;display:inline-block;padding:0 5px;border-radius:3px}.datanode-tree-bubble .fcc{font-size:9px}.datanode-tree-bubble-internal{color:#00799a;background-color:#ccf3f4}.datanode-tree-bubble-external{color:#373534;background-color:#f2f2f1}.datanode-tree-bubble-internal.on{background-color:#00bdc5;color:#fff}.datanode-tree-bubble-external.on{background-color:#685c53;color:#fff}.cke_widget_wrapper:hover>.label-datanode{outline:0!important;-webkit-box-shadow:0 0 8px #004ebc;-moz-box-shadow:0 0 8px #004ebc;box-shadow:0 0 8px #004ebc}.cke_widget_focused .label-datanode{outline:0!important;-webkit-box-shadow:0 0 8px #002c5f;-moz-box-shadow:0 0 8px #002c5f;box-shadow:0 0 8px #002c5f;border-color:#0073f8}.cke_widget_drag_handler_container{top:-2px!important;background:0 0!important}.cke_widget_drag_handler{width:100%!important;height:100%!important}.itext-block-container.has-markdown .markdown-group{display:block!important}.itext-block-container.has-markdown .fd-help,.itext-block-container.has-markdown .markdown-output:not(:empty),.itext-block-container.has-markdown .turn-markdown-off{display:inline-block!important}.itext-block-container.has-markdown .turn-markdown-on{display:none!important}.itext-block-container:not(.has-markdown) .markdown-group,.itext-block-container:not(.has-markdown) .markdown-output,.itext-block-container:not(.has-markdown) .turn-markdown-off{display:none!important}.itext-block-container:not(.has-markdown) .fd-help,.itext-block-container:not(.has-markdown) .turn-markdown-on{display:inline-block!important}.itext-block-container.markdown-ignorant .fd-help,.itext-block-container.markdown-ignorant .markdown-output,.itext-block-container.markdown-ignorant .turn-markdown-off,.itext-block-container.markdown-ignorant .turn-markdown-on{display:none!important}.markdown-output{width:100%;margin:0}.markdown-output table{padding:0}.markdown-output table tr{border-top:1px solid #ccc;background-color:#fff;margin:0;padding:0}.markdown-output table tr th{font-weight:700;border:1px solid #ccc;text-align:left;margin:0;padding:6px 13px}.markdown-output table tr td:first-child,.markdown-output table tr th:first-child{margin-top:0}.markdown-output table tr td:last-child,.markdown-output table tr th:last-child{margin-bottom:0}.markdown-output table tr td{border:1px solid #ccc;text-align:left;margin:0;padding:6px 13px}.markdown-output table tr:nth-child(2n){background-color:#f8f8f8}.fd-valid-alert-icon{color:#d83a2e}.fd-form-saving{position:fixed;top:0;bottom:0;left:0;right:0;opacity:.8;background-color:#000;z-index:2000}.fd-form-saving>div{opacity:1;position:fixed;top:calc(50% - 24px);left:calc(50% - 24px);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:48px;height:48px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#fff;padding:8px}.fd-form-saving>div>div{width:32px;height:32px;background-image:url(images/ajax-loader.gif)}.fd-full-screen-modal .modal-dialog{position:fixed;left:0;right:0;top:0;bottom:0;margin:0;width:auto}.fd-full-screen-modal .modal-dialog .modal-content{position:absolute;top:20px;bottom:20px;left:20px;right:20px}.fd-full-screen-modal .modal-dialog .modal-content .modal-body{overflow-y:auto}.formdesigner .fd-ui-container .fd-mm-preview-container{text-align:center;width:115px;float:left}.formdesigner .fd-ui-container .fd-mm-preview-container .fd-mm-no-ref,.formdesigner .fd-ui-container .fd-mm-preview-container img{border:1px solid #eee}.formdesigner .fd-ui-container .fd-mm-preview-container img{padding:.5em;background-color:#fff;margin-bottom:10px}.formdesigner .fd-ui-container .fd-mm-preview-container .fd-mm-no-ref{color:#999;background-color:#fff;padding:10px}.formdesigner .fd-ui-container .fd-mm-preview-container .fd-mm-no-ref i{display:block;font-size:56px}.formdesigner .fd-ui-container .fd-mm-upload-container{margin-left:125px}.formdesigner .fd-ui-container .fd-mm-upload-container>.control-row{margin:0 0 10px}.formdesigner .fd-ui-container .fd-mm-upload-container>.control-row:first-child{height:25px}.formdesigner .fd-ui-container .fd-mm-upload-container .fd-mm-path-input{margin-right:92px}.rich-text-popover{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word;min-width:236px;max-width:276px}.rich-text-popover .popover-title h3{font-weight:600;font-size:14px;margin:0}.rich-text-popover .popover-title .text-muted{margin-top:5px;line-height:1.3em}.rich-text-popover.bottom,.rich-text-popover.left,.rich-text-popover.right,.rich-text-popover.top{margin:0}.rich-text-popover.bottom{margin-top:5px}.rich-text-popover.top{margin-bottom:-10px}.rich-text-popover.right{margin-left:5px}.rich-text-popover .arrow,.rich-text-popover .arrow:after{display:none}.popover-content .alert{margin-bottom:0}.formdesigner .fd-ui-container .fd-props-toolbar{margin-bottom:5px;border-bottom:1px solid #f4f4f4;padding:12px}.formdesigner .fd-ui-container .fd-props-toolbar .fd-question-comment{margin-top:10px;white-space:pre-line}.formdesigner .fd-ui-container .fd-props-content{padding:0 12px}.formdesigner .fd-ui-container .fd-props-content .fd-help{width:25px;font-size:21px}.formdesigner .fd-ui-container .fd-props-content .fd-help a:hover{text-decoration:none;color:#46a546}.formdesigner .fd-ui-container .fd-props-content .fd-copy-paste-help .row{padding:0 2em;margin-bottom:2em}.formdesigner .fd-ui-container .fd-props-content .fd-copy-paste-help .copy-paste-box textarea{width:100%;height:100px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset{position:relative;min-width:0;display:table-column}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset:first-child{margin-top:20px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset:first-child legend{display:none}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset legend{min-height:30px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset legend .fd-help{right:0;top:0}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .control-label .fd-help{position:relative;top:-8px;height:15px;display:inline-block}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .control-label label{vertical-align:top}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .messages .alert{margin:10px 0 0}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-fieldset-content .itext-block-container .btn-danger{margin:10px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-itextID-checkbox-container{width:55px;padding:0 5px;background-color:#f1f9f1;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-kv{margin-bottom:0}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-kv .fd-kv-arrow{text-align:center}.formdesigner .fd-ui-container .fd-props-content .fd-question-fieldset .fd-kv .fd-kv-arrow i{margin-top:8px}body.vellum-full-screen{overflow-y:hidden}.formdesigner .fd-ui-container{top:0;width:100%;background-color:#fff}.formdesigner .fd-ui-container.full-screen{z-index:1031}.formdesigner .fd-ui-container .fd-content{float:left}.formdesigner .fd-ui-container .fd-content.fd-content-left{width:30%}.formdesigner .fd-ui-container .fd-content.fd-content-left .fd-add-question{width:100%;border-radius:0;text-align:left;border:0}.formdesigner .fd-ui-container .fd-content.fd-content-left .fd-accessory-pane{overflow-x:hidden;overflow-y:auto}.formdesigner .fd-ui-container .fd-content.fd-content-right .fd-head{height:31px}.formdesigner .fd-ui-container .fd-content.fd-content-right .fd-head h2{line-height:30px}.formdesigner .fd-ui-container .fd-content.fd-content-right .well{padding:10px}.formdesigner .fd-ui-container .fd-content.fd-content-right .well .col-sm-1{padding:0}.formdesigner .fd-ui-container .fd-content.fd-content-right .fd-form-actions{background-color:#004ebc!important;padding:5px 8px 8px}.formdesigner .fd-ui-container .fd-content .fd-default-panel{padding-left:12px}.formdesigner .fd-ui-container .fd-content .fd-head{color:#fff;background-color:#002c5f;font-size:17px;height:25px;position:relative}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-max-indicator{position:absolute;right:10px}.atwho-view .cur small,.formdesigner .fd-ui-container .fd-content .fd-head:hover .fd-head-max-indicator i{color:#fff}.formdesigner .fd-ui-container .fd-content .fd-head>h2{font-size:12.6px;padding:1px 12px 0;margin:0;font-weight:400;line-height:23px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:absolute;left:0;right:38px}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container{position:absolute;right:0;top:0;line-height:23px;font-size:12.6px;min-width:50px}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-toggle{color:#fff;cursor:pointer;display:block;padding:0 12px;text-decoration:none;background-color:#002c5f}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-toggle:hover{text-decoration:none;background-color:#004ebc}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-menu a{min-width:170px}.formdesigner .fd-ui-container .fd-content .fd-head .fd-head-menu-container .dropdown .dropdown-menu a>.hotkey{float:right}.formdesigner .fd-ui-container .fd-content-vertical-divider{width:5px;background:#004ebc}.formdesigner .fd-ui-container .fd-content-horizontal-divider{height:5px;margin:1px 0;background:#f4f4f4;background-repeat:no-repeat;background-position:center center;background-image:url(images/ellipsis.png);background-size:auto 80%}.formdesigner .fd-ui-container .fd-messages{position:fixed;bottom:40px;left:0;width:100%}.formdesigner .fd-ui-container .fd-messages .alert{-webkit-box-shadow:0 0 10px rgba(0,0,0,.4);-moz-box-shadow:0 0 10px rgba(0,0,0,.4);box-shadow:0 0 10px rgba(0,0,0,.4);margin:20px;height:auto;overflow:auto;max-height:200px}.formdesigner .fd-ui-container .fd-scrollable,.formdesigner .fd-ui-container .fd-scrollable-minimal{overflow-x:hidden;overflow-y:auto;transform:translate3d(0,0,0)}.formdesigner .fd-ui-container .fd-scrollable{height:606px;width:100%}.formdesigner .fd-ui-container .fd-scrollable-minimal{max-height:606px}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor{color:#37475d;line-height:27px;height:26px}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor.jstree-clicked,.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor.jstree-hovered{border:0;background:#eaeff5}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor.jstree-clicked{-webkit-box-shadow:0 0 4px rgba(21,87,162,.6);-moz-box-shadow:0 0 4px rgba(21,87,162,.6);box-shadow:0 0 4px rgba(21,87,162,.6)}.formdesigner .fd-ui-container .jstree .jstree-node .jstree-anchor>.jstree-icon{background:0 0;font-size:.85em;color:#004ebc}.formdesigner .fd-ui-container .jstree .jstree-node .add_choice:before{background:0 0;color:#004ebc;margin-right:6px;font:14px/1 FontAwesome}.formdesigner .fd-ui-container .jstree .jstree-node .add_choice{display:block;margin-left:50px;cursor:pointer;padding:0 5px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;line-height:24px;height:24px}.formdesigner .fd-ui-container .jstree .jstree-node .add_choice:hover{border:0;background-color:#eaeff5;width:95px}.formdesigner .fd-ui-container .jstree .jstree-node.jstree-closed .add_choice{display:none}.formdesigner .fd-ui-container .jstree .jstree-node .fd-valid-alert-icon{margin-right:3px;margin-left:-3px}.formdesigner .fd-ui-container .fd-tree .fd-head{height:46px}.formdesigner .fd-ui-container .fd-tree .fd-head h2{line-height:46px;font-size:14px}.formdesigner .fd-ui-container .fd-tree .fd-head .fd-head-menu-container{line-height:46px}.formdesigner .fd-ui-container .fd-tree .fd-scrollable{overflow-x:auto}.formdesigner .fd-ui-container .fd-tree .fd-scrollable .jstree{margin:5px 0}.formdesigner .fd-ui-container .fd-tree .fd-undo-delete{margin-bottom:0}.formdesigner .fd-ui-container .fd-external-sources-container .fd-head.fd-head-external-sources{cursor:pointer}.formdesigner .fd-ui-container .fd-external-sources-container .fd-head.fd-head-external-sources h2{font-size:12px}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search{background-color:#f2f2f1;margin-bottom:5px}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-resource-search .fd-search-control{position:absolute;top:5px;margin-left:18px;width:100%}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-sources-tree .jstree-anchor{color:#373534}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-sources-tree .jstree-anchor.jstree-clicked{background-color:#f2f2f1;-webkit-box-shadow:0 0 4px rgba(104,92,83,.8);-moz-box-shadow:0 0 4px rgba(104,92,83,.8);box-shadow:0 0 4px rgba(104,92,83,.8)}.formdesigner .fd-ui-container .fd-external-sources-container .fd-external-sources-tree .jstree-anchor>.jstree-icon{color:#685c53}.formdesigner .fd-ui-container .fd-undo-delete p{margin-top:1em}#jstree-dnd{max-width:300px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.clearfix,.fd-xpath-editor .fd-xpath-editor-content fieldset legend{*zoom:1}.clearfix:after,.clearfix:before,.fd-xpath-editor .fd-xpath-editor-content fieldset legend:after,.fd-xpath-editor .fd-xpath-editor-content fieldset legend:before{display:table;content:"";line-height:0}.clearfix:after,.fd-xpath-editor .fd-xpath-editor-content fieldset legend:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.fd-xpath-editor .fd-xpath-editor-content{padding:20px}.fd-xpath-editor .fd-xpath-editor-content fieldset legend button{margin-bottom:5px}.fd-xpath-editor .fd-xpath-editor-content fieldset .fd-xpath-editor-expressions .xpath-expression-group:last-child{margin-bottom:0}.fd-xpath-editor .fd-xpath-editor-content fieldset .fd-xpath-editor-expressions .xpath-expression-group .validation-results{display:inline-block;padding:5px 25px;margin-bottom:0}.jstree-children,.jstree-container-ul,.jstree-node{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-anchor,.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:active,.jstree-anchor:hover,.jstree-anchor:link,.jstree-anchor:visited{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children,.jstree-anchor>.jstree-themeicon-hidden,.jstree-hidden,.jstree-no-icons .jstree-themeicon,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jstree-contextmenu .jstree-anchor{-webkit-user-select:none;-webkit-touch-callout:none}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon,.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin:-2.7em 0 0 -4px}.vakata-context .vakata-context-right ul,.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context .vakata-context-hover>a,.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context .vakata-contextmenu-disabled>a>i{filter:grayscale(100%)}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon{margin:0 2px 0 0}#jstree-dnd .jstree-copy,#jstree-dnd .jstree-icon{display:inline-block;text-decoration:none;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node{background-color:transparent}.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-animated,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-context,.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-disabled{color:#666}.jstree-default .jstree-disabled.jstree-hovered{box-shadow:none}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered,.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top}.jstree-default>.jstree-wholerow-ul .jstree-clicked,.jstree-default>.jstree-wholerow-ul .jstree-hovered{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok,.jstree-default .jstree-icon,.jstree-default .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default .jstree-disabled,.jstree-default .jstree-disabled.jstree-hovered,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default>.jstree-no-dots .jstree-node{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default .jstree-checked>.jstree-checkbox,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-228px -4px}.jstree-default .jstree-checked>.jstree-checkbox:hover,.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-er,#jstree-dnd.jstree-default .jstree-ok{background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default .jstree-ellipsis{overflow:hidden}.jstree-default .jstree-ellipsis .jstree-anchor{width:calc(100% - 29px);text-overflow:ellipsis;overflow:hidden}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-icon,.jstree-default-small .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small .jstree-disabled,.jstree-default-small .jstree-disabled.jstree-hovered,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small .jstree-checked>.jstree-checkbox,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small .jstree-checked>.jstree-checkbox:hover,.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-er,#jstree-dnd.jstree-default-small .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small .jstree-ellipsis{overflow:hidden}.jstree-default-small .jstree-ellipsis .jstree-anchor{width:calc(100% - 23px);text-overflow:ellipsis;overflow:hidden}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-icon,.jstree-default-large .jstree-node{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large .jstree-disabled,.jstree-default-large .jstree-disabled.jstree-hovered,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large .jstree-checked>.jstree-checkbox,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large .jstree-checked>.jstree-checkbox:hover,.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(src/../node_modules/jstree/dist/themes/default/throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-er,#jstree-dnd.jstree-default-large .jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large .jstree-ellipsis{overflow:hidden}.jstree-default-large .jstree-ellipsis .jstree-anchor{width:calc(100% - 37px);text-overflow:ellipsis;overflow:hidden}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last,span.CodeMirror-selectedtext{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-er,#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-position:-40px -200px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}.jstree-default-responsive .jstree-node{background:0 0;min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon{background-image:url(src/../node_modules/jstree/dist/themes/default/40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(src/../node_modules/jstree/dist/themes/default/40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}.CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre.CodeMirror-line,.CodeMirror pre.CodeMirror-line-like{padding:0 4px;-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-animate-fat-cursor,.cm-fat-cursor-mark{-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5)}.cm-animate-fat-cursor{width:auto;border:0;background-color:#7e7}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:0;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta,.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-invalidchar,.cm-s-default .cm-error{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-50px;margin-right:-50px;padding-bottom:50px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:50px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none;outline:0}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-50px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:0!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror-wrap pre.CodeMirror-line,.CodeMirror-wrap pre.CodeMirror-line-like{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}.CodeMirror-focused div.CodeMirror-cursors,div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}.atwho-view{position:absolute;top:0;left:0;display:none;margin-top:18px;background:#fff;color:#000;border:1px solid #ddd;border-radius:3px;box-shadow:0 0 5px rgba(0,0,0,.1);min-width:120px;z-index:11110!important}.atwho-view .atwho-header{padding:5px;margin:5px;cursor:pointer;border-bottom:solid 1px #eaeff1;color:#6f8092;font-size:11px;font-weight:700}.atwho-view .atwho-header .small{color:#6f8092;float:right;padding-top:2px;margin-right:-5px;font-size:12px;font-weight:400}.atwho-view .atwho-header:hover{cursor:default}.atwho-view .cur{background:#36f;color:#fff}.atwho-view strong{color:#36f}.atwho-view .cur strong{color:#fff;font:700}.atwho-view ul{list-style:none;padding:0;margin:auto;max-height:200px;overflow-y:auto}.atwho-view ul li{display:block;padding:5px 10px;border-bottom:1px solid #ddd;cursor:pointer}.atwho-view small{font-size:smaller;color:#777;font-weight:400}
\ No newline at end of file
diff --git a/corehq/apps/app_manager/static/app_manager/js/vellum/version.txt b/corehq/apps/app_manager/static/app_manager/js/vellum/version.txt
index 342e26a79aa6..ae5e11ffd4b3 100644
--- a/corehq/apps/app_manager/static/app_manager/js/vellum/version.txt
+++ b/corehq/apps/app_manager/static/app_manager/js/vellum/version.txt
@@ -1 +1 @@
-4cab4ebc583f2aa63d5e03875ebaedfbfe6d2c3b
+81a02d4222d41dad1b32ca2230c40e366f7c0a37
diff --git a/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml b/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml
index 5fcf2b47a724..fd8817d99965 100644
--- a/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml
+++ b/corehq/apps/app_manager/static/app_manager/json/commcare-app-settings.yml
@@ -154,10 +154,11 @@
   description: Version of mobile UCRs to use. Read more on the  <a target="_blank" href="https://help.commcarehq.org/display/saas/Moving+to+Mobile+UCR+V2">Help Site</a>
   toggle: MOBILE_UCR
   values:
-    - ['1.0', '1.0']
-    - ['1.5', '1.5']
     - ['2.0', '2.0']
-  default: '1.0'
+  default: '2.0'
+  disabled: true
+  disabled_txt: This setting has been discontinued. We recommend you change this setting to Version 2. Upon doing so this setting will no longer appear on this page.
+
 
 - id: location_fixture_restore
   name: App Aware Location Fixture Format
diff --git a/corehq/apps/app_manager/static/app_manager/json/commcare-profile-settings.yml b/corehq/apps/app_manager/static/app_manager/json/commcare-profile-settings.yml
index fd59b44dee60..e0a3fd09d3ad 100644
--- a/corehq/apps/app_manager/static/app_manager/json/commcare-profile-settings.yml
+++ b/corehq/apps/app_manager/static/app_manager/json/commcare-profile-settings.yml
@@ -356,7 +356,11 @@
   values:
     - ['org.commcare.dalvik.reminders', 'CommCare Reminders']
     - ['callout.commcare.org.sendussd', 'CommCare USSD']
-    - ['org.commcare.dalvik.abha', 'CommCare ABHA']
+    - ['com.dimagi.biometric', 'Biometrics Capture']
+    - ['org.rdtoolkit', 'CommCare Toolkit']
+    - ['richard.chard.lu.android.areamapper', 'Area Calculator for CommCare']
+    - ['org.commcare.respiratory', 'Breath Counter']
+    - ['com.simprints.id', 'Simprints ID']
   default: []  # multiSelect default takes a list
-  since: '2.53'
+  since: '2.54'
   force: true
diff --git a/corehq/apps/app_manager/static_strings.py b/corehq/apps/app_manager/static_strings.py
index faa24c7b592e..53ad3ce391d8 100644
--- a/corehq/apps/app_manager/static_strings.py
+++ b/corehq/apps/app_manager/static_strings.py
@@ -142,6 +142,8 @@
     gettext_noop('Only Flat Fixture'),
     gettext_noop('Only Hierarchical Fixture'),
     gettext_noop('Oops! This setting has been discontinued. We recommend you change this setting to Version 2, and it will no longer appear on your settings page.'),
+    gettext_noop('This setting has been discontinued. We recommend you change this setting to Version 2.'
+                 ' Upon doing so this setting will no longer appear on this page.'),
     gettext_noop('Practice Mobile Worker'),
     gettext_noop('Prevents mobile workers from using a CommCare app until the '
                  'Android apps that it needs have been installed on the '
diff --git a/corehq/apps/app_manager/templates/app_manager/app_view.html b/corehq/apps/app_manager/templates/app_manager/app_view.html
index 7b145d2aeb8e..34d8bf7f7ec5 100644
--- a/corehq/apps/app_manager/templates/app_manager/app_view.html
+++ b/corehq/apps/app_manager/templates/app_manager/app_view.html
@@ -5,10 +5,6 @@
 {% load i18n %}
 {% load xforms_extras %}
 
-{% block head %}{{ block.super }}
-  {% include 'analytics/fullstory.html' %}
-{% endblock %}
-
 {% block js %}{{  block.super }}
   {% compress js %}
     <script src="{% static 'app_manager/js/download_async_modal.js' %}"></script>
@@ -20,7 +16,6 @@
     <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
     <script src="{% static 'app_manager/js/supported_languages.js' %}"></script>
     <script src="{% static 'app_manager/js/settings/translations.js' %}"></script>
-    <script src="{% static 'app_manager/js/settings/password_setter.jquery.js' %}"></script>
     <script src="{% static "hqmedia/js/hqmediauploaders.js" %}"></script>
     <script src="{% static 'hqmedia/js/media_reference_models.js' %}"></script>
     <script src="{% static 'app_manager/js/app_view.js' %}"></script>
@@ -76,8 +71,7 @@
 
 {% block modals %}{{ block.super }}
   {% for uploader in uploaders %}
-    {% include 'hqmedia/partials/multimedia_uploader.html' %}
+    {% include 'hqmedia/partials/multimedia_uploader.html' with id=uploader.slug type=uploader.media_type %}
   {% endfor %}
-  {% include 'app_manager/partials/settings/password_setter_modal.html' %}
   {% include 'app_manager/partials/toggle_diff_modal.html' %}
 {% endblock %}
diff --git a/corehq/apps/app_manager/templates/app_manager/form_designer.html b/corehq/apps/app_manager/templates/app_manager/form_designer.html
index 6c58ebd06540..02762848b7ab 100644
--- a/corehq/apps/app_manager/templates/app_manager/form_designer.html
+++ b/corehq/apps/app_manager/templates/app_manager/form_designer.html
@@ -5,9 +5,6 @@
 {% load xforms_extras %}
 
 {% block head %}{{ block.super }}
-  {% if include_fullstory %}
-    {% include 'analytics/fullstory.html' %}
-  {% endif %}
   {% if not vellum_debug %}
     <link href="{% static "app_manager/js/vellum/style.css" %}" type="text/css" rel="stylesheet"/>
   {% elif vellum_debug == "dev-min" %}
diff --git a/corehq/apps/app_manager/templates/app_manager/form_view.html b/corehq/apps/app_manager/templates/app_manager/form_view.html
index d704184e8f2b..65935e5997d7 100644
--- a/corehq/apps/app_manager/templates/app_manager/form_view.html
+++ b/corehq/apps/app_manager/templates/app_manager/form_view.html
@@ -14,10 +14,6 @@
   </style>
 {% endblock %}
 
-{% block head %}{{ block.super }}
-  {% include 'analytics/fullstory.html' %}
-{% endblock %}
-
 {% block js %}{{ block.super }}
   {% compress js %}
     <script src="{% static 'hqwebapp/js/knockout_subscribables.ko.js' %}"></script>
@@ -312,5 +308,6 @@
 
 {% block modals %}{{ block.super }}
   {% include "app_manager/partials/forms/form_view_modals.html" %}
-  {% include "app_manager/partials/nav_menu_media_modals.html" %}
+  {% include "hqmedia/partials/multimedia_uploader.html" with id=multimedia.upload_managers.icon.slug type="image" %}
+  {% include "hqmedia/partials/multimedia_uploader.html" with id=multimedia.upload_managers.audio.slug type="audio" %}
 {% endblock modals %}
diff --git a/corehq/apps/app_manager/templates/app_manager/module_view.html b/corehq/apps/app_manager/templates/app_manager/module_view.html
index ff998f6b2707..b5156fcfddc9 100644
--- a/corehq/apps/app_manager/templates/app_manager/module_view.html
+++ b/corehq/apps/app_manager/templates/app_manager/module_view.html
@@ -5,10 +5,6 @@
 {% load i18n %}
 {% load xforms_extras %}
 
-{% block head %}{{ block.super }}
-  {% include 'analytics/fullstory.html' %}
-{% endblock %}
-
 {% block title %}{{ module.name|clean_trans:langs }} - {% trans 'Menu Settings' %}{% endblock %}
 
 {% block stylesheets %}{{ block.super }}
@@ -197,10 +193,11 @@
 {% endblock %}
 
 {% block modals %}{{ block.super }}
-  {% include "app_manager/partials/nav_menu_media_modals.html" %}
+  {% include "hqmedia/partials/multimedia_uploader.html" with id=multimedia.upload_managers.icon.slug type="image" %}
+  {% include "hqmedia/partials/multimedia_uploader.html" with id=multimedia.upload_managers.audio.slug type="audio" %}
   {% if request|toggle_enabled:"CASE_DETAIL_PRINT" %}
     {% with print_uploader as uploader %}
-      {% include 'hqmedia/partials/multimedia_uploader.html' %}
+      {% include 'hqmedia/partials/multimedia_uploader.html' with id=uploader.slug type=uploader.media_type %}
     {% endwith %}
   {% endif %}
 {% endblock modals %}
diff --git a/corehq/apps/app_manager/templates/app_manager/module_view_report.html b/corehq/apps/app_manager/templates/app_manager/module_view_report.html
index 8ce309802c7f..55aaed76cec8 100644
--- a/corehq/apps/app_manager/templates/app_manager/module_view_report.html
+++ b/corehq/apps/app_manager/templates/app_manager/module_view_report.html
@@ -41,6 +41,7 @@
 {% endblock %}
 
 {% block modals %}{{ block.super }}
-  {% include "app_manager/partials/nav_menu_media_modals.html" %}
+  {% include "hqmedia/partials/multimedia_uploader.html" with id=multimedia.upload_managers.icon.slug type="image" %}
+  {% include "hqmedia/partials/multimedia_uploader.html" with id=multimedia.upload_managers.audio.slug type="audio" %}
   {% include 'app_manager/partials/modules/graph_configuration_modal.html' %}
 {% endblock modals %}
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/mobile_ucr_v1_warning.html b/corehq/apps/app_manager/templates/app_manager/partials/mobile_ucr_v1_warning.html
new file mode 100644
index 000000000000..d8c460b22300
--- /dev/null
+++ b/corehq/apps/app_manager/templates/app_manager/partials/mobile_ucr_v1_warning.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+{% load hq_shared_tags %}
+{% load xforms_extras %}
+
+  <div class="alert alert-warning alert-build">
+    <h4 class="alert-heading">
+      <i class="fa fa-exclamation-circle"></i>
+      {% trans "Warning" %}</h4>
+        <span>
+          {{ warning_message }}
+        </span>
+  </div>
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html b/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
deleted file mode 100644
index 68c072a46e50..000000000000
--- a/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-<div class="modal fade" id="{{ multimedia.upload_managers.icon.slug }}">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">{% trans 'Upload Icon Image' %}</h4>
-      </div>
-      <div class="modal-body form form-horizontal">
-        <div class="form-group">
-          <label class="control-label col-sm-3">
-            {% trans 'Select Icon Image' %}
-          </label>
-          <div class="col-sm-9">
-            <div class="hqm-select-files-container">
-              <button class="hqm-select btn btn-primary" role="button">{% trans 'Select' %}</button>
-            </div>
-            <div class="hqm-queue"></div>
-          </div>
-        </div>
-        <div class="form-group hqm-existing hide">
-          <label class="control-label col-sm-3">
-            {% trans 'Current Icon' %}
-          </label>
-          <div class="col-sm-9 hqm-existing-controls"></div>
-        </div>
-        <div class="hqm-upload-form">
-          {% include 'hqmedia/partials/hqm_upload_form.html' %}
-        </div>
-      </div>
-      <div class="modal-footer">
-        <a href="#" class="btn btn-default" data-dismiss="modal">{% trans 'Close' %}</a>
-        <a href="#" class="btn btn-primary disabled hqm-upload hqm-upload-confirm">
-          <i class="fa-solid fa-cloud-arrow-up"></i> {% trans "Begin Upload" %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div class="modal fade" id="{{ multimedia.upload_managers.audio.slug }}">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title">{% trans 'Upload Menu Audio' %}</h4>
-      </div>
-      <div class="modal-body form form-horizontal">
-        <div class="form-group">
-          <label class="control-label col-sm-3">
-            {% trans 'Select Menu Audio' %}
-          </label>
-          <div class="col-sm-9">
-            <div class="hqm-select-files-container">
-              <button class="hqm-select btn btn-primary" role="button">{% trans 'Select' %}</button>
-            </div>
-            <div class="hqm-queue">
-
-            </div>
-          </div>
-        </div>
-        <div class="form-group hqm-existing hide">
-          <label class="control-label col-sm-3">
-            {% trans 'Current Audio' %}
-          </label>
-          <div class="col-sm-9 hqm-existing-controls"></div>
-        </div>
-        <div class="hqm-upload-form">
-          {% include 'hqmedia/partials/hqm_upload_form.html' %}
-        </div>
-      </div>
-      <div class="modal-footer">
-        <a href="#" class="btn btn-default" data-dismiss="modal">{% trans 'Close' %}</a>
-        <a href="#" class="btn btn-primary disabled hqm-upload hqm-upload-confirm">
-          <i class="fa-solid fa-cloud-arrow-up"></i> {% trans "Begin Upload" %}
-        </a>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html b/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
index 47e35ad25333..280feb8d71e6 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
@@ -51,16 +51,6 @@
         <i class="fa fa-cog"></i>
         {% trans 'Set Path' %}
       </button>
-      {% if type == "audio" %}
-        <p data-bind="visible: isMediaMatched"
-           class="help-block">
-          <i class="fa fa-info-circle"></i>
-          {% blocktrans %}
-            To hear audio on Java Phones, you must be in CommCare Sense
-            mode or Numeric Selection Mode. (On Android it will always work.)
-          {% endblocktrans %}
-        </p>
-      {% endif %}
       {% if app.langs|length > 1%}
         <div data-bind="visible: isDefaultLanguage">
           <label>
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html b/corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
index 3527662eab7a..82c66ad25050 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
@@ -157,12 +157,6 @@
     </span>
 </script>
 
-<script type="text/html" id="CommcareSettings.widgets.password">
-  <span>
-        <input type="password" data-bind="passwordSetter: visibleValue" class="form-control" />
-    </span>
-</script>
-
 <script type="text/html" id="CommcareSettings.widgets.text_input">
   <span data-bind="template: 'CommcareSettings.widgets.select'"></span>
   <aside id="custom-keys-help" data-bind="visible: visibleValue() === 'custom-keys'">
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html b/corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
deleted file mode 100644
index 9ddc2468f3d2..000000000000
--- a/corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% load i18n %}
-
-<div class="modal fade" id="password-setter">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span>
-        </button>
-        <h4 class="modal-title">{% trans "Set Password" %}</h4>
-      </div>
-      <div class="modal-body form-horizontal">
-        <div class="alert alert-danger password-mismatch hide">
-          {% trans "The passwords don't match. Please try again." %}
-        </div>
-        <div class="alert alert-danger password-empty hide">
-          {% trans "Please enter a password or cancel." %}
-        </div>
-        <div class="form-group password">
-          <label class="col-sm-4 control-label">{% trans "Password" %}</label>
-          <div class="col-sm-8">
-            <input type="password" class="form-control" />
-          </div>
-        </div>
-        <div class="form-group repeat-password">
-          <label class="col-sm-4 control-label">{% trans "Repeat Password" %}</label>
-          <div class="col-sm-8">
-            <input type="password" class="form-control" />
-          </div>
-        </div>
-      </div>
-      <div class="modal-footer">
-        <button class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</button>
-        <button class="btn btn-primary save">{% trans "Save" %}</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/corehq/apps/app_manager/templates/app_manager/profile.xml b/corehq/apps/app_manager/templates/app_manager/profile.xml
index 782bae17dcd4..4f89dd54b241 100644
--- a/corehq/apps/app_manager/templates/app_manager/profile.xml
+++ b/corehq/apps/app_manager/templates/app_manager/profile.xml
@@ -29,8 +29,8 @@
     <property key="support-email-address" value="{{ support_email }}" force="true"/>
     {% endif %}
 
-    <property key="cc_persistent_menu" value="{{ app.persistent_menu|yesno:"yes,no" }}" force="true"/>
-    <property key="cc_breadcrumbs_enabled" value="{{ app.show_breadcrumbs|yesno:"yes,no" }}" force="true"/>
+    <property key="cc-persistent-menu" value="{{ app.persistent_menu|yesno:"yes,no" }}" force="true"/>
+    <property key="cc-breadcrumbs-enabled" value="{{ app.show_breadcrumbs|yesno:"yes,no" }}" force="true"/>
 
     <!-- Properties configured on CommCare HQ 1.0 -->
     {% for key, value in app_profile.properties.items %}{% if value != None %}
diff --git a/corehq/apps/app_manager/templatetags/xforms_extras.py b/corehq/apps/app_manager/templatetags/xforms_extras.py
index 239d40628636..12a5ab04ef6a 100644
--- a/corehq/apps/app_manager/templatetags/xforms_extras.py
+++ b/corehq/apps/app_manager/templatetags/xforms_extras.py
@@ -5,6 +5,7 @@
     gettext as _,
     gettext_lazy
 )
+from enum import Enum
 
 register = template.Library()
 
@@ -117,10 +118,15 @@ def html_name(name):
     return html.strip_tags(name) or EMPTY_LABEL
 
 
+class EscapeMethod(Enum):
+    HTML = 'html'
+    JS = 'js'
+
+
 @register.simple_tag
 def input_trans(name, langs=None, input_name='name', input_id=None, data_bind=None, element_type='input_text'):
     if element_type == 'input_text':
-        options = _get_dynamic_input_trans_options(name, langs=langs)
+        options = _get_dynamic_input_trans_options(name, EscapeMethod.HTML, langs=langs)
         template = '''
             <input type="text"
                    name="{input_name}" {input_id_attribute} {data_bind_attribute}
@@ -129,7 +135,7 @@ def input_trans(name, langs=None, input_name='name', input_id=None, data_bind=No
                    placeholder="{placeholder}" />
         '''
     elif element_type == 'textarea':
-        options = _get_dynamic_input_trans_options(name, langs=langs, is_textarea=True)
+        options = _get_dynamic_input_trans_options(name, EscapeMethod.HTML, langs=langs)
         template = '''
             <textarea name="{input_name}" {input_id_attribute} {data_bind_attribute}
                       class="form-control vertical-resize"
@@ -151,7 +157,7 @@ def input_trans(name, langs=None, input_name='name', input_id=None, data_bind=No
 @register.simple_tag
 def inline_edit_trans(name, langs=None, url='', saveValueName='', postSave='',
         containerClass='', iconClass='', readOnlyClass='', disallow_edit='false'):
-    options = _get_dynamic_input_trans_options(name, langs=langs, allow_blank=False)
+    options = _get_dynamic_input_trans_options(name, EscapeMethod.JS, langs=langs, allow_blank=False)
     options.update({
         'url': url,
         'saveValueName': saveValueName,
@@ -181,7 +187,7 @@ def inline_edit_trans(name, langs=None, url='', saveValueName='', postSave='',
     return format_html(template, **options)
 
 
-def _get_dynamic_input_trans_options(name, langs=None, allow_blank=True, is_textarea=False):
+def _get_dynamic_input_trans_options(name, escape_method: EscapeMethod, langs=None, allow_blank=True):
     if langs is None:
         langs = ["default"]
     placeholder = _("Untitled")
@@ -201,18 +207,15 @@ def _get_dynamic_input_trans_options(name, langs=None, allow_blank=True, is_text
                 options['placeholder'] = name[lang] if (allow_blank or name[lang] != '') else placeholder
                 options['lang'] = lang
             break
-    if is_textarea:
-        options = _escape_options(options, keys_to_html_escape=['value'])
-    else:
-        options = _escape_options(options)
+    options = _escape_options(options, escape_method=escape_method)
     return options
 
 
-def _escape_options(options, keys_to_html_escape: list[str] = []):
-    escaped_options = {}
-    for (key, value) in options.items():
-        if key in keys_to_html_escape:
-            escaped_options[key] = html.escape(value)
-        else:
-            escaped_options[key] = html.escapejs(value)
+def _escape_options(options, escape_method: EscapeMethod):
+    if escape_method == EscapeMethod.HTML:
+        escape_func = html.escape
+    elif escape_method == EscapeMethod.JS:
+        escape_func = html.escapejs
+
+    escaped_options = {key: escape_func(value) for key, value in options.items()}
     return escaped_options
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-mixed.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-mixed.xml
index 9cb457b9d92a..75aec6d18b89 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-mixed.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-mixed.xml
@@ -1,5 +1,5 @@
 <partial>
-  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="rows/row">
+  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="row">
     <title>
       <text>
         <locale id="cchq.report_data_table"/>
@@ -13,7 +13,7 @@
       </header>
       <template>
         <text>
-          <xpath function="if(column[@id='owner'] = '2', 'two', if(column[@id='owner'] = '&#2319;&#2325;', if($lang = 'es', 'uno', if($lang = 'en', 'one', column[@id='owner'])), column[@id='owner']))">
+          <xpath function="if(owner = '2', 'two', if(owner = '&#2319;&#2325;', if($lang = 'es', 'uno', if($lang = 'en', 'one', owner)), owner))">
             <variable name="lang">
               <locale id="lang.current"/>
             </variable>
@@ -29,7 +29,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='count']"/>
+          <xpath function="count"/>
         </text>
       </template>
     </field>
@@ -41,7 +41,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='is_starred']"/>
+          <xpath function="is_starred"/>
         </text>
       </template>
     </field>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-simple.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-simple.xml
index b53d463c3997..fde189cc8732 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-simple.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated-simple.xml
@@ -1,5 +1,5 @@
 <partial>
-  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="rows/row">
+  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="row">
     <title>
       <text>
         <locale id="cchq.report_data_table"/>
@@ -13,7 +13,7 @@
       </header>
       <template>
         <text>
-          <xpath function="if(column[@id='owner'] = '2', 'two', if(column[@id='owner'] = '&#2319;&#2325;', 'one', column[@id='owner']))">
+          <xpath function="if(owner = '2', 'two', if(owner = '&#2319;&#2325;', 'one', owner))">
             <variable name="lang">
               <locale id="lang.current"/>
             </variable>
@@ -29,7 +29,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='count']"/>
+          <xpath function="count"/>
         </text>
       </template>
     </field>
@@ -41,7 +41,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='is_starred']"/>
+          <xpath function="is_starred"/>
         </text>
       </template>
     </field>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated.xml
index 71c9ffd80461..ae0ef50524f2 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail-translated.xml
@@ -1,5 +1,5 @@
 <partial>
-  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="rows/row">
+  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="row">
     <title>
       <text>
         <locale id="cchq.report_data_table"/>
@@ -13,7 +13,7 @@
       </header>
       <template>
         <text>
-          <xpath function="if(column[@id='owner'] = '2', if($lang = 'hin', '&#2342;&#2379;', if($lang = 'es', 'dos''', if($lang = 'en', 'two', column[@id='owner']))), if(column[@id='owner'] = '&#2319;&#2325;', if($lang = 'es', 'uno', if($lang = 'en', 'one', column[@id='owner'])), column[@id='owner']))">
+          <xpath function="if(owner = '2', if($lang = 'hin', '&#2342;&#2379;', if($lang = 'es', 'dos''', if($lang = 'en', 'two', owner))), if(owner = '&#2319;&#2325;', if($lang = 'es', 'uno', if($lang = 'en', 'one', owner)), owner))">
             <variable name="lang">
               <locale id="lang.current"/>
             </variable>
@@ -29,7 +29,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='count']"/>
+          <xpath function="count"/>
         </text>
       </template>
     </field>
@@ -41,7 +41,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='is_starred']"/>
+          <xpath function="is_starred"/>
         </text>
       </template>
     </field>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail.xml
index a6765f94086f..10429de44334 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_data_detail.xml
@@ -1,5 +1,5 @@
 <partial>
-  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="rows/row">
+  <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="row">
     <title>
       <text>
         <locale id="cchq.report_data_table"/>
@@ -13,7 +13,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='owner']"/>
+          <xpath function="owner"/>
         </text>
       </template>
     </field>
@@ -25,7 +25,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='count']"/>
+          <xpath function="count"/>
         </text>
       </template>
     </field>
@@ -37,7 +37,7 @@
       </header>
       <template>
         <text>
-          <xpath function="column[@id='is_starred']"/>
+          <xpath function="is_starred"/>
         </text>
       </template>
     </field>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry.xml
index ac31005dc225..763c4ee2073b 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry.xml
@@ -5,11 +5,11 @@
         <locale id="cchq.reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.name"/>
       </text>
     </command>
-    <instance id="reports" src="jr://fixture/commcare:reports"/>
+    <instance id="commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i" src="jr://fixture/commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i"/>
     <session>
       <datum
         id="report_id_ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i"
-        nodeset="instance('reports')/reports/report[@id='ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i']"
+        nodeset="instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/rows"
         value="./@id"
         detail-select="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.select"
         detail-confirm="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.summary"
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry_mobile_ucr_v1.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry_mobile_ucr_v1.xml
new file mode 100644
index 000000000000..ac31005dc225
--- /dev/null
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_data_entry_mobile_ucr_v1.xml
@@ -0,0 +1,19 @@
+<partial>
+  <entry>
+    <command id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i">
+      <text>
+        <locale id="cchq.reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.name"/>
+      </text>
+    </command>
+    <instance id="reports" src="jr://fixture/commcare:reports"/>
+    <session>
+      <datum
+        id="report_id_ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i"
+        nodeset="instance('reports')/reports/report[@id='ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i']"
+        value="./@id"
+        detail-select="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.select"
+        detail-confirm="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.summary"
+        autoselect="true"/>
+    </session>
+  </entry>
+</partial>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_hide_data_table.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_hide_data_table.xml
index 972c3fcf39db..966335165dfd 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_hide_data_table.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_hide_data_table.xml
@@ -37,7 +37,7 @@
       </header>
       <template>
         <text>
-          <xpath function="format-date(date(instance('reports')/reports/@last_sync), '%Y-%m-%d %H:%M')"/>
+          <xpath function="format-date(date(instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/@last_sync), '%Y-%m-%d %H:%M')"/>
         </text>
       </template>
     </field>
@@ -47,10 +47,10 @@
       </header>
       <template form="graph">
         <graph type="bar">
-          <series nodeset="instance('reports')/reports/report[@id='ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i']/rows/row[@is_total_row='False']">
+          <series nodeset="instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/rows/row[@is_total_row='False']">
             <configuration/>
-            <x function="column[@id='owner']" />
-            <y function="column[@id='count']" />
+            <x function="owner" />
+            <y function="count" />
           </series>
           <configuration/>
         </graph>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_localized_description.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_localized_description.xml
index dd7e20e81713..d322c0c4360b 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_localized_description.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_localized_description.xml
@@ -43,7 +43,7 @@
         </header>
         <template>
           <text>
-            <xpath function="format-date(date(instance('reports')/reports/@last_sync), '%Y-%m-%d %H:%M')"/>
+            <xpath function="format-date(date(instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/@last_sync), '%Y-%m-%d %H:%M')"/>
           </text>
         </template>
       </field>
@@ -53,17 +53,17 @@
         </header>
         <template form="graph">
           <graph type="bar">
-            <series nodeset="instance('reports')/reports/report[@id='ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i']/rows/row[@is_total_row='False']">
+            <series nodeset="instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/rows/row[@is_total_row='False']">
               <configuration/>
-              <x function="column[@id='owner']" />
-              <y function="column[@id='count']" />
+              <x function="owner" />
+              <y function="count" />
             </series>
             <configuration/>
           </graph>
         </template>
       </field>
     </detail>
-    <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="rows/row">
+    <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="row">
       <title>
         <text>
           <locale id="cchq.report_data_table"/>
@@ -77,7 +77,7 @@
         </header>
         <template>
           <text>
-            <xpath function="column[@id='owner']"/>
+            <xpath function="owner"/>
           </text>
         </template>
       </field>
@@ -89,7 +89,7 @@
         </header>
         <template>
           <text>
-            <xpath function="column[@id='count']"/>
+            <xpath function="count"/>
           </text>
         </template>
       </field>
@@ -101,7 +101,7 @@
         </header>
         <template>
           <text>
-            <xpath function="column[@id='is_starred']"/>
+            <xpath function="is_starred"/>
           </text>
         </template>
       </field>
diff --git a/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_xpath_description.xml b/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_xpath_description.xml
index da9d3b0e59a4..027890c1f262 100644
--- a/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_xpath_description.xml
+++ b/corehq/apps/app_manager/tests/data/suite/reports_module_summary_detail_use_xpath_description.xml
@@ -43,7 +43,7 @@
         </header>
         <template>
           <text>
-            <xpath function="format-date(date(instance('reports')/reports/@last_sync), '%Y-%m-%d %H:%M')"/>
+            <xpath function="format-date(date(instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/@last_sync), '%Y-%m-%d %H:%M')"/>
           </text>
         </template>
       </field>
@@ -53,17 +53,17 @@
         </header>
         <template form="graph">
           <graph type="bar">
-            <series nodeset="instance('reports')/reports/report[@id='ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i']/rows/row[@is_total_row='False']">
+            <series nodeset="instance('commcare-reports:ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i')/rows/row[@is_total_row='False']">
               <configuration/>
-              <x function="column[@id='owner']" />
-              <y function="column[@id='count']" />
+              <x function="owner" />
+              <y function="count" />
             </series>
             <configuration/>
           </graph>
         </template>
       </field>
     </detail>
-    <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="rows/row">
+    <detail id="reports.ip1bjs8xtaejnhfrbzj2r6v1fi6hia4i.data" nodeset="row">
       <title>
         <text>
           <locale id="cchq.report_data_table"/>
@@ -77,7 +77,7 @@
         </header>
         <template>
           <text>
-            <xpath function="column[@id='owner']"/>
+            <xpath function="owner"/>
           </text>
         </template>
       </field>
@@ -89,7 +89,7 @@
         </header>
         <template>
           <text>
-            <xpath function="column[@id='count']"/>
+            <xpath function="count"/>
           </text>
         </template>
       </field>
@@ -101,7 +101,7 @@
         </header>
         <template>
           <text>
-            <xpath function="column[@id='is_starred']"/>
+            <xpath function="is_starred"/>
           </text>
         </template>
       </field>
diff --git a/corehq/apps/app_manager/tests/templatetags/test_xforms_extras.py b/corehq/apps/app_manager/tests/templatetags/test_xforms_extras.py
index 530f2bab467a..45b1f84d1607 100644
--- a/corehq/apps/app_manager/tests/templatetags/test_xforms_extras.py
+++ b/corehq/apps/app_manager/tests/templatetags/test_xforms_extras.py
@@ -288,18 +288,18 @@ def generate_markup_fragment(
             data_bind=data_bind,
             element_type=element_type)
 
-        return fragment_fromstring(markup)
+        return markup, fragment_fromstring(markup)
 
     def test_creates_input_tag(self):
-        fragment = self.generate_markup_fragment()
+        markup, fragment = self.generate_markup_fragment()
         self.assertEqual(fragment.tag, 'input')
 
     def test_creates_textarea_tag(self):
-        fragment = self.generate_markup_fragment(element_type='textarea')
+        markup, fragment = self.generate_markup_fragment(element_type='textarea')
         self.assertEqual(fragment.tag, 'textarea')
 
     def test_fills_all_attributes(self):
-        fragment = self.generate_markup_fragment(
+        markup, fragment = self.generate_markup_fragment(
             name_dict={'en': 'English Output'},
             langs=['en'],
             input_name='name',
@@ -316,7 +316,7 @@ def test_fills_all_attributes(self):
         self.assertEqual(fragment.attrib['placeholder'], '')
 
     def test_primary_language_populates_value(self):
-        fragment = self.generate_markup_fragment(
+        markup, fragment = self.generate_markup_fragment(
             name_dict={'en': 'English Output'},
             langs=['en']
         )
@@ -325,7 +325,7 @@ def test_primary_language_populates_value(self):
         self.assertEqual(fragment.attrib['placeholder'], '')
 
     def test_secondary_language_ignores_value_and_populates_placeholder(self):
-        fragment = self.generate_markup_fragment(
+        markup, fragment = self.generate_markup_fragment(
             name_dict={'por': 'Portuguese Output'},
             langs=['en', 'por']
         )
@@ -334,30 +334,29 @@ def test_secondary_language_ignores_value_and_populates_placeholder(self):
         self.assertEqual(fragment.attrib['placeholder'], 'Portuguese Output')
 
     def test_no_id_contains_no_id_attribute(self):
-        fragment = self.generate_markup_fragment(input_name=None)
+        markup, fragment = self.generate_markup_fragment(input_name=None)
 
         self.assertFalse('input_id' in fragment.attrib)
 
     def test_no_data_binding_contains_no_data_binding(self):
-        fragment = self.generate_markup_fragment(data_bind=None)
+        markup, fragment = self.generate_markup_fragment(data_bind=None)
 
         self.assertFalse('data-bind' in fragment.attrib)
 
-    # NOTE: documenting existing behavior -- I think this was a side effect
-    # of the parsing logic also being used elsewhere, and I doubt 'value' is meant to have javascript-escaping
-    def test_escapes_value_using_javascript_notation(self):
-        fragment = self.generate_markup_fragment(
-            name_dict={'en': 'English; Output'},
+    def test_escapes_value_using_html_escape(self):
+        markup, fragment = self.generate_markup_fragment(
+            name_dict={'en': 'English <div>Output</div>'},
             langs=['en']
         )
 
-        self.assertEqual(fragment.attrib['value'], 'English\\u003B Output')
+        self.assertIn('value="English &lt;div&gt;Output&lt;/div&gt;"', markup)
+        self.assertEqual(fragment.attrib['value'], 'English <div>Output</div>')
 
-    # NOTE: documenting existing behavior -- it is unlikely this needs to be javascript-escaped
-    def test_escapes_placeholder_using_javascript_notation(self):
-        fragment = self.generate_markup_fragment(
-            name_dict={'por': 'Portuguese; Output'},
+    def test_escapes_placeholder_using_html_escape(self):
+        markup, fragment = self.generate_markup_fragment(
+            name_dict={'por': 'Portuguese <div>Output</div>'},
             langs=['en', 'por']
         )
 
-        self.assertEqual(fragment.attrib['placeholder'], 'Portuguese\\u003B Output')
+        self.assertIn('placeholder="Portuguese &lt;div&gt;Output&lt;/div&gt;"', markup)
+        self.assertEqual(fragment.attrib['placeholder'], 'Portuguese <div>Output</div>')
diff --git a/corehq/apps/app_manager/tests/test_app_strings.py b/corehq/apps/app_manager/tests/test_app_strings.py
index 0fcada3e13b2..53075f770cc1 100644
--- a/corehq/apps/app_manager/tests/test_app_strings.py
+++ b/corehq/apps/app_manager/tests/test_app_strings.py
@@ -1,6 +1,7 @@
 import os
 from collections import OrderedDict
 
+import pytest
 from django.test import TestCase
 
 import commcare_translations
@@ -61,28 +62,28 @@ def test_non_empty_only():
     eq(non_empty_things, {"all_of_the_things": [None, 0, "", [], {}]})
 
 
-class AppManagerTranslationsTest(TestCase, SuiteMixin):
-    root = os.path.dirname(__file__)
+@pytest.mark.parametrize("input, expected_output", [
+    ('hello', '<value>hello</value>'),
+    ('abc < def > abc', '<value>abc &lt; def &gt; abc</value>'),
+    ("bee's knees", "<value>bee's knees</value>"),
+    ('unfortunate <xml expression', '<value>unfortunate &lt;xml expression</value>'),
+    ('क्लिक', '<value>क्लिक</value>'),
+    ('&#39', '<value>&amp;#39</value>'),
+    ('question1 is <output value="/data/question1" vellum:value="#form/question1"/> !',
+        '<value>question1 is &lt;output value="/data/question1" '
+        'vellum:value="#form/question1"/&gt; !</value>'),
+    ('Here is a ref <output value="/data/no_media"/> with some "trailing" text & that\'s some bad < xml.',
+        '<value>Here is a ref &lt;output value="/data/no_media"/&gt; with some "trailing" text &amp; that\'s'
+        ' some bad &lt; xml.</value>')
+])
+def test_escape_output_value(input, expected_output):
+    escaped_input = BulkAppTranslationFormUpdater.escape_output_value(input)
+    escaped_value = etree.tostring(escaped_input, encoding='utf-8').decode('utf-8')
+    assert escaped_value == expected_output
 
-    def test_escape_output_value(self):
-        test_cases = [
-            ('hello', '<value>hello</value>'),
-            ('abc < def > abc', '<value>abc &lt; def &gt; abc</value>'),
-            ("bee's knees", "<value>bee's knees</value>"),
-            ('unfortunate <xml expression', '<value>unfortunate &lt;xml expression</value>'),
-            ('क्लिक', '<value>क्लिक</value>'),
-            ('&#39', '<value>&amp;#39</value>'),
-            ('question1 is <output value="/data/question1" vellum:value="#form/question1"/> !',
-             '<value>question1 is &lt;output value="/data/question1" '
-             'vellum:value="#form/question1"/&gt; !</value>'),
-            ('Here is a ref <output value="/data/no_media"/> with some "trailing" text & that\'s some bad < xml.',
-             '<value>Here is a ref &lt;output value="/data/no_media"/&gt; with some "trailing" text &amp; that\'s'
-             ' some bad &lt; xml.</value>')
 
-        ]
-        for input, expected_output in test_cases:
-            escaped_input = BulkAppTranslationFormUpdater.escape_output_value(input)
-            self.assertEqual(expected_output, etree.tostring(escaped_input, encoding='utf-8').decode('utf-8'))
+class AppManagerTranslationsTest(TestCase, SuiteMixin):
+    root = os.path.dirname(__file__)
 
     def test_language_names(self):
         factory = AppFactory(build_version='2.40.0')
diff --git a/corehq/apps/app_manager/tests/test_apps.py b/corehq/apps/app_manager/tests/test_apps.py
index 2c4919a44f11..cf1ece2c393b 100644
--- a/corehq/apps/app_manager/tests/test_apps.py
+++ b/corehq/apps/app_manager/tests/test_apps.py
@@ -29,6 +29,7 @@
 from corehq.apps.app_manager.tests.util import (
     TestXmlMixin,
     add_build,
+    delete_all_multimedia,
     patch_default_builds, get_simple_form, patch_validate_xform,
 )
 from corehq.apps.app_manager.util import add_odk_profile_after_build
@@ -288,6 +289,7 @@ def testBuildImportedApp(self):
 
     @patch('urllib3.PoolManager.request')
     def testBuildTemplateApps(self, request_mock):
+        self.addCleanup(delete_all_multimedia)
         image_path = os.path.join('corehq', 'apps', 'hqwebapp', 'static', 'hqwebapp', 'images',
                                   'commcare-hq-logo.png')
         with open(image_path, 'rb') as f:
diff --git a/corehq/apps/app_manager/tests/test_report_config.py b/corehq/apps/app_manager/tests/test_report_config.py
index 8585c58e05d2..28a0151412bb 100644
--- a/corehq/apps/app_manager/tests/test_report_config.py
+++ b/corehq/apps/app_manager/tests/test_report_config.py
@@ -1,11 +1,10 @@
 import os
 from collections import OrderedDict
+from unittest import mock
 from xml.etree import cElementTree as ElementTree
 
 from django.test import SimpleTestCase, TestCase
 
-from unittest import mock
-
 from casexml.apps.phone.tests.utils import (
     call_fixture_generator,
     create_restore_user,
@@ -13,9 +12,6 @@
 
 from corehq.apps.app_manager.const import MOBILE_UCR_VERSION_2
 from corehq.apps.app_manager.fixtures import report_fixture_generator
-from corehq.apps.app_manager.fixtures.mobile_ucr import (
-    ReportFixturesProviderV1,
-)
 from corehq.apps.app_manager.models import (
     Application,
     GraphConfiguration,
@@ -279,9 +275,11 @@ def setUpClass(cls):
                 with mock.patch('corehq.apps.app_manager.fixtures.mobile_ucr.get_apps_in_domain',
                                 lambda domain, include_remote: [cls.app]):
                     with mock_datasource_config():
-                        fixtures = call_fixture_generator(report_fixture_generator, cls.user)
-                        fixture = [f for f in fixtures if f.attrib.get('id') == ReportFixturesProviderV1.id][0]
-        cls.fixture = ElementTree.tostring(fixture, encoding='utf-8')
+                        cls.fixtures = list(call_fixture_generator(report_fixture_generator, cls.user))
+
+    def _get_fixture_xml_by_id(self, id):
+        return next(ElementTree.tostring(fixture, encoding='utf-8')
+                    for fixture in self.fixtures if fixture.attrib.get('id') == id)
 
     def test_filter_entry(self):
         self.assertXmlPartialEqual("""
@@ -292,14 +290,21 @@ def test_filter_entry(self):
                 <locale id="cchq.reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.name"/>
               </text>
             </command>
+            <instance id="commcare-reports-filters:a98c812873986df34fd1b4ceb45e6164ae9cc664"
+                      src="jr://fixture/commcare-reports-filters:a98c812873986df34fd1b4ceb45e6164ae9cc664"/>
+            <instance id="commcare-reports:a98c812873986df34fd1b4ceb45e6164ae9cc664"
+                      src="jr://fixture/commcare-reports:a98c812873986df34fd1b4ceb45e6164ae9cc664"/>
             <instance id="commcare-reports:index" src="jr://fixture/commcare-reports:index"/>
             <instance id="commcaresession" src="jr://instance/session"/>
-            <instance id="reports" src="jr://fixture/commcare:reports"/>
             <session>
               <datum autoselect="true" detail-persistent="report_context_tile" id="tile_holder" nodeset="instance('commcare-reports:index')/report_index/reports" value="./@last_update"/>
-              <datum id="report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_fav_fruit_abc123_1" nodeset="instance('reports')/reports/report[@id='a98c812873986df34fd1b4ceb45e6164ae9cc664']/filters/filter[@field='fav_fruit_abc123_1']/option" value="./@value" detail-select="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.filter.fav_fruit_abc123_1" />
-              <datum id="report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_computed_owner_name_40cc88a0_1" nodeset="instance('reports')/reports/report[@id='a98c812873986df34fd1b4ceb45e6164ae9cc664']/filters/filter[@field='computed_owner_name_40cc88a0_1']/option" value="./@value" detail-select="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.filter.computed_owner_name_40cc88a0_1"/>
-              <datum id="report_id_a98c812873986df34fd1b4ceb45e6164ae9cc664" nodeset="instance('reports')/reports/report[@id='a98c812873986df34fd1b4ceb45e6164ae9cc664']" value="./@id" detail-select="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.select" detail-confirm="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.summary" autoselect="true"/>
+              <datum detail-select="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.filter.fav_fruit_abc123_1"
+                     id="report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_fav_fruit_abc123_1"
+                     nodeset="instance('commcare-reports-filters:a98c812873986df34fd1b4ceb45e6164ae9cc664')/filters/filter[@field='fav_fruit_abc123_1']/option" value="./@value"/>
+              <datum detail-select="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.filter.computed_owner_name_40cc88a0_1"
+                     id="report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_computed_owner_name_40cc88a0_1"
+                     nodeset="instance('commcare-reports-filters:a98c812873986df34fd1b4ceb45e6164ae9cc664')/filters/filter[@field='computed_owner_name_40cc88a0_1']/option" value="./@value"/>
+              <datum autoselect="true" detail-confirm="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.summary" detail-select="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.select" id="report_id_a98c812873986df34fd1b4ceb45e6164ae9cc664" nodeset="instance('commcare-reports:a98c812873986df34fd1b4ceb45e6164ae9cc664')/rows" value="./@id"/>
             </session>
           </entry>
         </partial>
@@ -313,11 +318,14 @@ def test_filter_entry(self):
                 <locale id="cchq.reports.45152061d8dc4d2a8d987a0568abe1ae.name"/>
               </text>
             </command>
+            <instance id="commcare-reports:45152061d8dc4d2a8d987a0568abe1ae"
+                      src="jr://fixture/commcare-reports:45152061d8dc4d2a8d987a0568abe1ae"/>
             <instance id="commcare-reports:index" src="jr://fixture/commcare-reports:index"/>
-            <instance id="reports" src="jr://fixture/commcare:reports"/>
             <session>
               <datum autoselect="true" detail-persistent="report_context_tile" id="tile_holder" nodeset="instance('commcare-reports:index')/report_index/reports" value="./@last_update"/>
-              <datum autoselect="true" detail-confirm="reports.45152061d8dc4d2a8d987a0568abe1ae.summary" detail-select="reports.45152061d8dc4d2a8d987a0568abe1ae.select" id="report_id_45152061d8dc4d2a8d987a0568abe1ae" nodeset="instance('reports')/reports/report[@id='45152061d8dc4d2a8d987a0568abe1ae']" value="./@id"/>
+              <datum autoselect="true" detail-confirm="reports.45152061d8dc4d2a8d987a0568abe1ae.summary"
+                     detail-select="reports.45152061d8dc4d2a8d987a0568abe1ae.select" id="report_id_45152061d8dc4d2a8d987a0568abe1ae"
+                     nodeset="instance('commcare-reports:45152061d8dc4d2a8d987a0568abe1ae')/rows" value="./@id"/>
             </session>
           </entry>
         </partial>
@@ -347,7 +355,8 @@ def test_filter_detail(self):
     def test_data_detail(self):
         self.assertXmlPartialEqual("""
         <partial>
-          <detail nodeset="rows/row[column[@id='fav_fruit_abc123']=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_fav_fruit_abc123_1][column[@id='computed_owner_name_40cc88a0']=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_computed_owner_name_40cc88a0_1]" id="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.data">
+          <detail id="reports.a98c812873986df34fd1b4ceb45e6164ae9cc664.data"
+                  nodeset="row[fav_fruit_abc123=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_fav_fruit_abc123_1][computed_owner_name_40cc88a0=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_computed_owner_name_40cc88a0_1]">
             <title>
               <text>
                 <locale id="cchq.report_data_table"/>
@@ -362,7 +371,7 @@ def test_data_detail(self):
               </template>
               <sort direction="ascending" order="1" type="int">
                 <text>
-                  <xpath function="column[@id='row_index']"/>
+                  <xpath function="row_index"/>
                 </text>
               </sort>
             </field>
@@ -374,7 +383,7 @@ def test_data_detail(self):
               </header>
               <template>
                 <text>
-                  <xpath function="column[@id='color_94ec39e6']"/>
+                  <xpath function="color_94ec39e6"/>
                 </text>
               </template>
             </field>
@@ -386,7 +395,7 @@ def test_data_detail(self):
               </header>
               <template>
                 <text>
-                  <xpath function="column[@id='count']"/>
+                  <xpath function="count"/>
                 </text>
               </template>
             </field>
@@ -399,10 +408,10 @@ def test_graph(self):
         <partial>
           <template form="graph">
             <graph type="bar">
-              <series nodeset="instance('reports')/reports/report[@id='a98c812873986df34fd1b4ceb45e6164ae9cc664']/rows/row[@is_total_row='False'][column[@id='fav_fruit_abc123']=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_fav_fruit_abc123_1][column[@id='computed_owner_name_40cc88a0']=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_computed_owner_name_40cc88a0_1]">
+               <series nodeset="instance('commcare-reports:a98c812873986df34fd1b4ceb45e6164ae9cc664')/rows/row[@is_total_row='False'][fav_fruit_abc123=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_fav_fruit_abc123_1][computed_owner_name_40cc88a0=instance('commcaresession')/session/data/report_filter_a98c812873986df34fd1b4ceb45e6164ae9cc664_computed_owner_name_40cc88a0_1]">
                 <configuration/>
-                <x function="column[@id='color_94ec39e6']"/>
-                <y function="column[@id='count']"/>
+                <x function="color_94ec39e6" />
+                <y function="count"/>
               </series>
               <configuration/>
             </graph>
@@ -413,53 +422,55 @@ def test_graph(self):
     def test_fixture_rows(self):
         self.assertXmlPartialEqual("""
         <partial>
-          <rows>
             <row index="0" is_total_row="False">
-              <column id="row_index">0</column>
-              <column id="color_94ec39e6">red</column>
-              <column id="computed_owner_name_40cc88a0">cory</column>
-              <column id="count">2</column>
-              <column id="fav_fruit_abc123">c</column>
+              <row_index>0</row_index>
+              <color_94ec39e6>red</color_94ec39e6>
+              <computed_owner_name_40cc88a0>cory</computed_owner_name_40cc88a0>
+              <count>2</count>
+              <fav_fruit_abc123>c</fav_fruit_abc123>
             </row>
             <row index="1" is_total_row="False">
-              <column id="row_index">1</column>
-              <column id="color_94ec39e6">black</column>
-              <column id="computed_owner_name_40cc88a0">ctsims</column>
-              <column id="count">1</column>
-              <column id="fav_fruit_abc123">b</column>
+              <row_index>1</row_index>
+              <color_94ec39e6>black</color_94ec39e6>
+              <computed_owner_name_40cc88a0>ctsims</computed_owner_name_40cc88a0>
+              <count>1</count>
+              <fav_fruit_abc123>b</fav_fruit_abc123>
             </row>
             <row index="2" is_total_row="False">
-              <column id="row_index">2</column>
-              <column id="color_94ec39e6">red</column>
-              <column id="computed_owner_name_40cc88a0">daniel</column>
-              <column id="count">3</column>
-              <column id="fav_fruit_abc123">b</column>
+              <row_index>2</row_index>
+              <color_94ec39e6>red</color_94ec39e6>
+              <computed_owner_name_40cc88a0>daniel</computed_owner_name_40cc88a0>
+              <count>3</count>
+              <fav_fruit_abc123>b</fav_fruit_abc123>
             </row>
-          </rows>
         </partial>
-        """, self.fixture, "reports/report[@id='a98c812873986df34fd1b4ceb45e6164ae9cc664']/rows")
+        """, self._get_fixture_xml_by_id('commcare-reports:a98c812873986df34fd1b4ceb45e6164ae9cc664'), "rows/row")
 
     def test_fixture_filters(self):
-        self.assertXmlPartialEqual("""
-        <partial>
-          <filters>
-            <filter field="fav_fruit_abc123_1">
-              <option value="b">banana</option>
-              <option value="c">clementine</option>
-            </filter>
-            <filter field="computed_owner_name_40cc88a0_1">
-              <option value="ctsims">Clayton Sims</option>
-              <option value="cory">Cory Zue</option>
-              <option value="daniel">Daniel Roberts</option>
-            </filter>
-          </filters>
-        </partial>
-        """, self.fixture, "reports/report[@id='a98c812873986df34fd1b4ceb45e6164ae9cc664']/filters")
+        self.assertXmlPartialEqual(
+            """
+                <partial>
+                  <filters>
+                    <filter field="fav_fruit_abc123_1">
+                      <option value="b">banana</option>
+                      <option value="c">clementine</option>
+                    </filter>
+                    <filter field="computed_owner_name_40cc88a0_1">
+                      <option value="ctsims">Clayton Sims</option>
+                      <option value="cory">Cory Zue</option>
+                      <option value="daniel">Daniel Roberts</option>
+                    </filter>
+                  </filters>
+                </partial>
+            """,
+            self._get_fixture_xml_by_id('commcare-reports-filters:a98c812873986df34fd1b4ceb45e6164ae9cc664'),
+            "filters"
+        )
 
     def test_hidden_columns_data_detail(self):
         self.assertXmlPartialEqual("""
         <partial>
-          <detail id="reports.45152061d8dc4d2a8d987a0568abe1ae.data" nodeset="rows/row">
+          <detail id="reports.45152061d8dc4d2a8d987a0568abe1ae.data" nodeset="row">
             <title>
               <text>
                 <locale id="cchq.report_data_table"/>
@@ -474,7 +485,7 @@ def test_hidden_columns_data_detail(self):
               </template>
               <sort direction="ascending" order="1" type="int">
                 <text>
-                  <xpath function="column[@id='row_index']"/>
+                  <xpath function="row_index"/>
                 </text>
               </sort>
             </field>
@@ -486,7 +497,7 @@ def test_hidden_columns_data_detail(self):
               </header>
               <template>
                 <text>
-                  <xpath function="column[@id='color_94ec39e6']"/>
+                  <xpath function="color_94ec39e6"/>
                 </text>
               </template>
             </field>
@@ -498,7 +509,7 @@ def test_hidden_columns_data_detail(self):
               </header>
               <template>
                 <text>
-                  <xpath function="column[@id='count']"/>
+                  <xpath function="count"/>
                 </text>
               </template>
             </field>
diff --git a/corehq/apps/app_manager/tests/test_suite.py b/corehq/apps/app_manager/tests/test_suite.py
index d3e14ceb1e74..294815e296ee 100644
--- a/corehq/apps/app_manager/tests/test_suite.py
+++ b/corehq/apps/app_manager/tests/test_suite.py
@@ -15,11 +15,12 @@
 from corehq.apps.app_manager.tests.app_factory import AppFactory
 from corehq.apps.app_manager.tests.util import (
     SuiteMixin,
+    case_search_sync_cases_on_form_entry_enabled_for_domain,
     patch_get_xform_resource_overrides,
-    case_search_sync_cases_on_form_entry_enabled_for_domain
 )
 from corehq.apps.hqmedia.models import HQMediaMapItem
 from corehq.apps.userreports.models import ReportConfiguration
+from corehq.util.test_utils import flag_enabled
 
 
 @patch_get_xform_resource_overrides()
@@ -89,8 +90,11 @@ def test_owner_name(self, *args):
     def test_printing(self, *args):
         self._test_generic_suite('app_print_detail', 'suite-print-detail')
 
+    @flag_enabled('MOBILE_UCR')
     def test_report_module(self, *args):
-        from corehq.apps.userreports.tests.utils import get_sample_report_config
+        from corehq.apps.userreports.tests.utils import (
+            get_sample_report_config,
+        )
 
         app = Application.new_app('domain', "Untitled Application")
 
diff --git a/corehq/apps/app_manager/tests/test_util.py b/corehq/apps/app_manager/tests/test_util.py
index 9e72e261555a..d9121d7e4317 100644
--- a/corehq/apps/app_manager/tests/test_util.py
+++ b/corehq/apps/app_manager/tests/test_util.py
@@ -7,11 +7,14 @@
     BuildProfile,
     GlobalAppConfig,
     LatestEnabledBuildProfiles,
-    Module,
 )
 from corehq.apps.app_manager.tests.app_factory import AppFactory
-from corehq.apps.app_manager.tests.util import get_simple_form, patch_validate_xform
-from corehq.apps.app_manager.util import split_path
+from corehq.apps.app_manager.tests.util import (
+    get_simple_form,
+    patch_validate_xform,
+    SuiteMixin,
+)
+from corehq.apps.app_manager.util import split_path, does_app_have_mobile_ucr_v1_refs
 from corehq.apps.app_manager.views.utils import get_default_followup_form_xml
 from corehq.apps.domain.models import Domain
 
@@ -213,3 +216,24 @@ def test_empty_string(self):
         path, name = split_path('')
         self.assertEqual(path, '')
         self.assertEqual(name, '')
+
+
+class TestDoesAppHaveMobileUCRV1Refs(TestCase, SuiteMixin):
+    file_path = ('data', 'suite')
+
+    def _create_app_with_form(self, xml_source_name):
+        app = Application.new_app('domain', "Untitled Application")
+        app.add_module(AdvancedModule.new_module('module', None))
+        app.new_form(
+            module_id=0,
+            name="My Form",
+            lang=None,
+            attachment=self.get_xml(xml_source_name).decode('utf-8')
+        )
+        return app
+
+    def test_does_app_have_mobile_ucr_v1_refs(self):
+        app_with_refs = self._create_app_with_form('reports_module_data_entry_mobile_ucr_v1')
+        self.assertTrue(does_app_have_mobile_ucr_v1_refs(app_with_refs))
+        app_without_refs = self._create_app_with_form('normal-suite')
+        self.assertFalse(does_app_have_mobile_ucr_v1_refs(app_without_refs))
diff --git a/corehq/apps/app_manager/tests/test_views.py b/corehq/apps/app_manager/tests/test_views.py
index 559763fe9aef..edee3de01626 100644
--- a/corehq/apps/app_manager/tests/test_views.py
+++ b/corehq/apps/app_manager/tests/test_views.py
@@ -557,7 +557,7 @@ def test_view_form_legacy(self, mock1):
         'WEBSOCKET_URI', 'selected_form', 'module', 'MINIMUM_PASSWORD_LENGTH', 'MINIMUM_ZXCVBN_SCORE',
         'SUPPORT_EMAIL', 'app_view_options', 'show_advanced', 'role_version', 'custom_assertions',
         'is_app_settings_page', 'domain_names', 'latest_version_for_build_profiles', 'ANALYTICS_CONFIG',
-        'csrf_token', 'LANGUAGE_CODE', 'app_name', 'requirejs_main', 'sub', 'is_saas_environment',
+        'csrf_token', 'LANGUAGE_CODE', 'app_name', 'sub', 'is_saas_environment',
         'selected_module', 'add_ons_layout', 'is_dimagi_environment', 'TIME_ZONE', 'env', 'add_ons',
         'show_shadow_forms', 'can_edit_apps', 'ANALYTICS_IDS', 'active_tab', 'current_url_name',
         'show_release_mode', 'application_profile_url', 'linkable_domains', 'domain_links',
@@ -581,7 +581,7 @@ def test_view_form_legacy(self, mock1):
         'nav_menu_media_specifics', 'user', 'TIME_ZONE', 'domain', 'module_brief', 'timezone', 'active_tab',
         'data_registry_enabled', 'confirm', 'messages', 'releases_active', 'show_status_page',
         'show_search_workflow', 'data_registries', 'label', 'underscore', 'forloop', 'show_shadow_modules',
-        'requirejs_main', 'SUPPORT_EMAIL', 'valid_parents_for_child_module', 'parent_case_modules',
+        'SUPPORT_EMAIL', 'valid_parents_for_child_module', 'parent_case_modules',
         'current_url_name', 'LANGUAGE_BIDI', 'DEFAULT_MESSAGE_LEVELS', 'show_report_modules', 'BASE_MAIN',
         'app_id', 'request', 'MINIMUM_PASSWORD_LENGTH', 'type', 'is_saas_environment', 'show_all_projects_link',
         'enterprise_mode', 'csrf_token', 'WS4REDIS_HEARTBEAT', 'is_dimagi_environment', 'domain_names',
@@ -597,7 +597,7 @@ def test_view_form_legacy(self, mock1):
         'form', 'error', 'previews_dict', 'copy_app_form', 'LANGUAGE_CODE', 'menu', 'add_ons_privileges',
         'shadow_parent', 'restrict_domain_creation', 'show_mobile_ux_warning', 'WEBSOCKET_URI', 'PRIVACY_EMAIL',
         'custom_assertions', 'analytics', 'form_endpoint_options', 'title_context_block', 'secure_cookies',
-        'langs', 'details', 'None', 'CUSTOM_LOGO_URL', 'hq', 'selected_form', 'slug', 'env', 'False',
+        'langs', 'details', 'None', 'CUSTOM_LOGO_URL', 'hq', 'selected_form', 'slug', 'env', 'False', 'id',
         'ANALYTICS_IDS', 'STATIC_URL', 'selected_module', 'role_version', 'EULA_COMPLIANCE', 'sentry',
         'case_list_form_not_allowed_reasons', 'child_module_enabled', 'block',
     }
@@ -607,7 +607,7 @@ def test_view_form_legacy(self, mock1):
         'show_release_mode', 'linked_name', 'linked_version', 'latest_commcare_version',
         'nav_menu_media_specifics', 'user', 'TIME_ZONE', 'domain', 'case_config_options', 'timezone',
         'root_requires_same_case', 'active_tab', 'confirm', 'messages', 'releases_active', 'show_status_page',
-        'form_filter_patterns', 'form_workflows', 'label', 'underscore', 'forloop', 'requirejs_main',
+        'form_filter_patterns', 'form_workflows', 'label', 'underscore', 'forloop',
         'SUPPORT_EMAIL', 'current_url_name', 'LANGUAGE_BIDI', 'DEFAULT_MESSAGE_LEVELS', 'show_report_modules',
         'BASE_MAIN', 'xform_languages', 'app_id', 'request', 'allow_usercase', 'MINIMUM_PASSWORD_LENGTH', 'type',
         'is_saas_environment', 'show_all_projects_link', 'enterprise_mode', 'module_is_multi_select', 'csrf_token',
@@ -624,7 +624,7 @@ def test_view_form_legacy(self, mock1):
         'ANALYTICS_CONFIG', 'is_training_module', 'custom_icon', 'page_title_block', 'INVOICING_CONTACT_EMAIL',
         'form', 'error', 'previews_dict', 'copy_app_form', 'LANGUAGE_CODE', 'menu', 'add_ons_privileges',
         'restrict_domain_creation', 'show_mobile_ux_warning', 'WEBSOCKET_URI', 'PRIVACY_EMAIL',
-        'is_allowed_to_be_release_notes_form', 'custom_assertions', 'analytics', 'title_context_block',
+        'is_allowed_to_be_release_notes_form', 'custom_assertions', 'analytics', 'title_context_block', 'id',
         'secure_cookies', 'langs', 'None', 'CUSTOM_LOGO_URL', 'hq', 'allow_form_copy', 'selected_form', 'slug',
         'env', 'False', 'ANALYTICS_IDS', 'STATIC_URL', 'selected_module', 'role_version', 'is_usercase_in_use',
         'module_loads_registry_case', 'EULA_COMPLIANCE', 'sentry', 'show_shadow_modules', 'show_custom_ref',
diff --git a/corehq/apps/app_manager/tests/util.py b/corehq/apps/app_manager/tests/util.py
index 8bacd7517b4b..47cdccc0ef7d 100644
--- a/corehq/apps/app_manager/tests/util.py
+++ b/corehq/apps/app_manager/tests/util.py
@@ -6,6 +6,8 @@
 from lxml import etree
 from nose.tools import nottest
 
+from dimagi.utils.couch.database import iter_bulk_delete
+
 import commcare_translations
 from corehq.apps.app_manager.models import Application
 from corehq.apps.app_manager.util import app_doc_types
@@ -14,6 +16,10 @@
     CommCareBuild,
     CommCareBuildConfig,
 )
+from corehq.apps.hqmedia.models import CommCareMultimedia
+from corehq.blobs import CODES, get_blob_db
+from corehq.blobs.models import BlobMeta
+from corehq.sql_db.util import get_db_aliases_for_partitioned_query
 from corehq.tests.util.xml import (
     assert_html_equal,
     assert_xml_equal,
@@ -170,6 +176,20 @@ def delete_all_apps():
             Application.get_db().delete_doc(row['doc'])
 
 
+@unit_testing_only
+def delete_all_multimedia():
+    # Clean up multimedia, which is shared across domains keyed on
+    # file content hash. Blob metadata is automatically cleaned up
+    # on SQL transaction rollback, which breaks CommCareMultimedia
+    # functionality in other tests.
+    metas = []
+    for dbname in get_db_aliases_for_partitioned_query():
+        metas.extend(BlobMeta.objects.using(dbname).filter(type_code=CODES.multimedia))
+    couch_ids = [m.parent_id for m in metas]
+    iter_bulk_delete(CommCareMultimedia.get_db(), couch_ids)
+    get_blob_db().bulk_delete(metas)
+
+
 def get_simple_form(xmlns=None):
     xmlns = xmlns or uuid.uuid4().hex
     return """<?xml version="1.0" encoding="UTF-8" ?>
diff --git a/corehq/apps/app_manager/util.py b/corehq/apps/app_manager/util.py
index 9d40e56fdbb3..8faec1b827e1 100644
--- a/corehq/apps/app_manager/util.py
+++ b/corehq/apps/app_manager/util.py
@@ -27,6 +27,9 @@
     USERCASE_ID,
     USERCASE_PREFIX,
     USERCASE_TYPE,
+    MOBILE_UCR_V1_FIXTURE_IDENTIFIER,
+    MOBILE_UCR_V1_ALL_REFERENCES,
+    MOBILE_UCR_V1_CASE_LIST_REFERENCES_PATTERN,
 )
 from corehq.apps.app_manager.dbaccessors import get_app, get_apps_in_domain
 from corehq.apps.app_manager.exceptions import (
@@ -313,9 +316,9 @@ def languages_mapping():
     if not mapping:
         with open('submodules/langcodes/langs.json', encoding='utf-8') as langs_file:
             lang_data = json.load(langs_file)
-            mapping = dict([(l["two"], l["names"]) for l in lang_data])
+            mapping = dict([(lang["two"], lang["names"]) for lang in lang_data])
         mapping["default"] = ["Default Language"]
-        cache.set('__languages_mapping', mapping, 12*60*60)
+        cache.set('__languages_mapping', mapping, 12 * 60 * 60)
     return mapping
 
 
@@ -361,8 +364,8 @@ def get_commcare_builds(request_user):
 
 
 def actions_use_usercase(actions):
-    return (('usercase_update' in actions and actions['usercase_update'].update) or
-            ('usercase_preload' in actions and actions['usercase_preload'].preload))
+    return (('usercase_update' in actions and actions['usercase_update'].update)
+            or ('usercase_preload' in actions and actions['usercase_preload'].preload))
 
 
 def advanced_actions_use_usercase(actions):
@@ -410,8 +413,8 @@ def module_offers_search(module):
     from corehq.apps.app_manager.models import AdvancedModule, Module, ShadowModule
 
     return (
-        isinstance(module, (Module, AdvancedModule, ShadowModule)) and
-        module.search_config
+        isinstance(module, (Module, AdvancedModule, ShadowModule))
+        and module.search_config
         and (module.search_config.properties
         or module.search_config.default_properties)
     )
@@ -592,7 +595,9 @@ def get_sort_and_sort_only_columns(detail_columns, sort_elements):
             except IndexError:
                 raise AppManagerException(f"Sort column references an unknown column at index: {column_index}")
             if not column.useXpathExpression:
-                raise AppManagerException(f"Calculation sort column references an incorrect column: {column.field}")
+                raise AppManagerException(
+                    f"Calculation sort column references an incorrect column: {column.field}"
+                )
             sort_columns[column.field] = (element, element_order)
 
     sort_only_elements = [
@@ -752,3 +757,21 @@ def extract_instance_id_from_nodeset_ref(nodeset):
     if nodeset:
         matches = re.findall(r"instance\('(.*?)'\)", nodeset)
         return matches[0] if matches else None
+
+
+def does_app_have_mobile_ucr_v1_refs(app):
+    suite = app.create_suite()
+    re_mobile_ucr_v1_case_list_references_pattern = re.compile(MOBILE_UCR_V1_CASE_LIST_REFERENCES_PATTERN)
+    if re.search(re_mobile_ucr_v1_case_list_references_pattern, suite.decode()):
+        return True
+
+    re_mobile_ucr_v1_all_refs = re.compile(MOBILE_UCR_V1_ALL_REFERENCES)
+    for form in app.get_forms():
+        # The second condition should always be False if the first one is
+        # but just as a precaution we'll check for it
+        if (
+            MOBILE_UCR_V1_FIXTURE_IDENTIFIER in form.source
+            or re_mobile_ucr_v1_all_refs.search(form.source)
+        ):
+            return True
+    return False
diff --git a/corehq/apps/app_manager/views/apps.py b/corehq/apps/app_manager/views/apps.py
index c9adbf1e0cd0..054662a6c5cf 100644
--- a/corehq/apps/app_manager/views/apps.py
+++ b/corehq/apps/app_manager/views/apps.py
@@ -947,7 +947,7 @@ def require_remote_app():
     if should_edit("custom_suite"):
         app.set_custom_suite(hq_settings['custom_suite'])
 
-    return HttpResponse(json.dumps(resp))
+    return JsonResponse(resp)
 
 
 @no_conflict_require_POST
@@ -959,7 +959,7 @@ def edit_add_ons(request, domain, app_id):
         if slug in current:
             app.add_ons[slug] = value == 'on'
     app.save()
-    return HttpResponse(json.dumps({'success': True}))
+    return JsonResponse({'success': True})
 
 
 @no_conflict_require_POST
@@ -1003,7 +1003,7 @@ def rearrange(request, domain, app_id, key):
         return back_to_main(request, domain, app_id=app_id, module_id=module_id)
     app.save(resp)
     if ajax:
-        return HttpResponse(json.dumps(resp))
+        return JsonResponse(resp)
     else:
         return back_to_main(request, domain, app_id=app_id, module_id=module_id)
 
diff --git a/corehq/apps/app_manager/views/formdesigner.py b/corehq/apps/app_manager/views/formdesigner.py
index 4a84aab2a219..f786b0f4ccb7 100644
--- a/corehq/apps/app_manager/views/formdesigner.py
+++ b/corehq/apps/app_manager/views/formdesigner.py
@@ -1,5 +1,6 @@
 import json
 import logging
+from looseversion import LooseVersion
 
 from django.conf import settings
 from django.contrib import messages
@@ -131,11 +132,6 @@ def _get_form_designer_view(request, domain, app, module, form):
 
     send_hubspot_form(HUBSPOT_FORM_BUILDER_FORM_ID, request)
 
-    def _form_too_large(_app, _form):
-        # form less than 0.1MB, anything larger starts to have
-        # performance issues with fullstory
-        return _app.blobs['{}.xml'.format(_form.unique_id)]['content_length'] > 102400
-
     context = get_apps_base_context(request, domain, app)
     context.update(locals())
 
@@ -150,7 +146,6 @@ def _form_too_large(_app, _form):
         'nav_form': form,
         'formdesigner': True,
 
-        'include_fullstory': not _form_too_large(app, form),
         'CKEDITOR_BASEPATH': "app_manager/js/vellum/lib/ckeditor/",
         'show_live_preview': should_show_preview_app(
             request,
@@ -204,7 +199,7 @@ def get_form_data_schema(request, domain, app_id, form_unique_id):
     kw = {}
     if "pretty" in request.GET:
         kw["indent"] = 2
-    return HttpResponse(json.dumps(data, **kw))
+    return HttpResponse(json.dumps(data, **kw), content_type='application/json')
 
 
 @require_GET
@@ -326,6 +321,7 @@ def _get_vellum_features(request, domain, app):
         'sorted_itemsets': app.enable_sorted_itemsets,
         'advanced_itemsets': add_ons.show("advanced_itemsets", request, app),
         'markdown_tables': app.enable_markdown_tables,
+        'use_custom_repeat_button_text': app.build_version >= LooseVersion('2.55'),
     })
     return vellum_features
 
diff --git a/corehq/apps/app_manager/views/forms.py b/corehq/apps/app_manager/views/forms.py
index 922de0d5fe53..400219e16497 100644
--- a/corehq/apps/app_manager/views/forms.py
+++ b/corehq/apps/app_manager/views/forms.py
@@ -470,7 +470,7 @@ def should_edit(attribute):
     app.save(resp)
     notify_form_changed(domain, request.couch_user, app_id, form_unique_id)
     if ajax:
-        return HttpResponse(json.dumps(resp))
+        return JsonResponse(resp)
     else:
         return back_to_main(request, domain, app_id=app_id, form_unique_id=form_unique_id)
 
@@ -588,8 +588,7 @@ def get_xform_source(request, domain, app_id, form_unique_id):
 
     lang = request.COOKIES.get('lang', app.langs[0])
     source = form.source
-    response = HttpResponse(source)
-    response['Content-Type'] = "application/xml"
+    response = HttpResponse(source, content_type='application/xml')
     filename = form.default_name()
     for lc in [lang] + app.langs:
         if lc in form.name:
diff --git a/corehq/apps/app_manager/views/modules.py b/corehq/apps/app_manager/views/modules.py
index 5689ad1d7dc6..3979b0658d07 100644
--- a/corehq/apps/app_manager/views/modules.py
+++ b/corehq/apps/app_manager/views/modules.py
@@ -857,7 +857,7 @@ def should_edit(attribute):
 
     app.save(resp)
     resp['case_list-show'] = module.requires_case_details()
-    return HttpResponse(json.dumps(resp))
+    return JsonResponse(resp)
 
 
 def _new_advanced_module(request, domain, app, name, lang):
diff --git a/corehq/apps/app_manager/views/releases.py b/corehq/apps/app_manager/views/releases.py
index 67e11be01752..7368f42f16b4 100644
--- a/corehq/apps/app_manager/views/releases.py
+++ b/corehq/apps/app_manager/views/releases.py
@@ -68,7 +68,10 @@
 from corehq.apps.app_manager.tasks import (
     create_build_files_for_all_app_profiles,
 )
-from corehq.apps.app_manager.util import get_and_assert_practice_user_in_domain
+from corehq.apps.app_manager.util import (
+    get_and_assert_practice_user_in_domain,
+    does_app_have_mobile_ucr_v1_refs,
+)
 from corehq.apps.app_manager.views.download import source_files
 from corehq.apps.app_manager.views.settings import PromptSettingsUpdateView
 from corehq.apps.app_manager.views.utils import (
@@ -273,6 +276,10 @@ def release_build(request, domain, app_id, saved_app_id):
     saved_app = get_app(domain, saved_app_id)
     if saved_app.copy_of != app_id:
         raise Http404
+    if is_released:
+        error_message = _check_app_for_mobile_ucr_v1_refs(domain, saved_app)
+        if error_message:
+            return json_response({'error': error_message})
     saved_app.is_released = is_released
     saved_app.last_released = datetime.datetime.utcnow() if is_released else None
     saved_app.is_auto_generated = False
@@ -362,10 +369,17 @@ def save_copy(request, domain, app_id):
     case_types = get_case_types_for_app_build(domain, app_id)
     deprecated_case_types = get_data_dict_deprecated_case_types(domain)
     used_deprecated_case_types = case_types.intersection(deprecated_case_types)
+    error_html = ''
+    warning_message = _check_app_for_mobile_ucr_v1_refs(domain, app)
+    if warning_message:
+        error_html = render_to_string("app_manager/partials/mobile_ucr_v1_warning.html", {
+            'warning_message': warning_message,
+        })
+
     return JsonResponse({
         "saved_app": copy_json,
         "deprecated_case_types": list(used_deprecated_case_types),
-        "error_html": "",
+        "error_html": error_html,
     })
 
 
@@ -388,6 +402,19 @@ def _track_build_for_app_preview(domain, couch_user, app_id, message):
     })
 
 
+def _check_app_for_mobile_ucr_v1_refs(domain, app):
+    if not toggles.MOBILE_UCR.enabled(domain):
+        return
+    if app.mobile_ucr_restore_version != '2.0':
+        return _("The mobile UCR restore version for v%(app_version)s needs to be updated to V2.0") % {
+            'app_version': app.version,
+        }
+    if does_app_have_mobile_ucr_v1_refs(app):
+        return _("One or more forms for v%(app_version)s contain V1 Mobile UCR references.") % {
+            'app_version': app.version,
+        }
+
+
 @no_conflict_require_POST
 @require_can_edit_apps
 def revert_to_copy(request, domain, app_id):
@@ -400,6 +427,9 @@ def revert_to_copy(request, domain, app_id):
     copy = get_app(domain, request.POST['build_id'])
     if copy.get_doc_type() == 'LinkedApplication' and app.get_doc_type() == 'Application':
         copy = copy.convert_to_application()
+    warning_message = _check_app_for_mobile_ucr_v1_refs(domain, app=copy)
+    if warning_message:
+        messages.warning(request, warning_message)
     app = app.make_reversion_to_copy(copy)
     app.save()
     messages.success(
diff --git a/corehq/apps/app_manager/views/settings.py b/corehq/apps/app_manager/views/settings.py
index 2fa08807312c..a04e57a53844 100644
--- a/corehq/apps/app_manager/views/settings.py
+++ b/corehq/apps/app_manager/views/settings.py
@@ -3,9 +3,9 @@
 
 from django.contrib import messages
 from django.http import (
-    HttpResponse,
     HttpResponseBadRequest,
     HttpResponseRedirect,
+    JsonResponse,
 )
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -30,7 +30,7 @@
 @login_and_domain_required
 def commcare_profile(request, domain, app_id):
     app = get_app(domain, app_id)
-    return HttpResponse(json.dumps(app.profile))
+    return JsonResponse(app.profile, safe=False)
 
 
 @no_conflict_require_POST
diff --git a/corehq/apps/auditcare/tests/test_models.py b/corehq/apps/auditcare/tests/test_models.py
index cd6899811288..da258b3e366a 100644
--- a/corehq/apps/auditcare/tests/test_models.py
+++ b/corehq/apps/auditcare/tests/test_models.py
@@ -1,6 +1,7 @@
 from contextlib import contextmanager
 from unittest.mock import patch
 
+import pytest
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.test import RequestFactory
@@ -123,18 +124,17 @@ def test_audit_view_should_not_save(self):
         self.assertIsNone(event.id)
 
 
-def test_get_domain():
-    def test(cfg):
-        request = make_request(cfg.path)
-        if "request_domain" in cfg:
-            request.domain = cfg.request_domain
-        eq(mod.get_domain(request), cfg.expect)
-
-    cfg = Config(expect="block")
-    yield test, cfg(path="/path", expect=None)
-    yield test, cfg(path="/a/block/path")
-    yield test, cfg(path="/path", request_domain="block")
-    yield test, cfg(path="/a/block/path", request_domain="xx")
+@pytest.mark.parametrize("cfg", [
+    Config(expect=None, path="/path"),
+    Config(expect="block", path="/a/block/path"),
+    Config(expect="block", path="/path", request_domain="block"),
+    Config(expect="block", path="/a/block/path", request_domain="xx"),
+])
+def test_get_domain(cfg):
+    request = make_request(cfg.path)
+    if "request_domain" in cfg:
+        request.domain = cfg.request_domain
+    eq(mod.get_domain(request), cfg.expect)
 
 
 def make_request(path="/path", session_key="abc", params=None, **headers):
diff --git a/corehq/apps/auditcare/views.py b/corehq/apps/auditcare/views.py
index 34581dc587e9..3cfbb8df7684 100644
--- a/corehq/apps/auditcare/views.py
+++ b/corehq/apps/auditcare/views.py
@@ -22,7 +22,7 @@ def export_all(request):
         else:
             return HttpResponseBadRequest(f'[start] {e}')
 
-    response = HttpResponse()
+    response = HttpResponse(content_type='text/csv')
     response['Content-Disposition'] = 'attachment; filename="AuditAll.csv"'
     write_export_from_all_log_events(response, start=start, end=end)
     return response
diff --git a/corehq/apps/callcenter/sync_usercase.py b/corehq/apps/callcenter/sync_usercase.py
index 828d4f38c8d6..80a6a269f79e 100644
--- a/corehq/apps/callcenter/sync_usercase.py
+++ b/corehq/apps/callcenter/sync_usercase.py
@@ -105,7 +105,7 @@ def _domain_has_new_fields(domain, field_names):
 def _get_sync_usercase_helper(user, domain, case_type, owner_id, case=None):
     fields = _get_user_case_fields(user, case_type, owner_id, domain)
     case = case or CommCareCase.objects.get_case_by_external_id(domain, user.user_id, case_type)
-    close = user.to_be_deleted() or not user.is_active
+    close = user.to_be_deleted() or not user.is_active or domain not in user.get_domains()
     user_case_helper = _UserCaseHelper(domain, owner_id, user.user_id)
 
     def case_should_be_reopened(case, user_case_should_be_closed):
diff --git a/corehq/apps/callcenter/tests/test_utils.py b/corehq/apps/callcenter/tests/test_utils.py
index f4f08a2ea176..93e665f9ce57 100644
--- a/corehq/apps/callcenter/tests/test_utils.py
+++ b/corehq/apps/callcenter/tests/test_utils.py
@@ -242,13 +242,17 @@ def tearDownClass(cls):
         cls.domain.delete()
         super().tearDownClass()
 
+    def _get_user_case(self, user_id=None):
+        return CommCareCase.objects.get_case_by_external_id(
+            TEST_DOMAIN, user_id or self.user._id, USERCASE_TYPE)
+
     def test_sync_usercase_custom_user_data_on_create(self):
         """
         Custom user data should be synced when the user is created
         """
         self.user.get_user_data(self.domain.name)['completed_training'] = 'yes'
         self.user.save()
-        case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        case = self._get_user_case()
         self.assertIsNotNone(case)
         self.assertEqual(case.dynamic_case_properties()['completed_training'], 'yes')
 
@@ -260,7 +264,7 @@ def test_sync_usercase_custom_user_data_on_update(self):
         self.user.save()
         self.user.get_user_data(self.domain.name)['completed_training'] = 'yes'
         self.user.save()
-        case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        case = self._get_user_case()
         self.assertEqual(case.dynamic_case_properties()['completed_training'], 'yes')
         self._check_update_matches(case, {'completed_training': 'yes'})
 
@@ -273,7 +277,7 @@ def test_sync_usercase_overwrite_hq_props(self):
             'case_type': 'bob',
         })
         self.user.save()
-        case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        case = self._get_user_case()
         self.assertEqual(case.owner_id, self.user.get_id)
         self.assertEqual(case.type, USERCASE_TYPE)
         self.assertEqual(1, len(case.xform_ids))
@@ -286,17 +290,17 @@ def _check_update_matches(self, case, expected_update):
     def test_reactivate_user(self):
         """Confirm that reactivating a user re-opens its user case."""
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertIsNotNone(user_case)
 
         self.user.is_active = False
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertTrue(user_case.closed)
 
         self.user.is_active = True
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertFalse(user_case.closed)
 
     def test_update_deactivated_user(self):
@@ -304,17 +308,17 @@ def test_update_deactivated_user(self):
         Confirm that updating a deactivated user also updates the user case.
         """
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertIsNotNone(user_case)
 
         self.user.is_active = False
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertTrue(user_case.closed)
 
         self.user.get_user_data(self.domain.name)['foo'] = 'bar'
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertTrue(user_case.closed)
         self.assertEqual(user_case.dynamic_case_properties()['foo'], 'bar')
 
@@ -326,30 +330,30 @@ def test_update_and_reactivate_in_one_save(self):
         Confirm that updating a deactivated user also updates the user case.
         """
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertIsNotNone(user_case)
 
         self.user.is_active = False
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertTrue(user_case.closed)
 
         self.user.get_user_data(self.domain.name)['foo'] = 'bar'
         self.user.is_active = True
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertFalse(user_case.closed)
         self.assertEqual(user_case.dynamic_case_properties()['foo'], 'bar')
 
     def test_update_no_change(self):
         self.user.get_user_data(self.domain.name)['numeric'] = 123
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertIsNotNone(user_case)
         self.assertEqual(1, len(user_case.xform_ids))
 
         self.user.save()
-        user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        user_case = self._get_user_case()
         self.assertEqual(1, len(user_case.xform_ids))
 
     def test_bulk_upload_usercases(self):
@@ -389,21 +393,30 @@ def test_bulk_upload_usercases(self):
         self.assertEqual(results['errors'], [])
         self.assertEqual([r['flag'] for r in results['rows']], ['updated', 'created'])
 
-        old_user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, self.user._id, USERCASE_TYPE)
+        old_user_case = self._get_user_case()
         self.assertEqual(old_user_case.owner_id, self.user.get_id)
         self.assertEqual(2, len(old_user_case.xform_ids))
 
         new_user = CommCareUser.get_by_username(format_username('the_bunk', TEST_DOMAIN))
         self.addCleanup(new_user.delete, self.domain.name, deleted_by=None)
-        new_user_case = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN, new_user._id, USERCASE_TYPE)
+        new_user_case = self._get_user_case(new_user._id)
         self.assertEqual(new_user_case.owner_id, new_user.get_id)
         self.assertEqual(1, len(new_user_case.xform_ids))
 
+    @flag_enabled('USH_USERCASES_FOR_WEB_USERS')
+    def test_web_user_removed(self):
+        self.user.save()
+        web_user = self._make_web_user()
+        self.assertFalse(self._get_user_case(web_user._id).closed)
+
+        web_user.delete_domain_membership(TEST_DOMAIN)
+        web_user.save()
+        self.assertTrue(self._get_user_case(web_user._id).closed)
+
     @flag_enabled('USH_USERCASES_FOR_WEB_USERS')
     def test_web_user_location_fields_sync(self):
         self.user.save()
-        web_user = WebUser.create(TEST_DOMAIN, 'user3', '***', None, None)
-        self.addCleanup(web_user.delete, TEST_DOMAIN, deleted_by=None)
+        web_user = self._make_web_user()
         lt = LocationType.objects.create(
             domain=TEST_DOMAIN, name='lt2'
         )
@@ -411,12 +424,16 @@ def test_web_user_location_fields_sync(self):
         self.loc2 = make_loc('loc2', type=lt.name, domain=TEST_DOMAIN)
         web_user.set_location(TEST_DOMAIN, self.loc1)
         web_user.add_to_assigned_locations(TEST_DOMAIN, self.loc2)
-        case_json = CommCareCase.objects.get_case_by_external_id(TEST_DOMAIN,
-                                                                 web_user._id, USERCASE_TYPE).case_json
+        case_json = self._get_user_case(web_user._id).case_json
         self.assertEqual(case_json['commcare_location_id'], self.loc1.location_id)
         self.assertEqual(case_json['commcare_location_ids'], self.loc1.location_id + ' ' + self.loc2.location_id)
         self.assertEqual(case_json['commcare_primary_case_sharing_id'], self.loc1.location_id)
 
+    def _make_web_user(self):
+        web_user = WebUser.create(TEST_DOMAIN, 'user3', '***', None, None)
+        self.addCleanup(web_user.delete, TEST_DOMAIN, deleted_by=None)
+        return web_user
+
 
 class DomainTimezoneTests(SimpleTestCase):
 
diff --git a/corehq/apps/case_importer/do_import.py b/corehq/apps/case_importer/do_import.py
index 2a88483dd88a..b33cdc2804a6 100644
--- a/corehq/apps/case_importer/do_import.py
+++ b/corehq/apps/case_importer/do_import.py
@@ -342,9 +342,7 @@ def _report_import_timings(self, timer, results):
         for rows, status in ((rows_created, 'created'),
                              (rows_updated, 'updated'),
                              (rows_failed, 'error')):
-            metrics_counter('commcare.case_importer.cases', rows, tags={
-                'status': status,
-            })
+            metrics_counter("commcare.case_importer.cases", rows, tags={"status": status, "domain": self.domain})
 
 
 class SubmitCaseBlockHandler:
diff --git a/corehq/apps/case_importer/static/case_importer/js/excel_fields.js b/corehq/apps/case_importer/static/case_importer/js/excel_fields.js
index 9d5f7f1e1605..dd821f3206a6 100644
--- a/corehq/apps/case_importer/static/case_importer/js/excel_fields.js
+++ b/corehq/apps/case_importer/static/case_importer/js/excel_fields.js
@@ -10,7 +10,8 @@ hqDefine('case_importer/js/excel_fields', [
     _,
     levenshtein
 ) {
-    function excelFieldRows(excelFields, caseFieldSpecs) {
+    function excelFieldRows(excelFields, caseFieldSpecs, systemFields) {
+        systemFields = _(systemFields);
         var self = {
             excelFields: excelFields,
             caseFieldSpecs: caseFieldSpecs,
@@ -30,6 +31,9 @@ hqDefine('case_importer/js/excel_fields', [
                 customCaseField: ko.observable(excelField),
                 isCustom: ko.observable(false),
             };
+            row.hasValue = ko.computed(function () {
+                return row.isCustom() || row.selectedCaseField();
+            });
             row.selectedCaseFieldOrBlank = ko.computed({
                 read: function () {
                     return row.isCustom() ? '' : row.selectedCaseField();
@@ -63,12 +67,6 @@ hqDefine('case_importer/js/excel_fields', [
             row.valuesHints = ko.computed(function () {
                 return row.caseFieldSpec().values_hints || [];
             });
-            row.createNewChecked = ko.computed({
-                read: function () {
-                    return _.isEmpty(row.caseFieldSpec());
-                },
-                write: row.isCustom,
-            });
             row.isDeprecated = ko.computed(function () {
                 return row.caseFieldSpec().deprecated === true;
             });
@@ -81,7 +79,7 @@ hqDefine('case_importer/js/excel_fields', [
                     row.isCustom(false);
                     row.selectedCaseField(field);
                 } else {
-                    row.isCustom(true);
+                    row.isCustom(!systemFields.contains(field));
                     row.selectedCaseField(null);
                 }
             };
@@ -102,6 +100,9 @@ hqDefine('case_importer/js/excel_fields', [
                 });
                 return _.chain(suggestions).sortBy('distance').pluck('field').value();
             });
+            row.isSystemProperty = ko.computed(function () {
+                return row.isCustom() && systemFields.contains(row.customCaseField());
+            });
 
             self.mappingRows.push(row);
         };
diff --git a/corehq/apps/case_importer/static/case_importer/js/import_history.js b/corehq/apps/case_importer/static/case_importer/js/import_history.js
index a6eef5d79f06..0d503bce5bb4 100644
--- a/corehq/apps/case_importer/static/case_importer/js/import_history.js
+++ b/corehq/apps/case_importer/static/case_importer/js/import_history.js
@@ -5,7 +5,9 @@ hqDefine('case_importer/js/import_history', [
     'underscore',
     'hqwebapp/js/assert_properties',
     'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/bootstrap5/components.ko',
+    'hqwebapp/js/components/inline_edit',
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/case_importer/static/case_importer/js/main.js b/corehq/apps/case_importer/static/case_importer/js/main.js
index c8c903761f8c..8a5cccc8fb8a 100644
--- a/corehq/apps/case_importer/static/case_importer/js/main.js
+++ b/corehq/apps/case_importer/static/case_importer/js/main.js
@@ -6,6 +6,7 @@ hqDefine("case_importer/js/main", [
     'case_importer/js/import_history',
     'case_importer/js/excel_fields',
     'hqwebapp/js/bootstrap5/widgets',
+    'hqwebapp/js/components/select_toggle',
 ], function (
     $,
     _,
@@ -61,6 +62,7 @@ hqDefine("case_importer/js/main", [
     var behaviorForExcelMappingPage = function () {
         var excelFields = initialPageData.get('excel_fields');
         var caseFieldSpecs = initialPageData.get('case_field_specs');
+        var systemFields = initialPageData.get('system_fields');
         if (!excelFields && !caseFieldSpecs) {
             // We're not on the excel mapping page
             return;
@@ -78,7 +80,7 @@ hqDefine("case_importer/js/main", [
             return;
         }
 
-        var excelFieldRows = excelFieldsModule.excelFieldRowsModel(excelFields, caseFieldSpecs);
+        var excelFieldRows = excelFieldsModule.excelFieldRowsModel(excelFields, caseFieldSpecs, systemFields);
         $('#excel-field-rows').koApplyBindings(excelFieldRows);
 
         $('#js-add-mapping').click(function (e) {
diff --git a/corehq/apps/case_importer/suggested_fields.py b/corehq/apps/case_importer/suggested_fields.py
index 7db372bec54f..5b8c3c8c6032 100644
--- a/corehq/apps/case_importer/suggested_fields.py
+++ b/corehq/apps/case_importer/suggested_fields.py
@@ -9,6 +9,7 @@
 )
 from corehq.apps.case_importer.util import RESERVED_FIELDS
 from corehq.apps.data_dictionary.util import get_values_hints_dict, get_deprecated_fields
+from corehq.apps.export.system_properties import MAIN_CASE_TABLE_PROPERTIES
 from corehq.toggles import BULK_UPLOAD_DATE_OPENED
 
 
@@ -115,3 +116,8 @@ def get_special_fields(domain=None):
             )
         )
     return special_fields
+
+
+def get_non_discoverable_system_properties():
+    discoverable = {s.field for s in get_special_fields() if s.description and s.discoverable}
+    return [p.label for p in MAIN_CASE_TABLE_PROPERTIES if p.label not in discoverable]
diff --git a/corehq/apps/case_importer/templates/case_importer/excel_config.html b/corehq/apps/case_importer/templates/case_importer/excel_config.html
index 5e4246d928b5..8fee156c1731 100644
--- a/corehq/apps/case_importer/templates/case_importer/excel_config.html
+++ b/corehq/apps/case_importer/templates/case_importer/excel_config.html
@@ -84,7 +84,7 @@
         <div class="col-md-6">
           <select class="form-control hqwebapp-select2" name="search_column" id="search_column" {% if is_bulk_import %}disabled="disabled"{% endif %}>
             {% for column in columns %}
-              <option value="{{column|escape}}">
+              <option value="{{column|escape}}" {% if column == "caseid" %}selected{% endif %}>
                 {{column|escape}}
               </option>
             {% endfor %}
diff --git a/corehq/apps/case_importer/templates/case_importer/excel_fields.html b/corehq/apps/case_importer/templates/case_importer/excel_fields.html
index f8caf4bd0d7a..7ecd2538eb03 100644
--- a/corehq/apps/case_importer/templates/case_importer/excel_fields.html
+++ b/corehq/apps/case_importer/templates/case_importer/excel_fields.html
@@ -21,6 +21,7 @@
 
   {% initial_page_data 'excel_fields' excel_fields %}
   {% initial_page_data 'case_field_specs' case_field_specs %}
+  {% initial_page_data 'system_fields' system_fields %}
   {% initial_page_data 'is_bulk_import' is_bulk_import %}
 
   <form action="{% url "excel_commit" domain %}"
diff --git a/corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html b/corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
index 4f7f05538c68..96289e7c9b71 100644
--- a/corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+++ b/corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
@@ -18,7 +18,7 @@
   </td>
 
   <td class="text-center">
-    <i class="fa fa-arrow-right"></i>
+    <!-- ko if: hasValue --><i class="fa fa-arrow-right"></i><!--/ko-->
   </td>
 
   <td class="col-md-3">
@@ -58,17 +58,27 @@
         </p>
     </div>
     <!--ko if: caseFieldSuggestions().length-->
-      <p class="help-block text-warning">
+      <p class="help-block text-info">
         <i class="fa fa-question-circle"></i>
         {% blocktrans with '<!--ko foreach: caseFieldSuggestions--><!--ko if: $index() !== 0-->, <!--/ko--><strong data-bind="text: $data"></strong><!--/ko-->' as suggestion %}
           Did you mean "{{ suggestion }}" instead?
         {% endblocktrans %}
       </p>
     <!--/ko-->
+    <!--ko if: isSystemProperty-->
+      <p class="help-block text-warning">
+        <i class="fa fa-question-circle"></i>
+        {% blocktrans %}
+          Importing a system property may have unexpected results such as
+          adding a duplicate field to case exports. Consider using a
+          different property name.
+        {% endblocktrans %}
+      </p>
+    <!--/ko-->
   </td>
 
   <td>
-    <input type="checkbox" class="form-check-input mt-2" class="new_property" data-bind="checked: createNewChecked"/>
+    <input type="checkbox" class="form-check-input mt-2" class="new_property" data-bind="checked: isCustom"/>
   </td>
 
   {% if request|toggle_enabled:"CASE_IMPORT_DATA_DICTIONARY_VALIDATION" %}
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 b0273ed0f2af..ba0b015e0ea6 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
@@ -55,10 +55,23 @@
       </p>
       <p data-bind="visible: sample, text: sample">
       </p>
-      <p data-bind="visible: rows.length">
-        <span>{% trans "Row(s):" %}</span>
-        <span data-bind="text: rows.join(', ')"></span>
-      </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-' + $index(),
+                  'aria-controls': 'rowDetailsCollapse-' + $index()
+                }"
+                aria-expanded="false">
+          {% trans "Toggle Affected Row(s)" %}
+        </button>
+        <div class="collapse"
+             data-bind="attr: { id: 'rowDetailsCollapse-' + $index() }">
+          <div class="card card-body mt-3"
+               data-bind="text: rows.join(', ')"></div>
+        </div>
+      </div>
     </li>
     <!--/ko-->
     <!--/ko-->
diff --git a/corehq/apps/case_importer/tests/test_suggested_fields.py b/corehq/apps/case_importer/tests/test_suggested_fields.py
index 0c5c652acdce..a493f1a8319c 100644
--- a/corehq/apps/case_importer/tests/test_suggested_fields.py
+++ b/corehq/apps/case_importer/tests/test_suggested_fields.py
@@ -6,6 +6,7 @@
 from corehq.apps.case_importer.suggested_fields import (
     FieldSpec,
     get_suggested_case_fields,
+    get_non_discoverable_system_properties,
 )
 from corehq.util.test_utils import DocTestMixin
 
@@ -68,3 +69,26 @@ def test_basic_inclusion_and_sorting(self):
                 FieldSpec(field='weight', show_in_menu=True),
             ]
         )
+
+
+class TestSystemProperties(SimpleTestCase):
+
+    def test_get_non_discoverable_system_properties(self):
+        self.assertEqual(get_non_discoverable_system_properties(), [
+            'number',
+            'caseid',
+            'case_type',
+            'closed',
+            'closed_by_user_id',
+            'closed_by_username',
+            'closed_date',
+            'last_modified_by_user_id',
+            'last_modified_by_user_username',
+            'last_modified_date',
+            'opened_by_user_id',
+            'opened_by_username',
+            'opened_date',
+            'server_last_modified_date',
+            'state',
+            'case_link',
+        ])
diff --git a/corehq/apps/case_importer/tracking/dbaccessors.py b/corehq/apps/case_importer/tracking/dbaccessors.py
index d6406c2d1fc4..ba9e7d4b6f64 100644
--- a/corehq/apps/case_importer/tracking/dbaccessors.py
+++ b/corehq/apps/case_importer/tracking/dbaccessors.py
@@ -29,9 +29,8 @@ def get_case_upload_record_count(domain, user):
 
 
 def get_case_ids_for_case_upload(case_upload):
-    enterprise_perms = EnterprisePermissions.get_by_domain(case_upload.domain)
     for form_record in case_upload.form_records.order_by('pk').all():
-        if enterprise_perms.is_enabled and enterprise_perms.source_domain == case_upload.domain:
+        if EnterprisePermissions.is_source_domain(case_upload.domain):
             form = XFormInstance.objects.get_form(form_record.form_id)
         else:
             form = XFormInstance.objects.get_form(form_record.form_id, case_upload.domain)
diff --git a/corehq/apps/case_importer/views.py b/corehq/apps/case_importer/views.py
index 635369125901..66760512d2b2 100644
--- a/corehq/apps/case_importer/views.py
+++ b/corehq/apps/case_importer/views.py
@@ -32,6 +32,7 @@
 )
 from corehq.apps.case_importer.suggested_fields import (
     get_suggested_case_fields,
+    get_non_discoverable_system_properties,
 )
 from corehq.apps.case_importer.tracking.case_upload_tracker import CaseUpload
 from corehq.apps.case_importer.util import (
@@ -372,6 +373,7 @@ def excel_fields(request, domain):
         'columns': columns,
         'excel_fields': excel_fields,
         'case_field_specs': case_field_specs,
+        'system_fields': get_non_discoverable_system_properties(),
         'domain': domain,
         'mirroring_enabled': mirroring_enabled,
         'is_bulk_import': request.POST.get('is_bulk_import', 'False') == 'True',
diff --git a/corehq/apps/case_search/tests/test_filter_dsl.py b/corehq/apps/case_search/tests/test_filter_dsl.py
index 14f742055c59..c62a5612f4a1 100644
--- a/corehq/apps/case_search/tests/test_filter_dsl.py
+++ b/corehq/apps/case_search/tests/test_filter_dsl.py
@@ -206,6 +206,21 @@ def test_fuzzy_match(self):
             case_property_query("name", "jimmy", fuzzy=True)
         )
 
+    def test_fuzzy_date(self):
+        self._test_xpath_query(
+            "fuzzy-date(dob, '2024-12-03')",
+            case_property_query("dob", [
+                "2024-12-03",
+                "2024-03-12",
+                "2024-03-21",
+                "2024-12-30",
+                "2042-12-03",
+                "2042-03-12",
+                "2042-03-21",
+                "2042-12-30"
+            ], boost_first=True)
+        )
+
     def _test_xpath_query(self, query_string, expected_filter):
         helper = QueryHelper("domain")
         helper.config = CaseSearchConfig(domain="domain")
diff --git a/corehq/apps/case_search/tests/test_subcase_query_parser.py b/corehq/apps/case_search/tests/test_subcase_query_parser.py
index b18addbbba95..e5e377898818 100644
--- a/corehq/apps/case_search/tests/test_subcase_query_parser.py
+++ b/corehq/apps/case_search/tests/test_subcase_query_parser.py
@@ -1,3 +1,4 @@
+import pytest
 from eulxml.xpath import parse as parse_xpath
 from testil import eq, assert_raises
 
@@ -5,121 +6,97 @@
 from corehq.apps.case_search.xpath_functions.subcase_functions import _parse_normalize_subcase_query
 
 
-def test_subcase_query_parsing():
-    def _check(query, expected):
-        node = parse_xpath(query)
-        result = _parse_normalize_subcase_query(node)
-        eq(result.as_tuple(), expected)
+@pytest.mark.parametrize("query, expected", [
+    (
+        "subcase-exists('parent', @case_type='bob')",
+        ("parent", "@case_type='bob'", ">", 0, False)
+    ),
+    (
+        "subcase-exists('p', @case_type='bob' and prop='value')",
+        ("p", "@case_type='bob' and prop='value'", ">", 0, False)
+    ),
+    (
+        "subcase-count('p', prop=1) > 3",
+        ("p", "prop=1", ">", 3, False)
+    ),
+    (
+        "subcase-count('p', prop=1) >= 3",
+        ("p", "prop=1", ">", 2, False)
+    ),
+    (
+        "subcase-count('p', prop=1) < 3",
+        ("p", "prop=1", ">", 2, True)
+    ),
+    (
+        "subcase-count('p', prop=1) <= 3",
+        ("p", "prop=1", ">", 3, True)
+    ),
+    (
+        "subcase-count('p', prop=1) = 3",
+        ("p", "prop=1", "=", 3, False)
+    ),
+    (
+        "subcase-count('p', prop=1) = 0",
+        ("p", "prop=1", ">", 0, True)
+    ),
+    (
+        "subcase-count('p', prop=1) != 2",
+        ("p", "prop=1", "=", 2, True)
+    ),
+    (
+        "subcase-count('p') = 2",
+        ("p", None, "=", 2, False)
+    ),
+    (
+        "subcase-exists('p')",
+        ("p", None, ">", 0, False)
+    ),
+])
+def test_subcase_query_parsing(query, expected):
+    node = parse_xpath(query)
+    result = _parse_normalize_subcase_query(node)
+    eq(result.as_tuple(), expected)
 
-    yield from [
-        (
-            _check,
-            "subcase-exists('parent', @case_type='bob')",
-            ("parent", "@case_type='bob'", ">", 0, False)
-        ),
-        (
-            _check,
-            "subcase-exists('p', @case_type='bob' and prop='value')",
-            ("p", "@case_type='bob' and prop='value'", ">", 0, False)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) > 3",
-            ("p", "prop=1", ">", 3, False)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) >= 3",
-            ("p", "prop=1", ">", 2, False)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) < 3",
-            ("p", "prop=1", ">", 2, True)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) <= 3",
-            ("p", "prop=1", ">", 3, True)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) = 3",
-            ("p", "prop=1", "=", 3, False)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) = 0",
-            ("p", "prop=1", ">", 0, True)
-        ),
-        (
-            _check,
-            "subcase-count('p', prop=1) != 2",
-            ("p", "prop=1", "=", 2, True)
-        ),
-        (
-            _check,
-            "subcase-count('p') = 2",
-            ("p", None, "=", 2, False)
-        ),
-        (
-            _check,
-            "subcase-exists('p')",
-            ("p", None, ">", 0, False)
-        ),
-    ]
 
-
-def test_subcase_query_parsing_validations():
-    def _check(query, msg):
-        node = parse_xpath(query)
-        with assert_raises(XPathFunctionException, msg=msg):
-            _parse_normalize_subcase_query(node)
-
-    yield from [
-        (
-            _check,
-            "subcase-exists()",
-            "'subcase-exists' expects one or two arguments"
-        ),
-        (
-            _check,
-            "subcase-count() > 1",
-            "'subcase-count' expects one or two arguments"
-        ),
-        (
-            _check,
-            "subcase-count()",
-            "XPath incorrectly formatted. Expected 'subcase-exists'"
-        ),
-        (
-            _check,
-            "subcase-count('p', name = 'bob') > -1",
-            "'subcase-count' must be compared to a positive integer"
-        ),
-        (
-            _check,
-            "subcase-count('p', name = 'bob') + 1",
-            "Unsupported operator for use with 'subcase-count': +"
-        ),
-        (
-            _check,
-            "subcase-count('p', name = 'bob') > 'bob'",
-            "'subcase-count' must be compared to a positive integer"
-        ),
-        (
-            _check,
-            "subcase-count('p', name = 'bob') > date('2020-01-01')",
-            "'subcase-count' must be compared to a positive integer"
-        ),
-        (
-            _check,
-            "subcase-count(parent) = 1",
-            "'subcase-count' error. Index identifier must be a string"
-        ),
-        (
-            _check,
-            "subcase-exists(3)",
-            "'subcase-exists' error. Index identifier must be a string"
-        ),
-    ]
+@pytest.mark.parametrize("query, msg", [
+    (
+        "subcase-exists()",
+        "'subcase-exists' expects one or two arguments"
+    ),
+    (
+        "subcase-count() > 1",
+        "'subcase-count' expects one or two arguments"
+    ),
+    (
+        "subcase-count()",
+        "XPath incorrectly formatted. Expected 'subcase-exists'"
+    ),
+    (
+        "subcase-count('p', name = 'bob') > -1",
+        "'subcase-count' must be compared to a positive integer"
+    ),
+    (
+        "subcase-count('p', name = 'bob') + 1",
+        "Unsupported operator for use with 'subcase-count': +"
+    ),
+    (
+        "subcase-count('p', name = 'bob') > 'bob'",
+        "'subcase-count' must be compared to a positive integer"
+    ),
+    (
+        "subcase-count('p', name = 'bob') > date('2020-01-01')",
+        "'subcase-count' must be compared to a positive integer"
+    ),
+    (
+        "subcase-count(parent) = 1",
+        "'subcase-count' error. Index identifier must be a string"
+    ),
+    (
+        "subcase-exists(3)",
+        "'subcase-exists' error. Index identifier must be a string"
+    ),
+])
+def test_subcase_query_parsing_validations(query, msg):
+    node = parse_xpath(query)
+    with assert_raises(XPathFunctionException, msg=msg):
+        _parse_normalize_subcase_query(node)
diff --git a/corehq/apps/case_search/tests/test_value_functions.py b/corehq/apps/case_search/tests/test_value_functions.py
index 77736d6e4fa5..5308d04a1115 100644
--- a/corehq/apps/case_search/tests/test_value_functions.py
+++ b/corehq/apps/case_search/tests/test_value_functions.py
@@ -1,5 +1,6 @@
 from django.test import TestCase
 
+import pytest
 from eulxml.xpath import parse as parse_xpath
 from freezegun import freeze_time
 from testil import assert_raises, eq
@@ -63,62 +64,52 @@ def test_date_today(self):
         eq(result, '2021-08-02')
 
 
-def test_date_add():
-    def _do_test(expression, expected):
-        node = parse_xpath(expression)
-        result = date_add(node, SearchFilterContext("domain"))
-        eq(result, expected)
-
-    test_cases = [
-        ("date-add('2020-02-29', 'years', 1)", "2021-02-28"),
-        ("date-add('2020-02-29', 'years', 1.0)", "2021-02-28"),
-        ("date-add('2022-01-01', 'months', 1)", "2022-02-01"),
-        ("date-add('2022-01-01', 'months', '3')", "2022-04-01"),
-        ("date-add('2020-04-30', 'months', -2)", "2020-02-29"),
-        ("date-add('2020-03-31', 'weeks', 4)", "2020-04-28"),
-        ("date-add('2020-02-01', 'weeks', 1.5)", "2020-02-11"),
-        ("date-add('2022-01-01', 'days', -1)", "2021-12-31"),
-        ("date-add('2022-01-01', 'days', 1.5)", "2022-01-02"),
-        ("date-add('2022-01-01', 'days', '5')", "2022-01-06"),
-        ("date-add(0, 'days', '5')", "1970-01-06"),
-        ("date-add(365, 'years', '5')", "1976-01-01"),
-        ("date-add(date('2021-01-01'), 'years', '5')", "2026-01-01"),
-        ("date-add(date(5), 'months', '1')", "1970-02-06"),
-    ]
-
-    for expression, expected in test_cases:
-        yield _do_test, expression, expected
-
-
-def test_date_add_errors():
-    def _do_test(expression):
-        node = parse_xpath(expression)
-        with assert_raises(XPathFunctionException):
-            date_add(node, SearchFilterContext("domain"))
-
-    test_cases = [
-        # bad date
-        "date-add('2020-02-31', 'years', 1)",
-        "date-add(1.5, 'years', 1)",
-
-        # non-integer quantity
-        "date-add('2020-02-01', 'years', 1.5)",
-        "date-add('2020-02-01', 'months', 1.5)",
-
-        # non-numeric quantity
-        "date-add('2020-02-01', 'months', 'five')",
-
-        # bad interval names
-        "date-add('2020-02-01', 'year', 1)",
-        "date-add('2020-02-01', 'month', 1)",
-        "date-add('2020-02-01', 'week', 1)",
-        "date-add('2020-02-01', 'day', 1)",
-
-        # missing args
-        "date-add('2020-02-01', 'days')",
-        "date-add('2020-02-01')",
-        "date-add()",
-    ]
-
-    for expression in test_cases:
-        yield _do_test, expression
+@pytest.mark.parametrize("expression, expected", [
+    ("date-add('2020-02-29', 'years', 1)", "2021-02-28"),
+    ("date-add('2020-02-29', 'years', 1.0)", "2021-02-28"),
+    ("date-add('2022-01-01', 'months', 1)", "2022-02-01"),
+    ("date-add('2022-01-01', 'months', '3')", "2022-04-01"),
+    ("date-add('2020-04-30', 'months', -2)", "2020-02-29"),
+    ("date-add('2020-03-31', 'weeks', 4)", "2020-04-28"),
+    ("date-add('2020-02-01', 'weeks', 1.5)", "2020-02-11"),
+    ("date-add('2022-01-01', 'days', -1)", "2021-12-31"),
+    ("date-add('2022-01-01', 'days', 1.5)", "2022-01-02"),
+    ("date-add('2022-01-01', 'days', '5')", "2022-01-06"),
+    ("date-add(0, 'days', '5')", "1970-01-06"),
+    ("date-add(365, 'years', '5')", "1976-01-01"),
+    ("date-add(date('2021-01-01'), 'years', '5')", "2026-01-01"),
+    ("date-add(date(5), 'months', '1')", "1970-02-06"),
+])
+def test_date_add(expression, expected):
+    node = parse_xpath(expression)
+    result = date_add(node, SearchFilterContext("domain"))
+    eq(result, expected)
+
+
+@pytest.mark.parametrize("expression", [
+    # bad date
+    "date-add('2020-02-31', 'years', 1)",
+    "date-add(1.5, 'years', 1)",
+
+    # non-integer quantity
+    "date-add('2020-02-01', 'years', 1.5)",
+    "date-add('2020-02-01', 'months', 1.5)",
+
+    # non-numeric quantity
+    "date-add('2020-02-01', 'months', 'five')",
+
+    # bad interval names
+    "date-add('2020-02-01', 'year', 1)",
+    "date-add('2020-02-01', 'month', 1)",
+    "date-add('2020-02-01', 'week', 1)",
+    "date-add('2020-02-01', 'day', 1)",
+
+    # missing args
+    "date-add('2020-02-01', 'days')",
+    "date-add('2020-02-01')",
+    "date-add()",
+])
+def test_date_add_errors(expression):
+    node = parse_xpath(expression)
+    with assert_raises(XPathFunctionException):
+        date_add(node, SearchFilterContext("domain"))
diff --git a/corehq/apps/case_search/tests/test_xpath_functions.py b/corehq/apps/case_search/tests/test_xpath_functions.py
index a3b37eefd203..669118b0de6e 100644
--- a/corehq/apps/case_search/tests/test_xpath_functions.py
+++ b/corehq/apps/case_search/tests/test_xpath_functions.py
@@ -1,5 +1,8 @@
+import re
+
+import pytest
 from eulxml.xpath import parse as parse_xpath
-from nose.tools import assert_raises_regex
+from nose.tools import assert_raises
 
 from corehq.apps.case_search.exceptions import XPathFunctionException
 from corehq.apps.case_search.filter_dsl import (
@@ -31,11 +34,9 @@
 )]
 
 
-def test_invalid():
-    def _check(xpath, error_msg):
-        with assert_raises_regex(XPathFunctionException, error_msg):
-            parsed = parse_xpath(xpath)
-            build_filter_from_ast(parsed, SearchFilterContext("mydomain"))
-
-    for xpath, expected in INVALID_TEST_CASES:
-        yield _check, xpath, expected
+@pytest.mark.parametrize("xpath, error_msg", INVALID_TEST_CASES)
+def test_invalid(xpath, error_msg):
+    regex = re.compile(re.escape(error_msg))
+    with assert_raises(XPathFunctionException, msg=regex):
+        parsed = parse_xpath(xpath)
+        build_filter_from_ast(parsed, SearchFilterContext("mydomain"))
diff --git a/corehq/apps/case_search/xpath_functions/__init__.py b/corehq/apps/case_search/xpath_functions/__init__.py
index b04388448427..5836cdbf6a0e 100644
--- a/corehq/apps/case_search/xpath_functions/__init__.py
+++ b/corehq/apps/case_search/xpath_functions/__init__.py
@@ -1,4 +1,5 @@
 from .query_functions import (
+    fuzzy_date,
     fuzzy_match,
     not_,
     selected_all,
@@ -30,6 +31,7 @@
     'selected-any': selected_any,
     'selected-all': selected_all,
     'within-distance': within_distance,
+    'fuzzy-date': fuzzy_date,
     'fuzzy-match': fuzzy_match,
     'phonetic-match': phonetic_match,
     'starts-with': starts_with,
diff --git a/corehq/apps/case_search/xpath_functions/query_functions.py b/corehq/apps/case_search/xpath_functions/query_functions.py
index 52c736591ce5..cb18e23d2a1b 100644
--- a/corehq/apps/case_search/xpath_functions/query_functions.py
+++ b/corehq/apps/case_search/xpath_functions/query_functions.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from django.utils.translation import gettext as _
 
 from eulxml.xpath import serialize
@@ -95,6 +97,56 @@ def fuzzy_match(node, context):
     return case_property_query(property_name, value, fuzzy=True)
 
 
+def fuzzy_date(node, context):
+    """fuzzy-match(dob, '2024-12-03')"""
+    confirm_args_count(node, 2)
+    property_name = _property_name_to_string(node.args[0], node)
+    value = unwrap_value(node.args[1], context)
+
+    if not validate_date(value):
+        raise XPathFunctionException(
+            _(f"'{value}' is not a valid date. Expected 'YYYY-MM-DD"),
+            serialize(node)
+        )
+
+    return case_property_query(property_name, date_permutations(value), boost_first=True)
+
+
+def date_permutations(date_str):
+    [year, month, day] = date_str.split('-')
+    reverse_decade = year[:2] + year[3] + year[2]
+    reverse_month = month[::-1]
+    reverse_day = day[::-1]
+    permutations = [
+        date_str,
+        f"{year}-{day}-{month}",
+        f"{year}-{reverse_month}-{day}",
+        f"{year}-{day}-{reverse_month}",
+        f"{year}-{month}-{reverse_day}",
+        f"{year}-{reverse_day}-{month}",
+        f"{year}-{reverse_month}-{reverse_day}",
+        f"{year}-{reverse_day}-{reverse_month}",
+        f"{reverse_decade}-{month}-{day}",
+        f"{reverse_decade}-{day}-{month}",
+        f"{reverse_decade}-{reverse_month}-{day}",
+        f"{reverse_decade}-{day}-{reverse_month}",
+        f"{reverse_decade}-{month}-{reverse_day}",
+        f"{reverse_decade}-{reverse_day}-{month}",
+        f"{reverse_decade}-{reverse_month}-{reverse_day}",
+        f"{reverse_decade}-{reverse_day}-{reverse_month}"
+    ]
+    valid_permutations = [p for p in permutations if validate_date(p)]
+    return valid_permutations
+
+
+def validate_date(date_text):
+    try:
+        datetime.strptime(date_text, '%Y-%m-%d')  # change the date format if needed
+        return True
+    except ValueError:
+        return False
+
+
 def _property_name_to_string(value, node):
     if isinstance(value, Step):
         return serialize(value)
diff --git a/corehq/apps/change_feed/tests/test_data_sources.py b/corehq/apps/change_feed/tests/test_data_sources.py
index 948b66a8dca6..2bb249452147 100644
--- a/corehq/apps/change_feed/tests/test_data_sources.py
+++ b/corehq/apps/change_feed/tests/test_data_sources.py
@@ -6,13 +6,14 @@
 from decorator import contextmanager
 
 from casexml.apps.phone.document_store import SyncLogDocumentStore
-from corehq.apps.domain.tests.test_utils import test_domain
 from dimagi.utils.couch.database import get_db
 from pillowtop.dao.couch import CouchDocumentStore
+from pillowtop.dao.exceptions import DocumentNotFoundError
 
 from corehq.apps.change_feed import data_sources
 from corehq.apps.change_feed.data_sources import get_document_store
 from corehq.apps.change_feed.exceptions import UnknownDocumentStore
+from corehq.apps.domain.tests.test_utils import test_domain
 from corehq.apps.locations.document_store import LocationDocumentStore
 from corehq.apps.sms.document_stores import SMSDocumentStore
 from corehq.form_processor.backends.sql.dbaccessors import LedgerAccessorSQL
@@ -117,10 +118,12 @@ def form_data():
 
 @contextmanager
 def location_data():
-    from corehq.apps.locations.tests.util import LocationTypeStructure
-    from corehq.apps.locations.tests.util import LocationStructure
-    from corehq.apps.locations.tests.util import setup_location_types_with_structure
-    from corehq.apps.locations.tests.util import setup_locations_with_structure
+    from corehq.apps.locations.tests.util import (
+        LocationStructure,
+        LocationTypeStructure,
+        setup_location_types_with_structure,
+        setup_locations_with_structure,
+    )
     location_type_structure = [LocationTypeStructure('t1', [])]
 
     location_structure = [
@@ -138,9 +141,8 @@ def location_data():
 
 @contextmanager
 def ledger_data():
-    from casexml.apps.stock.mock import Balance
     from casexml.apps.case.mock import CaseFactory
-    from casexml.apps.stock.mock import Entry
+    from casexml.apps.stock.mock import Balance, Entry
 
     factory = CaseFactory('domain')
     with case_data() as case_ids:
@@ -224,3 +226,49 @@ def _test_document_store(self, doc_store_cls, doc_store_args, data_context, id_f
 ], DocumentStoreDbTests)
 def test_documet_store(*args):
     _test_document_store(*args)
+
+
+class CaseDocumentStoreTests(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        domain = 'test-domain'
+        cls.store = CaseDocumentStore(domain)
+
+        cls.case_ids = [uuid.uuid4().hex, uuid.uuid4().hex, uuid.uuid4().hex]
+        external_ids = ['external-id', 'external-id-dup', 'external-id-dup']
+        now = datetime.utcnow()
+        for case_id, external_id in zip(cls.case_ids, external_ids):
+            case = CommCareCase(
+                domain=domain,
+                case_id=case_id,
+                external_id=external_id,
+                modified_on=now,
+                server_modified_on=now,
+            )
+            case.save()
+            cls.addClassCleanup(case.delete)
+
+    def test_get_doc_by_case_id(self):
+        case_id = self.case_ids[0]
+        doc = self.store.get_document(case_id)
+        self.assertEqual(doc['case_id'], case_id)
+
+    def test_get_doc_by_external_id(self):
+        external_id = 'external-id'
+        doc = self.store.get_document(None, external_id=external_id)
+        self.assertEqual(doc['external_id'], external_id)
+
+    def test_external_id_not_found(self):
+        with self.assertRaises(DocumentNotFoundError):
+            self.store.get_document(None, external_id='external-id-not-found')
+
+    def test_case_not_found(self):
+        with self.assertRaises(DocumentNotFoundError):
+            self.store.get_document('case-id-not-found')
+
+    def test_get_doc_by_duplicate_external_id(self):
+        with self.assertRaises(DocumentNotFoundError):
+            self.store.get_document(None, external_id='external-id-dup')
diff --git a/corehq/apps/change_feed/tests/test_kafka_change_feed.py b/corehq/apps/change_feed/tests/test_kafka_change_feed.py
index ae2ecb89dc4c..582cac05353f 100644
--- a/corehq/apps/change_feed/tests/test_kafka_change_feed.py
+++ b/corehq/apps/change_feed/tests/test_kafka_change_feed.py
@@ -43,12 +43,13 @@ def test_expired_checkpoint_iteration_strict(self):
             for topic_partition, offset in first_available_offsets.items()
         }
         with self.assertRaises(UnavailableKafkaOffset):
-            next(feed.iter_changes(since=since, forever=False))
+            next(feed.iter_changes(since=since, forever=False), None)
 
     def test_non_expired_checkpoint_iteration_strict(self):
         feed = KafkaChangeFeed(topics=[topics.FORM_SQL, topics.CASE_SQL], client_id='test-kafka-feed', strict=True)
         first_available_offsets = get_multi_topic_first_available_offsets([topics.FORM_SQL, topics.CASE_SQL])
-        next(feed.iter_changes(since=first_available_offsets, forever=False))
+        # should not raise UnavailableKafkaOffset
+        next(feed.iter_changes(since=first_available_offsets, forever=False), None)
 
 
 class KafkaCheckpointTest(TestCase):
diff --git a/corehq/apps/change_feed/topics.py b/corehq/apps/change_feed/topics.py
index 5b2f40054a34..d6069f0debba 100644
--- a/corehq/apps/change_feed/topics.py
+++ b/corehq/apps/change_feed/topics.py
@@ -119,6 +119,16 @@ def _get_topic_offsets(topics, latest):
         return offsets
 
 
+def get_all_kafka_partitons_for_topic(topic):
+    """
+    :returns: A set of strings containing topic and the partition numbers for the given topic.
+    For example:
+    {'form-sql-0', 'form-sql-1', 'form-sql-2'}
+    """
+    paritions_and_offsets = _get_topic_offsets([topic], latest=False)
+    return set(f"{topic}-{offset}" for (topic, offset) in paritions_and_offsets.keys())
+
+
 def validate_offsets(expected_offsets):
     """
     Takes in a dictionary of offsets (topics to checkpoint numbers) and ensures they are all available
diff --git a/corehq/apps/cleanup/tests/test_populate_sql_model_from_couch_model.py b/corehq/apps/cleanup/tests/test_populate_sql_model_from_couch_model.py
index e180bfee3fc3..e71392424041 100644
--- a/corehq/apps/cleanup/tests/test_populate_sql_model_from_couch_model.py
+++ b/corehq/apps/cleanup/tests/test_populate_sql_model_from_couch_model.py
@@ -187,6 +187,8 @@ def diff_couch_and_sql(cls, couch, sql):
 
 
 class TestDoc(SyncCouchToSQLMixin, Document):
+    __test__ = False
+
     class Meta:
         app_label = "couch"
 
diff --git a/corehq/apps/cloudcare/middleware.py b/corehq/apps/cloudcare/middleware.py
index b59bfa96ef20..0954c4eb6db3 100644
--- a/corehq/apps/cloudcare/middleware.py
+++ b/corehq/apps/cloudcare/middleware.py
@@ -1,6 +1,6 @@
+from django.conf import settings
 from django.utils.deprecation import MiddlewareMixin
 
-
 FORMPLAYER_SESSION_COOKIE_NAME = 'formplayer_session'
 
 
@@ -27,4 +27,5 @@ def _set_formplayer_session_cookie(request, response):
         couch_user = getattr(request, 'couch_user', None)
         if couch_user:
             if request.COOKIES.get(FORMPLAYER_SESSION_COOKIE_NAME) != couch_user.user_id:
-                response.set_cookie(FORMPLAYER_SESSION_COOKIE_NAME, couch_user.user_id)
+                response.set_cookie(FORMPLAYER_SESSION_COOKIE_NAME, couch_user.user_id,
+                                    httponly=settings.SESSION_COOKIE_HTTPONLY)
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js b/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
index d70377527f14..ea6b16230b1b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/debugger/debugger.js
@@ -121,14 +121,6 @@ hqDefine('cloudcare/js/debugger/debugger', [
                 $('.debugger-content').outerHeight(contentHeight);
             }
         };
-
-        // Called afterRender, ensures that the debugger takes the whole screen
-        self.adjustWidth = function () {
-            var $debug = $('#instance-xml-home'),
-                $body = $('body');
-
-            $debug.width($body.width());
-        };
     };
 
     // By default do nothing when updating the debugger
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
index 8925034d9866..a172209740e1 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/const.js
@@ -43,7 +43,6 @@ hqDefine("cloudcare/js/form_entry/const", [], function () {
         BUTTON_SELECT: 'button-select',
         SHORT: 'short',
         MEDIUM: 'medium',
-        STRIPE_REPEATS: 'stripe-repeats',
         GROUP_BORDER: 'group-border',
         HINT_AS_PLACEHOLDER: 'hint-as-placeholder',
         RECEIVER_FIELD_INDEXED: 'indexed',
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
index e2857e78848e..fb1abe776cd1 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -835,7 +835,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
         this.templateType = 'time';
         if (question.style) {
             if (question.stylesContains(constants.TIME_12_HOUR)) {
-                this.clientFormat = 'h:mm T';
+                this.clientFormat = 'h:mm A';
             }
         }
         DateTimeEntryBase.call(this, question, options);
@@ -931,18 +931,27 @@ hqDefine("cloudcare/js/form_entry/entries", [
         // Tracks whether file entry has already been cleared, preventing an additional failing request to Formplayer
         self.cleared = false;
         self.buildBroadcastTopics(options);
+        self.uploadFile = function () {
+            document.getElementById(self.entryId).click();
+        };
+        self.fileNameDisplay = ko.observable(gettext("No file selected."));
     }
     FileEntry.prototype = Object.create(EntrySingleAnswer.prototype);
     FileEntry.prototype.constructor = EntrySingleAnswer;
     FileEntry.prototype.onPreProcess = function (newValue) {
         var self = this;
-        if (newValue !== constants.NO_ANSWER && newValue !== "") {
+        if (newValue === "" && self.question.filename) {
+            self.question.hasAnswered = true;
+            self.fileNameDisplay(self.question.filename());
+        } else if (newValue !== constants.NO_ANSWER && newValue !== "") {
             // Input has changed and validation will be checked
             if (newValue !== self.answer()) {
                 self.question.formplayerMediaRequest = $.Deferred();
                 self.cleared = false;
             }
-            self.answer(newValue.replace(constants.FILE_PREFIX, ""));
+            var fixedNewValue = newValue.replace(constants.FILE_PREFIX, "");
+            self.fileNameDisplay(fixedNewValue);
+            self.answer(fixedNewValue);
         } else {
             self.onClear();
         }
@@ -950,7 +959,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     FileEntry.prototype.onAnswerChange = function (newValue) {
         var self = this;
         // file has already been validated and assigned a unique id. another request should not be sent to formplayer
-        if (self.question.formplayerMediaRequest.state() === "resolved") {
+        if (newValue === constants.NO_ANSWER || self.question.formplayerMediaRequest.state() === "resolved") {
             return;
         }
         if (newValue !== constants.NO_ANSWER && newValue !== "") {
@@ -1004,6 +1013,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
         self.question.error(null);
         self.question.onClear();
         self.broadcastMessages(self.question, constants.NO_ANSWER);
+        self.fileNameDisplay(gettext("No file selected."));
     };
 
     /**
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
index 6dbf380214ca..d8e762b3346b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/form_ui.js
@@ -420,12 +420,32 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
             parentOfDeletedGroup = parentOfDeletedGroup.children.find(c => c.ix.endsWith(ixParts[i]));
         }
         const siblingsOfDeletedGroup = parentOfDeletedGroup.children;
-        const lastPart = ixParts[ixParts.length - 1];
-        const lastPartPrefix = lastPart.substr(0, lastPart.lastIndexOf("_") + 1);
+
+        const getIxPrefix = (ix) => ix.substr(0, ix.lastIndexOf("_") + 1);
+        const getIxNestedPosition = (ix) => ix.substr(ix.lastIndexOf("_") + 1, ix.lastIndexOf("_") + 2);
+
+        const deletedGroupIxPrefix = getIxPrefix(deletedGroupIx);
         parentOfDeletedGroup.children = siblingsOfDeletedGroup.filter(function (c) {
-            const childIxParts = c.ix.split(",");
-            return !childIxParts[childIxParts.length - 1].startsWith(lastPartPrefix);
+            return !c.ix.startsWith(deletedGroupIxPrefix);
+        });
+
+        // Preserve the 'collapsed' state of the group upon rerendering.
+        // This is done by decrementing the ix of siblings that come after the deleted group.
+        let collapsedIx = JSON.parse(sessionStorage.getItem('collapsedIx')) || [];
+        collapsedIx = collapsedIx
+            .filter(ix => !ix.startsWith(deletedGroupIx) && ix !== deletedGroupIx);
+        collapsedIx = collapsedIx.map(ix => {
+            if (ix.startsWith(deletedGroupIxPrefix)) {
+                let IxNestedPosition = getIxNestedPosition(ix);
+                if (IxNestedPosition > getIxNestedPosition(deletedGroupIx)) {
+                    IxNestedPosition--;
+                }
+                return getIxPrefix(ix) + IxNestedPosition;
+            }
+            return ix;
         });
+        sessionStorage.setItem('collapsedIx', JSON.stringify(collapsedIx));
+
     }
 
     /**
@@ -671,6 +691,24 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
                     element.serverError(null);
                 }
 
+                const inputControl = [constants.CONTROL_IMAGE_CHOOSE, constants.CONTROL_LABEL,
+                    constants.CONTROL_AUDIO_CAPTURE, constants.CONTROL_VIDEO_CAPTURE];
+
+                let findChildAndSetFilename = function (children) {
+                    for (let child of children) {
+                        if (child.children && child.children.length > 0) {
+                            findChildAndSetFilename(child.children);
+                        } else if (inputControl.includes(child.control) && element.binding() === child.binding &&
+                            element.ix() === child.ix && element.answer()) {
+                            child.filename = element.answer();
+                            return;
+                        }
+                    }
+                };
+                if (!_.isEmpty(element) && allChildren && allChildren.length > 0) {
+                    findChildAndSetFilename(allChildren);
+                }
+
                 response.children = allChildren;
                 self.fromJS(response);
             }
@@ -704,6 +742,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         } else {
             self.showDelete = false;
         }
+        const isRepeatable = ko.utils.unwrapObservable(self.repeatable) === "true";
         let parentForm = getParentForm(self);
         let oneQuestionPerScreen = parentForm.displayOptions.oneQuestionPerScreen !== undefined && parentForm.displayOptions.oneQuestionPerScreen();
 
@@ -712,7 +751,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         });
 
         // Header and captions
-        self.showHeader = oneQuestionPerScreen || ko.utils.unwrapObservable(self.caption) || ko.utils.unwrapObservable(self.caption_markdown);
+        self.showHeader = oneQuestionPerScreen || ko.utils.unwrapObservable(self.caption) || ko.utils.unwrapObservable(self.caption_markdown) || self.showDelete;
 
         if (_.has(json, 'domain_meta') && _.has(json, 'style')) {
             self.domain_meta = parseMeta(json.datatype, json.style);
@@ -725,16 +764,22 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
             }
         };
 
+        let collapsedIx = JSON.parse(sessionStorage.getItem('collapsedIx')) || [];
         var styles = _.has(json, 'style') && json.style && json.style.raw ? json.style.raw.split(/\s+/) : [];
-        self.stripeRepeats = _.contains(styles, constants.STRIPE_REPEATS);
-        self.collapsible = _.contains(styles, constants.COLLAPSIBLE);
+        self.collapsible = (_.contains(styles, constants.COLLAPSIBLE) || isRepeatable) && self.showHeader;
         self.groupBorder = _.contains(styles, constants.GROUP_BORDER);
-        self.showChildren = ko.observable(!self.collapsible || _.contains(styles, constants.COLLAPSIBLE_OPEN));
+        self.showChildren = ko.observable(!self.collapsible || _.contains(styles, constants.COLLAPSIBLE_OPEN) || (isRepeatable && !collapsedIx.includes(self.rel_ix())));
         self.toggleChildren = function () {
             if (self.collapsible) {
                 if (self.showChildren()) {
+                    let collapsedIx = JSON.parse(sessionStorage.getItem('collapsedIx')) || [];
+                    collapsedIx.push(self.rel_ix());
+                    sessionStorage.setItem('collapsedIx', JSON.stringify(collapsedIx));
                     self.showChildren(false);
                 } else {
+                    let collapsedIx = JSON.parse(sessionStorage.getItem('collapsedIx')) || [];
+                    collapsedIx = collapsedIx.filter(e => e !== self.rel_ix());
+                    sessionStorage.setItem('collapsedIx', JSON.stringify(collapsedIx));
                     self.showChildren(true);
                 }
             }
@@ -1032,7 +1077,7 @@ hqDefine("cloudcare/js/form_entry/form_ui", [
         } else {
             if (self.isLabel) {
                 self.controlWidth = "";
-                self.labelWidth = "";
+                self.labelWidth = constants.FULL_WIDTH;
             } else {
                 self.controlWidth = constants.CONTROL_WIDTH;
                 self.labelWidth = constants.LABEL_WIDTH;
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js
index 103c9ba9ca4d..2717c24df38b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/spec/fixtures.js
@@ -102,6 +102,7 @@ hqDefine("cloudcare/js/form_entry/spec/fixtures", [
                     "type": "sub-group",
                     "exists": true,
                     "ix": "1,2",
+                    "caption": "Sub Group",
                     "children": [
                         {
                             "type": "question",
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
index 36cfe8b60557..90332f1433d6 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/app.js
@@ -96,6 +96,17 @@ hqDefine("cloudcare/js/formplayer/app", [
         return true;
     };
 
+    FormplayerFrontend.showRestoreAs = function (user) {
+        hqRequire(["cloudcare/js/formplayer/users/views"], function (UsersViews) {
+            FormplayerFrontend.regions.getRegion('restoreAsBanner').show(
+                UsersViews.RestoreAsBanner({model: user, smallScreen: false}));
+            const mobileRegion = FormplayerFrontend.regions.getRegion('mobileRestoreAsBanner');
+            if (mobileRegion.$el.length) {      // This region doesn't exist in app preview
+                mobileRegion.show(UsersViews.RestoreAsBanner({model: user, smallScreen: true}));
+            }
+        });
+    };
+
     /**
      * This function maps a jr:// media path to its HTML path IE
      * jr://images/icon/mother.png -> https://commcarehq.org/hq/multimedia/file/CommCareImage/[app_id]/mother.png
@@ -143,6 +154,7 @@ hqDefine("cloudcare/js/formplayer/app", [
         $('#cloudcare-debugger').html("");
         $('.atwho-container').remove();
         bootstrap.Modal.getOrCreateInstance($('#case-detail-modal')).hide();
+        sessionStorage.removeItem('collapsedIx');
     });
 
     FormplayerFrontend.getChannel().reply('clearMenu', function () {
@@ -261,7 +273,7 @@ hqDefine("cloudcare/js/formplayer/app", [
                     });
                 }
 
-                if (user.environment === Const.PREVIEW_APP_ENVIRONMENT) {
+                if (user.isAppPreview) {
                     Kissmetrics.track.event("[app-preview] User submitted a form");
                     GGAnalytics.track.event("App Preview", "User submitted a form");
                     appcues.trackEvent(appcues.EVENT_TYPES.FORM_SUBMIT, { success: true });
@@ -289,7 +301,7 @@ hqDefine("cloudcare/js/formplayer/app", [
                     FormplayerUtils.navigate('/apps', { trigger: true });
                 }
             } else {
-                if (user.environment === Const.PREVIEW_APP_ENVIRONMENT) {
+                if (user.isAppPreview) {
                     appcues.trackEvent(appcues.EVENT_TYPES.FORM_SUBMIT, { success: false });
                 }
                 CloudcareUtils.showError(resp.output, $("#cloudcare-notifications"));
@@ -324,14 +336,8 @@ hqDefine("cloudcare/js/formplayer/app", [
                 var apps = appCollection.toJSON();
                 if (Backbone.history) {
                     Backbone.history.start();
-                    hqRequire(["cloudcare/js/formplayer/users/views"], function (UsersViews) {
-                        FormplayerFrontend.regions.getRegion('restoreAsBanner').show(
-                            UsersViews.RestoreAsBanner({
-                                model: user,
-                            })
-                        );
-                    });
-                    if (user.displayOptions.singleAppMode || user.displayOptions.landingPageAppMode) {
+                    FormplayerFrontend.showRestoreAs(user);
+                    if (user.displayOptions.singleAppMode) {
                         appId = apps[0]['_id'];
                     }
 
@@ -339,9 +345,6 @@ hqDefine("cloudcare/js/formplayer/app", [
                         if (user.displayOptions.singleAppMode) {
                             FormplayerFrontend.trigger('setAppDisplayProperties', apps[0]);
                             FormplayerFrontend.trigger("app:singleApp", appId);
-                        } else if (user.displayOptions.landingPageAppMode) {
-                            FormplayerFrontend.trigger('setAppDisplayProperties', apps[0]);
-                            FormplayerFrontend.trigger("app:landingPageApp", appId);
                         } else {
                             FormplayerFrontend.trigger("apps:list", apps);
                         }
@@ -728,6 +731,7 @@ hqDefine("cloudcare/js/formplayer/app", [
         urlObject.clearExceptApp();
         FormplayerFrontend.regions.getRegion('sidebar').empty();
         FormplayerFrontend.regions.getRegion('breadcrumb').empty();
+        FormplayerFrontend.regions.getRegion('persistentMenu').empty();
         if (currentUser.displayOptions.singleAppMode) {
             appId = FormplayerFrontend.getChannel().request('getCurrentAppId');
             FormplayerFrontend.trigger("app:singleApp", appId);
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js
index 2bbe4aac018f..c1ee0e77fae8 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/api.js
@@ -59,7 +59,12 @@ hqDefine("cloudcare/js/formplayer/apps/api", [
                 return null;
             }
             var appCollection = Collections(apps);
-            return appCollection.get(id);
+            let fetchedApp = appCollection.get(id);
+            if (!fetchedApp) {
+                fetchedApp = appCollection.models.find(currApp => currApp.get("copy_of") === id);
+            }
+
+            return fetchedApp;
         },
     };
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js
index 2f1b04a224b0..3eca02df1590 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/controller.js
@@ -3,7 +3,6 @@ hqDefine("cloudcare/js/formplayer/apps/controller", [
     'jquery',
     'backbone',
     'hqwebapp/js/toggles',
-    'cloudcare/js/formplayer/constants',
     'cloudcare/js/formplayer/app',
     'cloudcare/js/formplayer/layout/views/settings',
     'cloudcare/js/formplayer/apps/api',
@@ -13,7 +12,6 @@ hqDefine("cloudcare/js/formplayer/apps/controller", [
     $,
     Backbone,
     Toggles,
-    constants,
     FormplayerFrontend,
     settingsViews,
     AppsAPI,
@@ -47,21 +45,13 @@ hqDefine("cloudcare/js/formplayer/apps/controller", [
                 FormplayerFrontend.regions.getRegion('main').show(singleAppView);
             });
         },
-        landingPageApp: function (appId) {
-            $.when(AppsAPI.getAppEntities()).done(function () {
-                var landingPageAppView = views.LandingPageAppView({
-                    appId: appId,
-                });
-                FormplayerFrontend.regions.getRegion('main').show(landingPageAppView);
-            });
-        },
         listSettings: function () {
             var currentUser = UsersModels.getCurrentUser(),
                 slugs = settingsViews.slugs,
                 settings = [],
                 collection,
                 settingsView;
-            if (currentUser.environment === constants.PREVIEW_APP_ENVIRONMENT) {
+            if (currentUser.isAppPreview) {
                 settings = settings.concat([
                     new Backbone.Model({ slug: slugs.SET_LANG }),
                     new Backbone.Model({ slug: slugs.SET_DISPLAY }),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
index 993601bd7bc8..94f5916b59dd 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/apps/views.js
@@ -29,7 +29,7 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
 
         rowClick: function (e) {
             e.preventDefault();
-            FormplayerFrontend.trigger("app:select", this.model.get('_id'));
+            FormplayerFrontend.trigger("app:select", this.model.get('copy_of'));
         },
 
         rowKeyAction: function (e) {
@@ -182,45 +182,6 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
         },
     });
 
-    var LandingPageAppView = Marionette.View.extend({
-        template: _.template($("#landing-page-app-template").html() || ""),
-        className: 'landing-page-app-view',
-
-        events: _.extend({
-            'click .js-start-app': 'startApp',
-            'keydown .js-start-app': 'keyAction',
-        }, BaseAppView.events),
-        incompleteSessionsClick: _.extend(BaseAppView.incompleteSessionsClick),
-        syncClick: _.extend(BaseAppView.syncClick),
-        onClickRestoreAs: _.extend(BaseAppView.onClickRestoreAs),
-        onClickSettings: _.extend(BaseAppView.onClickSettings),
-        incompleteSessionsKeyAction: _.extend(BaseAppView.incompleteSessionsKeyAction),
-        syncKeyAction: _.extend(BaseAppView.syncKeyAction),
-        restoreAsKeyAction: _.extend(BaseAppView.restoreAsKeyAction),
-        settingsKeyAction: _.extend(BaseAppView.settingsKeyAction),
-
-        initialize: function (options) {
-            this.appId = options.appId;
-        },
-        templateContext: function () {
-            var currentApp = AppsAPI.getAppEntity(this.appId),
-                appName = currentApp.get('name'),
-                imageUri = currentApp.get('imageUri');
-            return {
-                appName: appName,
-                imageUrl: imageUri && this.appId ? FormplayerFrontend.getChannel().request('resourceMap', imageUri, this.appId) : "",
-            };
-        },
-        startApp: function () {
-            FormplayerFrontend.trigger("app:select", this.appId);
-        },
-        keyAction: function (e) {
-            if (e.keyCode === 13) {
-                this.startApp();
-            }
-        },
-    });
-
     return {
         GridView: function (options) {
             return new GridView(options);
@@ -228,8 +189,5 @@ hqDefine("cloudcare/js/formplayer/apps/views", [
         SingleAppView: function (options) {
             return new SingleAppView(options);
         },
-        LandingPageAppView: function (options) {
-            return new LandingPageAppView(options);
-        },
     };
 });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
index ac2f0b1f88cf..8480dfb9ac55 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/main.js
@@ -31,13 +31,13 @@ hqDefine("cloudcare/js/formplayer/main", [
         var $menuToggle = $('#commcare-menu-toggle'),
             $navbar = $('#hq-navigation'),
             $trialBanner = $('#cta-trial-banner');
-        var hideMenu = function () {
+        var hideMainMenu = function () {
             $menuToggle.data('minimized', 'yes');
             $navbar.addClass("d-none");
             $trialBanner.addClass("d-none");
             $menuToggle.text(gettext('Show Full Menu'));
         };
-        var showMenu = function () {
+        var showMainMenu = function () {
             $menuToggle.data('minimized', 'no');
             $navbar.removeClass("d-none");
             $trialBanner.removeClass("d-none");
@@ -48,15 +48,15 @@ hqDefine("cloudcare/js/formplayer/main", [
         // Show the top HQ nav for new users, so they know how to get back to HQ,
         // but hide it for more mature users so it's out of the way
         if (initialPageData.get("domain_is_on_trial")) {
-            showMenu();
+            showMainMenu();
         } else {
-            hideMenu();
+            hideMainMenu();
         }
         $menuToggle.click(function (e) {
             if ($menuToggle.data('minimized') === 'yes') {
-                showMenu();
+                showMainMenu();
             } else {
-                hideMenu();
+                hideMainMenu();
             }
             e.preventDefault();
         });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
index 61321457b2f3..73ac467415b7 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/api.js
@@ -48,16 +48,22 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                 menus;
 
             $.when(AppsAPI.getAppEntities()).done(function (appCollection) {
+                const app = appCollection.find(function (app) {
+                    const currPrimaryAppId = app.get('copy_of');
+                    // Prevents breaking if a web apps session spans pre and post deploy. Can remove post deploy.
+                    if (app.id && app.id === params.appId) {
+                        return app;
+                    }
+                    if (currPrimaryAppId && currPrimaryAppId === params.appId) {
+                        return app;
+                    }
+                    if (currPrimaryAppId && (currPrimaryAppId === params.copyOf)) {
+                        return app;
+                    }
+                });
                 if (!params.preview) {
                     // Make sure the user has access to the app
-                    if (!appCollection.find(function (app) {
-                        if (app.id && app.id === params.appId) {
-                            return true;
-                        }
-                        if (app.get('copy_of') && app.get('copy_of') === params.copyOf) {
-                            return true;
-                        }
-                    })) {
+                    if (!app) {
                         FormplayerFrontend.trigger(
                             'showError',
                             gettext('The application could not be found')
@@ -67,6 +73,13 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                         return;
                     }
                 }
+                let appId = params.appId;
+                if (!params.preview) {
+                    const copyOf = app.get('copy_of');
+                    if (copyOf && copyOf === params.appId) {
+                        appId = app.id;
+                    }
+                }
                 FormplayerFrontend.permitIntervalSync = true;
                 options = {
                     success: function (parsedMenus, response) {
@@ -99,7 +112,7 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                             }
                         } else {
                             if (response.smartLinkRedirect) {
-                                if (user.environment === constants.PREVIEW_APP_ENVIRONMENT) {
+                                if (user.isAppPreview) {
                                     FormplayerFrontend.trigger('showSuccess', gettext("You have selected a case in a different domain. App Preview does not support this feature.", 5000));
                                     FormplayerFrontend.trigger('navigateHome');
                                     return;
@@ -164,7 +177,7 @@ hqDefine("cloudcare/js/formplayer/menus/api", [
                     "username": user.username,
                     "restoreAs": user.restoreAs,
                     "domain": user.domain,
-                    "app_id": params.appId,
+                    "app_id": appId,
                     "endpoint_id": params.endpointId,
                     "endpoint_args": params.endpointArgs,
                     "locale": params.changeLang || displayOptions.language,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
index 2e62c75e97fd..cfb720b6206b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/collections.js
@@ -46,6 +46,7 @@ hqDefine("cloudcare/js/formplayer/menus/collections", [
             'noItemsText',
             'dynamicSearch',
             'metaData',
+            'persistentMenu',
         ],
 
         entityProperties: [
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
index 251ebf04552a..cd79a170e972 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/controller.js
@@ -155,11 +155,40 @@ hqDefine("cloudcare/js/formplayer/menus/controller", [
         } else {
             FormplayerFrontend.regions.getRegion('breadcrumb').empty();
         }
+
+        if (!appPreview && menuResponse.persistentMenu) {
+            FormplayerFrontend.regions.getRegion('persistentMenu').show(
+                views.PersistentMenuView({
+                    collection: _toMenuCommands(menuResponse.persistentMenu, [], menuResponse.selections),
+                }).render());
+        } else {
+            FormplayerFrontend.regions.getRegion('persistentMenu').empty();
+        }
+
         if (menuResponse.appVersion) {
             FormplayerFrontend.trigger('setVersionInfo', menuResponse.appVersion);
         }
     };
 
+    var _toMenuCommands = function (menuCommands, priorSelections, activeSelection) {
+        return new Backbone.Collection(_.map(menuCommands, function (menuCommand) {
+            const command = _.pick(menuCommand, [
+                'index',
+                'displayText',
+                'navigationState',
+                'imageUri',
+                'commands',
+            ]);
+            // Store an array of the commands needed to navigate to each nested menu item
+            command.selections = priorSelections.concat([command.index]);
+            if (JSON.stringify(command.selections) === JSON.stringify(activeSelection)) {
+                command.isActiveSelection = true;
+            }
+            command.commands = _toMenuCommands(command.commands, command.selections, activeSelection);
+            return new Backbone.Model(command);
+        }));
+    };
+
     var showSplitScreenQuery = function (menuResponse, menuListView) {
         var menuData = menusUtils.getMenuData(menuResponse);
         var queryResponse = menuResponse.queryResponse;
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js
index 435624b4febf..45af883beeb5 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/utils.js
@@ -11,6 +11,7 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
     'cloudcare/js/formplayer/users/models',
     'cloudcare/js/formplayer/utils/utils',
     'cloudcare/js/formplayer/menus/views',
+    'analytix/js/gtx',
 ], function (
     _,
     Backbone,
@@ -22,7 +23,8 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
     view,
     UsersModels,
     utils,
-    views
+    views,
+    gtx
 ) {
     var recordPosition = function (position) {
         sessionStorage.locationLat = position.coords.latitude;
@@ -108,7 +110,7 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
             langCollection;
 
         FormplayerFrontend.regions.addRegions({
-            breadcrumbMenuDropdown: "#breadcrumb__menu-dropdown",
+            breadcrumbMenuDropdown: "#navbar-menu-region",
         });
 
         if (langs && langs.length > 1) {
@@ -205,23 +207,26 @@ hqDefine("cloudcare/js/formplayer/menus/utils", [
             });
             return view.queryListView(menuData);
         } else if (menuResponse.type === constants.ENTITIES) {
-            var searchText = urlObject.search;
-            var event = "Viewed Case List";
-            if (searchText) {
-                event = "Searched Case List";
-            }
+
             if (isSidebarEnabled(menuResponse)) {
                 menuData.sidebarEnabled = true;
             }
-            var eventData = {
-                domain: UsersModels.getCurrentUser().domain,
-                name: menuResponse.title,
-            };
+            var eventData = {};
             var fields = _.pick(utils.getCurrentQueryInputs(), function (v) { return !!v; });
             if (!_.isEmpty(fields)) {
                 eventData.searchFields = _.sortBy(_.keys(fields)).join(",");
             }
-            kissmetrics.track.event(event, eventData);
+
+            var kissmetricsEventData = _.extend(eventData, {
+                domain: UsersModels.getCurrentUser().domain,
+                name: menuResponse.title,
+            });
+            var gtxEventData = _.extend(eventData, {
+                moduleName: menuResponse.title,
+            });
+            kissmetrics.track.event("Viewed Case List", kissmetricsEventData);
+            gtx.sendEvent("web_apps_viewed_case_list", gtxEventData);
+
             if (/search_command\.m\d+/.test(menuResponse.queryKey) && menuResponse.currentPage === 0) {
                 kissmetrics.track.event('Started Case Search', {
                     'Split Screen Case Search': toggles.toggleEnabled('SPLIT_SCREEN_CASE_SEARCH'),
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
index 4b82416fc508..ac19191b958a 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/menus/views.js
@@ -2,13 +2,16 @@
 hqDefine("cloudcare/js/formplayer/menus/views", [
     'jquery',
     'underscore',
+    'backbone',
     'backbone.marionette',
     'DOMPurify/dist/purify.min',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
     'analytix/js/kissmetrix',
     'cloudcare/js/formplayer/constants',
     'cloudcare/js/formplayer/app',
+    'cloudcare/js/formplayer/apps/api',
     'cloudcare/js/formplayer/users/models',
     'cloudcare/js/formplayer/utils/utils',
     'cloudcare/js/markdown',
@@ -17,13 +20,16 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
 ], function (
     $,
     _,
+    Backbone,
     Marionette,
     DOMPurify,
+    bootstrap,
     initialPageData,
     toggles,
     kissmetrics,
     constants,
     FormplayerFrontend,
+    AppsAPI,
     UsersModels,
     formplayerUtils,
     markdown,
@@ -142,10 +148,9 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
             return _.template($(id).html() || "");
         },
         templateContext: function () {
-            const environment = UsersModels.getCurrentUser().environment;
             return {
                 title: this.options.title,
-                isAppPreview: environment === constants.PREVIEW_APP_ENVIRONMENT,
+                isAppPreview: UsersModels.getCurrentUser().isAppPreview,
             };
         },
         childViewOptions: function (model) {
@@ -1275,15 +1280,7 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
         template: _.template($("#breadcrumb-item-template").html() || ""),
         className: "breadcrumb-item",
         attributes: function () {
-            let attributes = {
-                "role": "link",
-                "tabindex": "0",
-                "style": this.buildMaxWidth(),
-            };
-            if (this.options.model.get('ariaCurrentPage')) {
-                attributes['aria-current'] = 'page';
-            }
-            return attributes;
+            return {"style": this.buildMaxWidth()};
         },
         events: {
             "click": "crumbClick",
@@ -1304,6 +1301,9 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
                 this.crumbClick(e);
             }
         },
+        templateContext: function () {
+            return {isCurrentPage: this.options.model.get('ariaCurrentPage')};
+        },
     });
 
     const BreadcrumbListView = Marionette.CollectionView.extend({
@@ -1393,15 +1393,6 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
                 languageOptionsEnabled: languageOptionsEnabled,
             };
         },
-        events: {
-            "keydown": "expandDropdown",
-        },
-        expandDropdown: function (e) {
-            if (e.keyCode === 13 || e.keyCode === 32) {
-                e.preventDefault();
-                $(this.ui.dropdownMenu).toggleClass("open");
-            }
-        },
     });
 
     const DetailView = Marionette.View.extend({
@@ -1492,6 +1483,89 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
         },
     });
 
+    /* Handle an individual menu item. Also contains a child list view */
+    const PersistentMenuItemView = Marionette.View.extend({
+        tagName: "li",
+        template: _.template($("#persistent-menu-item").html() || ""),
+        regions: {
+            tree: {
+                el: 'ul',
+                replaceElement: true,
+            },
+        },
+        triggers: {
+            "click a": "click:persistent:menu:command",  // magically calls onClickPersistentMenuCommand
+        },
+        templateContext: function () {
+            const appId = formplayerUtils.currentUrlToObject().appId,
+                imageUri = this.model.get('imageUri'),
+                icons = {JUMP: 'fa-pencil', NEXT: 'fa-regular fa-folder', ENTITY_SELECT: 'fa-list-ul'};
+            return {
+                imageUri: imageUri ? FormplayerFrontend.getChannel().request('resourceMap', imageUri, appId) : "",
+                iconClass: icons[this.model.get('navigationState')] || 'fa-arrow-up-right-from-square',
+                isActive: this.model.get('isActiveSelection'),
+            };
+        },
+        onRender: function () {
+            if (!_.isEmpty(this.model.get('commands'))) {
+                this.showChildView('tree', new PersistentMenuListView({
+                    collection: this.model.get('commands'),
+                }));
+            }
+        },
+        onClickPersistentMenuCommand: function () {
+            FormplayerFrontend.trigger("persistentMenuSelect", this.model.get('selections'));
+        },
+    });
+
+    /* Handle a collection of sibling menu items at the same level */
+    const PersistentMenuListView = Marionette.CollectionView.extend({
+        tagName: "ul",
+        className: "list-unstyled",
+        childView: PersistentMenuItemView,
+    });
+
+    /*
+      This view operates on a collection of persistent menu items, each of which
+      may contain its own collection in a recursive tree structure.
+      PersistentMenuView manages the top level of the menu
+    */
+    const PersistentMenuView = Marionette.View.extend({
+        tagName: "div",
+        template: _.template($("#persistent-menu-template").html() || ""),
+        regions: {
+            menu: "#persistent-menu-content",
+        },
+        events: {
+            'click #app-main': 'onClickAppMain',
+        },
+        onRender: function () {
+            this.showChildView('menu', new PersistentMenuListView({collection: this.collection}));
+        },
+        templateContext: function () {
+            const appId = formplayerUtils.currentUrlToObject().appId,
+                currentApp = AppsAPI.getAppEntity(appId),
+                appName = currentApp.get('name'),
+                imageUri = currentApp.get('imageUri');
+            return {
+                appName: appName,
+                imageUri: imageUri ? FormplayerFrontend.getChannel().request('resourceMap', imageUri, appId) : "",
+            };
+        },
+        onClickAppMain: function () {
+            FormplayerFrontend.trigger("persistentMenuSelect");
+        },
+        onBeforeDetach: function () {
+            // Be sure to hide offcanvas element so scroll works properly
+            const openedCanvas = bootstrap.Offcanvas.getInstance(
+                document.getElementById('persistent-menu-container')
+            );
+            if (openedCanvas) {
+                openedCanvas.hide();
+            }
+        },
+    });
+
     return {
         buildCaseTileStyles: buildCaseTileStyles,
         BreadcrumbListView: function (options) {
@@ -1533,6 +1607,9 @@ hqDefine("cloudcare/js/formplayer/menus/views", [
         PersistentCaseTileView: function (options) {
             return new PersistentCaseTileView(options);
         },
+        PersistentMenuView: function (options) {
+            return new PersistentMenuView(options);
+        },
     };
 })
 ;
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js
index 1810464d6ad4..e7a3ca661b93 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/router.js
@@ -35,7 +35,6 @@ hqDefine("cloudcare/js/formplayer/router", [
         appRoutes: {
             "apps": "listApps", // list all apps available to this user
             "single_app/:id": "singleApp", // Show app in phone mode (SingleAppView)
-            "home/:id": "landingPageApp", // Show app in landing page mode (LandingPageAppView)
             "sessions": "listSessions", //list all this user's current sessions (incomplete forms)
             "sessions/:id": "getSession",
             "restore_as/:page/:query": "listUsers",
@@ -59,9 +58,6 @@ hqDefine("cloudcare/js/formplayer/router", [
             user.previewAppId = appId;
             appsController.singleApp(appId);
         },
-        landingPageApp: function (appId) {
-            appsController.landingPageApp(appId);
-        },
         selectApp: function (appId, isInitial) {
             menusController.selectMenu({
                 'appId': appId,
@@ -165,11 +161,6 @@ hqDefine("cloudcare/js/formplayer/router", [
         API.singleApp(appId);
     });
 
-    FormplayerFrontend.on('app:landingPageApp', function (appId) {
-        utils.navigate("/home/" + appId);
-        API.landingPageApp(appId);
-    });
-
     FormplayerFrontend.on("menu:select", function (index) {
         var urlObject = utils.currentUrlToObject();
         if (index === undefined) {
@@ -290,6 +281,17 @@ hqDefine("cloudcare/js/formplayer/router", [
         menusController.selectMenu(options);
     });
 
+    FormplayerFrontend.on("persistentMenuSelect", function (selections) {
+        if (!FormplayerFrontend.confirmUserWantsToNavigateAwayFromForm()) {
+            return;
+        }
+        FormplayerFrontend.trigger("clearForm");
+        menusController.selectMenu({
+            'appId': utils.currentUrlToObject().appId,
+            'selections': selections,
+        });
+    });
+
     return {
         start: function () {
             return new Router({
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js
index b6938e304453..c7e39a9af472 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/sessions/views.js
@@ -5,7 +5,6 @@ hqDefine("cloudcare/js/formplayer/sessions/views", [
     'backbone',
     'backbone.marionette',
     'moment',
-    'cloudcare/js/formplayer/constants',
     'cloudcare/js/formplayer/app',
     'cloudcare/js/formplayer/users/models',
     'cloudcare/js/formplayer/utils/utils',
@@ -16,7 +15,6 @@ hqDefine("cloudcare/js/formplayer/sessions/views", [
     Backbone,
     Marionette,
     moment,
-    constants,
     FormplayerFrontend,
     UsersModels,
     utils
@@ -139,8 +137,7 @@ hqDefine("cloudcare/js/formplayer/sessions/views", [
             }
         },
         templateContext: function () {
-            var user = UsersModels.getCurrentUser(),
-                paginationConfig = utils.paginateOptions(
+            var paginationConfig = utils.paginateOptions(
                     this.options.pageNumber,
                     this.options.totalPages,
                     this.collection.totalSessions
@@ -150,7 +147,7 @@ hqDefine("cloudcare/js/formplayer/sessions/views", [
                 totalPages: this.options.totalPages,
                 currentPage: this.model.get('page') - 1,
                 limit: this.model.get("limit"),
-                isPreviewEnv: user.environment === constants.PREVIEW_APP_ENVIRONMENT,
+                isAppPreview: UsersModels.getCurrentUser().isAppPreview,
             });
         },
     });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js
index b99a16d1766f..a397e1951e4b 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/spec/user_spec.js
@@ -68,7 +68,6 @@ hqDefine("cloudcare/js/formplayer/spec/user_spec", [
                 assert.deepEqual(user.displayOptions, {
                     phoneMode: undefined, // we don't store this option
                     singleAppMode: undefined,
-                    landingPageAppMode: undefined,
                     oneQuestionPerScreen: true,
                     language: 'sindarin',
                 });
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js
index 8d12a5f8a583..168ed0c2990f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/models.js
@@ -85,6 +85,7 @@ hqDefine("cloudcare/js/formplayer/users/models", [
         userInstance.formplayer_url = options.formplayer_url;
         userInstance.debuggerEnabled = options.debuggerEnabled;
         userInstance.environment = options.environment;
+        userInstance.isAppPreview = options.environment === Const.PREVIEW_APP_ENVIRONMENT;
         userInstance.changeFormLanguage = options.changeFormLanguage;
 
         var savedDisplayOptions = _.pick(
@@ -93,7 +94,6 @@ hqDefine("cloudcare/js/formplayer/users/models", [
         );
         userInstance.displayOptions = _.defaults(savedDisplayOptions, {
             singleAppMode: options.singleAppMode,
-            landingPageAppMode: options.landingPageAppMode,
             phoneMode: options.phoneMode,
             oneQuestionPerScreen: options.oneQuestionPerScreen,
             language: options.language,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js
index 35cf9ba5c3d0..9eebb1ba1c03 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/utils.js
@@ -85,14 +85,7 @@ hqDefine("cloudcare/js/formplayer/users/utils", [
             user.username
         );
         user.restoreAs = null;
-        hqRequire(["cloudcare/js/formplayer/users/views"], function (UsersViews) {
-            FormplayerFrontend.regions.getRegion('restoreAsBanner').show(
-                UsersViews.RestoreAsBanner({
-                    model: user,
-                })
-            );
-        });
-
+        FormplayerFrontend.showRestoreAs(user);
         FormplayerFrontend.trigger('navigateHome');
     });
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
index afaea59f85a5..0295ee9e4882 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/users/views.js
@@ -6,7 +6,6 @@ hqDefine("cloudcare/js/formplayer/users/views", [
     'backbone.marionette',
     'hqwebapp/js/toggles',
     'cloudcare/js/formplayer/app',
-    'cloudcare/js/formplayer/constants',
     'cloudcare/js/formplayer/utils/utils',
     'cloudcare/js/formplayer/users/models',
     'cloudcare/js/formplayer/users/utils',
@@ -17,7 +16,6 @@ hqDefine("cloudcare/js/formplayer/users/views", [
     Marionette,
     toggles,
     FormplayerFrontend,
-    constants,
     formplayerUtils,
     usersModels,
     usersUtils
@@ -29,14 +27,22 @@ hqDefine("cloudcare/js/formplayer/users/views", [
      * currently logged in (or restoring) as.
      */
     var RestoreAsBanner = Marionette.View.extend({
-        template: _.template($("#restore-as-banner-template").html() || ""),
-        className: 'restore-as-banner-container',
         ui: {
             clear: '.js-clear-user',
         },
         events: {
             'click @ui.clear': 'onClickClearUser',
         },
+        getTemplate: function () {
+            if (this.model.restoreAs) {
+                const templateId = (this.options.smallScreen || usersModels.getCurrentUser().isAppPreview ?
+                                    "#restore-as-banner-template" :
+                                    "#restore-as-pill-template");
+                return _.template($(templateId).html() || "");
+            } else {
+                return _.template("");
+            }
+        },
         templateContext: function () {
             var template = "";
             if (toggles.toggleEnabled('WEB_APPS_DOMAIN_BANNER')) {
@@ -45,15 +51,12 @@ hqDefine("cloudcare/js/formplayer/users/views", [
                 template = gettext("Working as <b><%- restoreAs %></b>.");
             }
             template += " <a class='js-clear-user'>" + gettext("Use <%- username %>.") + "</a>";
-
-            var message = _.template(template)({
-                restoreAs: this.model.restoreAs,
-                username: this.model.getDisplayUsername(),
-                domain: usersModels.getCurrentUser().domain,
-            });
             return {
-                message: message,
-                restoreAs: this.model.restoreAs,
+                message: _.template(template)({
+                    restoreAs: this.model.restoreAs,
+                    username: this.model.getDisplayUsername(),
+                    domain: usersModels.getCurrentUser().domain,
+                }),
             };
         },
         onClickClearUser: function () {
@@ -90,11 +93,7 @@ hqDefine("cloudcare/js/formplayer/users/views", [
                 confirmText: gettext('Log in'),
                 onConfirm: function () {
                     usersUtils.Users.logInAsUser(this.model.get('username'));
-                    FormplayerFrontend.regions.getRegion('restoreAsBanner').show(
-                        new RestoreAsBanner({
-                            model: usersModels.getCurrentUser(),
-                        })
-                    );
+                    FormplayerFrontend.showRestoreAs(usersModels.getCurrentUser());
                     var loginAsNextOptions = FormplayerFrontend.getChannel().request('getLoginAsNextOptions');
                     if (loginAsNextOptions) {
                         FormplayerFrontend.trigger("clearLoginAsNextOptions");
@@ -155,14 +154,13 @@ hqDefine("cloudcare/js/formplayer/users/views", [
             'keypress @ui.paginationGoTextBox': 'paginationGoKeyAction',
         },
         templateContext: function () {
-            const environment = usersModels.getCurrentUser().environment;
             const paginationOptions = formplayerUtils.paginateOptions(
                 this.model.get('page') - 1,
                 this.totalPages(),
                 this.collection.total
             );
             return _.extend(paginationOptions, {
-                isAppPreview: environment === constants.PREVIEW_APP_ENVIRONMENT,
+                isAppPreview: usersModels.getCurrentUser().isAppPreview,
                 total: this.collection.total,
                 totalPages: this.totalPages(),
                 limit: this.limit,
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index 5a5d413cccf9..123e4cb58379 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -314,6 +314,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
             sessionStorage.removeItem('validationInProgress');
             sessionStorage.removeItem('answerQuestionInProgress');
             sessionStorage.removeItem('formplayerQueryInProgress');
+            sessionStorage.removeItem('collapsedIx');
         };
 
         this.onSubmit = function () {
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/markdown.js b/corehq/apps/cloudcare/static/cloudcare/js/markdown.js
index b685124a0ad3..eef6ffdac11e 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/markdown.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/markdown.js
@@ -5,12 +5,14 @@ hqDefine('cloudcare/js/markdown', [
     'markdown-it/dist/markdown-it',
     'hqwebapp/js/initial_page_data',
     'integration/js/hmac_callout',
+    'hqwebapp/js/toggles',
 ], function (
     $,
     DOMPurify,
     markdowner,
     initialPageData,
-    HMACCallout
+    HMACCallout,
+    toggles
 ) {
 
     function updateTarget(tokens, idx, target) {
@@ -140,7 +142,21 @@ hqDefine('cloudcare/js/markdown', [
             // lazy init to avoid dependency order issues
             md = initMd();
         }
-        return md.render(DOMPurify.sanitize(text || "").replaceAll("&#10;", "\n"));
+        var rendered = md.render(DOMPurify.sanitize(text || "").replaceAll("&#10;", "\n"));
+        // sub case tile header with a caption
+        if (rendered.includes('<p><strong>') && toggles.toggleEnabled('CASE_LIST_TILE_CUSTOM')) {
+            rendered = appendExtraStyleClass(rendered, '<p>', 'mb-0');
+            rendered = appendExtraStyleClass(rendered, '<h6>', 'mb-0');
+        }
+        return rendered;
+    }
+
+    function appendExtraStyleClass(htmlString, element, styleClass) {
+        if (htmlString.includes(element)) {
+            let styledElement = element.slice(0, -1) + ' class="' + styleClass + '"' + element.slice(-1);
+            return htmlString.replace(element, styledElement);
+        }
+        return htmlString;
     }
 
     /**
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js b/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js
index 3e9d0037e393..0f6e7f6764b6 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/spec/markdown_spec.js
@@ -17,10 +17,12 @@ hqDefine("cloudcare/js/spec/markdown_spec", [
         let sandbox;
         beforeEach(function () {
             initialPageData.clear();
+            initialPageData.register("toggles_dict", { CASE_LIST_TILE_CUSTOM: false });
             sandbox = sinon.sandbox.create();
         });
 
         afterEach(function () {
+            initialPageData.unregister("toggles_dict");
             sandbox.restore();
         });
 
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
index 24226b001d3f..74fb7a4d12ef 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -138,7 +138,9 @@ hqDefine('cloudcare/js/utils', [
                 breadcrumb: "#breadcrumb-region",
                 persistentCaseTile: "#persistent-case-tile",
                 restoreAsBanner: '#restore-as-region',
+                mobileRestoreAsBanner: '#mobile-restore-as-region',
                 sidebar: '#sidebar-region',
+                persistentMenu: "#persistent-menu-region",
             },
         });
 
@@ -344,7 +346,7 @@ hqDefine('cloudcare/js/utils', [
     // TD does have a plugin to integrate with moment, but since other usages of TD in HQ
     // don't need it, instead of enabling that, hack around this.
     const _momentFormatToTempusFormat = function (momentFormat) {
-        return momentFormat.replaceAll("D", "d").replaceAll("Y", "y");
+        return momentFormat.replaceAll("D", "d").replaceAll("Y", "y").replaceAll("A", "T");
     };
 
     /** Coerce an input date string to a moment object */
@@ -391,6 +393,7 @@ hqDefine('cloudcare/js/utils', [
         }
 
         let date = moment(selectedTime, timeFormat);
+        const tempusTimeFormat = _momentFormatToTempusFormat(timeFormat);
         let options = {
             display: {
                 buttons: {
@@ -399,8 +402,8 @@ hqDefine('cloudcare/js/utils', [
                 },
             },
             localization: {
-                format: timeFormat,
-                hourCycle: timeFormat.indexOf('T') === -1 ? 'h23' : 'h12',
+                format: tempusTimeFormat,
+                hourCycle: tempusTimeFormat.indexOf('T') === -1 ? 'h23' : 'h12',
             },
             useCurrent: true,
         };
diff --git a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
index 5044f4b284cc..15fb1dc72fb9 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/formplayer_home.html
@@ -19,17 +19,6 @@
   <style id="list-cell-container-style"></style>
 {% endblock %}
 
-{% block navigation %}{{ block.super }}
-  <div class="navbar navbar-cloudcare">
-    <div class="container-fluid">
-      <a class="navbar-brand" href="{{ home_url }}"><i class="fcc fcc-flower"></i> {% trans "Web Apps" %}</a>
-      <ul class="nav navbar-nav navbar-right">
-        <li class="nav-item"><a href="#" class="nav-link" id="commcare-menu-toggle">{% trans 'Show Full Menu' %}</a></li>
-      </ul>
-    </div>
-  </div>
-{% endblock navigation %}
-
 {% block stylesheets %}
   {% compress css %}
     <link rel="stylesheet" href="{% static 'nprogress/nprogress.css' %}">
@@ -91,14 +80,29 @@
     {% registerurl 'gaen_otp_view' request.domain %}
   {% endif %}
 
-  <!-- For now we won't touch this since the form entry code is coupled with it  -->
-
   <div id="cloudcare-main" class="cloudcare-home-content">
     <section id="cases"></section>
     <div id="menu-container">
       <section id="formplayer-progress-container"></section>
-      <div id="restore-as-region"></div>
-      <div id="breadcrumb-region" class="print-container"></div>
+      <nav class="navbar navbar-cloudcare">
+        <div class="d-flex container-fluid">
+          <div class="flex-grow-1">
+            <a class="navbar-brand" href="{{ home_url }}"><i class="fcc fcc-flower"></i> {% trans "Web Apps" %}</a>
+          </div>
+          <div class="flex-grow-1 d-none d-lg-inline">
+            <div id="restore-as-region"></div>
+          </div>
+          <ul class="nav navbar-nav navbar-right">
+            <li class="nav-item"><a href="#" class="nav-link" id="commcare-menu-toggle">{% trans 'Show Full Menu' %}</a></li>
+          </ul>
+          <div id="navbar-menu-region">
+          </div>
+        </div>
+      </nav>
+      <div class="d-lg-none">
+        <div id="mobile-restore-as-region"></div>
+      </div>
+      <div id="breadcrumb-region" class="print-container sticky-top"></div>
       <section id="cloudcare-notifications" class="container notifications-container"></section>
       <div class="container case-tile-container">
         <div id="persistent-case-tile" class="print-container"></div>
@@ -113,16 +117,13 @@
                   }">
         </section>
       </div>
+      <div id="persistent-menu-region"></div>
     </div>
     <div role="region" id="sr-notification-region" class="sr-only" aria-live="assertive" aria-relevant="all"></div>
     <small id="version-info"></small>
     {% if request.couch_user.can_edit_data %}
-      <section id="cloudcare-debugger" data-bind="
-          template: {
-              name: 'instance-viewer-ko-template',
-              afterRender: adjustWidth
-          }
-        "></section>
+      <section data-bind="template: { name: 'instance-viewer-ko-template' }"
+               id="cloudcare-debugger"></section>
     {% endif %}
   </div>
   {% if not request.session.secure_session %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html b/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
index c86393bec2d7..9a7cf702948c 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/all_templates.html
@@ -38,7 +38,6 @@
 {% include 'cloudcare/partials/form_entry/sub_group.html' %}
 
 {% include 'cloudcare/partials/grid_view/grid.html' %}
-{% include 'cloudcare/partials/grid_view/landing_page_app.html' %}
 {% include 'cloudcare/partials/grid_view/row.html' %}
 {% include 'cloudcare/partials/grid_view/single_app.html' %}
 
@@ -50,6 +49,7 @@
 {% include 'cloudcare/partials/menu/grid_item.html' %}
 {% include 'cloudcare/partials/menu/list.html' %}
 {% include 'cloudcare/partials/menu/row.html' %}
+{% include 'cloudcare/partials/menu/persistent_menu.html' %}
 
 {% include 'cloudcare/partials/progress.html' %}
 
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_grid_style.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_grid_style.html
index 20ab7ec5dd00..12747b00e74a 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_grid_style.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_grid_style.html
@@ -6,6 +6,7 @@
   background-color: transparent;
   color: #685c53;
   justify-items: left;
+  border-radius: .3rem;
   <% if (model.prefix === "persistent") { %>
     margin: 20px 20px 10px 20px;
   <% } else if (model.isMultiSelect) { %>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_layout_style.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_layout_style.html
index 575bfaa41c46..a2edaf452fd0 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_layout_style.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/cell_layout_style.html
@@ -24,7 +24,6 @@
           <% } %>
           <% if (model.showShading) { %>
             background-color: white;
-            z-index: -1;
           <% } %>
         <% } else { %>
           margin: 7px;
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_grouped_item.html b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_grouped_item.html
index 4bd71ae3ea68..26437c3855d5 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_grouped_item.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/case_list/tile_grouped_item.html
@@ -5,36 +5,40 @@
     </div>
   <% } %>
 
-  <div class="group-data collapsible-tile-content">
+  <div class="group-data collapsible-tile-content text-break">
     <div class="<%- prefix %>-cell-grid-style">
       <% for (let [index, datum] of Object.entries(indexedHeaderData)) { %>
-        <div class="<%- prefix %>-grid-style-<%- index %> box" >
-          <% if (styles[index].displayFormat === 'ClickableIcon') {
-          if(resolveUri(datum)) { %>
-            <button class="clickable-icon">
-              <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" />
-              <i class="fa fa-spin fa-spinner d-none"></i>
-            </button>
-          <% } %>
-          <% } else if (styles[index].displayFormat === 'Image') {
-          if(resolveUri(datum)) { %>
-            <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
-          <% } %>
-          <% } else if(styles[index].widthHint === 0) { %>
-            <div class="d-none"><%- datum %></div>
-          <% } else { %>
-            <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
-          <% } %>
-        </div>
+        <% if (styles[index].displayFormat === 'ClickableIcon') { %>
+          <div class="<%- prefix %>-grid-style-<%- index %> box">
+            <% if(resolveUri(datum)) { %>
+              <button class="clickable-icon">
+                <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>" />
+                <i class="fa fa-spin fa-spinner d-none"></i>
+              </button>
+            <% } %>
+          </div>
+        <% } else { %>
+          <div class="<%- prefix %>-grid-style-<%- index %> box p-3 pb-0">
+            <% if (styles[index].displayFormat === 'Image') {
+              if(resolveUri(datum)) { %>
+                <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
+              <% } %>
+            <% } else if(styles[index].widthHint === 0) { %>
+              <div class="d-none"><%- datum %></div>
+            <% } else { %>
+              <div class="webapp-markdown-output"><%= renderMarkdown(datum) %></div>
+            <% } %>
+          </div>
+        <% } %>
       <% }; %>
     </div>
 
-    <div class="group-rows">
+    <div class="gap-0">
       <% _.each(indexedRowDataList, function(indexedRowData) { %>
         <div class="<%- prefix %>-cell-grid-style group-row">
           <% for (let index in indexedRowData) { %>
             <% let datum = indexedRowData[index]; %>
-            <div class="<%- prefix %>-grid-style-<%- index %> box">
+            <div class="<%- prefix %>-grid-style-<%- index %> box p-3">
               <% if (styles[index].displayFormat === 'Image') {
                 if(resolveUri(datum)) { %>
                   <img alt="<%- altText[index] %>" class="module-icon" src="<%- resolveUri(datum) %>"/>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
index 0c1b68ebf32c..6cfc4ca04a69 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_file.html
@@ -1,16 +1,22 @@
 {% load hq_shared_tags %}
 
 <script type="text/html" id="file-entry-ko-template">
-  <div class="d-flex">
-    <input type="file" data-bind="
+  <div class="d-flex align-items-center">
+    <input type="file" class="d-none" data-bind="
           value: $data.rawAnswer,
-          css: { 'is-invalid': $parent.hasError() },
           attr: {
               id: entryId,
               'aria-required': $parent.required() ? 'true' : 'false',
               accept: accept,
           },
       "/>
+    <button id="input-button-alt" class="btn btn-outline-primary" data-bind="
+          click: uploadFile,
+          css: { 'is-invalid': $parent.hasError() },
+      ">
+      Browse...
+    </button>
+    <p data-bind="text: fileNameDisplay" style="margin-left: 7px; margin-right: auto;"></p>
     <button class="btn btn-outline-primary btn-sm" data-bind="
       click: onClear,
       text: $root.getTranslation('upload.clear.title', '{% trans_html_attr 'Clear' %}'),
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
index b5cd5caded9d..3777baf7d40e 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
@@ -20,6 +20,9 @@
           <br><br>
           <input type="text" class="form-control" data-bind="value: $data.answer" />
         </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-bs-dismiss="modal">{% trans "OK" %}</button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
index 655641f13f77..660e46eaf4f7 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/grouped_element_tile_row.html
@@ -1,3 +1,3 @@
 <script type="text/html" id="grouped-element-tile-row-fullform-ko-template">
-  <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row gap-2"/>
+  <div data-bind="template: { name: childTemplate, foreach: $data.children }" class="question-tile-row row"/>
 </script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
index 8ade3d27b6a1..bc53ef91ace9 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/sub_group.html
@@ -16,87 +16,89 @@
         class: elementTile,
         css: {
           'gr-no-children': $data.children().length === 0,
-          'gr-has-no-nested-questions': !$data.hasAnyNestedQuestions(),
-          'card': collapsible,
+          'd-none': !$data.hasAnyNestedQuestions(),
           'required-group': !showChildren() && childrenRequired(),
-          'stripe-repeats': stripeRepeats,
-          'group-border': groupBorder,
         }">
-    <fieldset class="gr-header" data-bind="
+    <div data-bind="
         css: {
-          'card-header': collapsible,
-           clickable: collapsible
-        },
-        attr: collapsible ? {
-                'role': 'button',
-                'aria-expanded': showChildren() ? 'true' : 'false',
-                'aria-labelledby': captionId(),
-                // tab focus only if group is visible
-                'tabindex': isVisibleGroup() ? '0' : '-1'
-              } : {
-                'aria-labelledby': captionId(),
-              },
-        click: toggleChildren,
-        event: collapsible ? { keypress: keyPressAction } : {},
-        style: {'display': showHeader ? 'block': 'none',
-                'background-color': headerBackgroundColor(),
-                'color': headerBackgroundColor() ? 'white' : ''
+          'card rounded-0': collapsible,
+          'group-border': groupBorder,
+          'px-2': groupBorder,
         }">
-      <div data-bind="ifnot: collapsible">
-        <legend>
-          <span class="caption webapp-markdown-output"
-                data-bind="
-                  html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
-                "></span>
-          <button type="button"
-                  class="btn btn-outline-danger del float-end"
-                  href="#"
-                  aria-label="{% trans_html_attr 'Delete Repeat' %}"
+      <fieldset class="gr-header" data-bind="
+          css: {
+            'card-header': collapsible,
+             clickable: collapsible
+          },
+          attr: collapsible ? {
+                  'role': 'button',
+                  'aria-expanded': showChildren() ? 'true' : 'false',
+                  'aria-labelledby': captionId(),
+                  // tab focus only if group is visible
+                  'tabindex': isVisibleGroup() ? '0' : '-1'
+                } : {
+                  'aria-labelledby': captionId(),
+                },
+          click: toggleChildren,
+          event: collapsible ? { keypress: keyPressAction } : {},
+          style: {'display': showHeader ? 'block': 'none',
+                  'background-color': headerBackgroundColor(),
+                  'color': headerBackgroundColor() ? 'white' : ''
+          }">
+        <div data-bind="ifnot: collapsible">
+          <legend>
+            <span class="caption webapp-markdown-output"
                   data-bind="
-                      visible: showDelete,
-                      enabled: hasNoPendingAnswer(),
-                      click: deleteRepeat
-                  "><i class="fa fa-remove"></i></button>
-        </legend>
-      </div>
-      <div data-bind="if: collapsible">
-        <div class="d-flex align-items-center">
-          <div class="collapsible-icon-container">
-            <i class="fa" data-bind="
-                css: {'fa-angle-double-right': !showChildren(), 'fa-angle-double-down': showChildren()},
-            "></i>
+                    html: ko.utils.unwrapObservable($data.caption_markdown) || caption(),
+                  "></span>
+            <button type="button"
+                    class="btn btn-outline-danger del float-end"
+                    href="#"
+                    aria-label="{% trans_html_attr 'Delete Repeat' %}"
+                    data-bind="
+                        visible: showDelete,
+                        enabled: hasNoPendingAnswer(),
+                        click: deleteRepeat
+                    "><i class="fa fa-trash-can"></i></button>
+          </legend>
+        </div>
+        <div data-bind="if: collapsible">
+          <div class="d-flex align-items-center">
+            <div class="collapsible-icon-container">
+              <i class="fa" data-bind="
+                  css: {'fa-angle-double-right': !showChildren(), 'fa-angle-double-down': showChildren()},
+              "></i>
+            </div>
+            <span class="webapp-markdown-output my-05em-for-hs flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
+            <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
+             <button type="button"
+                     class="btn btn-outline-danger del float-end"
+                     href="#"
+                     aria-label="{% trans_html_attr 'Delete Repeat' %}"
+                     data-bind="
+                        visible: showDelete,
+                        enabled: hasNoPendingAnswer(),
+                        click: deleteRepeat
+                     "><i class="fa fa-trash-can"></i></button>
           </div>
-          <span class="webapp-markdown-output my-05em-for-hs flex-grow-1" data-bind="html: caption_markdown() || caption(), attr: {id: captionId()}"></span>
-          <i class="fa fa-warning text-danger float-end" data-bind="visible: hasError() && !showChildren()"></i>
-           <button type="button"
-                   class="btn btn-outline-danger del float-end"
-                   href="#"
-                   aria-label="{% trans_html_attr 'Delete Repeat' %}"
-                   data-bind="
-                      visible: showDelete,
-                      enabled: hasNoPendingAnswer(),
-                      click: deleteRepeat
-                   "><i class="fa fa-remove"></i></button>
         </div>
-      </div>
-      <span class="ix"></span>
-    </fieldset>
-      <div data-bind="visible: showChildren">
-        <fieldset>
-        <legend aria-hidden="true" class="sr-only">{% trans "Question Group" %}</legend>
-          <div class="children" data-bind="
-              slideVisible: showChildren(),
-              template: {
-                name: childTemplate,
-                foreach: $data.children,
-                afterRender: focusNewRepeat,
-              },
-              css: {
-                'card-body': collapsible,
-                'group-body': !collapsible,
-                'stripe-repeats': stripeRepeats,
-              }"></div>
-        </fieldset>
+        <span class="ix"></span>
+      </fieldset>
+        <div data-bind="visible: showChildren">
+          <fieldset>
+          <legend aria-hidden="true" class="sr-only">{% trans "Question Group" %}</legend>
+            <div class="children" data-bind="
+                slideVisible: showChildren(),
+                template: {
+                  name: childTemplate,
+                  foreach: $data.children,
+                  afterRender: focusNewRepeat,
+                },
+                css: {
+                  'card-body': collapsible,
+                }"></div>
+          </fieldset>
+        </div>
       </div>
   </div>
   <!-- /ko -->
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/landing_page_app.html b/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/landing_page_app.html
deleted file mode 100644
index c13910315e33..000000000000
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/grid_view/landing_page_app.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<script id="landing-page-app-template" type="text/template">
-  <div class="container">
-    <div class="spacer"></div>
-    <div class="col-sm-6 col-md-4 offset-sm-3 offset-md-4">
-      <div class="appicon appicon-default js-start-app" role="link" tabindex="0" aria-label="<%- appName %>">
-        <% if (!imageUrl) { %>
-          <i class="fcc fcc-flower appicon-icon" aria-hidden="true"></i>
-        <% } else { %>
-          <i class="fcc appicon-custom appicon-icon" style="background-image: url('<%- imageUrl %>');" aria-hidden="true"></i>
-        <% } %>
-        <div class="appicon-title">
-          <h3><%- appName %></h3>
-        </div>
-      </div>
-    </div>
-  </div>
-</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/breadcrumbs.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/breadcrumbs.html
index db01c111ba2d..7c3a2d46528a 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/breadcrumbs.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/breadcrumbs.html
@@ -1,17 +1,17 @@
 {% load i18n %}
 
 <script type="text/template" id="breadcrumb-item-template">
-  <%- data %>
+  <a href="#" <% if (isCurrentPage) { %> aria-current="page" <% } %>>
+    <%- data %>
+  </a>
 </script>
 
 <script type="text/template" id="breadcrumb-list-template">
-  <nav class="breadcrumb-nav" aria-label="Breadcrumb">
+  <nav style="--bsbreadcrumb-divider: '\f054';" class="breadcrumb-nav shadow-sm" aria-label="Breadcrumb">
     <ol class="breadcrumb">
-      <li class="js-home breadcrumb-item" role="link" tabindex="0">
-        {% trans 'Home' %}
+      <li class="js-home breadcrumb-item">
+        <a href="#">{% trans 'Home' %}</a>
       </li>
     </ol>
-    <div class="float-end dropdown dropdown-menu-right" id="breadcrumb__menu-dropdown">
-    </div>
   </nav>
 </script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/dropdown.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/dropdown.html
index 6af06c205794..f88811e9121c 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/dropdown.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/dropdown.html
@@ -2,12 +2,12 @@
 
 <script type="text/template" id="menu-dropdown-template">
   <div class="btn-group" id="menu-dropdown">
-    <button class="btn btn-dark dropdown-toggle" role="button"
+    <button class="btn text-light dropdown-toggle nav-link ms-4" role="button"
             data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
       <i class="fa fa-bars"></i>
       <span class="sr-only">{% trans 'Dropdown toggle' %}</span>
     </button>
-    <ul class="dropdown-menu dropdown-menu-right noprint-sub-container" aria-label="Dropdown">
+    <ul class="dropdown-menu dropdown-menu-end noprint-sub-container" aria-label="Dropdown">
       <li tabindex="0" class="print-button">
         <a href="#" class="dropdown-item">
           {% trans "Print" %}
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/menu/persistent_menu.html b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/persistent_menu.html
new file mode 100644
index 000000000000..00d61489c8c0
--- /dev/null
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/menu/persistent_menu.html
@@ -0,0 +1,52 @@
+{% load i18n %}
+
+<script type="text/template" id="persistent-menu-template">
+  <a type="button"
+     href="#"
+     tabindex="1"
+     data-bs-toggle="offcanvas"
+     data-bs-target="#persistent-menu-container"
+     aria-expanded="false"
+     aria-controls="persistent-menu-container"
+     class="position-fixed top-50 start-0 rounded-end persistent-menu-toggle">
+    <i class="fa fa-chevron-right"></i>
+  </a>
+  <div id="persistent-menu-container" class="offcanvas offcanvas-start w-auto" tabindex="-1" aria-labelledby="persistent-menu-label">
+    <div class="offcanvas-header persistent-menu-max-width d-flex align-items-center justify-content-between">
+      <% if (imageUri) { %>
+        <i class="fcc persistent-menu-image align-self-start flex-shrink-0" aria-hidden="true"
+           style="background-image: url('<%- imageUri %>');"></i>
+      <% } else { %>
+        <i class="fcc fcc-flower persistent-menu-image align-self-start flex-shrink-0" aria-hidden="true"></i>
+      <% } %>
+      <h5 class="offcanvas-title position-relative mx-2 flex-grow-1" id="persistent-menu-label">
+        <a id="app-main" class="stretched-link text-reset d-block" href="#"
+           data-bs-toggle="offcanvas" data-bs-target="#persistent-menu-container">
+          <%- appName %>
+        </a>
+      </h5>
+      <button type="button" class="btn-close text-reset p-3" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+    </div>
+    <div class="offcanvas-body persistent-menu-max-width">
+      <div id="persistent-menu-content" class="persistent-menu"></div>
+    </div>
+  </div>
+</script>
+
+<script type="text/template" id="persistent-menu-item">
+  <div class="position-relative persistent-menu-item rounded d-flex align-items-center">
+    <% if (imageUri) { %>
+      <i class="fcc persistent-menu-image align-self-start flex-shrink-0" aria-hidden="true"
+         style="background-image: url('<%- imageUri %>');"></i>
+    <% } else { %>
+      <i class="fa <%- iconClass %> persistent-menu-image align-self-start flex-shrink-0" aria-hidden="true"></i>
+    <% } %>
+    <div class="mx-3 flex-grow-1">
+      <a class="d-block stretched-link text-reset <%= isActive ? 'fw-bold' : '' %>" href="#"
+         data-bs-toggle="offcanvas" data-bs-target="#persistent-menu-container">
+        <%- displayText %>
+      </a>
+    </div>
+  </div>
+  <ul></ul>
+</script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html
index 259ff5f35e9b..fb60765a3490 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/sessions/list.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 
 <script type="text/template" id="session-view-list-template">
-  <% if(isPreviewEnv) { %>
+  <% if(isAppPreview) { %>
   <div class="breadcrumb-form-container">
     <ol class="breadcrumb breadcrumb-form">
       <li class="breadcrumb-item">
@@ -10,7 +10,7 @@
     </ol>
   </div>
   <% } else { %>
-  <div class="module-banner alert alert-info">
+  <div class="alert alert-warning">
     <span>
         {% blocktrans %}
           Web Apps deletes any Incomplete Forms that are more than 7 days old.
@@ -20,7 +20,7 @@
   </div>
   <% } %>
   <div class="module-menu-container module-menu-bar-offset">
-    <% if (!isPreviewEnv) { %>
+    <% if (!isAppPreview) { %>
     <div class="page-header menu-header d-none d-md-block">
       <h1 class="page-title">{% trans "Incomplete Forms" %}</h1>
     </div>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as_banner.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as_banner.html
index 723c895e3273..5dc297cbb02f 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as_banner.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/restore_as_banner.html
@@ -1,11 +1,13 @@
 {% load hq_shared_tags %}
 
 <script type="text/template" id="restore-as-banner-template">
-  {% if request|can_use_restore_as %}
-    <% if (restoreAs) { %>
-    <div class="restore-as-banner module-banner">
-      <%= message %>
-    </div>
-    <% } %>
-  {% endif %}
+  <div class="restore-as-banner py-1 text-dark bg-cc-light-warm-accent-extra-hi text-center shadow-sm">
+    <%= message %>
+  </div>
+</script>
+
+<script type="text/template" id="restore-as-pill-template">
+  <span class="badge rounded-pill text-dark bg-cc-light-warm-accent-extra-hi">
+    <%= message %>
+  </span>
 </script>
diff --git a/corehq/apps/cloudcare/templates/cloudcare/preview_app.html b/corehq/apps/cloudcare/templates/cloudcare/preview_app.html
index 1de3beb6e50d..939f830bded7 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/preview_app.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/preview_app.html
@@ -72,12 +72,8 @@
       </section>
     </div>
     {% if request.couch_user.can_edit_data %}
-      <section id="cloudcare-debugger" data-bind="
-        template: {
-            name: 'instance-viewer-ko-template',
-            afterRender: adjustWidth
-        }
-    "></section>
+      <section data-bind="template: { name: 'instance-viewer-ko-template' }"
+               id="cloudcare-debugger"></section>
     {% endif %}
   </div>
 {% endblock %}
diff --git a/corehq/apps/cloudcare/tests/test_session.py b/corehq/apps/cloudcare/tests/test_session.py
index 735cc256aa25..5852549afdda 100644
--- a/corehq/apps/cloudcare/tests/test_session.py
+++ b/corehq/apps/cloudcare/tests/test_session.py
@@ -70,6 +70,7 @@ def test_user_data_profile(self):
 
     def test_load_session_data_for_web_user(self):
         user = WebUser.create(None, 'web-user@example.com', '123', None, None)
+        self.addCleanup(user.delete, None, None)
         data = get_user_contributions_to_touchforms_session('cloudcare-tests', user)
         self.assertEqual('web-user@example.com', data['username'])
         self.assertEqual(user._id, data['user_id'])
diff --git a/corehq/apps/commtrack/static/commtrack/images/goodstock.png b/corehq/apps/commtrack/static/commtrack/images/goodstock.png
deleted file mode 100644
index 89c8129a490b..000000000000
Binary files a/corehq/apps/commtrack/static/commtrack/images/goodstock.png and /dev/null differ
diff --git a/corehq/apps/commtrack/static/commtrack/images/no_data.png b/corehq/apps/commtrack/static/commtrack/images/no_data.png
deleted file mode 100644
index 041bdbf735fb..000000000000
Binary files a/corehq/apps/commtrack/static/commtrack/images/no_data.png and /dev/null differ
diff --git a/corehq/apps/commtrack/static/commtrack/images/overstock.png b/corehq/apps/commtrack/static/commtrack/images/overstock.png
deleted file mode 100644
index 64181d236ed2..000000000000
Binary files a/corehq/apps/commtrack/static/commtrack/images/overstock.png and /dev/null differ
diff --git a/corehq/apps/commtrack/static/commtrack/images/stockout.png b/corehq/apps/commtrack/static/commtrack/images/stockout.png
deleted file mode 100644
index ab6808fba554..000000000000
Binary files a/corehq/apps/commtrack/static/commtrack/images/stockout.png and /dev/null differ
diff --git a/corehq/apps/commtrack/static/commtrack/images/warning.png b/corehq/apps/commtrack/static/commtrack/images/warning.png
deleted file mode 100644
index 81e9ed29a560..000000000000
Binary files a/corehq/apps/commtrack/static/commtrack/images/warning.png and /dev/null differ
diff --git a/corehq/apps/custom_data_fields/edit_entity.py b/corehq/apps/custom_data_fields/edit_entity.py
index 2852fa56ffca..67354e97852e 100644
--- a/corehq/apps/custom_data_fields/edit_entity.py
+++ b/corehq/apps/custom_data_fields/edit_entity.py
@@ -33,6 +33,11 @@ def with_prefix(string, prefix):
     return "{}-{}".format(prefix, string)
 
 
+def without_prefix(string, prefix):
+    prefix_len = len(prefix) + 1
+    return string[prefix_len:] if string.startswith(prefix) else string
+
+
 def add_prefix(field_dict, prefix):
     """
     Prefix all keys in the dict.
@@ -131,13 +136,45 @@ def _make_field(self, field):
         else:
             return forms.CharField(label=safe_label, required=field.is_required)
 
+    def make_fieldsets(self, form_fields, is_post, field_name_includes_prefix=False):
+        if self.ko_model:
+            field_names = []
+            for field_name, field in form_fields.items():
+                data_bind_field_name = (
+                    without_prefix(field_name, self.prefix) if field_name_includes_prefix else field_name)
+                data_binds = [
+                    f"value: {self.ko_model}.{data_bind_field_name}.value",
+                    f"disable: {self.ko_model}.{data_bind_field_name}.disable",
+                ]
+                if hasattr(field, 'choices') or without_prefix(field_name, self.prefix) == PROFILE_SLUG:
+                    data_binds.append("select2: " + json.dumps([
+                        {"id": id, "text": text} for id, text in field.widget.choices
+                    ]))
+                field_names.append(Field(
+                    field_name,
+                    data_bind=", ".join(data_binds)
+                ))
+        else:
+            field_names = list(form_fields)
+
+        form_fieldsets = []
+        if field_names:
+            form_fieldsets.append(Fieldset(
+                _("Additional Information"),
+                *field_names,
+                css_class="custom-data-fieldset"
+            ))
+        if not is_post:
+            form_fieldsets.append(self.uncategorized_form)
+        return form_fieldsets
+
     @property
     @memoized
     def fields(self):
         return list(self.model.get_fields(required_only=self.required_only))
 
     def init_form(self, post_dict=None):
-        fields = OrderedDict()
+        form_fields = OrderedDict()
 
         from corehq.apps.users.views.mobile import UserFieldsView
         has_profile_privilege_and_is_user_fields_view = (
@@ -167,7 +204,7 @@ def validate_profile_slug(value):
                 }
                 if not self.ko_model:
                     attrs.update({'class': 'hqwebapp-select2'})
-                fields[PROFILE_SLUG] = forms.IntegerField(
+                form_fields[PROFILE_SLUG] = forms.IntegerField(
                     label=_('Profile'),
                     required=False,
                     widget=Select(choices=[
@@ -177,74 +214,49 @@ def validate_profile_slug(value):
                     validators=[validate_profile_slug],
                 )
         for field in self.fields:
-            fields[field.slug] = self._make_field(field)
-
-        if self.ko_model:
-            field_names = []
-            for field_name, field in fields.items():
-                data_binds = [
-                    f"value: {self.ko_model}.{field_name}.value",
-                    f"disable: {self.ko_model}.{field_name}.disable",
-                ]
-                if hasattr(field, 'choices') or field_name == PROFILE_SLUG:
-                    data_binds.append("select2: " + json.dumps([
-                        {"id": id, "text": text} for id, text in field.widget.choices
-                    ]))
-                field_names.append(Field(
-                    field_name,
-                    data_bind=", ".join(data_binds)
-                ))
-        else:
-            field_names = list(fields)
+            form_fields[field.slug] = self._make_field(field)
 
-        CustomDataForm = type('CustomDataForm', (forms.Form,), fields)
+        CustomDataForm = type('CustomDataForm', (forms.Form,), form_fields.copy())
         if self.ko_model:
             CustomDataForm.helper = HQModalFormHelper()
         else:
             CustomDataForm.helper = HQFormHelper()
         CustomDataForm.helper.form_tag = False
 
-        additional_fields = []
-        if field_names:
-            additional_fields.append(Fieldset(
-                _("Additional Information"),
-                *field_names,
-                css_class="custom-data-fieldset"
-            ))
-        if post_dict is None:
-            additional_fields.append(self.uncategorized_form)
+        form_fieldsets = self.make_fieldsets(form_fields, post_dict is not None)
+
         CustomDataForm.helper.layout = Layout(
-            *additional_fields
+            *form_fieldsets
         )
 
         CustomDataForm._has_uncategorized = bool(self.uncategorized_form) and post_dict is None
 
         if post_dict:
-            fields = post_dict.copy()   # make mutable
+            form_data = post_dict.copy()   # make mutable
         elif self.existing_custom_data is not None:
-            fields = add_prefix(self.existing_custom_data, self.prefix)
+            form_data = add_prefix(self.existing_custom_data, self.prefix)
         else:
-            fields = None
+            form_data = None
 
         # Add profile fields so that form validation passes
-        if fields and has_profile_privilege_and_is_user_fields_view:
+        if form_data and has_profile_privilege_and_is_user_fields_view:
 
             # When a field is disabled via knockout, it is not included in POST so this
             # adds it back
             if (post_dict and (with_prefix(PROFILE_SLUG, self.prefix)) not in post_dict
                     and not can_edit_original_profile):
-                fields.update({with_prefix(PROFILE_SLUG, self.prefix): original_profile_id})
+                form_data.update({with_prefix(PROFILE_SLUG, self.prefix): original_profile_id})
             try:
                 profile_fields = CustomDataFieldsProfile.objects.get(
-                    id=int(fields.get(with_prefix(PROFILE_SLUG, self.prefix))),
+                    id=int(form_data.get(with_prefix(PROFILE_SLUG, self.prefix))),
                     definition__field_type=self.field_view.field_type,
                     definition__domain=self.domain,
                 ).fields
             except (ValueError, TypeError, CustomDataFieldsProfile.DoesNotExist):
                 profile_fields = {}
-            fields.update(add_prefix(profile_fields, self.prefix))
+            form_data.update(add_prefix(profile_fields, self.prefix))
 
-        self.form = CustomDataForm(fields, prefix=self.prefix)
+        self.form = CustomDataForm(form_data, prefix=self.prefix)
         return self.form
 
     @property
diff --git a/corehq/apps/dashboard/static/dashboard/js/dashboard.js b/corehq/apps/dashboard/static/dashboard/js/dashboard.js
index 5f345232a4ec..ccc45ffca4c5 100644
--- a/corehq/apps/dashboard/static/dashboard/js/dashboard.js
+++ b/corehq/apps/dashboard/static/dashboard/js/dashboard.js
@@ -4,7 +4,7 @@ hqDefine("dashboard/js/dashboard", [
     'knockout',
     'underscore',
     'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/bootstrap5/components.ko',    // pagination widget
+    'hqwebapp/js/components/pagination',
     'hqwebapp/js/bootstrap5/main',     // post-link function
     'hqwebapp/js/bootstrap5/knockout_bindings.ko',  // popover
 ], function (
diff --git a/corehq/apps/data_dictionary/static/data_dictionary/js/data_dictionary.js b/corehq/apps/data_dictionary/static/data_dictionary/js/data_dictionary.js
index 011536975ca2..fda23e481f50 100644
--- a/corehq/apps/data_dictionary/static/data_dictionary/js/data_dictionary.js
+++ b/corehq/apps/data_dictionary/static/data_dictionary/js/data_dictionary.js
@@ -122,6 +122,7 @@ hqDefine("data_dictionary/js/data_dictionary", [
         self.description = ko.observable(description);
         self.caseType = caseType;
         self.properties = ko.observableArray();
+        self.newPropertyName = ko.observable();
         self.expanded = ko.observable(true);
         self.toggleExpanded = () => self.expanded(!self.expanded());
         self.deprecated = deprecated;
@@ -139,6 +140,27 @@ hqDefine("data_dictionary/js/data_dictionary", [
             return self.toBeDeprecated() && !deprecated && self.properties().length > 0;
         });
 
+        self.newCaseProperty = function () {
+            if (self.newPropertyName().trim()) {
+                const prop = {
+                    'name': self.newPropertyName(),
+                    'label': self.newPropertyName(),
+                    'allowedValues': {},
+                };
+                let propObj = propertyListItem(
+                    prop,
+                    false,
+                    self.name(),
+                    self.caseType,
+                    false,
+                    self.name(),
+                    changeSaveButton
+                );
+                self.newPropertyName(undefined);
+                self.properties.push(propObj);
+            }
+        };
+
         self.name.subscribe(changeSaveButton);
         self.description.subscribe(changeSaveButton);
         self.toBeDeprecated.subscribe(changeSaveButton);
@@ -521,19 +543,19 @@ hqDefine("data_dictionary/js/data_dictionary", [
             return pattern.test(nameStr);
         }
 
-        self.newPropertyNameValid = ko.computed(function () {
-            if (!self.newPropertyName()) {
+        self.newPropertyNameValid = function (name) {
+            if (!name) {
                 return true;
             }
-            return isNameValid(self.newPropertyName());
-        });
+            return isNameValid(name);
+        };
 
-        self.newPropertyNameUnique = ko.computed(function () {
-            if (!self.newPropertyName()) {
+        self.newPropertyNameUnique = function (name) {
+            if (!name) {
                 return true;
             }
 
-            const propertyNameFormatted = self.newPropertyName().toLowerCase().trim();
+            const propertyNameFormatted = name.toLowerCase().trim();
             const activeCaseTypeData = self.activeCaseTypeData();
             for (const group of activeCaseTypeData) {
                 if (group.properties().find(v => v.name.toLowerCase() === propertyNameFormatted)) {
@@ -541,7 +563,7 @@ hqDefine("data_dictionary/js/data_dictionary", [
                 }
             }
             return true;
-        });
+        };
 
         self.newGroupNameValid = ko.computed(function () {
             if (!self.newGroupName()) {
@@ -565,28 +587,6 @@ hqDefine("data_dictionary/js/data_dictionary", [
             return true;
         });
 
-        self.newCaseProperty = function () {
-            if (_.isString(self.newPropertyName()) && self.newPropertyName().trim()) {
-                let lastGroup = self.activeCaseTypeData()[self.activeCaseTypeData().length - 1];
-                const prop = {
-                    'name': self.newPropertyName(),
-                    'label': self.newPropertyName(),
-                    'allowedValues': {},
-                };
-                let propObj = propertyListItem(
-                    prop,
-                    false,
-                    lastGroup.name(),
-                    self.activeCaseType(),
-                    false,
-                    lastGroup.name(),
-                    changeSaveButton
-                );
-                self.newPropertyName(undefined);
-                lastGroup.properties.push(propObj);
-            }
-        };
-
         self.newGroup = function () {
             if (_.isString(self.newGroupName()) && self.newGroupName().trim()) {
                 var group = groupsViewModel(
diff --git a/corehq/apps/data_dictionary/templates/data_dictionary/base.html b/corehq/apps/data_dictionary/templates/data_dictionary/base.html
index 9c347d361f44..594ee88330f9 100644
--- a/corehq/apps/data_dictionary/templates/data_dictionary/base.html
+++ b/corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -93,7 +93,8 @@ <h4 class="modal-title">{% trans "Create a new Case Type" %}</h4>
                       {% trans "Description" %}
                   </label>
                   <div class="col-xs-12 col-sm-6 col-md-6 col-lg-8 controls">
-                    <textarea name="description" class="form-control vertical-resize"></textarea>
+                    <textarea name="description"
+                              class="form-control std-height vertical-resize"></textarea>
                   </div>
                 </div>
               </fieldset>
@@ -200,10 +201,11 @@ <h3 data-bind="text: $root.activeCaseType()" style="display: inline-block;"></h3
           <div class="table-row table-header">
           <div class="row-item-small"></div>
           <div class="row-item">{% trans "Case Property" %}</div>
+          <div class="row-item">{% trans "Label" %}</div>
           {% if request|toggle_enabled:"CASE_IMPORT_DATA_DICTIONARY_VALIDATION" %}
             <div class="row-item">{% trans "Data Type" %}</div>
           {% endif %}
-          <div class="row-item">{% trans "Description" %}</div>
+          <div class="row-item-big">{% trans "Description" %}</div>
           {% if fhir_integration_enabled %}
             <div class="row-item">{% trans "FHIR Resource Property Path" %}</div>
           {% endif %}
@@ -215,12 +217,16 @@ <h3 data-bind="text: $root.activeCaseType()" style="display: inline-block;"></h3
             <div class="row-item-small"></div>
           {% endif %}
           </div>
-          <div data-bind="sortable: { data: activeCaseTypeData(), connectClass: 'groups', options: { handle: 'i.sortable-handle' } }">
+          <div data-bind="sortable: {
+                            data: activeCaseTypeData(),
+                            connectClass: 'groups',
+                            options: { handle: 'i.sortable-handle' }
+                          }">
           <div>
           <div class="group-deprecated" data-bind="visible: showGroupPropertyTransferWarning" style="display: none;">
-            <b data-bind="text: name()"></b>
-            {% trans "group's properties will be moved to" %}
-            <b>{% trans "No Group" %}</b>
+            {% blocktrans %}
+            <b data-bind="text: name()"></b> group's properties will be moved to <b>No Group</b>
+            {% endblocktrans %}
           </div>
           <div class="table-row group" data-bind="css: { 'group-deprecated': toBeDeprecated() }, visible: !deprecated || $root.showAll()">
             <div class="row-item-small">
@@ -239,15 +245,17 @@ <h3 data-bind="text: $root.activeCaseType()" style="display: inline-block;"></h3
                             attr: {'placeholder': name}" id="group-name" />
               <!-- /ko -->
             </div>
+            <div class="row-item">
+              &nbsp;{# Empty cell where "Label" is in case property rows #}
+            </div>
             {% if request|toggle_enabled:"CASE_IMPORT_DATA_DICTIONARY_VALIDATION" %}
               <div class="row-item">{% trans "Case Property Group" %}</div>
             {% endif %}
-            <div class="row-item">
+            <div class="row-item-big">
               <!-- ko if: name() !== ''-->
-              <textarea class="form-control vertical-resize" data-bind="
-                    value: $data.description,
-                    rows: 1"
-                    placeholder='{% trans "Click here to add a description" %}'></textarea>
+              <textarea class="form-control std-height vertical-resize"
+                        data-bind="value: $data.description, rows: 1"
+                        placeholder='{% trans "Click here to add a description" %}'></textarea>
               <!-- /ko -->
             </div>
             {% if fhir_integration_enabled %}
@@ -278,17 +286,15 @@ <h3 data-bind="text: $root.activeCaseType()" style="display: inline-block;"></h3
               <div class="row-item">
                 <div class="w-100">
                 <span data-bind="text: name"></span>
-                <div class="row mt-3">
-                  <label class="col-xs-2 py-2" for="prop-label">Label </label>
-                  <span class="col-xs-9">
-                    <input class="form-control"
-                          data-bind="value: $data.label, attr: {'placeholder': 'Click here to add Label'}"
-                          id="prop-label"
-                    />
-                  </span>
-                </div>
                 </div>
               </div>
+              <div class="row-item">
+                <input class="form-control"
+                       id="prop-label"
+                       data-bind="
+                         value: $data.label,
+                         attr: {'placeholder': 'Click here to add a label'}" />
+              </div>
               {% if request|toggle_enabled:"CASE_IMPORT_DATA_DICTIONARY_VALIDATION" %}
                 <div class="row-item main-form">
                   <select class="form-control"
@@ -310,11 +316,11 @@ <h3 data-bind="text: $root.activeCaseType()" style="display: inline-block;"></h3
                   </span>
                 </div>
               {% endif %}
-              <div class="row-item main-form">
-                              <textarea class="form-control vertical-resize" data-bind="
-                                value: $data.description,
-                                rows: 1"
-                                placeholder='{% trans "Click here to add a description" %}'></textarea>
+              <div class="row-item-big main-form">
+                <textarea class="form-control std-height vertical-resize"
+                          placeholder="{% trans 'Click here to add a description' %}"
+                          data-bind=" value: $data.description, rows: 1">
+                </textarea>
               </div>
             {% if fhir_integration_enabled %}
               <div class="row-item fhir-path">
@@ -363,30 +369,51 @@ <h3 data-bind="text: $root.activeCaseType()" style="display: inline-block;"></h3
             {% endif %}
             </div>
           </div>
+
+          {% if not request.is_view_only %}
+            <div class="table-row"
+                 data-bind="visible: !deprecated">
+              <div class="row-item">
+                <form class="form-inline"
+                      data-bind="css: {
+                                   'has-error': !$root.newPropertyNameUnique(newPropertyName())
+                                                || !$root.newPropertyNameValid(newPropertyName())
+                                 }">
+                  <input class="form-control"
+                         placeholder="Case Property"
+                         data-bind="value: newPropertyName">
+                  <button class="btn btn-default"
+                          id="gtm-add-case-property"
+                          data-bind="click: newCaseProperty,
+                                     enable: $root.newPropertyNameUnique(newPropertyName())
+                                             && $root.newPropertyNameValid(newPropertyName())">
+                    <i class="fa fa-plus"></i>
+                    {% trans "Add Case Property" %}
+                  </button>
+                  <div class="help-block">
+                    <span class="text-danger"
+                          data-bind="visible: !$root.newPropertyNameUnique(newPropertyName())">
+                      {% blocktrans %}
+                        A case property with this name already exists.
+                        If you don’t see it on the page, please click ‘Show Deprecated’ button to reveal deprecated
+                        properties.
+                      {% endblocktrans %}
+                    </span>
+                    <span class="text-danger" data-bind="visible: !$root.newPropertyNameValid(newPropertyName())">
+                      {% trans "Invalid case property name. It should start with a letter, and only contain letters, numbers, '-', and '_'" %}
+                    </span>
+                  </div>
+
+                </form>
+              </div>
+            </div>
+          {% endif %}
+
           </div>
           </div>
         </div>
+
         {% if not request.is_view_only %}
-          <form class="form-inline" data-bind="css: { 'has-error': !newPropertyNameUnique() || !newPropertyNameValid() }">
-            <input class="form-control" placeholder="Case Property" data-bind="value: newPropertyName">
-            <button class="btn btn-default" id="gtm-add-case-property" data-bind="click: $root.newCaseProperty, enable: newPropertyNameUnique() && newPropertyNameValid()">
-              <i class="fa fa-plus"></i>
-              {% trans "Add Case Property" %}
-            </button>
-            <div class="help-block">
-              <span class="text-danger" data-bind="visible: !newPropertyNameUnique()">
-                {% blocktrans %}
-                  A case property with this name already exists.
-                  If you don’t see it on the page, please click ‘Show Deprecated’ button to reveal deprecated
-                  properties.
-                {% endblocktrans %}
-              </span>
-              <span class="text-danger" data-bind="visible: !newPropertyNameValid()">
-                {% trans "Invalid case property name. It should start with a letter, and only contain letters, numbers, '-', and '_'" %}
-              </span>
-            </div>
-          </form>
-          <br />
           <form class="form-inline" data-bind="css: {'has-error': !newGroupNameUnique() || !newGroupNameValid()}">
             <input class="form-control" placeholder="Group Name" data-bind="value: newGroupName">
             <button class="btn btn-default" id="gtm-add-case-property-group" data-bind="click: $root.newGroup, enable: newGroupNameUnique() && newGroupNameValid()">
diff --git a/corehq/apps/data_interfaces/deduplication.py b/corehq/apps/data_interfaces/deduplication.py
index ba068f1ac340..b7555de347ae 100644
--- a/corehq/apps/data_interfaces/deduplication.py
+++ b/corehq/apps/data_interfaces/deduplication.py
@@ -2,6 +2,8 @@
 
 from django.utils.text import slugify
 
+from casexml.apps.case.const import CASE_UI_OWNER_ID
+
 from corehq.apps.case_search.const import INDEXED_METADATA_BY_KEY
 from corehq.apps.data_interfaces.utils import iter_cases_and_run_rules
 from corehq.apps.es import queries
@@ -46,12 +48,7 @@ def apply_criterion_to_query(query_, definition):
                     queries.MUST_NOT,
                 )
         elif isinstance(definition, LocationFilterDefinition):
-            # Get all users owning cases at definition.location_id
-            owners_ids = user_ids_at_locations([definition.location_id])
-            # Add the definition.location_id for cases which belong to definition.location_id
-            owners_ids.append(definition.location_id)
-
-            query_ = query_.owner(owners_ids)
+            query_ = query_.owner(_get_owner_ids_for_definition(definition))
 
         return query_
 
@@ -61,6 +58,15 @@ def apply_criterion_to_query(query_, definition):
     return query
 
 
+def _get_owner_ids_for_definition(location_definition):
+    location_ids = location_definition.get_location_ids()
+    owner_ids = user_ids_at_locations(location_ids)
+    # Add the location_ids for cases which belong to a location
+    owner_ids.extend(location_ids)
+
+    return owner_ids
+
+
 def case_exists_in_es(
     domain,
     case,
@@ -121,12 +127,17 @@ def find_duplicate_case_ids(
 
 
 def add_case_properties_to_query(es, case, case_properties, match_type):
+    # HACK: due to inconsistencies in how case metadata properties are displayed
+    # to users, we need to translate the display value to the backend value
+    display_to_backend_properties_map = {CASE_UI_OWNER_ID: "@owner_id"}
+
     clause = queries.MUST if match_type == "ALL" else queries.SHOULD
     _case_json = None
 
     at_least_one_property_query = False
 
     for case_property_name in case_properties:
+        case_property_name = display_to_backend_properties_map.get(case_property_name, case_property_name)
         if case_property_name in INDEXED_METADATA_BY_KEY:
             if _case_json is None:
                 _case_json = case.to_json()
diff --git a/corehq/apps/data_interfaces/forms.py b/corehq/apps/data_interfaces/forms.py
index f62053e72472..74dea91d7a2b 100644
--- a/corehq/apps/data_interfaces/forms.py
+++ b/corehq/apps/data_interfaces/forms.py
@@ -308,8 +308,10 @@ def current_values(self):
     @property
     def constants(self):
         return {
-            'MATCH_DAYS_BEFORE': MatchPropertyDefinition.MATCH_DAYS_BEFORE,
-            'MATCH_DAYS_AFTER': MatchPropertyDefinition.MATCH_DAYS_AFTER,
+            'MATCH_DAYS_LESS_THAN': MatchPropertyDefinition.MATCH_DAYS_LESS_THAN,
+            'MATCH_DAYS_LESS_OR_EQUAL': MatchPropertyDefinition.MATCH_DAYS_LESS_OR_EQUAL,
+            'MATCH_DAYS_GREATER_THAN': MatchPropertyDefinition.MATCH_DAYS_GREATER_THAN,
+            'MATCH_DAYS_GREATER_OR_EQUAL': MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL,
             'MATCH_EQUAL': MatchPropertyDefinition.MATCH_EQUAL,
             'MATCH_NOT_EQUAL': MatchPropertyDefinition.MATCH_NOT_EQUAL,
             'MATCH_HAS_VALUE': MatchPropertyDefinition.MATCH_HAS_VALUE,
@@ -581,8 +583,8 @@ def clean_property_match_definitions(self):
                     'match_type': match_type,
                 })
             elif match_type in (
-                MatchPropertyDefinition.MATCH_DAYS_BEFORE,
-                MatchPropertyDefinition.MATCH_DAYS_AFTER,
+                MatchPropertyDefinition.MATCH_DAYS_LESS_THAN,
+                MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL,
             ):
                 property_value = obj['property_value']
                 try:
diff --git a/corehq/apps/data_interfaces/models.py b/corehq/apps/data_interfaces/models.py
index 5bb744da148d..f29c7cd6c959 100644
--- a/corehq/apps/data_interfaces/models.py
+++ b/corehq/apps/data_interfaces/models.py
@@ -1,5 +1,6 @@
 import csv
 import hashlib
+import operator
 import re
 from collections import defaultdict
 from datetime import date, datetime, time, timedelta
@@ -71,6 +72,7 @@
 )
 from corehq import toggles
 from corehq.util.log import with_progress_bar
+from corehq.util.metrics.load_counters import dedupe_load_counter
 from corehq.util.quickcache import quickcache
 from corehq.util.test_utils import unit_testing_only
 from corehq.apps.locations.models import SQLLocation
@@ -559,11 +561,11 @@ def matches(self, case, now):
 
 
 class MatchPropertyDefinition(CaseRuleCriteriaDefinition):
-    # True when today < (the date in property_name + property_value days)
-    MATCH_DAYS_BEFORE = 'DAYS_BEFORE'
+    MATCH_DAYS_LESS_THAN = 'DAYS_BEFORE'
+    MATCH_DAYS_LESS_OR_EQUAL = 'DAYS_LESS_OR_EQUAL'
 
-    # True when today >= (the date in property_name + property_value days)
-    MATCH_DAYS_AFTER = 'DAYS'
+    MATCH_DAYS_GREATER_THAN = 'DAYS_GREATER_THAN'
+    MATCH_DAYS_GREATER_OR_EQUAL = 'DAYS'
 
     MATCH_EQUAL = 'EQUAL'
     MATCH_NOT_EQUAL = 'NOT_EQUAL'
@@ -572,8 +574,10 @@ class MatchPropertyDefinition(CaseRuleCriteriaDefinition):
     MATCH_REGEX = 'REGEX'
 
     MATCH_CHOICES = (
-        MATCH_DAYS_BEFORE,
-        MATCH_DAYS_AFTER,
+        MATCH_DAYS_LESS_THAN,
+        MATCH_DAYS_LESS_OR_EQUAL,
+        MATCH_DAYS_GREATER_THAN,
+        MATCH_DAYS_GREATER_OR_EQUAL,
         MATCH_EQUAL,
         MATCH_NOT_EQUAL,
         MATCH_HAS_VALUE,
@@ -599,34 +603,32 @@ def clean_datetime(self, timestamp):
 
         return timestamp
 
-    def check_days_before(self, case, now):
-        values = self.get_case_values(case)
-        for date_to_check in values:
-            date_to_check = _try_date_conversion(date_to_check)
+    def check_days_less_than(self, case, now):
+        return self.check_days(case, now, operator.lt)
 
-            if not isinstance(date_to_check, date):
-                continue
-
-            date_to_check = self.clean_datetime(date_to_check)
+    def check_days_less_or_equal(self, case, now):
+        return self.check_days(case, now, operator.le)
 
-            days = int(self.property_value)
-            if now < (date_to_check + timedelta(days=days)):
-                return True
+    def check_days_greater_than(self, case, now):
+        return self.check_days(case, now, operator.gt)
 
-        return False
+    def check_days_greater_or_equal(self, case, now):
+        return self.check_days(case, now, operator.ge)
 
-    def check_days_after(self, case, now):
+    def check_days(self, case, now, predicate):
         values = self.get_case_values(case)
         for date_to_check in values:
             date_to_check = _try_date_conversion(date_to_check)
+            if isinstance(date_to_check, datetime):
+                date_to_check = date_to_check.date()
 
             if not isinstance(date_to_check, date):
                 continue
 
-            date_to_check = self.clean_datetime(date_to_check)
+            today = now.date() if isinstance(now, datetime) else now
 
             days = int(self.property_value)
-            if now >= (date_to_check + timedelta(days=days)):
+            if predicate(today, date_to_check + timedelta(days=days)):
                 return True
 
         return False
@@ -673,8 +675,10 @@ def check_regex(self, case, now):
 
     def matches(self, case, now):
         return {
-            self.MATCH_DAYS_BEFORE: self.check_days_before,
-            self.MATCH_DAYS_AFTER: self.check_days_after,
+            self.MATCH_DAYS_LESS_THAN: self.check_days_less_than,
+            self.MATCH_DAYS_LESS_OR_EQUAL: self.check_days_less_or_equal,
+            self.MATCH_DAYS_GREATER_OR_EQUAL: self.check_days_greater_or_equal,
+            self.MATCH_DAYS_GREATER_THAN: self.check_days_greater_than,
             self.MATCH_EQUAL: self.check_equal,
             self.MATCH_NOT_EQUAL: self.check_not_equal,
             self.MATCH_HAS_VALUE: self.check_has_value,
@@ -755,6 +759,14 @@ def is_matching_location(location_id):
     def location(self):
         return SQLLocation.by_location_id(self.location_id)
 
+    def get_location_ids(self):
+        if self.include_child_locations:
+            location_ids = list(SQLLocation.objects.get_locations_and_children_ids([self.location_id]))
+        else:
+            location_ids = [self.location_id]
+
+        return location_ids
+
     def to_dict(self):
         return {
             'location_id': self.location_id,
@@ -1158,7 +1170,14 @@ def _handle_case_duplicate(self, case, rule):
                 # We've decided skipping this record and recording an error is likely the safest way to handle this
                 # Hopefully, these errors allow us to track down the underlying bug or infrastructure issue
                 # and fix the issue at the source
-                raise ValueError(f'Unable to find current ElasticSearch data for: {case.case_id}')
+
+                # TODO: Commenting this line out, as it has caused us to surpass our sentry error quota
+                # we should figure out whether this can be safely handled, or what truly constitutes an error,
+                # but disabling this to avoid further quota issues.
+                # raise ValueError(f'Unable to find current ElasticSearch data for: {case.case_id}')
+                # Ignore this result for now
+                dedupe_load_counter('unknown', case.domain, {'result': 'errored'})()
+                return CaseRuleActionResult(num_errors=1)
             else:
                 # Normal processing can involve latency between when a case is written to the database and when
                 # it arrives in ElasticSearch. If this case was modified within the acceptable latency window,
@@ -1169,9 +1188,12 @@ def _handle_case_duplicate(self, case, rule):
                 # inserts into ElasticSearch are asychronous, we can receive cases here that will not yet be
                 # present in ElasticSearch but will never be processed later. In the short-term, we're avoiding
                 # this by resaving the case, with the intention to use a more stable approach in the future
+                dedupe_load_counter('unknown', case.domain, {'result': 'retried'})()
                 resave_case(rule.domain, case, send_post_save_signal=False)
                 return CaseRuleActionResult(num_updates=0)
 
+        dedupe_load_counter('unknown', case.domain, {'result': 'processed'})()
+
         try:
             existing_duplicate = CaseDuplicateNew.objects.get(case_id=case.case_id, action=self)
         except CaseDuplicateNew.DoesNotExist:
diff --git a/corehq/apps/data_interfaces/static/data_interfaces/js/auto_update_rules.js b/corehq/apps/data_interfaces/static/data_interfaces/js/auto_update_rules.js
index 354527b63d6d..b96d6fcd1382 100644
--- a/corehq/apps/data_interfaces/static/data_interfaces/js/auto_update_rules.js
+++ b/corehq/apps/data_interfaces/static/data_interfaces/js/auto_update_rules.js
@@ -4,7 +4,8 @@ hqDefine("data_interfaces/js/auto_update_rules", [
     'underscore',
     'hqwebapp/js/initial_page_data',
     'analytix/js/google',
-    'hqwebapp/js/bootstrap3/components.ko', // for pagination and search box
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/data_interfaces/static/data_interfaces/js/case_rule_criteria.js b/corehq/apps/data_interfaces/static/data_interfaces/js/case_rule_criteria.js
index 6c5c60ffe4f4..c93e82a4f9ed 100644
--- a/corehq/apps/data_interfaces/static/data_interfaces/js/case_rule_criteria.js
+++ b/corehq/apps/data_interfaces/static/data_interfaces/js/case_rule_criteria.js
@@ -4,7 +4,7 @@ hqDefine("data_interfaces/js/case_rule_criteria", [
     'knockout',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/base_ace',  // ace editor for UCR filter
-    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
 ], function ($, _, ko, initialPageData, baseAce) {
 
     var CaseRuleCriteria = function (initial, constants, caseTypeObservable) {
@@ -199,8 +199,10 @@ hqDefine("data_interfaces/js/case_rule_criteria", [
                     obj.match_type(value.match_type);
                     self.criteria.push(obj);
                 } else if (
-                    value.match_type === constants.MATCH_DAYS_BEFORE ||
-                    value.match_type === constants.MATCH_DAYS_AFTER
+                    value.match_type === constants.MATCH_DAYS_LESS_THAN ||
+                    value.match_type === constants.MATCH_DAYS_LESS_OR_EQUAL ||
+                    value.match_type === constants.MATCH_DAYS_GREATER_THAN ||
+                    value.match_type === constants.MATCH_DAYS_GREATER_OR_EQUAL
                 ) {
                     var days = Number.parseInt(value.property_value);
                     if (days === 0) {
diff --git a/corehq/apps/data_interfaces/tasks.py b/corehq/apps/data_interfaces/tasks.py
index b246753d163e..da66ca03f6af 100644
--- a/corehq/apps/data_interfaces/tasks.py
+++ b/corehq/apps/data_interfaces/tasks.py
@@ -20,6 +20,7 @@
 from corehq.apps.users.models import CouchUser
 from corehq.form_processor.models import XFormInstance
 from corehq.apps.case_importer.do_import import SubmitCaseBlockHandler, RowAndCase
+from corehq.motech.repeaters.const import State
 from corehq.motech.repeaters.models import RepeatRecord
 from corehq.sql_db.util import get_db_aliases_for_partitioned_query
 from corehq.toggles import DISABLE_CASE_UPDATE_RULE_SCHEDULED_TASK
@@ -212,29 +213,16 @@ def task_generate_ids_and_operate_on_payloads(
     payload_id: Optional[str],
     repeater_id: Optional[str],
     domain: str,
-    action,  # type: Literal['resend', 'cancel', 'requeue']  # 3.8+
+    action: Literal['resend', 'cancel', 'requeue'],
+    state: Literal[None, State.Pending, State.Cancelled] = None,
 ) -> dict:
-    repeat_record_ids = _get_repeat_record_ids(payload_id, repeater_id, domain)
+    repeat_record_ids = RepeatRecord.objects.get_repeat_record_ids(
+        domain, repeater_id=repeater_id, state=state, payload_id=payload_id,
+    )
     return operate_on_payloads(repeat_record_ids, domain, action,
                                task=task_generate_ids_and_operate_on_payloads)
 
 
-def _get_repeat_record_ids(payload_id, repeater_id, domain):
-    if payload_id:
-        queryset = RepeatRecord.objects.filter(
-            domain=domain,
-            payload_id=payload_id,
-        )
-    elif repeater_id:
-        queryset = RepeatRecord.objects.filter(
-            domain=domain,
-            repeater__id=repeater_id,
-        )
-    else:
-        return []
-    return list(queryset.order_by().values_list("id", flat=True))
-
-
 @task
 def bulk_case_reassign_async(domain, user_id, owner_id, download_id, report_url):
     task = bulk_case_reassign_async
diff --git a/corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html b/corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
index d4dbc6dba0cb..8d014cdd7743 100644
--- a/corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+++ b/corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
@@ -139,8 +139,10 @@
     <label class="control-label col-xs-2">{% trans "When the current date is" %}</label>
     <div class="controls col-xs-2">
       <select class="select form-control" data-bind="value: match_type">
-        <option value="{{ form.constants.MATCH_DAYS_AFTER }}">{% trans "greater than" %}</option>
-        <option value="{{ form.constants.MATCH_DAYS_BEFORE }}">{% trans "less than" %}</option>
+        <option value="{{ form.constants.MATCH_DAYS_GREATER_THAN }}">{% trans "greater than" %}</option>
+        <option value="{{ form.constants.MATCH_DAYS_GREATER_OR_EQUAL }}">{% trans "greater than or equal" %}</option>
+        <option value="{{ form.constants.MATCH_DAYS_LESS_THAN }}">{% trans "less than" %}</option>
+        <option value="{{ form.constants.MATCH_DAYS_LESS_OR_EQUAL }}">{% trans "less than or equal" %}</option>
       </select>
     </div>
     <div class="col-xs-2">
@@ -164,8 +166,8 @@
     <label class="control-label col-xs-2">{% trans "When the current date is" %}</label>
     <div class="controls col-xs-2">
       <select class="select form-control" data-bind="value: match_type">
-        <option value="{{ form.constants.MATCH_DAYS_AFTER }}">{% trans "greater than" %}</option>
-        <option value="{{ form.constants.MATCH_DAYS_BEFORE }}">{% trans "less than" %}</option>
+        <option value="{{ form.constants.MATCH_DAYS_GREATER_OR_EQUAL }}">{% trans "greater than" %}</option>
+        <option value="{{ form.constants.MATCH_DAYS_LESS_THAN }}">{% trans "less than" %}</option>
       </select>
     </div>
     <div class="col-xs-2">
diff --git a/corehq/apps/data_interfaces/tests/test_auto_case_updates.py b/corehq/apps/data_interfaces/tests/test_auto_case_updates.py
index f7029f6410f7..ef919fcb5ed0 100644
--- a/corehq/apps/data_interfaces/tests/test_auto_case_updates.py
+++ b/corehq/apps/data_interfaces/tests/test_auto_case_updates.py
@@ -279,7 +279,7 @@ def test_date_case_property_before(self):
             MatchPropertyDefinition,
             property_name='last_visit_date',
             property_value='-5',
-            match_type=MatchPropertyDefinition.MATCH_DAYS_BEFORE,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_THAN,
         )
 
         rule2 = _create_empty_rule(self.domain)
@@ -287,7 +287,7 @@ def test_date_case_property_before(self):
             MatchPropertyDefinition,
             property_name='last_visit_date',
             property_value='0',
-            match_type=MatchPropertyDefinition.MATCH_DAYS_BEFORE,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_THAN,
         )
 
         rule3 = _create_empty_rule(self.domain)
@@ -295,7 +295,7 @@ def test_date_case_property_before(self):
             MatchPropertyDefinition,
             property_name='last_visit_date',
             property_value='5',
-            match_type=MatchPropertyDefinition.MATCH_DAYS_BEFORE,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_THAN,
         )
 
         with _with_case(self.domain, 'person', datetime.utcnow()) as case:
@@ -324,7 +324,7 @@ def test_date_case_property_after(self):
             MatchPropertyDefinition,
             property_name='last_visit_date',
             property_value='-5',
-            match_type=MatchPropertyDefinition.MATCH_DAYS_AFTER,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL,
         )
 
         rule2 = _create_empty_rule(self.domain)
@@ -332,7 +332,7 @@ def test_date_case_property_after(self):
             MatchPropertyDefinition,
             property_name='last_visit_date',
             property_value='0',
-            match_type=MatchPropertyDefinition.MATCH_DAYS_AFTER,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL,
         )
 
         rule3 = _create_empty_rule(self.domain)
@@ -340,7 +340,7 @@ def test_date_case_property_after(self):
             MatchPropertyDefinition,
             property_name='last_visit_date',
             property_value='5',
-            match_type=MatchPropertyDefinition.MATCH_DAYS_AFTER,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL,
         )
 
         with _with_case(self.domain, 'person', datetime.utcnow()) as case:
diff --git a/corehq/apps/data_interfaces/tests/test_case_deduplication.py b/corehq/apps/data_interfaces/tests/test_case_deduplication.py
index 156c783c8daf..c104d32be80e 100644
--- a/corehq/apps/data_interfaces/tests/test_case_deduplication.py
+++ b/corehq/apps/data_interfaces/tests/test_case_deduplication.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 from itertools import chain
-from unittest.mock import patch
+from unittest.mock import patch, PropertyMock
 
 from django.test import TestCase
 from freezegun import freeze_time
@@ -35,6 +35,7 @@
 from corehq.apps.users.tasks import tag_cases_as_deleted_and_remove_indices
 from corehq.form_processor.models import CommCareCase
 from corehq.util.test_utils import flag_enabled, set_parent_case
+from corehq.apps.locations.models import SQLLocation, LocationType
 
 
 @es_test(requires=[case_search_adapter])
@@ -77,6 +78,7 @@ def test_with_location_filter(self):
         # Create a filter criteria of cases to consider
         definition = LocationFilterDefinition.objects.create(
             location_id='mustafar_id',
+            include_child_locations=False,
         )
         criteria = CaseRuleCriteria(rule=rule)
         criteria.definition = definition
@@ -97,6 +99,50 @@ def test_with_location_filter(self):
         self.assertTrue(retrieved_cases[0]['owner_id'] == location_id)
         self.assertTrue(retrieved_cases[1]['owner_id'] == location_id)
 
+    @patch.object(LocationType, 'commtrack_enabled', new_callable=PropertyMock, return_value=False)
+    @patch('corehq.apps.commtrack.models.sync_supply_point')
+    def test_with_child_location(self, sync_supply_mock, mock_commtrack_enabled):
+        loc_type = LocationType.objects.create(domain='test-domain', name='level1')
+        parent_location = SQLLocation.objects.create(
+            domain='test-domain', name='parent', location_type=loc_type, location_id='parent'
+        )
+        SQLLocation.objects.create(
+            domain='test-domain', name='child', location_type=loc_type, parent=parent_location, location_id='child'
+        )
+
+        cases = [
+            self.factory.create_case(case_name=case_name, update={'dob': dob}) for (case_name, dob) in [
+                ("Anakin Skywalker", "1977-03-25"),
+                ("Darth Vadar", "1977-03-25"),
+                ("Wannabe Anakin Skywalker", "1977-03-25"),
+                ("Wannabe Darth Vadar", "1977-03-25"),
+            ]
+        ]
+
+        rule = self.create_rule('test rule', cases[0].type)
+        definition = LocationFilterDefinition.objects.create(
+            location_id='parent',
+            include_child_locations=True,
+        )
+        criteria = CaseRuleCriteria(rule=rule)
+        criteria.definition = definition
+        criteria.save()
+
+        location_id = 'child'
+
+        # Only assign location id to first 2 cases, since we want only those two cases to be considered
+        cases[0].owner_id = location_id
+        cases[1].owner_id = location_id
+
+        self._prime_es_index(cases)
+
+        query = _get_es_filtered_case_query(self.domain, cases[0], rule.memoized_criteria)
+        retrieved_cases = query.run().hits
+
+        self.assertEqual(len(retrieved_cases), 2)
+        self.assertTrue(retrieved_cases[0]['owner_id'] == location_id)
+        self.assertTrue(retrieved_cases[1]['owner_id'] == location_id)
+
     def test_with_case_properties_filter_match_equal(self):
         match_type = MatchPropertyDefinition.MATCH_EQUAL
 
@@ -277,8 +323,14 @@ def test_when_case_parameters_match_returns_true(self):
 
         self.assertTrue(case_exists_in_es(self.domain, updated_case, ['case_name']))
 
-    def _create_case(self, name='Anakin Skywalker'):
-        return self.factory.create_case(case_name=name, update={})
+    def test_when_case_metadata_parameters_match_returns_true(self):
+        case = self._create_case(name='Anakin Skywalker', owner_id='abc123')
+        self._prime_es_index([case])
+
+        self.assertTrue(case_exists_in_es(self.domain, case, ['owner_id']))
+
+    def _create_case(self, name='Anakin Skywalker', owner_id=None):
+        return self.factory.create_case(case_name=name, owner_id=owner_id, update={})
 
 
 @es_test(requires=[case_search_adapter])
@@ -642,16 +694,15 @@ def test_ignores_recent_submissions_not_in_elasticsearch(self, mock_case_exists,
         self.assertEqual(created_duplicates.count(), 0)
 
     @patch("corehq.apps.data_interfaces.models.case_matching_rule_criteria_exists_in_es")
-    def test_raises_error_when_case_not_in_elasticsearch(self, mock_case_exists):
+    def test_returns_error_result_when_case_not_in_elasticsearch(self, mock_case_exists):
         current_time = datetime(year=2024, month=2, day=5, hour=10)
         case = self._create_case()
         case.server_modified_on = current_time - timedelta(hours=1, seconds=1)
         mock_case_exists.return_value = False
 
-        with self.assertRaisesRegex(
-                ValueError, f'Unable to find current ElasticSearch data for: {case.case_id}'):
-            with freeze_time(current_time):
-                self.rule.run_rule(case, datetime.now())
+        result = self.rule.run_rule(case, datetime.now())
+        self.assertEqual(result.num_updates, 0)
+        self.assertEqual(result.num_errors, 1)
 
     @patch("corehq.apps.data_interfaces.models._find_duplicate_case_ids")
     def test_case_no_longer_duplicate(self, find_duplicates_mock):
diff --git a/corehq/apps/data_interfaces/tests/test_models.py b/corehq/apps/data_interfaces/tests/test_models.py
index 8ae74900fa3c..b7038801d274 100644
--- a/corehq/apps/data_interfaces/tests/test_models.py
+++ b/corehq/apps/data_interfaces/tests/test_models.py
@@ -43,6 +43,120 @@ def test_to_dict_includes_all_fields(self):
             'match_type': 'test_type',
         })
 
+    def test_days_less_or_equal_matches_when_date_is_equal_to_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_OR_EQUAL
+        )
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=1)
+        })
+
+        self.assertTrue(definition.matches(case, datetime(year=2024, month=10, day=1)))
+
+    def test_days_less_or_equal_does_not_match_when_date_is_greater_than_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_OR_EQUAL
+        )
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=1)
+        })
+
+        self.assertFalse(definition.matches(case, datetime(year=2024, month=10, day=2)))
+
+    def test_days_before_does_not_match_when_date_is_equal_to_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_THAN
+        )
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=2)
+        })
+
+        self.assertFalse(definition.matches(case, datetime(year=2024, month=10, day=2)))
+
+    def test_days_before_matches_when_date_is_less_than_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_LESS_THAN
+        )
+
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=2)
+        })
+
+        self.assertTrue(definition.matches(case, datetime(year=2024, month=10, day=1)))
+
+    def test_days_after_matches_when_date_is_equal_to_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL
+        )
+
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=1)
+        })
+
+        self.assertTrue(definition.matches(case, datetime(year=2024, month=10, day=1, hour=0)))
+
+    def test_days_after_does_not_match_when_date_is_less_than_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL
+        )
+
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=2)
+        })
+
+        self.assertFalse(definition.matches(case, datetime(year=2024, month=10, day=1)))
+
+    def test_days_greater_than_matches_when_date_is_greater_than_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_THAN
+        )
+
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=1)
+        })
+
+        self.assertTrue(definition.matches(case, datetime(year=2024, month=10, day=2)))
+
+    def test_days_greater_than_does_not_match_when_date_is_equal_to_case_date(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_THAN
+        )
+
+        case = CommCareCase(case_json={
+            'test_date': date(year=2024, month=10, day=1)
+        })
+
+        self.assertFalse(definition.matches(case, datetime(year=2024, month=10, day=1, hour=5)))
+
+    def test_check_days_handles_case_dates_as_strings(self):
+        definition = MatchPropertyDefinition(
+            property_name='test_date',
+            property_value=0,
+            match_type=MatchPropertyDefinition.MATCH_DAYS_GREATER_OR_EQUAL
+        )
+
+        case = CommCareCase(case_json={
+            'test_date': '2024-10-01',
+        })
+
+        self.assertTrue(definition.matches(case, datetime(year=2024, month=10, day=1)))
+
 
 class CustomMatchDefinitionTests(SimpleTestCase):
     def test_to_dict_includes_all_fields(self):
diff --git a/corehq/apps/data_interfaces/tests/test_tasks.py b/corehq/apps/data_interfaces/tests/test_tasks.py
index 627edaa41f5a..455b7553bf4a 100644
--- a/corehq/apps/data_interfaces/tests/test_tasks.py
+++ b/corehq/apps/data_interfaces/tests/test_tasks.py
@@ -1,4 +1,4 @@
-from unittest.case import TestCase
+from django.test import SimpleTestCase
 from unittest.mock import patch
 
 from corehq.apps.data_interfaces.tasks import (
@@ -7,7 +7,7 @@
 )
 
 
-class TestTasks(TestCase):
+class TestTasks(SimpleTestCase):
 
     @patch('corehq.apps.data_interfaces.utils.DownloadBase')
     @patch('corehq.apps.data_interfaces.utils._get_sql_repeat_record')
@@ -43,13 +43,14 @@ def test_task_operate_on_payloads_no_payload_ids(self):
 
     @patch('corehq.apps.data_interfaces.utils.DownloadBase')
     @patch('corehq.apps.data_interfaces.utils._get_sql_repeat_record')
-    @patch('corehq.apps.data_interfaces.tasks._get_repeat_record_ids')
+    @patch('corehq.apps.data_interfaces.tasks.RepeatRecord.objects.get_repeat_record_ids')
     def test_task_generate_ids_and_operate_on_payloads_no_action(
         self,
         get_repeat_record_ids_mock,
         unused_1,
         unused_2,
     ):
+
         get_repeat_record_ids_mock.return_value = ['c0ffee', 'deadbeef']
         response = task_generate_ids_and_operate_on_payloads(
             payload_id='c0ffee',
@@ -70,7 +71,9 @@ def test_task_generate_ids_and_operate_on_payloads_no_action(
             }
         })
 
-    def test_task_generate_ids_and_operate_on_payloads_no_data(self):
+    @patch('corehq.apps.data_interfaces.tasks.RepeatRecord.objects.get_repeat_record_ids')
+    def test_task_generate_ids_and_operate_on_payloads_no_data(self, get_repeat_record_ids_mock):
+        get_repeat_record_ids_mock.return_value = []
         response = task_generate_ids_and_operate_on_payloads(
             payload_id=None,
             repeater_id=None,
diff --git a/corehq/apps/data_interfaces/tests/test_utils.py b/corehq/apps/data_interfaces/tests/test_utils.py
index d75cce3abc26..d0b9cf56d557 100644
--- a/corehq/apps/data_interfaces/tests/test_utils.py
+++ b/corehq/apps/data_interfaces/tests/test_utils.py
@@ -1,70 +1,12 @@
-from datetime import datetime
 from unittest.mock import Mock, patch
-from uuid import uuid4
 
-from django.test import SimpleTestCase, TestCase
+from django.test import TestCase
 
-from corehq.apps.data_interfaces.tasks import (
-    _get_repeat_record_ids,
-    task_generate_ids_and_operate_on_payloads,
-)
-from corehq.apps.data_interfaces.utils import (
-    _get_sql_repeat_record,
-    operate_on_payloads,
-)
-from corehq.motech.models import ConnectionSettings
-from corehq.motech.repeaters.models import FormRepeater, RepeatRecord
+from corehq.apps.data_interfaces.tasks import task_generate_ids_and_operate_on_payloads
+from corehq.apps.data_interfaces.utils import operate_on_payloads
 
-DOMAIN = 'test-domain'
-
-
-class TestUtils(SimpleTestCase):
-
-    def test__get_ids_no_data(self):
-        response = _get_repeat_record_ids(None, None, 'test_domain')
-        self.assertEqual(response, [])
-
-    @patch('corehq.apps.data_interfaces.tasks.RepeatRecord.objects.filter')
-    def test__get_ids_payload_id_in_data(self, get_by_payload_id):
-        payload_id = Mock()
-        _get_repeat_record_ids(payload_id, None, 'test_domain')
-
-        self.assertEqual(get_by_payload_id.call_count, 1)
-        get_by_payload_id.assert_called_with(domain='test_domain', payload_id=payload_id)
-
-    @patch('corehq.apps.data_interfaces.tasks.RepeatRecord.objects.filter')
-    def test__get_ids_payload_id_not_in_data(self, iter_by_repeater):
-        REPEATER_ID = 'c0ffee'
-        _get_repeat_record_ids(None, REPEATER_ID, 'test_domain')
-
-        iter_by_repeater.assert_called_with(domain='test_domain', repeater__id=REPEATER_ID)
-        self.assertEqual(iter_by_repeater.call_count, 1)
 
-    @patch('corehq.motech.repeaters.models.RepeatRecord.objects')
-    def test__validate_record_record_does_not_exist(self, mock_objects):
-        mock_objects.get.side_effect = [RepeatRecord.DoesNotExist]
-        response = _get_sql_repeat_record('test_domain', '1234')
-
-        mock_objects.get.assert_called_once_with(domain='test_domain', id='1234')
-        self.assertIsNone(response)
-
-    @patch('corehq.motech.repeaters.models.RepeatRecord.objects')
-    def test__validate_record_invalid_domain(self, mock_objects):
-        mock_objects.get.side_effect = RepeatRecord.DoesNotExist
-        response = _get_sql_repeat_record('test_domain', '1234')
-
-        mock_objects.get.assert_called_once_with(domain='test_domain', id='1234')
-        self.assertIsNone(response)
-
-    @patch('corehq.motech.repeaters.models.RepeatRecord.objects')
-    def test__validate_record_success(self, mock_objects):
-        mock_record = Mock()
-        mock_record.domain = 'test_domain'
-        mock_objects.get.return_value = mock_record
-        response = _get_sql_repeat_record('test_domain', '1234')
-
-        mock_objects.get.assert_called_once_with(domain='test_domain', id='1234')
-        self.assertEqual(response, mock_record)
+DOMAIN = 'test-domain'
 
 
 class TestTasks(TestCase):
@@ -75,22 +17,22 @@ def setUp(self):
         self.mock_payload_ids = [self.mock_payload_one.id,
                                  self.mock_payload_two.id]
 
-    @patch('corehq.apps.data_interfaces.tasks._get_repeat_record_ids')
+    @patch('corehq.apps.data_interfaces.tasks.RepeatRecord.objects.get_repeat_record_ids')
     @patch('corehq.apps.data_interfaces.tasks.operate_on_payloads')
     def test_generate_ids_and_operate_on_payloads_success(
         self,
         mock_operate_on_payloads,
-        mock__get_ids,
+        mock_get_repeat_record_ids,
     ):
-        mock__get_ids.return_value = record_ids = [1, 2, 3]
+        mock_get_repeat_record_ids.return_value = record_ids = [1, 2, 3]
         payload_id = 'c0ffee'
         repeater_id = 'deadbeef'
         task_generate_ids_and_operate_on_payloads(
             payload_id, repeater_id, 'test_domain', 'test_action')
 
-        mock__get_ids.assert_called_once()
-        mock__get_ids.assert_called_with(
-            'c0ffee', 'deadbeef', 'test_domain')
+        mock_get_repeat_record_ids.assert_called_once()
+        mock_get_repeat_record_ids.assert_called_with(
+            'test_domain', repeater_id='deadbeef', state=None, payload_id='c0ffee')
 
         mock_operate_on_payloads.assert_called_once()
         mock_operate_on_payloads.assert_called_with(
@@ -469,43 +411,3 @@ def _check_requeue(self, mock_payload_one, mock_payload_two,
         self.assertEqual(mock_payload_one.requeue.call_count, 1)
         self.assertEqual(mock_payload_two.requeue.call_count, 0)
         self.assertEqual(response, expected_response)
-
-
-class TestGetRepeatRecordIDs(TestCase):
-
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        cls.instance_id = str(uuid4())
-        url = 'https://www.example.com/api/'
-        conn = ConnectionSettings.objects.create(domain=DOMAIN, name=url, url=url)
-        cls.repeater = FormRepeater(
-            domain=DOMAIN,
-            connection_settings_id=conn.id,
-            include_app_id_param=False,
-        )
-        cls.repeater.save()
-        cls.create_repeat_records()
-
-    @classmethod
-    def create_repeat_records(cls):
-        now = datetime.now()
-        cls.sql_records = [RepeatRecord(
-            domain=DOMAIN,
-            repeater_id=cls.repeater.id,
-            payload_id=cls.instance_id,
-            registered_at=now,
-        ) for __ in range(3)]
-        RepeatRecord.objects.bulk_create(cls.sql_records)
-
-    def test_no_payload_id_no_repeater_id_sql(self):
-        result = _get_repeat_record_ids(payload_id=None, repeater_id=None, domain=DOMAIN)
-        self.assertEqual(result, [])
-
-    def test_payload_id_sql(self):
-        result = _get_repeat_record_ids(payload_id=self.instance_id, repeater_id=None, domain=DOMAIN)
-        self.assertEqual(set(result), {r.pk for r in self.sql_records})
-
-    def test_repeater_id_sql(self):
-        result = _get_repeat_record_ids(payload_id=None, repeater_id=self.repeater.repeater_id, domain=DOMAIN)
-        self.assertEqual(set(result), {r.pk for r in self.sql_records})
diff --git a/corehq/apps/domain/auth.py b/corehq/apps/domain/auth.py
index c639ae0c4ba1..6d472b2d995d 100644
--- a/corehq/apps/domain/auth.py
+++ b/corehq/apps/domain/auth.py
@@ -285,12 +285,13 @@ def is_authenticated(self, request):
             return False
 
         # ensure API Key exists
-        domain_accessible = Q(domain='')
+        query = Q(key=api_key)
         domain = getattr(request, 'domain', '')
         if domain:
-            domain_accessible = domain_accessible | Q(domain=domain)
+            domain_accessible = Q(domain='') | Q(domain=domain)
+            query = domain_accessible & query
         try:
-            key = user.api_keys.get(domain_accessible, key=api_key)
+            key = user.api_keys.get(query)
         except HQApiKey.DoesNotExist:
             return self._unauthorized()
 
diff --git a/corehq/apps/domain/forms.py b/corehq/apps/domain/forms.py
index 45f4a79e072b..07e628475937 100644
--- a/corehq/apps/domain/forms.py
+++ b/corehq/apps/domain/forms.py
@@ -124,6 +124,7 @@
 from corehq.apps.sms.phonenumbers_helper import parse_phone_number
 from corehq.apps.users.models import CouchUser, WebUser
 from corehq.toggles import (
+    EXPORTS_APPS_USE_ELASTICSEARCH,
     HIPAA_COMPLIANCE_CHECKBOX,
     MOBILE_UCR,
     SECURE_SESSION_TIMEOUT,
@@ -351,6 +352,11 @@ class DomainGlobalSettingsForm(forms.Form):
     delete_logo = BooleanField(
         label=gettext_lazy("Delete Logo"),
         required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_lazy(
+                "Delete Logo after Submitting this Form"
+            ),
+        ),
         help_text=gettext_lazy("Delete your custom logo and use the standard one.")
     )
     logo_for_system_emails = ImageField(
@@ -364,6 +370,11 @@ class DomainGlobalSettingsForm(forms.Form):
     call_center_enabled = BooleanField(
         label=gettext_lazy("Call Center Application"),
         required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_lazy(
+                "Enable Call Center Application"
+            ),
+        ),
         help_text=gettext_lazy("Call Center mode is a CommCare HQ module for managing "
                     "call center workflows. It is still under "
                     "active development. Do not enable for your domain unless "
@@ -436,8 +447,13 @@ class DomainGlobalSettingsForm(forms.Form):
     )
 
     release_mode_visibility = BooleanField(
-        label=gettext_lazy("Enable Release Mode"),
+        label=gettext_lazy("Release Mode"),
         required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_lazy(
+                "Enable Release Mode"
+            ),
+        ),
         help_text=gettext_lazy(
             """
             Check this box to enable release mode setting on the app release page.
@@ -449,8 +465,13 @@ class DomainGlobalSettingsForm(forms.Form):
     )
 
     orphan_case_alerts_warning = BooleanField(
-        label=gettext_lazy("Show Orphan Case Alerts on Mobile Worker Edit Page"),
+        label=gettext_lazy("Orphan Case Alerts"),
         required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_lazy(
+                "Show Orphan Case Alerts on Mobile Worker Edit Page"
+            ),
+        ),
         help_text=gettext_lazy(
             """
             Displays a warning message on the mobile worker location edit page
@@ -461,26 +482,21 @@ class DomainGlobalSettingsForm(forms.Form):
         )
     )
 
+    exports_use_elasticsearch = BooleanField(
+        label=gettext_lazy("Use elasticsearch when fetching apps for exports"),
+        required=False,
+        help_text=gettext_lazy(
+            """
+            (Internal) Fetches apps using elasticsearch instead of couch in exports
+            """
+        )
+    )
+
     def __init__(self, *args, **kwargs):
         self.project = kwargs.pop('domain', None)
         self.domain = self.project.name
         self.can_use_custom_logo = kwargs.pop('can_use_custom_logo', False)
         super(DomainGlobalSettingsForm, self).__init__(*args, **kwargs)
-        self.helper = hqcrispy.HQFormHelper(self)
-        self.helper[5] = twbscrispy.PrependedText('delete_logo', '')
-        self.helper[7] = twbscrispy.PrependedText('call_center_enabled', '')
-        self.helper[15] = twbscrispy.PrependedText('release_mode_visibility', '')
-        self.helper[16] = twbscrispy.PrependedText('orphan_case_alerts_warning', '')
-        self.helper.all().wrap_together(crispy.Fieldset, _('Edit Basic Information'))
-        self.helper.layout.append(
-            hqcrispy.FormActions(
-                StrictButton(
-                    _("Update Basic Info"),
-                    type="submit",
-                    css_class='btn-primary',
-                )
-            )
-        )
         self.fields['default_timezone'].label = gettext_lazy('Default timezone')
 
         if not self.can_use_custom_logo:
@@ -511,6 +527,55 @@ def __init__(self, *args, **kwargs):
         self._handle_release_mode_setting_value()
         self._handle_orphan_case_alerts_setting_value()
 
+        if not EXPORTS_APPS_USE_ELASTICSEARCH.enabled(self.domain):
+            del self.fields['exports_use_elasticsearch']
+        else:
+            self._handle_exports_use_elasticsearch_setting_value()
+
+        self.helper = hqcrispy.HQFormHelper(self)
+        self.helper.layout = crispy.Layout(
+            crispy.Fieldset(
+                _("Edit Basic Information"),
+                'hr_name',
+                'project_description',
+                'default_timezone',
+                crispy.Div(*self.get_extra_fields()),
+                hqcrispy.CheckboxField('release_mode_visibility'),
+                hqcrispy.CheckboxField('orphan_case_alerts_warning'),
+            ),
+            hqcrispy.FormActions(
+                StrictButton(
+                    _("Update Basic Info"),
+                    type="submit",
+                    css_class='btn-primary',
+                )
+            )
+        )
+
+    def get_extra_fields(self):
+        extra_fields = [
+            'default_geocoder_location',  # might be removed in subclass (only following original logic)
+        ]
+        if self.can_use_custom_logo:
+            extra_fields.extend([
+                'logo',
+                hqcrispy.CheckboxField('delete_logo'),
+            ])
+        if self.system_emails_logo_enabled:
+            extra_fields.append('logo_for_system_emails')
+        if self.project and self.project.call_center_config.enabled:
+            extra_fields.extend([
+                hqcrispy.CheckboxField('call_center_enabled'),
+                'call_center_type',
+                'call_center_case_owner',
+                'call_center_case_type',
+            ])
+        if MOBILE_UCR.enabled(self.domain):
+            extra_fields.append('mobile_ucr_sync_interval')
+        if EXPORTS_APPS_USE_ELASTICSEARCH.enabled(self.domain):
+            extra_fields.append('exports_use_elasticsearch')
+        return extra_fields
+
     def _handle_account_confirmation_by_sms_settings(self):
         if not TWO_STAGE_USER_PROVISIONING_BY_SMS.enabled(self.domain):
             del self.fields['confirmation_link_expiry']
@@ -545,6 +610,9 @@ def _handle_release_mode_setting_value(self):
     def _handle_orphan_case_alerts_setting_value(self):
         self.fields['orphan_case_alerts_warning'].initial = self.project.orphan_case_alerts_warning
 
+    def _handle_exports_use_elasticsearch_setting_value(self):
+        self.fields['exports_use_elasticsearch'].initial = self.project.exports_use_elasticsearch
+
     def _add_range_validation_to_integer_input(self, settings_name, min_value, max_value):
         setting = self.fields.get(settings_name)
         min_validator = MinValueValidator(min_value)
@@ -701,6 +769,9 @@ def _save_release_mode_setting(self, domain):
     def _save_orphan_case_alerts_setting(self, domain):
         domain.orphan_case_alerts_warning = self.cleaned_data.get("orphan_case_alerts_warning", False)
 
+    def _save_exports_use_elasticsearch(self, domain):
+        domain.exports_use_elasticsearch = self.cleaned_data.get("exports_use_elasticsearch", True)
+
     def save(self, request, domain):
         domain.hr_name = self.cleaned_data['hr_name']
         domain.project_description = self.cleaned_data['project_description']
@@ -721,6 +792,8 @@ def save(self, request, domain):
         self._save_account_confirmation_settings(domain)
         self._save_release_mode_setting(domain)
         self._save_orphan_case_alerts_setting(domain)
+        if EXPORTS_APPS_USE_ELASTICSEARCH.enabled(self.domain):
+            self._save_exports_use_elasticsearch(domain)
         domain.save()
         return True
 
@@ -750,6 +823,16 @@ def __init__(self, *args, **kwargs):
         if not domain_has_privilege(self.domain, privileges.GEOCODER):
             del self.fields['default_geocoder_location']
 
+    def get_extra_fields(self):
+        extra_fields = super().get_extra_fields()
+        if not (self.project.cloudcare_releases == 'default'
+                or not domain_has_privilege(self.domain, privileges.CLOUDCARE)):
+            extra_fields.append('cloudcare_releases')
+        if (not domain_has_privilege(self.domain, privileges.GEOCODER)
+                and 'default_geocoder_location' in extra_fields):
+            extra_fields.remove('default_geocoder_location')
+        return extra_fields
+
     def save(self, request, domain):
         res = DomainGlobalSettingsForm.save(self, request, domain)
 
diff --git a/corehq/apps/domain/models.py b/corehq/apps/domain/models.py
index 4aa6f541d84e..29550b52f21e 100644
--- a/corehq/apps/domain/models.py
+++ b/corehq/apps/domain/models.py
@@ -448,6 +448,7 @@ class Domain(QuickCachedDocumentMixin, BlobMixin, Document, SnapshotMixin):
 
     ga_opt_out = BooleanProperty(default=False)
     orphan_case_alerts_warning = BooleanProperty(default=False)
+    exports_use_elasticsearch = BooleanProperty(default=False)
 
     # For domains that have been migrated to a different environment
     redirect_url = StringProperty()
@@ -829,10 +830,7 @@ def get_custom_logo(self):
         if not self.has_custom_logo:
             return None
 
-        return (
-            self.fetch_attachment(LOGO_ATTACHMENT),
-            self.blobs[LOGO_ATTACHMENT].content_type
-        )
+        return self.fetch_attachment(LOGO_ATTACHMENT)
 
     def get_odata_feed_limit(self):
         return self.odata_feed_limit or settings.DEFAULT_ODATA_FEED_LIMIT
diff --git a/corehq/apps/domain/static/domain/js/select.js b/corehq/apps/domain/static/domain/js/select.js
index f72aec20d375..d5e0954f7ba1 100644
--- a/corehq/apps/domain/static/domain/js/select.js
+++ b/corehq/apps/domain/static/domain/js/select.js
@@ -4,7 +4,7 @@ hqDefine("domain/js/select", [
     'knockout',
     'hqwebapp/js/assert_properties',
     'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/bootstrap3/components.ko',    // search box
+    'hqwebapp/js/components/search_box',
 ], function (
     $,
     _,
diff --git a/corehq/apps/domain/static/domain/js/toggles.js b/corehq/apps/domain/static/domain/js/toggles.js
index ec078fa94107..a60f9628db1e 100644
--- a/corehq/apps/domain/static/domain/js/toggles.js
+++ b/corehq/apps/domain/static/domain/js/toggles.js
@@ -7,6 +7,7 @@ hqDefine('domain/js/toggles', [
     'hqwebapp/js/assert_properties',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko',  // for slideVisible
     'hqwebapp/js/bootstrap3/main',
+    'commcarehq_b3',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/domain/templates/domain/admin/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/flags_and_privileges.html
index 715661644645..d50b32601e6a 100644
--- a/corehq/apps/domain/templates/domain/admin/flags_and_privileges.html
+++ b/corehq/apps/domain/templates/domain/admin/flags_and_privileges.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'domain/js/toggles' %}
+{% js_entry_b3 'domain/js/toggles' %}
 
 {% block page_content %}
 
diff --git a/corehq/apps/domain/templates/domain/renew_plan.html b/corehq/apps/domain/templates/domain/renew_plan.html
index b31718e0023f..9b48a1ebaaa0 100644
--- a/corehq/apps/domain/templates/domain/renew_plan.html
+++ b/corehq/apps/domain/templates/domain/renew_plan.html
@@ -34,6 +34,12 @@
     <input type="hidden" name="plan_edition" value="{{ current_edition }}">
 
     <div class="text-center plan-next">
+      {% if downgrade_messages %}
+        <a class="btn btn-default btn-lg"
+          href="{% url 'custom_plan_request_quote' domain %}">
+          {% trans 'Talk to Sales' %}
+        </a>
+      {% endif %}
       <button type="submit"
               class="btn btn-primary btn-lg">
         {% trans 'Next' %}
diff --git a/corehq/apps/domain/templates/domain/selected_annual_plan.html b/corehq/apps/domain/templates/domain/selected_annual_plan.html
deleted file mode 100644
index 87853e1edac4..000000000000
--- a/corehq/apps/domain/templates/domain/selected_annual_plan.html
+++ /dev/null
@@ -1,31 +0,0 @@
-{% extends "domain/base_change_plan.html" %}
-{% load crispy_forms_tags %}
-{% load i18n %}
-
-{% block form_content %}
-  <p class="lead text-center">
-    {% if selected_enterprise_plan %}
-      {% blocktrans with edition as e %}
-        Dimagi handles Enterprise plans on a case-by-case basis. <br />
-        Please submit the following form if you would like to sign up for or
-        have questions regarding an Enterprise plan. Our sales team will be in touch shortly.
-      {% endblocktrans %}
-    {% elif on_annual_plan %}
-      {% blocktrans with edition as e %}
-        Please submit the following form if you would like to sign up for or have questions regarding your
-        annual {{ e }} Plan. Our sales team will be in touch shortly.
-      {% endblocktrans %}
-    {% else %}
-      {% blocktrans with edition as e %}
-        Please submit the following form to request your project space be set up for an <strong>annual {{ e }} Plan</strong>.<br/>
-        Our sales team will reach out shortly.
-      {% endblocktrans %}
-    {% endif %}
-  </p>
-
-  <div class="panel panel-modern-gray panel-form-only">
-    <div class="panel-body">
-      {% crispy annual_plan_contact_form %}
-    </div>
-  </div>
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/selected_enterprise_plan.html b/corehq/apps/domain/templates/domain/selected_plan_contact.html
similarity index 55%
rename from corehq/apps/domain/templates/domain/selected_enterprise_plan.html
rename to corehq/apps/domain/templates/domain/selected_plan_contact.html
index 4c6aac43b2a4..7ffb5a9c5f0a 100644
--- a/corehq/apps/domain/templates/domain/selected_enterprise_plan.html
+++ b/corehq/apps/domain/templates/domain/selected_plan_contact.html
@@ -4,15 +4,12 @@
 
 {% block form_content %}
   <p class="lead text-center">
-    {% blocktrans %}
-      Dimagi handles Enterprise plans on a case-by-case basis. <br />
-      Please fill out your information below to request a quote.
-    {% endblocktrans %}
+    {{ lead_text }}
   </p>
 
   <div class="panel panel-modern-gray panel-form-only">
     <div class="panel-body">
-      {% crispy enterprise_contact_form %}
+      {% crispy contact_form %}
     </div>
   </div>
 {% endblock %}
diff --git a/corehq/apps/domain/tests/test_auth.py b/corehq/apps/domain/tests/test_auth.py
index abd2c6fbf9c7..355ee27ad5e8 100644
--- a/corehq/apps/domain/tests/test_auth.py
+++ b/corehq/apps/domain/tests/test_auth.py
@@ -303,6 +303,15 @@ def test_user_cannot_authenticate_with_expired_key(self):
             response = auth.is_authenticated(request)
             self.assertEqual(response.status_code, 401)
 
+    def test_user_can_authenticate_to_urls_lacking_domain_with_domain_scoped_keys(self):
+        user = self._create_user('test@dimagi.com')
+        self._create_api_key_for_user(user, key='1234', domain='test-domain')
+        request = self._create_request(username='test@dimagi.com', api_key='1234', for_domain='')
+
+        auth = HQApiKeyAuthentication()
+
+        self.assertIs(auth.is_authenticated(request), True)
+
     @classmethod
     def _create_user(cls, username):
         return User.objects.create_user(username=username, password='password')
@@ -339,3 +348,12 @@ def _create_request(cls, username='test@dimagi.com', api_key='1234', for_domain=
             request.META['HTTP_X_FORWARDED_FOR'] = ip
 
         return request
+
+    def test_domain_scoped_api_key_allows_authentication_to_domain_agnostic_urls(self):
+        user = self._create_user('test@dimagi.com')
+        self._create_api_key_for_user(user, key='1234', domain='test-domain')
+        request = self._create_request(username='test@dimagi.com', api_key='1234', for_domain='')
+
+        auth = HQApiKeyAuthentication()
+
+        self.assertIs(auth.is_authenticated(request), True)
diff --git a/corehq/apps/domain/tests/test_deletion_models.py b/corehq/apps/domain/tests/test_deletion_models.py
index 86b76ec78a51..19fbf4af2b01 100644
--- a/corehq/apps/domain/tests/test_deletion_models.py
+++ b/corehq/apps/domain/tests/test_deletion_models.py
@@ -62,6 +62,8 @@
     'fixtures.UserLookupTableStatus',
     'fixtures.LookupTableRow',          # handled by cascading delete
     'fixtures.LookupTableRowOwner',     # handled by cascading delete
+    'registration.AsyncSignupRequest',
+    'registration.SelfSignupWorkflow',
     'repeaters.RepeatRecord',         # handled by cascading delete
     'repeaters.RepeatRecordAttempt',  # handled by cascading delete
     'sms.MigrationStatus',
@@ -69,7 +71,6 @@
     'util.ComplaintBounceMeta',
     'util.PermanentBounceMeta',
     'util.TransientBounceEmail',
-    'registration.AsyncSignupRequest',
     'users.UserHistory',
 }
 
diff --git a/corehq/apps/domain/tests/test_utils.py b/corehq/apps/domain/tests/test_utils.py
index 4014e79b9f74..70ef87fbd4bf 100644
--- a/corehq/apps/domain/tests/test_utils.py
+++ b/corehq/apps/domain/tests/test_utils.py
@@ -18,6 +18,7 @@
 )
 from corehq.apps.users.models import CommCareUser
 from corehq.motech.utils import b64_aes_decrypt
+from corehq.tests.tools import nottest
 from corehq.util.test_utils import generate_cases, unit_testing_only
 
 
@@ -126,6 +127,7 @@ def test_return_value_is_json_serializable(self):
         self.assertTrue(serialized_items)
 
 
+@nottest
 @contextmanager
 def test_domain(name="domain", skip_full_delete=False):
     """Context manager for use in tests"""
diff --git a/corehq/apps/domain/urls.py b/corehq/apps/domain/urls.py
index bbb3d574c25f..699c63254eb0 100644
--- a/corehq/apps/domain/urls.py
+++ b/corehq/apps/domain/urls.py
@@ -32,6 +32,7 @@
     InternalSubscriptionManagementView,
     InvoiceStripePaymentView,
     SelectedAnnualPlanView,
+    SelectedCustomPlanView,
     SelectedEnterprisePlanView,
     SelectPlanView,
     SubscriptionRenewalView,
@@ -149,6 +150,8 @@
         name=SelectedEnterprisePlanView.urlname),
     url(r'^subscription/change/request_annual/$', SelectedAnnualPlanView.as_view(),
         name=SelectedAnnualPlanView.urlname),
+    url(r'^subscription/change/request_custom/$', SelectedCustomPlanView.as_view(),
+        name=SelectedCustomPlanView.urlname),
     url(r'^subscription/change/account/$', ConfirmBillingAccountInfoView.as_view(),
         name=ConfirmBillingAccountInfoView.urlname),
     url(r'^subscription/change/pause/$', pause_subscription, name='pause_subscription'),
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 273db2231767..55fc866a5f44 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -41,10 +41,7 @@
     SubscriptionAdjustmentError,
     SubscriptionRenewalError,
 )
-from corehq.apps.accounting.forms import (
-    AnnualPlanContactForm,
-    EnterprisePlanContactForm,
-)
+from corehq.apps.accounting.forms import PlanContactForm
 from corehq.apps.accounting.invoicing import DomainWireInvoiceFactory
 from corehq.apps.accounting.models import (
     MINIMUM_SUBSCRIPTION_LENGTH,
@@ -963,13 +960,10 @@ def is_form_editable(self):
 )
 
 
-class SelectPlanView(DomainAccountingSettings):
-    template_name = 'domain/select_plan.html'
-    urlname = 'domain_select_plan'
+class PlanViewBase(DomainAccountingSettings):
     page_title = gettext_lazy("Change Plan")
-    step_title = gettext_lazy("Select Plan")
-    edition = None
     lead_text = gettext_lazy("Please select a plan below that fits your organization's needs.")
+    edition = None
 
     @property
     @memoized
@@ -1002,14 +996,6 @@ def plan_options(self):
                   "workflows, and advanced security needs. Also for M&E teams "
                   "integrating data with 3rd party analytics."),
             ),
-            PlanOption(
-                SoftwarePlanEdition.ENTERPRISE,
-                _("Contact Us"),
-                _("Contact Us"),
-                _("For organizations that need a sustainable path to scale "
-                  "mobile data collection and service delivery across multiple "
-                  "teams, programs, or countries."),
-            )
         ]
 
     @property
@@ -1060,7 +1046,7 @@ def steps(self):
 
     @property
     def main_context(self):
-        context = super(SelectPlanView, self).main_context
+        context = super().main_context
         context.update({
             'steps': self.steps,
             'step_title': self.step_title,
@@ -1086,7 +1072,6 @@ def page_context(self):
                     SoftwarePlanEdition.STANDARD,
                     SoftwarePlanEdition.PRO,
                     SoftwarePlanEdition.ADVANCED,
-                    SoftwarePlanEdition.ENTERPRISE,
                 ]
             ],
             'plan_options': [p._asdict() for p in self.plan_options],
@@ -1104,18 +1089,37 @@ def page_context(self):
         }
 
 
-class SelectedEnterprisePlanView(SelectPlanView):
-    template_name = 'domain/selected_enterprise_plan.html'
-    urlname = 'enterprise_request_quote'
+class SelectPlanView(PlanViewBase):
+    template_name = 'domain/select_plan.html'
+    urlname = 'domain_select_plan'
+    step_title = gettext_lazy("Select Plan")
+
+    def dispatch(self, request, *args, **kwargs):
+        if not self.can_change_subscription:
+            raise Http404()
+        return super().dispatch(request, *args, **kwargs)
+
+    @property
+    def can_change_subscription(self):
+        subscription = self.current_subscription
+        is_annual_plan = subscription.plan_version.plan.is_annual_plan
+        return not is_annual_plan
+
+
+class ContactFormViewBase(PlanViewBase):
+    template_name = 'domain/selected_plan_contact.html'
     step_title = gettext_lazy("Contact Dimagi")
-    edition = SoftwarePlanEdition.ENTERPRISE
+    lead_text = gettext_lazy("Please submit the following form and a member of our sales team will be "
+                             "in touch shortly about your plan.")
+    back_button = ('text', 'url')
+    request_type = None
 
     @property
     def steps(self):
-        last_steps = super(SelectedEnterprisePlanView, self).steps
+        last_steps = super().steps
         last_steps.append({
             'title': _("2. Contact Dimagi"),
-            'url': reverse(SelectedEnterprisePlanView.urlname, args=[self.domain]),
+            'url': reverse(self.urlname, args=[self.domain]),
         })
         return last_steps
 
@@ -1126,39 +1130,40 @@ def is_not_redirect(self):
 
     @property
     @memoized
-    def enterprise_contact_form(self):
+    def contact_form(self):
         if self.request.method == 'POST' and self.is_not_redirect:
-            return EnterprisePlanContactForm(self.domain, self.request.couch_user, data=self.request.POST)
-        return EnterprisePlanContactForm(self.domain, self.request.couch_user)
+            return PlanContactForm(self.domain, self.request.couch_user,
+                                   back_button=self.back_button, data=self.request.POST)
+        return PlanContactForm(self.domain, self.request.couch_user, back_button=self.back_button)
+
+    def post(self, request, *args, **kwargs):
+        if self.is_not_redirect and self.contact_form.is_valid():
+            self.contact_form.send_message(self.request_type)
+            messages.success(request, _("Your request was sent to Dimagi. We will follow up shortly."))
+            return HttpResponseRedirect(reverse(DomainSubscriptionView.urlname, args=[self.domain]))
+        return self.get(request, *args, **kwargs)
 
     @property
     def page_context(self):
         return {
-            'enterprise_contact_form': self.enterprise_contact_form,
+            'lead_text': self.lead_text,
+            'contact_form': self.contact_form,
         }
 
-    def post(self, request, *args, **kwargs):
-        if self.is_not_redirect and self.enterprise_contact_form.is_valid():
-            self.enterprise_contact_form.send_message()
-            messages.success(request, _("Your request was sent to Dimagi. "
-                                        "We will follow up shortly."))
-            return HttpResponseRedirect(reverse(DomainSubscriptionView.urlname, args=[self.domain]))
-        return self.get(request, *args, **kwargs)
-
 
-class SelectedAnnualPlanView(SelectPlanView):
-    template_name = 'domain/selected_annual_plan.html'
-    urlname = 'annual_plan_request_quote'
-    step_title = gettext_lazy("Contact Dimagi")
+class SelectedEnterprisePlanView(ContactFormViewBase):
+    urlname = 'enterprise_request_quote'
+    edition = SoftwarePlanEdition.ENTERPRISE
+    request_type = 'Enterprise Plan Request'
 
     @property
-    def steps(self):
-        last_steps = super(SelectedAnnualPlanView, self).steps
-        last_steps.append({
-            'title': _("2. Contact Dimagi"),
-            'url': reverse(SelectedAnnualPlanView.urlname, args=[self.domain]),
-        })
-        return last_steps
+    def back_button(self):
+        return (_("Select different plan"), reverse(SelectPlanView.urlname, args=[self.domain]))
+
+
+class SelectedAnnualPlanView(ContactFormViewBase):
+    urlname = 'annual_plan_request_quote'
+    request_type = 'Annual Plan Request'
 
     @property
     def on_annual_plan(self):
@@ -1167,11 +1172,6 @@ def on_annual_plan(self):
         else:
             return self.current_subscription.plan_version.plan.is_annual_plan
 
-    @property
-    @memoized
-    def is_not_redirect(self):
-        return 'plan_edition' not in self.request.POST
-
     @property
     @memoized
     def edition(self):
@@ -1183,32 +1183,28 @@ def edition(self):
         return edition
 
     @property
-    @memoized
-    def annual_plan_contact_form(self):
-        if self.request.method == 'POST' and self.is_not_redirect:
-            return AnnualPlanContactForm(self.domain, self.request.couch_user, self.on_annual_plan,
-                                         data=self.request.POST)
-        return AnnualPlanContactForm(self.domain, self.request.couch_user, self.on_annual_plan)
+    def back_button(self):
+        if self.on_annual_plan:
+            return (_("Back to my Subscription"), reverse(DomainSubscriptionView.urlname, args=[self.domain]))
+        return (_("Select different plan"), reverse(SelectPlanView.urlname, args=[self.domain]))
+
+
+class SelectedCustomPlanView(ContactFormViewBase):
+    urlname = 'custom_plan_request_quote'
+    request_type = 'Custom Plan Request'
 
     @property
-    def page_context(self):
-        return {
-            'annual_plan_contact_form': self.annual_plan_contact_form,
-            'on_annual_plan': self.on_annual_plan,
-            'edition': self.edition,
-            'selected_enterprise_plan': self.edition == SoftwarePlanEdition.ENTERPRISE
-        }
+    def edition(self):
+        if not self.current_subscription:
+            raise Http404()
+        return self.current_subscription.plan_version.plan.edition
 
-    def post(self, request, *args, **kwargs):
-        if self.is_not_redirect and self.annual_plan_contact_form.is_valid():
-            self.annual_plan_contact_form.send_message()
-            messages.success(request, _("Your request was sent to Dimagi. "
-                                        "We will try our best to follow up in a timely manner."))
-            return HttpResponseRedirect(reverse(DomainSubscriptionView.urlname, args=[self.domain]))
-        return self.get(request, *args, **kwargs)
+    @property
+    def back_button(self):
+        return (_("Back to my Subscription"), reverse(DomainSubscriptionView.urlname, args=[self.domain]))
 
 
-class ConfirmSelectedPlanView(SelectPlanView):
+class ConfirmSelectedPlanView(PlanViewBase):
     template_name = 'domain/confirm_plan.html'
     urlname = 'confirm_selected_plan'
 
@@ -1244,7 +1240,6 @@ def edition(self):
     def selected_plan_version(self):
         return DefaultProductPlan.get_default_plan_version(self.edition)
 
-    @property
     def downgrade_messages(self):
         subscription = Subscription.get_active_subscription_by_domain(self.domain)
         downgrades = get_change_status(
@@ -1299,7 +1294,7 @@ def next_invoice_date(self):
     @property
     def page_context(self):
         return {
-            'downgrade_messages': self.downgrade_messages,
+            'downgrade_messages': self.downgrade_messages(),
             'is_upgrade': self.is_upgrade,
             'is_same_edition': self.is_same_edition,
             'next_invoice_date': self.next_invoice_date.strftime(USER_DATE_FORMAT),
@@ -1328,8 +1323,6 @@ def get(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         if not self.can_domain_unpause:
             return HttpResponseRedirect(reverse(SelectPlanView.urlname, args=[self.domain]))
-        if self.edition == SoftwarePlanEdition.ENTERPRISE:
-            return HttpResponseRedirect(reverse(SelectedEnterprisePlanView.urlname, args=[self.domain]))
         return super(ConfirmSelectedPlanView, self).get(request, *args, **kwargs)
 
 
@@ -1529,61 +1522,75 @@ def subscription(self):
         return subscription
 
 
-class SubscriptionRenewalView(SelectPlanView, SubscriptionMixin):
+class SubscriptionRenewalView(PlanViewBase, SubscriptionMixin):
     urlname = "domain_subscription_renewal"
     page_title = gettext_lazy("Renew Plan")
     step_title = gettext_lazy("Renew Plan")
     template_name = "domain/renew_plan.html"
 
+    @property
+    def current_edition(self):
+        return self.current_subscription.plan_version.plan.edition
+
     @property
     def lead_text(self):
         return format_html(
             _("Based on your current usage we recommend you use the <strong>{plan}</strong> plan"),
-            plan=_(self.current_subscription.plan_version.plan.edition)
+            plan=_(self.current_edition)
         )
 
     @property
     def plan_is_self_renewable(self):
-        return self.subscription.plan_version.plan.edition in SoftwarePlanEdition.SELF_RENEWABLE_EDITIONS
+        return self.current_edition in SoftwarePlanEdition.SELF_RENEWABLE_EDITIONS
+
+    @property
+    @memoized
+    def monthly_plan_version(self):
+        return DefaultProductPlan.get_default_plan_version(
+            edition=self.current_edition, is_annual_plan=False)
 
     @property
     def renewal_choices(self):
-        edition = self.subscription.plan_version.plan.edition
         if not self.plan_is_self_renewable:
             return {}
 
-        monthly_plan = DefaultProductPlan.get_default_plan_version(
-            edition=edition, is_annual_plan=False)
+        monthly_plan = self.monthly_plan_version
         annual_plan = DefaultProductPlan.get_default_plan_version(
-            edition=edition, is_annual_plan=True)
+            edition=self.current_edition, is_annual_plan=True)
         return {'monthly_plan': monthly_plan.user_facing_description,
                 'annual_plan': annual_plan.user_facing_description}
 
+    def downgrade_messages(self):
+        downgrades = get_change_status(self.subscription.plan_version, self.monthly_plan_version)[1]
+        downgrade_handler = DomainDowngradeStatusHandler(
+            self.domain_object, self.monthly_plan_version, downgrades,
+        )
+        return downgrade_handler.get_response()
+
     @property
     def page_context(self):
         context = super(SubscriptionRenewalView, self).page_context
 
-        current_edition = self.subscription.plan_version.plan.edition
-
-        if current_edition in [
+        if self.current_edition in [
             SoftwarePlanEdition.COMMUNITY,
             SoftwarePlanEdition.PAUSED,
         ]:
             raise Http404()
 
         context.update({
-            'current_edition': current_edition,
+            'current_edition': self.current_edition,
             'plan': self.subscription.plan_version.user_facing_description,
             'is_annual_plan': self.subscription.plan_version.plan.is_annual_plan,
             'is_self_renewable_plan': self.plan_is_self_renewable,
             'renewal_choices': self.renewal_choices,
-            'tile_css': 'tile-{}'.format(current_edition.lower()),
+            'downgrade_messages': self.downgrade_messages(),
+            'tile_css': 'tile-{}'.format(self.current_edition.lower()),
             'is_renewal_page': True,
         })
         return context
 
 
-class ConfirmSubscriptionRenewalView(SelectPlanView, DomainAccountingSettings,
+class ConfirmSubscriptionRenewalView(PlanViewBase, DomainAccountingSettings,
                                      AsyncHandlerMixin, SubscriptionMixin):
     template_name = 'domain/confirm_subscription_renewal.html'
     urlname = 'domain_subscription_renewal_confirmation'
diff --git a/corehq/apps/domain/views/feedback.py b/corehq/apps/domain/views/feedback.py
index 7f239e110ca2..9d0a181c10a1 100644
--- a/corehq/apps/domain/views/feedback.py
+++ b/corehq/apps/domain/views/feedback.py
@@ -1,7 +1,5 @@
-import json
-
 from django.conf import settings
-from django.http import HttpResponse
+from django.http import JsonResponse
 from django.views.decorators.http import require_POST
 
 from corehq.apps.domain.decorators import login_and_domain_required
@@ -37,6 +35,4 @@ def submit_feedback(request, domain):
         message,
         [settings.FEEDBACK_EMAIL],
     )
-    return HttpResponse(json.dumps({
-        'success': True,
-    }), content_type="application/json")
+    return JsonResponse({'success': True})
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index 0c63e69009f0..69567466f535 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -275,7 +275,7 @@ def logo(request, domain):
     if logo is None:
         raise Http404()
 
-    return HttpResponse(logo[0], content_type=logo[1])
+    return HttpResponse(logo, content_type='image/png')
 
 
 class EditPrivacySecurityView(BaseAdminProjectSettingsView):
diff --git a/corehq/apps/dump_reload/tests/test_couch_dump_load.py b/corehq/apps/dump_reload/tests/test_couch_dump_load.py
index a9dfb35b8a1f..65f657040601 100644
--- a/corehq/apps/dump_reload/tests/test_couch_dump_load.py
+++ b/corehq/apps/dump_reload/tests/test_couch_dump_load.py
@@ -1,5 +1,4 @@
 import json
-import os
 import random
 import uuid
 from collections import Counter
@@ -137,11 +136,15 @@ def _make_doc(doc_type, domain):
 
     def test_multimedia(self):
         from corehq.apps.hqmedia.models import CommCareAudio, CommCareImage, CommCareVideo
-        image_path = os.path.join('corehq', 'apps', 'hqwebapp', 'static', 'hqwebapp', 'images', 'commcare-hq-logo.png')
+        image_path = 'corehq/apps/hqwebapp/static/hqwebapp/images/commcare-hq-logo.png'
         with open(image_path, 'rb') as f:
             image_data = f.read()
 
         image = CommCareImage.get_by_data(image_data)
+        assert not image.blobs, (
+            f"Expected empty blobs, got {image.blobs!r}. Failure indicates"
+            "incomplete cleanup by a test that ran before this one."
+        )
         image.attach_data(image_data, original_filename='logo.png')
         image.add_domain(self.domain_name)
         self.assertEqual(image_data, image.get_display_file(False))
diff --git a/corehq/apps/dump_reload/tests/test_dump_models.py b/corehq/apps/dump_reload/tests/test_dump_models.py
index 1837d15ebd07..0bf30270d94b 100644
--- a/corehq/apps/dump_reload/tests/test_dump_models.py
+++ b/corehq/apps/dump_reload/tests/test_dump_models.py
@@ -85,6 +85,8 @@
     "pillowtop.KafkaCheckpoint",
     "project_limits.DynamicRateDefinition",
     "project_limits.RateLimitedTwoFactorLog",
+    "project_limits.PillowLagGaugeDefinition",
+    "registration.SelfSignupWorkflow",
 
     # 'registry' models only make sense across multiple domains
     "registry.DataRegistry",
diff --git a/corehq/apps/enterprise/api/resources.py b/corehq/apps/enterprise/api/resources.py
index b90014b8ece5..09d5b85d120d 100644
--- a/corehq/apps/enterprise/api/resources.py
+++ b/corehq/apps/enterprise/api/resources.py
@@ -1,12 +1,12 @@
 from datetime import datetime
 from urllib.parse import urljoin
 
-from django.http import HttpResponse, HttpResponseForbidden
+from django.http import HttpResponse, HttpResponseForbidden, HttpResponseNotFound
 from django.template.loader import render_to_string
 from django.utils.translation import gettext as _
 
 from dateutil import tz
-from tastypie import fields
+from tastypie import fields, http
 from tastypie.exceptions import ImmediateHttpResponse
 
 from corehq.apps.accounting.models import BillingAccount
@@ -18,15 +18,13 @@
 from corehq.apps.api.odata.views import add_odata_headers
 from corehq.apps.api.resources import HqBaseResource
 from corehq.apps.api.resources.auth import ODataAuthentication
+from corehq.apps.api.resources.meta import get_hq_throttle
 from corehq.apps.enterprise.enterprise import (
     EnterpriseReport,
-    EnterpriseDomainReport,
-    EnterpriseFormReport,
-    EnterpriseMobileWorkerReport,
-    EnterpriseODataReport,
-    EnterpriseWebUserReport,
 )
 
+from corehq.apps.enterprise.tasks import generate_enterprise_report, ReportTaskProgress
+
 
 class EnterpriseODataAuthentication(ODataAuthentication):
     def is_authenticated(self, request, **kwargs):
@@ -51,6 +49,7 @@ class Meta:
         include_resource_uri = False
         collection_name = 'value'
         authentication = ODataAuthentication()
+        throttle = get_hq_throttle()
         limit = 2000
         max_limit = 10000
 
@@ -68,6 +67,13 @@ def alter_list_data_to_serialize(self, request, data):
         del result['meta']
         return result
 
+    def get_object_list(self, request):
+        '''Intended to be overwritten in subclasses with query logic'''
+        raise NotImplementedError()
+
+    def obj_get_list(self, bundle, **kwargs):
+        return self.get_object_list(bundle.request)
+
     def determine_format(self, request):
         # Currently a hack to force JSON. XML is supported by OData, but "Control Information" fields
         # (https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html#_Toc38457735)
@@ -138,12 +144,65 @@ def convert_datetime(cls, datetime_string):
         return time.isoformat()
 
 
-class ODataEnterpriseResource(ODataResource):
+class ODataEnterpriseReportResource(ODataResource):
+    REPORT_SLUG = None  # Override with correct slug
+    # If this delay is too quick, clients like PowerBI
+    # will hit their maximum number of retries before the report is ever generated.
+    # If the delay is too long, then even reports that would generate in well under the retry
+    # window will be subject to this delay (PowerBI will subject them to it twice,
+    # as the data preview and actual request perform separate queries
+    RETRY_IN_PROGRESS_DELAY = 60
+    RETRY_CONFLICT_DELAY = 120
+
     class Meta(ODataResource.Meta):
         authentication = EnterpriseODataAuthentication()
 
+    def get_object_list(self, request):
+        query_id = request.GET.get('query_id', None)
+        progress = ReportTaskProgress(
+            self.REPORT_SLUG, request.couch_user.username, query_id=query_id)
+        status = progress.get_status()
+        if status == ReportTaskProgress.STATUS_COMPLETE:
+            # ensure this is for the same parameters
+            if not progress.is_managing_task(self.get_report_task(request)):
+                raise ImmediateHttpResponse(
+                    response=http.HttpTooManyRequests(headers={'Retry-After': self.RETRY_CONFLICT_DELAY}))
+
+            try:
+                data = progress.get_data()
+                progress.clear_status()  # Clear this request so that this user can issue new requests
+            except KeyError:
+                raise ImmediateHttpResponse(HttpResponseNotFound())
+
+            # Because we are using a cacheable report, we need some way to tell tastypie to use
+            # the generated report for future page requests.
+            # By adding the report's query id to the request, the tastypie paginator will be able to
+            # use it when generating 'next page' links
+            # HACK: This is not ideal, as we are creeating a side effect within a 'get' method,
+            # but it doesn't seem that Tastypie provides an alternate means of modifying links
+            self._add_query_id_to_request(request, progress.get_query_id())
+            return data
+        elif status == ReportTaskProgress.STATUS_NEW:
+            progress.start_task(self.get_report_task(request))
+
+        # PowerBI respects delays with only two response codes:
+        # 429 (TooManyRequests) and 503 (ServiceUnavailable). Although 503 is likely more semantically
+        # correct here, 5XX errors are treated differently by our monitoring, and
+        # PowerBI will only retry 503 requests 3 times, whereas 429s permit 6 retries
+        raise ImmediateHttpResponse(
+            response=http.HttpTooManyRequests(headers={'Retry-After': self.RETRY_IN_PROGRESS_DELAY}))
+
+    def get_report_task(self, request):
+        raise NotImplementedError()
 
-class DomainResource(ODataEnterpriseResource):
+    def _add_query_id_to_request(self, request, query_id):
+        if 'report' not in request.GET:
+            new_params = request.GET.copy()
+            new_params['query_id'] = query_id
+            request.GET = new_params
+
+
+class DomainResource(ODataEnterpriseReportResource):
     domain = fields.CharField()
     created_on = fields.DateTimeField()
     num_apps = fields.IntegerField()
@@ -152,13 +211,15 @@ class DomainResource(ODataEnterpriseResource):
     num_sms_last_30_days = fields.IntegerField()
     last_form_submission = fields.DateTimeField()
 
-    def get_object_list(self, request):
-        account = BillingAccount.get_account_by_domain(request.domain)
-        report = EnterpriseDomainReport(account, request.couch_user)
-        return report.rows
+    REPORT_SLUG = EnterpriseReport.DOMAINS
 
-    def obj_get_list(self, bundle, **kwargs):
-        return self.get_object_list(bundle.request)
+    def get_report_task(self, request):
+        account = BillingAccount.get_account_by_domain(request.domain)
+        return generate_enterprise_report.s(
+            self.REPORT_SLUG,
+            account.id,
+            request.couch_user.username,
+        )
 
     def dehydrate(self, bundle):
         bundle.data['domain'] = bundle.obj[6]
@@ -175,7 +236,7 @@ def get_primary_keys(self):
         return ('domain',)
 
 
-class WebUserResource(ODataEnterpriseResource):
+class WebUserResource(ODataEnterpriseReportResource):
     email = fields.CharField()
     name = fields.CharField()
     role = fields.CharField()
@@ -184,13 +245,15 @@ class WebUserResource(ODataEnterpriseResource):
     status = fields.CharField()
     domain = fields.CharField()
 
-    def get_object_list(self, request):
-        account = BillingAccount.get_account_by_domain(request.domain)
-        report = EnterpriseWebUserReport(account, request.couch_user)
-        return report.rows
+    REPORT_SLUG = EnterpriseReport.WEB_USERS
 
-    def obj_get_list(self, bundle, **kwargs):
-        return self.get_object_list(bundle.request)
+    def get_report_task(self, request):
+        account = BillingAccount.get_account_by_domain(request.domain)
+        return generate_enterprise_report.s(
+            self.REPORT_SLUG,
+            account.id,
+            request.couch_user.username,
+        )
 
     def dehydrate(self, bundle):
         bundle.data['email'] = bundle.obj[0]
@@ -211,7 +274,7 @@ def get_primary_keys(self):
         return ('email',)
 
 
-class MobileUserResource(ODataEnterpriseResource):
+class MobileUserResource(ODataEnterpriseReportResource):
     username = fields.CharField()
     name = fields.CharField()
     email = fields.CharField()
@@ -223,13 +286,15 @@ class MobileUserResource(ODataEnterpriseResource):
     user_id = fields.CharField()
     domain = fields.CharField()
 
-    def get_object_list(self, request):
-        account = BillingAccount.get_account_by_domain(request.domain)
-        report = EnterpriseMobileWorkerReport(account, request.couch_user)
-        return report.rows
+    REPORT_SLUG = EnterpriseReport.MOBILE_USERS
 
-    def obj_get_list(self, bundle, **kwargs):
-        return self.get_object_list(bundle.request)
+    def get_report_task(self, request):
+        account = BillingAccount.get_account_by_domain(request.domain)
+        return generate_enterprise_report.s(
+            self.REPORT_SLUG,
+            account.id,
+            request.couch_user.username,
+        )
 
     def dehydrate(self, bundle):
         bundle.data['username'] = bundle.obj[0]
@@ -249,7 +314,7 @@ def get_primary_keys(self):
         return ('user_id',)
 
 
-class ODataFeedResource(ODataEnterpriseResource):
+class ODataFeedResource(ODataEnterpriseReportResource):
     '''
     A Resource for listing all Domain-level OData feeds which belong to the Enterprise.
     Currently includes summary rows as well as individual reports
@@ -261,13 +326,15 @@ class ODataFeedResource(ODataEnterpriseResource):
     report_name = fields.CharField(null=True)
     report_rows = fields.IntegerField(null=True)
 
-    def get_object_list(self, request):
-        account = BillingAccount.get_account_by_domain(request.domain)
-        report = EnterpriseODataReport(account, request.couch_user)
-        return report.rows
+    REPORT_SLUG = EnterpriseReport.ODATA_FEEDS
 
-    def obj_get_list(self, bundle, **kwargs):
-        return self.get_object_list(bundle.request)
+    def get_report_task(self, request):
+        account = BillingAccount.get_account_by_domain(request.domain)
+        return generate_enterprise_report.s(
+            self.REPORT_SLUG,
+            account.id,
+            request.couch_user.username,
+        )
 
     def dehydrate(self, bundle):
         bundle.data['num_feeds_used'] = bundle.obj[0]
@@ -282,7 +349,11 @@ def get_primary_keys(self):
         return ('report_name',)  # very odd report that makes coming up with an actual key challenging
 
 
-class FormSubmissionResource(ODataEnterpriseResource):
+class FormSubmissionResource(ODataEnterpriseReportResource):
+    class Meta(ODataEnterpriseReportResource.Meta):
+        limit = 10000
+        max_limit = 20000
+
     form_id = fields.CharField()
     form_name = fields.CharField()
     submitted = fields.DateTimeField()
@@ -290,16 +361,20 @@ class FormSubmissionResource(ODataEnterpriseResource):
     mobile_user = fields.CharField()
     domain = fields.CharField()
 
-    def get_object_list(self, request):
+    REPORT_SLUG = EnterpriseReport.FORM_SUBMISSIONS
+
+    def get_report_task(self, request):
         enddate = datetime.strptime(request.GET['enddate'], '%Y-%m-%d') if 'enddate' in request.GET else None
         startdate = datetime.strptime(request.GET['startdate'], '%Y-%m-%d') if 'startdate' in request.GET else None
         account = BillingAccount.get_account_by_domain(request.domain)
-        report = EnterpriseFormReport(
-            account, request.couch_user, start_date=startdate, end_date=enddate, include_form_id=True)
-        return report.rows
-
-    def obj_get_list(self, bundle, **kwargs):
-        return self.get_object_list(bundle.request)
+        return generate_enterprise_report.s(
+            self.REPORT_SLUG,
+            account.id,
+            request.couch_user.username,
+            start_date=startdate,
+            end_date=enddate,
+            include_form_id=True,
+        )
 
     def dehydrate(self, bundle):
         bundle.data['form_id'] = bundle.obj[0]
diff --git a/corehq/apps/enterprise/enterprise.py b/corehq/apps/enterprise/enterprise.py
index 80988777e024..352119c6ea00 100644
--- a/corehq/apps/enterprise/enterprise.py
+++ b/corehq/apps/enterprise/enterprise.py
@@ -3,13 +3,15 @@
 
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy
+from django.conf import settings
 
 from memoized import memoized
 
 from couchforms.analytics import get_last_form_submission_received
 from dimagi.utils.dates import DateSpan
 
-from corehq.apps.enterprise.exceptions import EnterpriseReportError
+from corehq.apps.enterprise.exceptions import EnterpriseReportError, TooMuchRequestedDataError
+from corehq.apps.enterprise.iterators import raise_after_max_elements
 from corehq.apps.accounting.models import BillingAccount
 from corehq.apps.accounting.utils import get_default_domain_url
 from corehq.apps.app_manager.dbaccessors import get_brief_apps_in_domain
@@ -38,7 +40,7 @@ class EnterpriseReport:
     title = _('Enterprise Report')
     subtitle = ''
 
-    def __init__(self, account, couch_user):
+    def __init__(self, account, couch_user, **kwargs):
         self.account = account
         self.couch_user = couch_user
         self.slug = None
@@ -52,19 +54,19 @@ def filename(self):
         return "{} ({}) {}.csv".format(self.account.name, self.title, datetime.utcnow().strftime('%Y%m%d %H%M%S'))
 
     @classmethod
-    def create(cls, slug, account_id, couch_user):
+    def create(cls, slug, account_id, couch_user, **kwargs):
         account = BillingAccount.objects.get(id=account_id)
         report = None
         if slug == cls.DOMAINS:
-            report = EnterpriseDomainReport(account, couch_user)
+            report = EnterpriseDomainReport(account, couch_user, **kwargs)
         elif slug == cls.WEB_USERS:
-            report = EnterpriseWebUserReport(account, couch_user)
+            report = EnterpriseWebUserReport(account, couch_user, **kwargs)
         elif slug == cls.MOBILE_USERS:
-            report = EnterpriseMobileWorkerReport(account, couch_user)
+            report = EnterpriseMobileWorkerReport(account, couch_user, **kwargs)
         elif slug == cls.FORM_SUBMISSIONS:
-            report = EnterpriseFormReport(account, couch_user)
+            report = EnterpriseFormReport(account, couch_user, **kwargs)
         elif slug == cls.ODATA_FEEDS:
-            report = EnterpriseODataReport(account, couch_user)
+            report = EnterpriseODataReport(account, couch_user, **kwargs)
 
         if report:
             report.slug = slug
@@ -209,13 +211,20 @@ def total_for_domain(self, domain_obj):
 
 class EnterpriseFormReport(EnterpriseReport):
     title = _('Mobile Form Submissions')
+    MAXIMUM_USERS_PER_DOMAIN = getattr(settings, 'ENTERPRISE_REPORT_DOMAIN_USER_LIMIT', 20_000)
+    MAXIMUM_ROWS_PER_REQUEST = getattr(settings, 'ENTERPRISE_REPORT_ROW_LIMIT', 1_000_000)
+    MAX_DATE_RANGE_DAYS = 90
 
     def __init__(self, account, couch_user, start_date=None, end_date=None, num_days=30, include_form_id=False):
         super().__init__(account, couch_user)
         if not end_date:
             end_date = datetime.utcnow()
+        elif isinstance(end_date, str):
+            end_date = datetime.fromisoformat(end_date)
 
         if start_date:
+            if isinstance(start_date, str):
+                start_date = datetime.fromisoformat(start_date)
             self.datespan = DateSpan(start_date, end_date)
             self.subtitle = _("{} to {}").format(
                 start_date.date(),
@@ -225,8 +234,10 @@ def __init__(self, account, couch_user, start_date=None, end_date=None, num_days
             self.datespan = DateSpan(end_date - timedelta(days=num_days), end_date)
             self.subtitle = _("past {} days").format(num_days)
 
-        if self.datespan.enddate - self.datespan.startdate > timedelta(days=90):
-            raise ValueError(_('Date ranges with more than 90 days are not supported'))
+        if self.datespan.enddate - self.datespan.startdate > timedelta(days=self.MAX_DATE_RANGE_DAYS):
+            raise TooMuchRequestedDataError(
+                _('Date ranges with more than {} days are not supported').format(self.MAX_DATE_RANGE_DAYS)
+            )
 
         self.include_form_id = include_form_id
 
@@ -241,23 +252,56 @@ def headers(self):
     def _query(self, domain_name):
         time_filter = form_es.submitted
 
-        users_filter = form_es.user_id(UserES().domain(domain_name).mobile_users().show_inactive()
-                                    .values_list('_id', flat=True))
+        users_filter = form_es.user_id(
+            UserES().domain(domain_name).mobile_users().show_inactive().size(self.MAXIMUM_USERS_PER_DOMAIN + 1)
+            .values_list('_id', flat=True)
+        )
+
+        if len(users_filter) > self.MAXIMUM_USERS_PER_DOMAIN:
+            raise TooMuchRequestedDataError(
+                _('Domain {name} has too many users. Maximum allowed is: {amount}')
+                .format(name=domain_name, amount=self.MAXIMUM_USERS_PER_DOMAIN)
+            )
 
-        query = (form_es.FormES()
-                 .domain(domain_name)
-                 .filter(time_filter(gte=self.datespan.startdate,
-                                     lt=self.datespan.enddate_adjusted))
-                 .filter(users_filter))
+        query = (
+            form_es.FormES()
+            .domain(domain_name)
+            .filter(time_filter(gte=self.datespan.startdate, lt=self.datespan.enddate_adjusted))
+            .filter(users_filter)
+        )
         return query
 
     def hits(self, domain_name):
-        return self._query(domain_name).run().hits
+        return raise_after_max_elements(
+            self._query(domain_name).scroll(),
+            self.MAXIMUM_ROWS_PER_REQUEST,
+            self._generate_data_error()
+        )
+
+    def _generate_data_error(self):
+        return TooMuchRequestedDataError(
+            _('{name} contains too many rows. Maximum allowed is: {amount}. Please narrow the date range'
+                ' to fetch a smaller amount of data').format(
+                    name=self.account.name, amount=self.MAXIMUM_ROWS_PER_REQUEST)
+        )
+
+    @property
+    def rows(self):
+        total_rows = 0
+        rows = []
+        for domain_obj in self.domains():
+            domain_rows = self.rows_for_domain(domain_obj)
+            total_rows += len(domain_rows)
+            if total_rows > self.MAXIMUM_ROWS_PER_REQUEST:
+                raise self._generate_data_error()
+            rows += domain_rows
+        return rows
 
     def rows_for_domain(self, domain_obj):
         apps = get_brief_apps_in_domain(domain_obj.name)
         apps = {a.id: a.name for a in apps}
         rows = []
+
         for hit in self.hits(domain_obj.name):
             if hit['form'].get('#type') == 'system':
                 continue
diff --git a/corehq/apps/enterprise/exceptions.py b/corehq/apps/enterprise/exceptions.py
index 2f3f4f1585cc..bf25e90bdad3 100644
--- a/corehq/apps/enterprise/exceptions.py
+++ b/corehq/apps/enterprise/exceptions.py
@@ -1,2 +1,6 @@
 class EnterpriseReportError(Exception):
     pass
+
+
+class TooMuchRequestedDataError(Exception):
+    pass
diff --git a/corehq/apps/enterprise/iterators.py b/corehq/apps/enterprise/iterators.py
new file mode 100644
index 000000000000..1fa96c54c132
--- /dev/null
+++ b/corehq/apps/enterprise/iterators.py
@@ -0,0 +1,7 @@
+def raise_after_max_elements(it, max_elements, exception=None):
+    for total_yielded, ele in enumerate(it):
+        if total_yielded >= max_elements:
+            exception = exception or Exception('Too Many Elements')
+            raise exception
+
+        yield ele
diff --git a/corehq/apps/enterprise/models.py b/corehq/apps/enterprise/models.py
index ddb0a46b13c8..f73e2975846c 100644
--- a/corehq/apps/enterprise/models.py
+++ b/corehq/apps/enterprise/models.py
@@ -28,7 +28,6 @@ class EnterprisePermissions(models.Model):
     )
 
     @classmethod
-    @quickcache(['domain'], timeout=7 * 24 * 60 * 60)
     def get_by_domain(cls, domain):
         """
         Get or create the configuration associated with the given domain's account.
@@ -41,6 +40,18 @@ def get_by_domain(cls, domain):
         except cls.DoesNotExist:
             return cls(account=account)
 
+    @classmethod
+    @quickcache(['domain'], timeout=7 * 24 * 60 * 60)
+    def get_source_domain(cls, domain):
+        """
+        If the given domain is controlled by another domain via enterprise permissions,
+        returns that controlling domain. Otherwise, returns None.
+        """
+        config = EnterprisePermissions.get_by_domain(domain)
+        if config.is_enabled and domain in config.domains:
+            return config.source_domain
+        return None
+
     @classmethod
     @quickcache(['source_domain'], timeout=7 * 24 * 60 * 60)
     def get_domains(cls, source_domain):
@@ -53,11 +64,29 @@ def get_domains(cls, source_domain):
             return []
         return list(set(config.domains) - {config.source_domain})
 
+    @classmethod
+    @quickcache(['domain'], timeout=7 * 24 * 60 * 60)
+    def is_source_domain(cls, domain):
+        """
+        Returns true if given domain is the source domain for an enabled configuration.
+        """
+        try:
+            cls.objects.get(is_enabled=True, source_domain=domain)
+        except cls.DoesNotExist:
+            return False
+        return True
+
     def save(self, *args, **kwargs):
+        self.is_source_domain.clear(self.__class__, self.source_domain)
+        for domain in self.account.get_domains():
+            self.get_domains.clear(self.__class__, domain)
+            self.get_source_domain.clear(self.__class__, domain)
+
         super().save(*args, **kwargs)
+        self.is_source_domain.clear(self.__class__, self.source_domain)
         for domain in self.account.get_domains():
             self.get_domains.clear(self.__class__, domain)
-            self.get_by_domain.clear(self.__class__, domain)
+            self.get_source_domain.clear(self.__class__, domain)
 
 
 class EnterpriseMobileWorkerSettings(models.Model):
diff --git a/corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js b/corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
index 7ea4feb25c6f..7144b40d89ad 100644
--- a/corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+++ b/corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
@@ -1,44 +1,244 @@
 hqDefine("enterprise/js/enterprise_dashboard", [
     'jquery',
+    'knockout',
+    'underscore',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/bootstrap5/alert_user',
     'analytix/js/kissmetrix',
+    'hqwebapp/js/tempus_dominus',
+    'moment',
     'hqwebapp/js/bootstrap5/hq.helpers',
+    'hqwebapp/js/components/select_toggle',
 ], function (
     $,
+    ko,
+    _,
     initialPageData,
     alertUser,
-    kissmetrics
+    kissmetrics,
+    tempusDominus,
+    moment
 ) {
+    const PRESET_LAST_30 = "last_30";
+    const PRESET_PREV_MONTH = "prev_month";
+    const PRESET_CUSTOM = "custom";
+
+    const dateRangePresetOptions = [
+        {id: PRESET_LAST_30, text: gettext("Last 30 Days")},
+        {id: PRESET_PREV_MONTH, text: gettext("Previous Month")},
+        {id: PRESET_CUSTOM, text: gettext("Custom")},
+    ];
+
+    var MobileFormSubmissionsTile = function (datePicker) {
+        var self = {};
+        self.endDate = ko.observable(moment().utc());
+        self.startDate = ko.observable(self.endDate().clone().subtract(30, "days"));
+        self.presetType = ko.observable(PRESET_LAST_30);
+        self.customDateRangeDisplay = ko.observable(datePicker.optionsStore.input.value);
+
+        self.presetText = ko.pureComputed(function () {
+            if (self.presetType() !== PRESET_CUSTOM) {
+                return dateRangePresetOptions.find(ele => ele.id === self.presetType()).text;
+            } else {
+                return self.customDateRangeDisplay();
+            }
+        });
+
+        self.onApply = function (preset, startDate, endDate) {
+            self.startDate(startDate);
+            self.endDate(endDate);
+            self.presetType(preset);
+            self.customDateRangeDisplay(datePicker.optionsStore.input.value);
+
+            updateDisplayTotal($("#form_submissions"), {
+                "start_date": startDate.toISOString(),
+                "end_date": endDate.toISOString(),
+            });
+        };
+
+        return self;
+    };
+
+    var DateRangeModal = function (datePicker, presetOptions, maxDateRangeDays, tileDisplay) {
+        var self = {};
+        self.presetOptions = presetOptions;
+        self.presetType = ko.observable(PRESET_LAST_30);
+        self.displayCustom = ko.pureComputed(function () {
+            return self.presetType() === PRESET_CUSTOM;
+        });
+
+        self.clarifyingText = ko.pureComputed(function () {
+            const template = _.template('<i class="fa-solid fa-info-circle"></i> ' + gettext("Spans <%- startDate %> to <%- endDate %> (UTC)"));
+            return template({
+                startDate: self.startDate().format("YYYY-MM-DD"),
+                endDate: self.endDate().format("YYYY-MM-DD"),
+            });
+        });
+
+        self.customStartDate = ko.observable(datePicker.dates.picked[0]);
+        self.customEndDate = ko.observable(datePicker.dates.picked[1]);
+
+        const updateWidgetDates = function (startDate, endDate) {
+            datePicker.dates.clear();
+            datePicker.dates.setValue(new tempusDominus.tempusDominus.DateTime(startDate));
+            datePicker.dates.setValue(new tempusDominus.tempusDominus.DateTime(endDate), 1);
+            self.customStartDate(startDate);
+            self.customEndDate(endDate);
+        };
+
+        /*
+        NOTE: The `.local(true)` calls below are due to TempusDominus only supporting local time.
+        These calls change the datetime to the local timezone without adjusting the displayed date,
+        so the displayed UTC datetime will still display as the same string within TempusDominus.
+        */
+        self.onApply = function () {
+            if (self.presetType() !== PRESET_CUSTOM) {
+                // update the custom values to align with the selected preset, for opening the modal in the future
+                updateWidgetDates(self.startDate().clone().local(true), self.endDate().clone().local(true));
+            }
+            tileDisplay.onApply(self.presetType(), self.startDate(), self.endDate());
+        };
+
+        self.onCancel = function () {
+            self.presetType(tileDisplay.presetType());
+            const startDate = tileDisplay.startDate().clone();
+            const endDate = tileDisplay.endDate().clone();
+            if (tileDisplay.presetType() !== PRESET_CUSTOM) {
+                startDate.local(true);
+                endDate.local(true);
+            }
+            updateWidgetDates(startDate, endDate);
+        };
+
+        self.endDate = ko.pureComputed(function () {
+            const presetType = self.presetType();
+            let endDate = null;
+            if (presetType === PRESET_LAST_30) {
+                endDate = moment().utc();
+            } else if (presetType === PRESET_PREV_MONTH) {
+                endDate = moment().utc().subtract(1, "months").endOf("month");
+            } else {
+                endDate = moment(self.customEndDate());
+            }
+
+            // the backend handles inclusive date ranges by adding a full day to the end date,
+            // so we'd like to minimize the results shown from the next day
+            return endDate.startOf('day');
+        });
+
+        self.startDate = ko.pureComputed(function () {
+            const presetType = self.presetType();
+            let startDate = null;
+            if (presetType === PRESET_LAST_30) {
+                startDate = self.endDate().clone().subtract(30, "days");
+            } else if (presetType === PRESET_PREV_MONTH) {
+                startDate = self.endDate().clone().startOf("month");
+            } else {
+                startDate = moment(self.customStartDate());
+            }
+
+            return startDate;
+        });
+
+        datePicker.subscribe("change.td", function () {
+            if (datePicker.dates.picked.length === 1) {
+                const selectedDate = moment(datePicker.dates.picked[0]);
+                datePicker.updateOptions({
+                    restrictions: {
+                        minDate: new tempusDominus.tempusDominus.DateTime(selectedDate.clone().subtract(maxDateRangeDays, 'days')),
+                        maxDate: new tempusDominus.tempusDominus.DateTime(selectedDate.clone().add(maxDateRangeDays, 'days')),
+                    },
+                });
+            } else {
+                datePicker.updateOptions({
+                    restrictions: {
+                        minDate: undefined,
+                        maxDate: undefined,
+                    },
+                });
+            }
+            self.customStartDate(datePicker.dates.picked[0]);
+            if (datePicker.dates.picked.length > 1) {
+                self.customEndDate(datePicker.dates.picked[1]);
+            } else {
+                self.customEndDate(datePicker.dates.picked[0]);
+            }
+        });
+
+        return self;
+    };
+
+    function updateDisplayTotal($element, kwargs) {
+        const $display = $element.find(".total");
+        const slug = $element.data("slug");
+        const requestParams = {
+            url: initialPageData.reverse("enterprise_dashboard_total", slug),
+            success: function (data) {
+                $display.html(Number(data.total).toLocaleString());
+            },
+            error: function (request) {
+                if (request.responseJSON) {
+                    alertUser.alert_user(request.responseJSON["message"], "danger");
+                } else {
+                    alertUser.alert_user(gettext("Error updating display total, please try again or report an issue if this persists."), "danger");
+                }
+                $display.html(gettext("??"));
+            },
+            data: kwargs,
+        };
+        $display.html('<i class="fa fa-spin fa-spinner"></i>');
+        $.ajax(requestParams);
+    }
+
     $(function () {
+        const datePicker = tempusDominus.createDefaultDateRangePicker(
+            document.getElementById("id_date_range"),
+            moment().subtract(30, "days"),
+            moment()
+        );
+
+        const formSubmissionsDisplay = MobileFormSubmissionsTile(datePicker);
+        const maxDateRangeDays = initialPageData.get("max_date_range_days");
+        const dateRangeModal = DateRangeModal(datePicker, dateRangePresetOptions, maxDateRangeDays, formSubmissionsDisplay);
+
+        $("#dateRangeDisplay").koApplyBindings(formSubmissionsDisplay);
+        $("#enterpriseFormsDaterange").koApplyBindings(
+            dateRangeModal
+        );
+
         kissmetrics.track.event("[Enterprise Dashboard] Visited page");
         $(".report-panel").each(function () {
             var $element = $(this),
                 slug = $element.data("slug");
 
-            // Load total
-            $.ajax({
-                url: initialPageData.reverse("enterprise_dashboard_total", slug),
-                success: function (data) {
-                    $element.find(".total").html(Number(data.total).toLocaleString());
-                },
-            });
+            updateDisplayTotal($element);
 
             $element.find(".btn-primary").click(function () {
                 kissmetrics.track.event("[Enterprise Dashboard] Clicked Email Report for " + slug);
                 var $button = $(this);
                 $button.disableButton();
-                $.ajax({
+                const requestParams = {
                     url: initialPageData.reverse("enterprise_dashboard_email", slug),
                     success: function (data) {
                         alertUser.alert_user(data.message, "success");
                         $button.enableButton();
                     },
-                    error: function () {
-                        alertUser.alert_user(gettext("Error sending email, please try again or report an issue if this persists."), "danger");
+                    error: function (request) {
+                        if (request.responseJSON) {
+                            alertUser.alert_user(request.responseJSON["message"], "danger");
+                        } else {
+                            alertUser.alert_user(gettext("Error sending email, please try again or report an issue if this persists."), "danger");
+                        }
                         $button.enableButton();
                     },
-                });
+                };
+                if (slug === "form_submissions") {
+                    requestParams["data"] = {
+                        "start_date": dateRangeModal.startDate().toISOString(),
+                        "end_date": dateRangeModal.endDate().toISOString(),
+                    };
+                }
+                $.ajax(requestParams);
             });
         });
     });
diff --git a/corehq/apps/enterprise/tasks.py b/corehq/apps/enterprise/tasks.py
index 3e746bea123d..c66cf6546a2b 100644
--- a/corehq/apps/enterprise/tasks.py
+++ b/corehq/apps/enterprise/tasks.py
@@ -15,6 +15,7 @@
     EnterpriseMobileWorkerSettings,
     EnterprisePermissions,
 )
+from corehq.apps.enterprise.exceptions import TooMuchRequestedDataError
 from corehq.apps.hqwebapp.tasks import send_html_email_async
 from corehq.apps.users.models import DeactivateMobileWorkerTrigger
 from corehq.const import ONE_DAY
@@ -24,15 +25,27 @@
 
 
 @task(serializer='pickle', queue="email_queue")
-def email_enterprise_report(domain: str, slug, couch_user):
+def email_enterprise_report(domain: str, slug, couch_user, **kwargs):
     account = BillingAccount.get_account_by_domain(domain)
-    report = EnterpriseReport.create(slug, account.id, couch_user)
+    report = EnterpriseReport.create(slug, account.id, couch_user, **kwargs)
 
     # Generate file
     csv_file = io.StringIO()
     writer = csv.writer(csv_file)
     writer.writerow(report.headers)
-    writer.writerows(report.rows)
+    try:
+        writer.writerows(report.rows)
+    except TooMuchRequestedDataError as e:
+        subject = _("Enterprise Dashboard Error: {}").format(report.title)
+        body = str(e)
+        send_html_email_async(
+            subject,
+            couch_user.get_email(),
+            body,
+            domain=domain,
+            use_domain_gateway=True,
+        )
+        return
 
     # Store file in redis
     hash_id = uuid.uuid4().hex
@@ -92,3 +105,118 @@ def auto_deactivate_mobile_workers():
         task_time.seconds,
         multiprocess_mode=MPM_LIVESUM
     )
+
+
+@task(queue="export_download_queue")
+def generate_enterprise_report(slug, billing_account_id, username, **kwargs):
+    report = EnterpriseReport.create(slug, billing_account_id, username, **kwargs)
+
+    rows = report.rows
+    progress = ReportTaskProgress(slug, username)
+    progress.complete_task(rows)
+
+
+class TaskProgress:
+    """
+    This class manages a task's lifecycle. Tasks triggered by this class are expected to call
+    complete_task in order to store their results for later retrieval.
+    Once a task completes, a query_id is generated that can be used to retrieve the results in the future.
+    Multiple tasks run with the same key will overwrite each other's results. If you want to re-use a key after
+    it has completed its task, you can call clear_status so that new tasks will store their results
+    in a different query_id
+    """
+    STATUS_TIMEOUT = 600  # 10 minutes
+
+    STATUS_COMPLETE = 'COMPLETE'
+    STATUS_IN_PROGRESS = 'IN_PROGRESS'
+    STATUS_NEW = 'NEW'
+
+    def __init__(self, key, query_id=None):
+        self.key = key
+        self._query_id = query_id
+        self.redis_client = get_redis_client()
+
+    def get_status(self):
+        if self._query_id:
+            return self.STATUS_COMPLETE
+
+        status_dict = self.redis_client.get(self.key)
+        if not status_dict:
+            return self.STATUS_NEW
+
+        return status_dict['status']
+
+    def start_task(self, task):
+        status_dict = {
+            'status': self.STATUS_IN_PROGRESS,
+            'query_id': None,
+            'task': task,
+        }
+
+        self.redis_client.set(self.key, status_dict, timeout=self.STATUS_TIMEOUT)
+        task.delay()
+
+    def is_managing_task(self, task):
+        return task == self.get_task()
+
+    def complete_task(self, data):
+        if not self.get_query_id():
+            self._query_id = uuid.uuid4().hex
+
+        status_dict = self.redis_client.get(self.key)
+        if status_dict is None:
+            raise KeyError(self.key)
+        status_dict['status'] = self.STATUS_COMPLETE
+        status_dict['query_id'] = self._query_id
+        self.redis_client.set(self.key, status_dict, timeout=self.STATUS_TIMEOUT)
+
+        task = status_dict['task']
+        data_dict = {
+            'task': task,
+            'data': data,
+        }
+        self.redis_client.set(self._query_id, data_dict, timeout=self.STATUS_TIMEOUT)
+
+    def get_data(self):
+        query_id = self.get_query_id()
+        if not query_id:
+            raise ValueError('cannot retrieve data without a query ID')
+
+        data = self.redis_client.get(query_id)
+        if data is None:
+            raise KeyError(query_id)
+
+        self.redis_client.touch(query_id, timeout=self.STATUS_TIMEOUT)
+
+        return data['data']
+
+    def get_query_id(self):
+        if self._query_id:
+            return self._query_id
+
+        status_dict = self.redis_client.get(self.key)
+        if not status_dict:
+            return None
+
+        self._query_id = status_dict['query_id']
+        return self._query_id
+
+    def clear_status(self):
+        self.redis_client.delete(self.key)  # clear status data to allow this key to be re-used
+
+    def get_task(self):
+        status_dict = self.redis_client.get(self.key)
+        if status_dict:
+            return status_dict['task']
+
+        data_dict = self.redis_client.get(self.get_query_id())
+        if data_dict:
+            return data_dict['task']
+
+        return None
+
+
+class ReportTaskProgress(TaskProgress):
+    def __init__(self, slug, username, query_id=None):
+        key = f'report-gen-status-{slug}.{username}'
+        super().__init__(key, query_id=query_id)
diff --git a/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html b/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html
index 639893a84a06..cee1bde0bf1d 100644
--- a/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html
+++ b/corehq/apps/enterprise/templates/enterprise/enterprise_dashboard.html
@@ -10,13 +10,19 @@
   {% 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 }}">
+        <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>
-            <div class="fs-6">{{ report.subtitle|default:"&nbsp;" }}</div>
+            {% if report.title == "Mobile Form Submissions" %}
+              <button id="dateRangeDisplay" type="button" data-bind="text: presetText" data-bs-toggle="modal" data-bs-target="#enterpriseFormsDaterange" 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">
@@ -32,4 +38,6 @@ <h1 class="card-text total">
       </div>
     {% endfor %}
   </div>
+
+  {% include 'enterprise/partials/date_range_modal.html' %}
 {% endblock %}
diff --git a/corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html b/corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
new file mode 100644
index 000000000000..7118a7aec50a
--- /dev/null
+++ b/corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
@@ -0,0 +1,26 @@
+{% load hq_shared_tags %}
+{% load i18n %}
+
+<div class="modal" role="dialog" tabindex="-1" id="enterpriseFormsDaterange">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">{% trans 'Customize Mobile Form Submissions Date Range' %}</h5>
+                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr 'Close' %}"></button>
+            </div>
+            <div class="modal-body">
+                <select-toggle name="range_type" data-apply-bindings="false" params="value: presetType, options: presetOptions"></select-toggle>
+                <div class="row">
+                    <div class="col-xs-6 pt-1">
+                        <input type="text" name="date_range" class="form-control" id="id_date_range" data-bind="visible: displayCustom">
+                        <div id="clarifyingText" class="form-control-plaintext" data-bind="html: clarifyingText, visible: !displayCustom()"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-outline-primary" data-bind="click: onCancel" data-bs-dismiss="modal">{% trans 'Cancel' %}</button>
+                <button type="button" class="btn btn-primary" data-bind="click: onApply" data-bs-dismiss="modal">{% trans 'Apply' %}</button>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/corehq/apps/enterprise/tests/test_enterprise.py b/corehq/apps/enterprise/tests/test_enterprise.py
index 79a34c8c21f8..1f0725dac311 100644
--- a/corehq/apps/enterprise/tests/test_enterprise.py
+++ b/corehq/apps/enterprise/tests/test_enterprise.py
@@ -3,11 +3,15 @@
 from freezegun import freeze_time
 from unittest.mock import patch, MagicMock
 
+from corehq.apps.enterprise.exceptions import TooMuchRequestedDataError
 from corehq.apps.export.models.new import FormExportInstance
 from corehq.apps.accounting.models import BillingAccount
 from corehq.apps.domain.models import Domain
 from corehq.apps.export.dbaccessors import ODataExportFetcher
-from corehq.apps.enterprise.enterprise import EnterpriseODataReport, EnterpriseFormReport
+from corehq.apps.enterprise.enterprise import (
+    EnterpriseODataReport,
+    EnterpriseFormReport,
+)
 
 
 @override_settings(BASE_ADDRESS='localhost:8000')
@@ -169,7 +173,7 @@ def test_constructor_with_only_end_date_uses_num_days(self):
 
     def test_specifying_timespan_greater_than_90_days_throws_error(self):
         end_date = datetime(month=10, day=1, year=2020)
-        with self.assertRaises(ValueError):
+        with self.assertRaises(TooMuchRequestedDataError):
             EnterpriseFormReport(self.billing_account, None, end_date=end_date, num_days=91)
 
     def test_specifying_timespans_up_to_90_days_works(self):
diff --git a/corehq/apps/enterprise/tests/test_iterators.py b/corehq/apps/enterprise/tests/test_iterators.py
new file mode 100644
index 000000000000..3ffc80c12a7c
--- /dev/null
+++ b/corehq/apps/enterprise/tests/test_iterators.py
@@ -0,0 +1,19 @@
+from django.test import SimpleTestCase
+
+from corehq.apps.enterprise.iterators import raise_after_max_elements
+
+
+class TestRaiseAfterMaxElements(SimpleTestCase):
+    def test_iterating_beyond_max_items_will_raise_the_default_exception(self):
+        it = raise_after_max_elements([1, 2, 3], 2)
+        with self.assertRaisesMessage(Exception, 'Too Many Elements'):
+            list(it)
+
+    def test_iterating_beyond_max_items_will_raise_provided_exception(self):
+        it = raise_after_max_elements([1, 2, 3], 2, Exception('Test Message'))
+        with self.assertRaisesMessage(Exception, 'Test Message'):
+            list(it)
+
+    def test_can_iterate_through_all_elements_with_no_exception(self):
+        it = raise_after_max_elements([1, 2, 3], 3)
+        self.assertEqual(list(it), [1, 2, 3])
diff --git a/corehq/apps/enterprise/tests/test_permissions.py b/corehq/apps/enterprise/tests/test_permissions.py
index bca8ff69f1b6..cd460fc127f4 100644
--- a/corehq/apps/enterprise/tests/test_permissions.py
+++ b/corehq/apps/enterprise/tests/test_permissions.py
@@ -7,6 +7,7 @@
 from .utils import create_enterprise_permissions
 from corehq.apps.domain.models import Domain
 from corehq.apps.domain.shortcuts import create_domain
+from corehq.apps.enterprise.models import EnterprisePermissions
 from corehq.apps.fixtures.resources.v0_1 import InternalFixtureResource
 from corehq.apps.users.models import (
     HQApiKey,
@@ -68,6 +69,36 @@ def tearDownClass(cls):
         Domain.get_by_name('staging').delete()
         super().tearDownClass()
 
+    def test_get_by_domain(self):
+        # Any domain in the account can be used to get the config
+        configs = [
+            EnterprisePermissions.get_by_domain('state'),
+            EnterprisePermissions.get_by_domain('county'),
+            EnterprisePermissions.get_by_domain('staging'),
+        ]
+        for config in configs:
+            self.assertTrue(config.is_enabled)
+            self.assertEqual(config.source_domain, 'state')
+            self.assertListEqual(config.domains, ['county'])
+
+        empty_config = EnterprisePermissions.get_by_domain('not-a-domain')
+        self.assertFalse(empty_config.is_enabled)
+
+    def test_get_source_domain(self):
+        self.assertEqual(EnterprisePermissions.get_source_domain('state'), None)
+        self.assertEqual(EnterprisePermissions.get_source_domain('county'), 'state')
+        self.assertEqual(EnterprisePermissions.get_source_domain('staging'), None)
+
+    def test_get_domains(self):
+        self.assertListEqual(EnterprisePermissions.get_domains('state'), ['county'])
+        self.assertListEqual(EnterprisePermissions.get_domains('county'), [])
+        self.assertListEqual(EnterprisePermissions.get_domains('staging'), [])
+
+    def test_is_source_domain(self):
+        self.assertTrue(EnterprisePermissions.is_source_domain('state'))
+        self.assertFalse(EnterprisePermissions.is_source_domain('county'))
+        self.assertFalse(EnterprisePermissions.is_source_domain('staging'))
+
     def test_permission_mirroring(self):
         for domain in ('state', 'county'):
             self.assertTrue(self.web_user_admin.is_domain_admin(domain))
diff --git a/corehq/apps/enterprise/tests/test_views.py b/corehq/apps/enterprise/tests/test_views.py
index 0f97389f5a96..84e7a298b6d0 100644
--- a/corehq/apps/enterprise/tests/test_views.py
+++ b/corehq/apps/enterprise/tests/test_views.py
@@ -1,12 +1,17 @@
-from django.test import SimpleTestCase, RequestFactory
+from django.test import SimpleTestCase, TestCase, RequestFactory
+from datetime import datetime
 from importlib import reload
 from unittest.mock import patch
 
+from corehq.apps.accounting.tests.generator import billing_account
 from corehq.apps.enterprise import views
+from corehq.apps.enterprise.enterprise import EnterpriseReport
 
 from corehq.apps.enterprise import decorators as enterprise_decorators
 from corehq.apps.domain import decorators as domain_decorators
 
+from corehq.apps.users.models import WebUser
+
 from codecs import BOM_UTF8
 
 
@@ -58,3 +63,48 @@ def _patch_decorators(cls):
             domain_decorators, 'login_and_domain_required', lambda x: x)
         login_and_domain_required_patcher.start()
         cls.addClassCleanup(login_and_domain_required_patcher.stop)
+
+
+class EnterpriseDashboardEmailTests(TestCase):
+    def test_custom_date_range_is_not_required(self):
+        request = RequestFactory().get('/')
+        request.couch_user = WebUser(username='test-user')
+        request.account = billing_account(request.couch_user, request.couch_user)
+
+        with patch.object(views, 'email_enterprise_report') as mocked:
+            views.enterprise_dashboard_email(request, 'test-domain', EnterpriseReport.FORM_SUBMISSIONS)
+            kwargs = mocked.delay.call_args[1]
+            self.assertNotIn('start_date', kwargs)
+            self.assertNotIn('end_date', kwargs)
+
+    def test_custom_date_range_is_sent_to_celery(self):
+        request = RequestFactory().get('/', data={
+            'start_date': '2015-04-08T00:00:00.000000Z',
+            'end_date': '2015-04-10T00:00:00.000000Z'
+        })
+        request.couch_user = WebUser(username='test-user')
+        request.account = billing_account(request.couch_user, request.couch_user)
+
+        with patch.object(views, 'email_enterprise_report') as mocked:
+            views.enterprise_dashboard_email(request, 'test-domain', EnterpriseReport.FORM_SUBMISSIONS)
+            kwargs = mocked.delay.call_args[1]
+            self.assertEqual(kwargs['start_date'], datetime(year=2015, month=4, day=8))
+            self.assertEqual(kwargs['end_date'], datetime(year=2015, month=4, day=10))
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls._patch_decorators()
+        reload(views)
+
+    @classmethod
+    def _patch_decorators(cls):
+        require_enterprise_admin_patcher = patch.object(
+            enterprise_decorators, 'require_enterprise_admin', lambda x: x)
+        require_enterprise_admin_patcher.start()
+        cls.addClassCleanup(require_enterprise_admin_patcher.stop)
+
+        login_and_domain_required_patcher = patch.object(
+            domain_decorators, 'login_and_domain_required', lambda x: x)
+        login_and_domain_required_patcher.start()
+        cls.addClassCleanup(login_and_domain_required_patcher.stop)
diff --git a/corehq/apps/enterprise/views.py b/corehq/apps/enterprise/views.py
index ec850e0084e6..7883da63ffb1 100644
--- a/corehq/apps/enterprise/views.py
+++ b/corehq/apps/enterprise/views.py
@@ -1,4 +1,5 @@
 import json
+from datetime import datetime
 
 from django.conf import settings
 from django.contrib import messages
@@ -23,11 +24,13 @@
 
 from corehq.apps.accounting.decorators import always_allow_project_access
 from corehq.apps.enterprise.decorators import require_enterprise_admin
+from corehq.apps.enterprise.exceptions import TooMuchRequestedDataError
 from corehq.apps.enterprise.mixins import ManageMobileWorkersMixin
 from corehq.apps.enterprise.models import EnterprisePermissions
 from corehq.apps.enterprise.tasks import clear_enterprise_permissions_cache_for_all_users
 from couchexport.export import Format
 from dimagi.utils.couch.cache.cache_core import get_redis_client
+from dimagi.utils.parsing import ISO_DATETIME_FORMAT
 
 from corehq import privileges
 from corehq.apps.accounting.models import (
@@ -44,20 +47,21 @@
 from corehq.apps.domain.views.accounting import PAYMENT_ERROR_MESSAGES, InvoiceStripePaymentView, \
     BulkStripePaymentView, WireInvoiceView, BillingStatementPdfView
 
-from corehq.apps.enterprise.enterprise import EnterpriseReport
+from corehq.apps.enterprise.enterprise import EnterpriseReport, EnterpriseFormReport
 
 from corehq.apps.enterprise.forms import EnterpriseSettingsForm
 from corehq.apps.enterprise.tasks import email_enterprise_report
 
 from corehq.apps.export.utils import get_default_export_settings_if_available
 
-from corehq.apps.hqwebapp.decorators import use_bootstrap5
+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
 
 
+@use_tempusdominus
 @use_bootstrap5
 @always_allow_project_access
 @require_enterprise_admin
@@ -69,6 +73,7 @@ def enterprise_dashboard(request, domain):
     context = {
         'account': request.account,
         'domain': domain,
+        'max_date_range_days': EnterpriseFormReport.MAX_DATE_RANGE_DAYS,
         'reports': [EnterpriseReport.create(slug, request.account.id, request.couch_user) for slug in (
             EnterpriseReport.DOMAINS,
             EnterpriseReport.WEB_USERS,
@@ -87,7 +92,16 @@ def enterprise_dashboard(request, domain):
 @require_enterprise_admin
 @login_and_domain_required
 def enterprise_dashboard_total(request, domain, slug):
-    report = EnterpriseReport.create(slug, request.account.id, request.couch_user)
+    kwargs = {}
+    if slug == EnterpriseReport.FORM_SUBMISSIONS:
+        kwargs = get_form_submission_report_kwargs(request)
+    try:
+        report = EnterpriseReport.create(slug, request.account.id, request.couch_user, **kwargs)
+    except TooMuchRequestedDataError as e:
+        response = JsonResponse({'message': str(e)})
+        response.status_code = 400
+        return response
+
     return JsonResponse({'total': report.total})
 
 
@@ -126,8 +140,17 @@ def _get_export_filename(request, slug):
 @require_enterprise_admin
 @login_and_domain_required
 def enterprise_dashboard_email(request, domain, slug):
-    report = EnterpriseReport.create(slug, request.account.id, request.couch_user)
-    email_enterprise_report.delay(domain, slug, request.couch_user)
+    kwargs = {}
+    if slug == EnterpriseReport.FORM_SUBMISSIONS:
+        kwargs = get_form_submission_report_kwargs(request)
+    try:
+        report = EnterpriseReport.create(slug, request.account.id, request.couch_user, **kwargs)
+    except TooMuchRequestedDataError as e:
+        response = JsonResponse({'message': str(e)})
+        response.status_code = 400
+        return response
+
+    email_enterprise_report.delay(domain, slug, request.couch_user, **kwargs)
     message = _("Generating {title} report, will email to {email} when complete.").format(**{
         'title': report.title,
         'email': request.couch_user.username,
@@ -135,6 +158,17 @@ def enterprise_dashboard_email(request, domain, slug):
     return JsonResponse({'message': message})
 
 
+def get_form_submission_report_kwargs(request):
+    kwargs = {}
+    start_date = request.GET.get('start_date')
+    end_date = request.GET.get('end_date')
+    if start_date and end_date:
+        kwargs['start_date'] = datetime.strptime(start_date, ISO_DATETIME_FORMAT)
+        kwargs['end_date'] = datetime.strptime(end_date, ISO_DATETIME_FORMAT)
+
+    return kwargs
+
+
 @use_bootstrap5
 @require_enterprise_admin
 @login_and_domain_required
diff --git a/corehq/apps/es/case_search.py b/corehq/apps/es/case_search.py
index 6251e0631bdb..858884d859c2 100644
--- a/corehq/apps/es/case_search.py
+++ b/corehq/apps/es/case_search.py
@@ -233,7 +233,7 @@ def multiplex_to_adapter(domain):
     return None
 
 
-def case_property_query(case_property_name, value, fuzzy=False, multivalue_mode=None):
+def case_property_query(case_property_name, value, fuzzy=False, multivalue_mode=None, boost_first=False):
     """
     Search for all cases where case property with name `case_property_name`` has text value `value`
     """
@@ -254,6 +254,15 @@ def case_property_query(case_property_name, value, fuzzy=False, multivalue_mode=
                 queries.match(value, PROPERTY_VALUE, operator=multivalue_mode)
             ),
         )
+    if boost_first:
+        return _base_property_query(
+            case_property_name,
+            filters.OR(
+                filters.term(PROPERTY_VALUE, value),
+                queries.match(value[0], PROPERTY_VALUE)
+            )
+
+        )
     if not fuzzy and multivalue_mode in ['or', 'and']:
         return case_property_text_query(case_property_name, value, operator=multivalue_mode)
     return exact_case_property_text_query(case_property_name, value)
diff --git a/corehq/apps/es/client.py b/corehq/apps/es/client.py
index c3f1cbf51336..1a8a2267fe08 100644
--- a/corehq/apps/es/client.py
+++ b/corehq/apps/es/client.py
@@ -90,22 +90,18 @@ def index_exists(self, index):
         """
         self._validate_single_index(index)
         try:
-            if self._es.indices.get(index, feature="_aliases",
-                                    expand_wildcards="none"):
+            if self._es.indices.get(index, expand_wildcards="none"):
                 return True
         except NotFoundError:
             pass
         return False
 
-    def get_indices(self, full_info=False):
+    def get_indices(self):
         """Return the cluster index information of active indices.
 
-        :param full_info: ``bool`` whether to return the full index info
-                          (default ``False``)
         :returns: ``dict``
         """
-        feature = "" if full_info else "_aliases,_settings"
-        return self._es.indices.get("_all", feature=feature)
+        return self._es.indices.get("_all")
 
     def get_aliases(self):
         """Return the cluster aliases information.
@@ -439,8 +435,19 @@ def reindex(
             "conflicts": "proceed"
         }
 
-        # Should be removed after ES 5-6 migration
-        if copy_doc_ids:
+    # Should be removed after ES 5-6 migration
+        if copy_doc_ids and source == const.HQ_USERS_INDEX_NAME:
+            # Remove password from form index
+            reindex_body["script"] = {
+                "lang": "painless",
+                "source": """
+                ctx._source.remove('password');
+                if (!ctx._source.containsKey('doc_id')) {
+                    ctx._source['doc_id'] = ctx._id;
+                }
+                """
+            }
+        elif copy_doc_ids:
             reindex_body["script"] = {
                 "lang": "painless",
                 "source": """
@@ -646,7 +653,7 @@ def search(self, query, **kw):
         try:
             result = self._search(query, **kw)
             self._fix_hits_in_result(result)
-            self._report_and_fail_on_shard_failures(result)
+            self._report_and_fail_on_shard_failures(result, {"index": self.canonical_name})
         except ElasticsearchException as exc:
             raise ESError(exc)
         return result
@@ -687,7 +694,7 @@ def scroll(self, query, scroll=SCROLL_KEEPALIVE, size=None):
         # TODO: standardize all result collections returned by this class.
         try:
             for result in self._scroll(query, scroll, size):
-                self._report_and_fail_on_shard_failures(result)
+                self._report_and_fail_on_shard_failures(result, {"index": self.canonical_name})
                 self._fix_hits_in_result(result)
                 for hit in result["hits"]["hits"]:
                     yield hit
@@ -752,7 +759,7 @@ def _scroll(self, query, scroll, size):
                 # resulting in this method fetching a maximum `size * 2`
                 # documents.
                 # see: https://stackoverflow.com/a/63911571
-                result = self._es.scroll(scroll_id, scroll=scroll)
+                result = self._es.scroll(scroll_id=scroll_id, scroll=scroll)
                 scroll_id = result.get("_scroll_id")
                 yield result
                 if scroll_id is None or not result["hits"]["hits"]:
@@ -991,7 +998,7 @@ def _fix_hits_in_result(self, result):
             self._fix_hit(hit)
 
     @staticmethod
-    def _report_and_fail_on_shard_failures(result):
+    def _report_and_fail_on_shard_failures(result, tags):
         """
         Raise an ESShardFailure if there are shard failures in a search result
         (JSON) and report to datadog.
@@ -1004,7 +1011,7 @@ def _report_and_fail_on_shard_failures(result):
         if not isinstance(result, dict):
             raise ValueError(f"invalid Elastic result object: {result}")
         if result.get("_shards", {}).get("failed"):
-            metrics_counter("commcare.es.partial_results")
+            metrics_counter("commcare.es.partial_results", tags=tags)
             # Example message:
             #   "_shards: {"successful": 4, "failed": 1, "total": 5}"
             shard_info = json.dumps(result["_shards"])
diff --git a/corehq/apps/es/mappings/user_mapping.py b/corehq/apps/es/mappings/user_mapping.py
index 28dfdf966490..aed7ebcfc77e 100644
--- a/corehq/apps/es/mappings/user_mapping.py
+++ b/corehq/apps/es/mappings/user_mapping.py
@@ -297,6 +297,7 @@
         "location_id": {
             "type": "keyword"
         },
+        # TODO: Remove password field when creating new mappings for this index.
         "password": {
             "type": "text"
         },
diff --git a/corehq/apps/es/tests/test_case_search_es.py b/corehq/apps/es/tests/test_case_search_es.py
index 1215945b3d46..d0bd82c58c17 100644
--- a/corehq/apps/es/tests/test_case_search_es.py
+++ b/corehq/apps/es/tests/test_case_search_es.py
@@ -8,6 +8,7 @@
 
 from couchforms.geopoint import GeoPoint
 
+from corehq.privileges import DATA_DICTIONARY
 from corehq.apps.case_search.const import RELEVANCE_SCORE
 from corehq.apps.case_search.models import CaseSearchConfig
 from corehq.apps.case_search.xpath_functions.comparison import adjust_input_date_by_timezone
@@ -29,7 +30,7 @@
 from corehq.form_processor.models import CommCareCaseIndex
 from corehq.form_processor.tests.utils import FormProcessorTestUtils
 from corehq.pillows.case_search import CaseSearchReindexerFactory
-from corehq.util.test_utils import create_and_save_a_case, flag_enabled
+from corehq.util.test_utils import create_and_save_a_case, flag_enabled, privilege_enabled
 
 
 @es_test
@@ -390,10 +391,11 @@ def _bootstrap_cases_in_es_for_domain(self, domain, input_cases):
 
     def _assert_query_runs_correctly(self, domain, input_cases, query, xpath_query, output):
         self._bootstrap_cases_in_es_for_domain(domain, input_cases)
-        self.assertItemsEqual(
-            query.get_ids(),
-            output
-        )
+        if query:
+            self.assertItemsEqual(
+                query.get_ids(),
+                output
+            )
         if xpath_query:
             self.assertItemsEqual(
                 CaseSearchES().xpath_query(self.domain, xpath_query).get_ids(),
@@ -434,6 +436,20 @@ def test_fuzzy_case_property_query(self):
             ['c3']
         )
 
+    def test_fuzzy_date(self):
+        self._assert_query_runs_correctly(
+            self.domain,
+            [
+                {'_id': 'c1', 'dob': date(2020, 3, 1)},
+                {'_id': 'c2', 'dob': date(2020, 1, 3)},
+                {'_id': 'c3', 'dob': date(2002, 3, 1)},
+                {'_id': 'c4', 'dob': date(2020, 3, 4)},
+            ],
+            None,
+            "fuzzy-date(dob, '2020-03-01')",
+            ['c1', 'c2', 'c3']
+        )
+
     def test_multiple_case_search_queries(self):
         query = (CaseSearchES().domain(self.domain)
                  .case_property_query("foo", "redbeard")
@@ -535,8 +551,8 @@ def test_case_property_query(self):
             )
         )
 
-    @flag_enabled('USH_CASE_CLAIM_UPDATES')
     @patch('corehq.pillows.case_search.get_gps_properties', return_value={'coords'})
+    @privilege_enabled(DATA_DICTIONARY)
     def test_geopoint_query_for_gps_properties(self, _):
         self._bootstrap_cases_in_es_for_domain(self.domain, [
             {'_id': 'c1', 'coords': "42.373611 -71.110558 0 0"},
diff --git a/corehq/apps/es/tests/test_client.py b/corehq/apps/es/tests/test_client.py
index 9a17a95c6cd4..5f99d22335a9 100644
--- a/corehq/apps/es/tests/test_client.py
+++ b/corehq/apps/es/tests/test_client.py
@@ -11,6 +11,7 @@
 
 from corehq.apps.es import const
 from corehq.apps.es.utils import check_task_progress, get_es_reindex_setting_value
+from corehq.apps.users.models import CommCareUser
 from corehq.util.es.elasticsearch import (
     BulkIndexError,
     Elasticsearch,
@@ -268,21 +269,14 @@ def _clear_cluster_routing(self, verify=False):
         a transient setting once its set without restarting the cluster, so we
         explicitly set the default value (`all`) instead.
         """
-        self.adapter.cluster_routing(enabled=True)  # default value
+        try:
+            self.adapter._cluster_put_settings({"cluster.routing.allocation.enable": None})
+        except TransportError:
+            # TransportError(400, 'action_request_validation_exception', 'Validation Failed: 1: no settings to update;')  # noqa: E501
+            pass
         if verify:
             settings = self.adapter._es.cluster.get_settings(flat_settings=True)
-            self.assertEqual(settings["transient"]["cluster.routing.allocation.enable"], "all")
-        #
-        # The code below is better. Use it instead when able Elastic v5+
-        #
-        #try:
-        #    self.adapter._cluster_put_settings({"cluster.routing.allocation.enable": None})
-        #except TransportError:
-        #    # TransportError(400, 'action_request_validation_exception', 'Validation Failed: 1: no settings to update;')  # noqa: E501
-        #    pass
-        #if verify:
-        #    settings = self.adapter._es.cluster.get_settings(flat_settings=True)
-        #    self.assertIsNone(settings["transient"].get("cluster.routing.allocation.enable"))
+            self.assertIsNone(settings["transient"].get("cluster.routing.allocation.enable"))
 
     def test_get_node_info(self):
         info = self.adapter._es.nodes.info()
@@ -584,6 +578,59 @@ def test_reindex_with_query_parameter_set(self):
 
                 self.assertEqual(list(self._get_all_doc_ids_in_index(SUBINDEX)), ['7'])
 
+    def test_reindex_for_users_index(self):
+        from corehq.apps.es.users import user_adapter
+
+        SECONDARY_INDEX = 'secondary_user_index'
+        domain = 'es_reindex_users_index'
+
+        # Setup Indices
+        with temporary_index(user_adapter.index_name, user_adapter.type, user_adapter.mapping):
+            with temporary_index(SECONDARY_INDEX, user_adapter.type, user_adapter.mapping):
+
+                mobile_user = CommCareUser(
+                    _id='1', username="amazing_user", domain=domain, password='**************',
+                    created_by=None, created_via=None
+                )
+
+                # Save user to the source index
+                with patch('corehq.apps.groups.dbaccessors.get_group_id_name_map_by_user', return_value=[]), \
+                     patch.object(user_adapter.model_cls, 'get_user_data', return_value={}):
+
+                    id, source = user_adapter.from_python(mobile_user)
+                    # Manually set password field because now it is removed in from_python
+                    source['password'] = '12345678'
+                    manager._es.index(
+                        user_adapter.index_name,
+                        user_adapter.type,
+                        source,
+                        id,
+                        refresh=True
+                    )
+
+                # Get the saved user from ES
+                user_es = user_adapter.get(mobile_user._id)
+
+                # Ensure that password field exists in the user dict
+                assert 'password' in user_es, "password does not exist in source index"
+                self.assertEqual(user_es['password'], '12345678')
+
+                # Reindex the user index to the secondary index
+                with patch.object(const, 'HQ_USERS_INDEX_NAME', user_adapter.index_name):
+                    manager.reindex(
+                        user_adapter.index_name, SECONDARY_INDEX,
+                        wait_for_completion=True,
+                        refresh=True,
+                        requests_per_second=2,
+                    )
+
+                # Get the saved user from the secondary index
+                user = manager._es.search(index=SECONDARY_INDEX, body={})['hits']['hits'][0]['_source']
+                # Ensure that password field does not exist in the user dict
+                print(user)
+                self.assertEqual(user['doc_id'], '1')
+                assert 'password' not in user, "password exists in source index"
+
     def _index_test_docs_for_reindex(self):
         all_ids = set([str(i) for i in range(1, 10)])
 
@@ -643,7 +690,10 @@ def test_index_close(self):
             self.adapter.index_close(test_adapter.index_name)
             with self.assertRaises(TransportError) as test:
                 test_adapter.index(TestDoc("2", "test"))
-            self.assertEqual(test.exception.status_code, 403)
+            if test_adapter.elastic_major_version <= 5:
+                self.assertEqual(test.exception.status_code, 403)
+            else:
+                self.assertEqual(test.exception.status_code, 400)
             self.assertEqual(test.exception.error, "index_closed_exception")
 
     def test_index_put_alias(self):
@@ -771,7 +821,11 @@ def test_index_put_mapping_clears_existing_mapping_metadata(self):
         }
         self.adapter.index_create(self.index, {"mappings": {type_: mapping}})
         self.assertEqual(self.adapter.index_get_mapping(self.index, type_), mapping)
-        del mapping["_meta"]
+        # To remove meta in Elastic 6.x, we have to pass an empty _meta field
+        # but in Elastic 5.x, we have to remove it entirely from the object
+        mapping["_meta"] = {}
+        if manager.elastic_major_version < 6:
+            del mapping["_meta"]
         self.adapter.index_put_mapping(self.index, type_, mapping)
         self.assertEqual(self.adapter.index_get_mapping(self.index, type_), mapping)
 
diff --git a/corehq/apps/es/tests/test_migration_operations.py b/corehq/apps/es/tests/test_migration_operations.py
index d3c0f6e3f21b..00c23a927e92 100644
--- a/corehq/apps/es/tests/test_migration_operations.py
+++ b/corehq/apps/es/tests/test_migration_operations.py
@@ -140,7 +140,10 @@ def test_fails_if_index_exists(self):
         migration = TestMigration(CreateIndex(*self.create_index_args))
         with self.assertRaises(RequestError) as context:
             migration.apply()
-        self.assertEqual(context.exception.error, "index_already_exists_exception")
+        if manager.elastic_major_version >= 6:
+            self.assertEqual(context.exception.error, "resource_already_exists_exception")
+        else:
+            self.assertEqual(context.exception.error, "index_already_exists_exception")
 
     def test_reverse_deletes_index(self):
         migration = TestMigration(CreateIndex(*self.create_index_args))
@@ -473,7 +476,10 @@ def test_reverse_fails_if_index_exists(self):
         )
         with self.assertRaises(RequestError) as context:
             migration.unapply()
-        self.assertEqual(context.exception.error, "index_already_exists_exception")
+        if manager.elastic_major_version >= 6:
+            self.assertEqual(context.exception.error, "resource_already_exists_exception")
+        else:
+            self.assertEqual(context.exception.error, "index_already_exists_exception")
 
     def test_describe(self):
         operation = DeleteIndex(self.index)
@@ -637,8 +643,9 @@ def test_fails_for_existing_property_type_change(self):
             self.type,
             {"prop": {"type": "integer"}},
         ))
+        error_type = "RequestError" if manager.elastic_major_version >= 6 else "TransportError"
         literal = (
-            "TransportError(400, 'illegal_argument_exception', 'mapper [prop] "
+            f"{error_type}(400, 'illegal_argument_exception', 'mapper [prop] "
             "of different type, current_type [text], merged_type [integer]')"
         )
         with self.assertRaisesRegex(RequestError, f"^{re.escape(literal)}$"):
@@ -654,8 +661,9 @@ def test_fails_for_changing_existing_property_index_values(self):
             self.type,
             {"prop": {"type": "keyword"}},
         ))
+        error_type = "RequestError" if manager.elastic_major_version >= 6 else "TransportError"
         literal = (
-            "TransportError(400, 'illegal_argument_exception', "
+            f"{error_type}(400, 'illegal_argument_exception', "
             "'mapper [prop] of different type, current_type [text], merged_type [keyword]')"
         )
         with self.assertRaisesRegex(RequestError, f"^{re.escape(literal)}$"):
diff --git a/corehq/apps/es/tests/test_test_utils.py b/corehq/apps/es/tests/test_test_utils.py
index 612efd45c2a3..22b490e9311c 100644
--- a/corehq/apps/es/tests/test_test_utils.py
+++ b/corehq/apps/es/tests/test_test_utils.py
@@ -1,5 +1,8 @@
+import re
+from contextlib import nullcontext
+
+import pytest
 from django.test import SimpleTestCase
-from nose.tools import assert_raises_regex
 from testil import assert_raises
 from unittest.mock import patch
 
@@ -121,17 +124,14 @@ def test_only_dog_index_exists(self):
 
 
 @es_test_attr
-def test_index_state_with_function_decorator():
-
-    @es_test(requires=[pigs_adapter])
-    def test_pig_index_exists():
-        assert_index_exists(pigs_adapter)
+@es_test(requires=[pigs_adapter])
+def test_pig_index_exists():
+    assert_index_exists(pigs_adapter)
 
-    def test_pig_index_does_not_exist():
-        assert_not_index_exists(pigs_adapter)
 
-    yield test_pig_index_exists,
-    yield test_pig_index_does_not_exist,
+@es_test_attr
+def test_pig_index_does_not_exist():
+    assert_not_index_exists(pigs_adapter)
 
 
 def assert_index_exists(adapter):
@@ -148,47 +148,46 @@ def assert_not_index_exists(adapter):
 
 @es_test_attr
 def test_setup_class_expects_classmethod():
-    with assert_raises_regex(ValueError, "^'setup_class' expects a classmethod"):
+    with assert_raises(ValueError, msg=re.compile("^'setup_class' expects a classmethod")):
         @es_test(requires=[pigs_adapter], setup_class=True)
         class TestExpectsClassmethod:
             def setUpClass(self):
                 pass
 
 
+@pytest.mark.parametrize("args", [
+    (),  # without type/mapping
+    ("test_doc", {"_meta": {}}),  # with type/mapping
+])
 @es_test
-def test_temporary_index():
+def test_temporary_index(args):
     index = "test_index"
+    with temporary_index(index, *args):
+        assert manager.index_exists(index)
+    assert not manager.index_exists(index)
 
-    def test_temporary_index_with_args(*args):
-        with temporary_index(index, *args):
-            assert manager.index_exists(index)
-        assert not manager.index_exists(index)
-
-    yield test_temporary_index_with_args,  # without type/mapping
-    yield test_temporary_index_with_args, "test_doc", {"_meta": {}}  # with type/mapping
 
+@pytest.mark.parametrize("has_index, type_, mapping", [
+    # test while index exists
+    (True, "test_doc", None),  # no mapping
+    (True, None, {}),  # no type
 
+    # test while index does not exist
+    (False, "test_doc", None),  # no mapping
+    (False, None, {}),  # no type
+])
 @es_test
-def test_temporary_index_fails_with_invalid_args():
+def test_temporary_index_fails_with_invalid_args(has_index, type_, mapping):
     index = "test_index"
+    with (temporary_index(index) if has_index else nullcontext()):
+        if has_index:
+            assert manager.index_exists(index)
+        else:
+            assert not manager.index_exists(index)
 
-    def test_temporary_index_with_args(type_, mapping):
         index_was_present = manager.index_exists(index)
         with assert_raises(ValueError):
             with temporary_index(index, type_, mapping):
                 pass
         assert index_was_present == manager.index_exists(index), \
             "unexpected index existence change"
-
-    no_mapping = ("test_doc", None)
-    no_type = (None, {})
-
-    with temporary_index(index):
-        # test while index exists
-        assert manager.index_exists(index)
-        yield test_temporary_index_with_args, *no_mapping
-        yield test_temporary_index_with_args, *no_type
-    # test while index does not exist
-    assert not manager.index_exists(index)
-    yield test_temporary_index_with_args, *no_mapping
-    yield test_temporary_index_with_args, *no_type
diff --git a/corehq/apps/es/tests/test_user_adapter.py b/corehq/apps/es/tests/test_user_adapter.py
index 93974f62658f..8059a43f851f 100644
--- a/corehq/apps/es/tests/test_user_adapter.py
+++ b/corehq/apps/es/tests/test_user_adapter.py
@@ -33,6 +33,18 @@ def test_from_python_works_with_user_dicts(self):
         user_adapter.from_python(self.user.to_json())
         user_adapter.from_python(self.web_user.to_json())
 
+    def test_from_python_removes_password_field(self):
+        user_obj = self.user.to_json()
+        self.assertIn('password', user_obj)
+        user_es_obj = user_adapter.from_python(user_obj)
+        self.assertNotIn('password', user_es_obj)
+
+    def test_from_python_works_fine_if_password_field_not_present(self):
+        user_obj = self.user.to_json()
+        user_obj.pop('password')
+        user_es_obj = user_adapter.from_python(user_obj)
+        self.assertNotIn('password', user_es_obj)
+
     def test_from_python_raises_for_other_objects(self):
         self.assertRaises(TypeError, user_adapter.from_python, set)
 
diff --git a/corehq/apps/es/tests/test_utils.py b/corehq/apps/es/tests/test_utils.py
index 57128ba17d5e..5b4dd50f6abd 100644
--- a/corehq/apps/es/tests/test_utils.py
+++ b/corehq/apps/es/tests/test_utils.py
@@ -1,5 +1,6 @@
 from datetime import date, datetime
 
+import pytest
 from django.test.testcases import SimpleTestCase
 from pytz import UTC, timezone
 
@@ -15,24 +16,21 @@
 
 
 @es_test
-def test_es_format_datetime():
-    def _assert_returns(date_or_datetime, expected):
-        actual = es_format_datetime(date_or_datetime)
-        assert actual == expected, f"Expected {expected}, got {actual}"
-
-    for date_or_datetime, expected in [
-            ("04/28/21", "04/28/21"),
-            (date(2021, 4, 28), "2021-04-28"),
-            (datetime(2021, 4, 28), "2021-04-28T00:00:00"),
-            (datetime(2021, 4, 28, 11, 47, 22), "2021-04-28T11:47:22"),
-            (datetime(2021, 4, 28, 11, 47, 22, 3), "2021-04-28T11:47:22.000003"),
-            (datetime(2021, 4, 28, 11, 47, 22, 300000), "2021-04-28T11:47:22.300000"),
-            (datetime(2021, 4, 28, 11, tzinfo=UTC), "2021-04-28T11:00:00+00:00"),
-            (ET.localize(datetime(2021, 4, 28, 11)), "2021-04-28T11:00:00-04:00"),
-            # 2021-04-28T11:00:00.000001-04:00 isn't supported in ES, so convert to server time
-            (ET.localize(datetime(2021, 4, 28, 11, microsecond=1)), "2021-04-28T15:00:00.000001"),
-    ]:
-        yield _assert_returns, date_or_datetime, expected
+@pytest.mark.parametrize("date_or_datetime, expected", [
+    ("04/28/21", "04/28/21"),
+    (date(2021, 4, 28), "2021-04-28"),
+    (datetime(2021, 4, 28), "2021-04-28T00:00:00"),
+    (datetime(2021, 4, 28, 11, 47, 22), "2021-04-28T11:47:22"),
+    (datetime(2021, 4, 28, 11, 47, 22, 3), "2021-04-28T11:47:22.000003"),
+    (datetime(2021, 4, 28, 11, 47, 22, 300000), "2021-04-28T11:47:22.300000"),
+    (datetime(2021, 4, 28, 11, tzinfo=UTC), "2021-04-28T11:00:00+00:00"),
+    (ET.localize(datetime(2021, 4, 28, 11)), "2021-04-28T11:00:00-04:00"),
+    # 2021-04-28T11:00:00.000001-04:00 isn't supported in ES, so convert to server time
+    (ET.localize(datetime(2021, 4, 28, 11, microsecond=1)), "2021-04-28T15:00:00.000001"),
+])
+def test_es_format_datetime(date_or_datetime, expected):
+    actual = es_format_datetime(date_or_datetime)
+    assert actual == expected, f"Expected {expected}, got {actual}"
 
 
 @es_test
diff --git a/corehq/apps/es/tests/utils.py b/corehq/apps/es/tests/utils.py
index a56865e0264d..15a227cb3d13 100644
--- a/corehq/apps/es/tests/utils.py
+++ b/corehq/apps/es/tests/utils.py
@@ -4,14 +4,14 @@
 from functools import wraps
 from inspect import isclass
 
-from nose.plugins.attrib import attr
-from nose.tools import nottest
+import pytest
 
 from pillowtop.es_utils import initialize_index_and_mapping
 from pillowtop.tests.utils import get_pillow_doc_adapter
 
 from corehq.apps.es.client import ElasticMultiplexAdapter
 from corehq.apps.es.migration_operations import CreateIndex
+from corehq.tests.tools import nottest
 from corehq.tests.util.warnings import filter_warnings
 from corehq.util.elastic import ensure_index_deleted
 from corehq.util.es.elasticsearch import NotFoundError
@@ -26,7 +26,7 @@
     },
     "properties": {
         "doc_type": {
-            "index": "not_analyzed", "type": "string"
+            "type": "keyword"
         },
     }
 }
@@ -39,7 +39,7 @@
     UserWarning,
 )
 
-es_test_attr = attr(es_test=True)
+es_test_attr = pytest.mark.es_test
 
 
 class TEST_ES_INFO:
diff --git a/corehq/apps/es/transient_util.py b/corehq/apps/es/transient_util.py
index 75dd2b4fce27..35e2cc16ee73 100644
--- a/corehq/apps/es/transient_util.py
+++ b/corehq/apps/es/transient_util.py
@@ -88,6 +88,7 @@ def populate_doc_adapter_map():
         from pillowtop.tests.utils import TEST_ES_TYPE, TEST_ES_MAPPING, TEST_ES_INDEX
         add_dynamic_adapter("PillowTop", TEST_ES_INDEX, TEST_ES_TYPE, TEST_ES_MAPPING)
 
+        import corehq.tests.pytest_compat  # noqa: F401 - to be removed after switch to pytest
         from corehq.apps.es.tests.utils import TEST_ES_INFO, TEST_ES_MAPPING
         add_dynamic_adapter("UtilES", TEST_ES_INFO.alias, TEST_ES_INFO.type,
                         TEST_ES_MAPPING)
diff --git a/corehq/apps/es/users.py b/corehq/apps/es/users.py
index a1835e4b44cb..90c7a12aed41 100644
--- a/corehq/apps/es/users.py
+++ b/corehq/apps/es/users.py
@@ -104,6 +104,7 @@ def _from_dict(self, user_dict):
         user_dict['__group_ids'] = [res.id for res in results]
         user_dict['__group_names'] = [res.name for res in results]
         user_dict['user_data_es'] = []
+        user_dict.pop('password', None)
         if user_dict.get('base_doc') == 'CouchUser' and user_dict['doc_type'] == 'CommCareUser':
             user_obj = self.model_cls.wrap_correctly(user_dict)
             user_data = user_obj.get_user_data(user_obj.domain)
@@ -127,9 +128,9 @@ def domain(domain, allow_enterprise=False):
     domain_list = [domain]
     if allow_enterprise:
         from corehq.apps.enterprise.models import EnterprisePermissions
-        config = EnterprisePermissions.get_by_domain(domain)
-        if config.is_enabled and domain in config.domains:
-            domain_list.append(config.source_domain)
+        source_domain = EnterprisePermissions.get_source_domain(domain)
+        if source_domain:
+            domain_list.append(source_domain)
     return domains(domain_list)
 
 
diff --git a/corehq/apps/events/static/events/js/event_attendees.js b/corehq/apps/events/static/events/js/event_attendees.js
index 20b3324de464..336c49e6d7e0 100644
--- a/corehq/apps/events/static/events/js/event_attendees.js
+++ b/corehq/apps/events/static/events/js/event_attendees.js
@@ -6,7 +6,8 @@ hqDefine("events/js/event_attendees",[
     'jquery.rmi/jquery.rmi',
     'locations/js/widgets',
     "hqwebapp/js/bootstrap3/widgets",
-    "hqwebapp/js/bootstrap3/components.ko", // for pagination
+    "hqwebapp/js/components/pagination",
+    "hqwebapp/js/components/search_box",
 ], function (
     $,
     ko,
@@ -111,24 +112,24 @@ hqDefine("events/js/event_attendees",[
         return self;
     };
 
-    var mobileWorkerAttendees = function() {
+    var mobileWorkerAttendees = function () {
         self.mobileWorkerAttendeesEnabled = ko.observable(false);
         self.buttonText = ko.observable("");
 
-        self.toggleButtonText = function() {
+        self.toggleButtonText = function () {
             var button = document.getElementById("mobileWorkerAttendeeButton");
-            if(self.mobileWorkerAttendeesEnabled()) {
+            if (self.mobileWorkerAttendeesEnabled()) {
                 button.innerHTML = gettext("Disable Mobile Worker Attendees");
                 // Appending btn-danger will override btn-default
-                button.classList.add("btn-danger")
-            }else{
+                button.classList.add("btn-danger");
+            } else {
                 button.innerHTML = gettext("Enable Mobile Worker Attendees");
                 // Simply removing btn-danger will effectively enable btn-default
-                button.classList.remove("btn-danger")
-            };
+                button.classList.remove("btn-danger");
+            }
         };
 
-        self.loadMobileWorkerAttendeeConfig = function() {
+        self.loadMobileWorkerAttendeeConfig = function () {
             $.ajax({
                 method: 'GET',
                 url: initialPageData.reverse('attendees_config'),
diff --git a/corehq/apps/export/forms.py b/corehq/apps/export/forms.py
index 9ef5382e4221..00d81a5cf988 100644
--- a/corehq/apps/export/forms.py
+++ b/corehq/apps/export/forms.py
@@ -9,7 +9,6 @@
 import dateutil
 from crispy_forms import layout as crispy
 from crispy_forms.helper import FormHelper
-from corehq.apps.hqwebapp import crispy as hqcrispy
 from crispy_forms.bootstrap import StrictButton
 
 from corehq import privileges
@@ -933,9 +932,6 @@ def __init__(self, domain_object, *args, **kwargs):
         self.domain_object = domain_object
         super(EmwfFilterFormExport, self).__init__(domain_object, *args, **kwargs)
 
-        self.helper.label_class = 'col-sm-3 col-md-2 col-lg-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-3'
-
     def get_model_filter(self, mobile_user_and_group_slugs, can_access_all_locations, accessible_location_ids):
         """
         :param mobile_user_and_group_slugs: slug from request like
@@ -989,8 +985,6 @@ def __init__(self, domain_object, timezone, *args, **kwargs):
         self.timezone = timezone
         super(FilterCaseESExportDownloadForm, self).__init__(domain_object, *args, **kwargs)
 
-        self.helper.label_class = 'col-sm-3 col-md-2 col-lg-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-3'
         # update date_range filter's initial values to span the entirety of
         # the domain's submission range
         default_datespan = datespan_from_beginning(self.domain_object, self.timezone)
@@ -1047,8 +1041,6 @@ def __init__(self, domain_object, timezone, *args, **kwargs):
         self.timezone = timezone
         super(FilterSmsESExportDownloadForm, self).__init__(domain_object, *args, **kwargs)
 
-        self.helper.label_class = 'col-sm-3 col-md-2 col-lg-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-3'
         # update date_range filter's initial values to span the entirety of
         # the domain's submission range
         default_datespan = datespan_from_beginning(self.domain_object, self.timezone)
@@ -1087,8 +1079,6 @@ class DatasourceExportDownloadForm(forms.Form):
     def __init__(self, domain, *args, **kwargs):
         super(DatasourceExportDownloadForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper()
-        self.helper.label_class = 'col-sm-3 col-md-2 col-lg-2'
-        self.helper.field_class = 'col-sm-9 col-md-8 col-lg-3'
 
         self.fields['data_source'].choices = self.domain_datasources(domain)
 
@@ -1104,14 +1094,12 @@ def __init__(self, domain, *args, **kwargs):
                     data_bind='visible: haveDatasources'
                 ),
             ),
-            hqcrispy.FormActions(
-                StrictButton(
-                    _("Download Data Export Tool query file"),
-                    type="submit",
-                    css_class="btn-primary",
-                    data_bind="enable: haveDatasources"
-                ),
-            )
+            StrictButton(
+                _("Download Data Export Tool query file"),
+                type="submit",
+                css_class="btn-primary",
+                data_bind="enable: haveDatasources"
+            ),
         )
 
     @staticmethod
diff --git a/corehq/apps/export/models/new.py b/corehq/apps/export/models/new.py
index 74dba4e0d090..dd94f03cd70c 100644
--- a/corehq/apps/export/models/new.py
+++ b/corehq/apps/export/models/new.py
@@ -1771,6 +1771,7 @@ def generate_schema_from_builds(
         only_process_current_builds=False,
         task=None,
         for_new_export_instance=False,
+        is_identifier_case_type=False,
     ):
         """
         Builds a schema from Application builds for a given identifier
@@ -1787,6 +1788,7 @@ def generate_schema_from_builds(
             processed.
         :param task: A celery task to update the progress of the build
         :param for_new_export_instance: Flag to be set if generating schema for a new export instance
+        :param is_identifier_case_type: boolean, if True, some optimizations are applied specific to case type
         :returns: Returns a ExportDataSchema instance
         """
 
@@ -1809,7 +1811,8 @@ def generate_schema_from_builds(
             )
         app_build_ids.extend(app_ids_for_domain)
         current_schema = cls._process_apps_for_export(domain, current_schema, identifier, app_build_ids, task,
-                                                      for_new_export_instance=for_new_export_instance)
+                                                      for_new_export_instance=for_new_export_instance,
+                                                      is_identifier_case_type=is_identifier_case_type)
 
         inferred_schema = cls._get_inferred_schema(domain, app_id, identifier)
         if inferred_schema:
@@ -1955,7 +1958,7 @@ def _save_export_schema(current_schema, original_id, original_rev):
 
     @classmethod
     def _process_apps_for_export(cls, domain, schema, identifier, app_build_ids, task,
-                                 for_new_export_instance=False):
+                                 for_new_export_instance=False, is_identifier_case_type=False):
         apps_processed = 0
         for app_doc in iter_docs(Application.get_db(), app_build_ids, chunksize=10):
             doc_type = app_doc.get('doc_type', '')
@@ -1974,6 +1977,9 @@ def _process_apps_for_export(cls, domain, schema, identifier, app_build_ids, tas
                 )
                 continue
 
+            if is_identifier_case_type and not app.case_type_exists(identifier):
+                continue
+
             try:
                 schema = cls._process_app_build(
                     schema,
@@ -2313,18 +2319,6 @@ def _get_stock_items_from_question(question, app_id, app_version, repeats):
 
         return items
 
-    @classmethod
-    def _process_apps_for_export(cls, domain, schema, identifier, app_build_ids, task,
-                                 for_new_export_instance=False):
-        return super(FormExportDataSchema, cls)._process_apps_for_export(
-            domain,
-            schema,
-            identifier,
-            app_build_ids,
-            task,
-            for_new_export_instance=for_new_export_instance
-        )
-
 
 class CaseExportDataSchema(ExportDataSchema):
 
@@ -2544,7 +2538,7 @@ def _add_to_group_schema(group_schema, path_start, prop, app_id, app_version):
 
     @classmethod
     def _process_apps_for_export(cls, domain, schema, identifier, app_build_ids, task,
-                                 for_new_export_instance=False):
+                                 for_new_export_instance=False, is_identifier_case_type=False):
         if identifier == ALL_CASE_TYPE_EXPORT:
             return cls._process_apps_for_bulk_export(domain, schema, app_build_ids, task)
         else:
@@ -2554,7 +2548,8 @@ def _process_apps_for_export(cls, domain, schema, identifier, app_build_ids, tas
                 identifier,
                 app_build_ids,
                 task,
-                for_new_export_instance=for_new_export_instance
+                for_new_export_instance=for_new_export_instance,
+                is_identifier_case_type=is_identifier_case_type
             )
 
     @classmethod
@@ -2623,17 +2618,6 @@ def schema_version(cls):
     def get_latest_export_schema(domain, include_metadata, identifier=None):
         return SMSExportDataSchema(domain=domain, include_metadata=include_metadata)
 
-    def _process_apps_for_export(cls, domain, schema, identifier, app_build_ids, task,
-                                 for_new_export_instance=False):
-        return super(SMSExportDataSchema, cls)._process_apps_for_export(
-            domain,
-            schema,
-            identifier,
-            app_build_ids,
-            task,
-            for_new_export_instance=for_new_export_instance
-        )
-
 
 def _string_path_to_list(path):
     return path if path is None else path[1:].split('/')
diff --git a/corehq/apps/export/static/export/js/create_export.js b/corehq/apps/export/static/export/js/create_export.js
index 65530e88c13a..c01a2355d428 100644
--- a/corehq/apps/export/static/export/js/create_export.js
+++ b/corehq/apps/export/static/export/js/create_export.js
@@ -131,6 +131,7 @@ hqDefine("export/js/create_export", [
                 $formElem.select2({
                     data: self._app_types || [],
                     width: '100%',
+                    dropdownParent: $("#createExportOptionsModal"),
                 }).val(drilldownDefaults.app_type).trigger('change');
             }
         },
@@ -152,6 +153,7 @@ hqDefine("export/js/create_export", [
                         $formElem.select2({
                             data: fieldData || [],
                             width: '100%',
+                            dropdownParent: $("#createExportOptionsModal"),
                         }).val(drilldownDefaults[fieldSlug]).trigger('change');
                     }
                 }
diff --git a/corehq/apps/export/static/export/js/customize_export_new.js b/corehq/apps/export/static/export/js/customize_export_new.js
index ad36e80e2137..5aed55dbfd95 100644
--- a/corehq/apps/export/static/export/js/customize_export_new.js
+++ b/corehq/apps/export/static/export/js/customize_export_new.js
@@ -1,6 +1,7 @@
 hqDefine('export/js/customize_export_new', [
     'jquery',
     'knockout',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'hqwebapp/js/initial_page_data',
     'export/js/models',
     'hqwebapp/js/toggles',
@@ -8,6 +9,7 @@ hqDefine('export/js/customize_export_new', [
 ], function (
     $,
     ko,
+    bootstrap,
     initialPageData,
     models,
     toggles,
@@ -31,7 +33,9 @@ hqDefine('export/js/customize_export_new', [
             "build_schema", "/a/---/data/export/build_full_schema/"
         );
         $('#customize-export').koApplyBindings(customExportView);
-        $('.export-tooltip').tooltip();
+        $('.export-tooltip').each(function (index, trigger) {
+            new bootstrap.Tooltip(trigger);
+        });
 
         if (toggles.toggleEnabled('SUPPORT_GEO_JSON_EXPORT')) {
             const exportFormat = initialPageData.get('export_instance').export_format;
diff --git a/corehq/apps/export/static/export/js/download_data_files.js b/corehq/apps/export/static/export/js/download_data_files.js
index 6452332a800c..e85cc1282eb7 100644
--- a/corehq/apps/export/static/export/js/download_data_files.js
+++ b/corehq/apps/export/static/export/js/download_data_files.js
@@ -1,6 +1,6 @@
 hqDefine("export/js/download_data_files",[
     'jquery',
-    'hqwebapp/js/bootstrap3/alert_user',
+    'hqwebapp/js/bootstrap5/alert_user',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/assert_properties',
 ], function ($, alertUserModule, initialPageData, assertProperties) {
diff --git a/corehq/apps/export/static/export/js/download_export.js b/corehq/apps/export/static/export/js/download_export.js
index 2c9dc3dbc729..c4ce890b62d4 100644
--- a/corehq/apps/export/static/export/js/download_export.js
+++ b/corehq/apps/export/static/export/js/download_export.js
@@ -13,12 +13,12 @@ hqDefine('export/js/download_export', [
     'underscore',
     'hqwebapp/js/assert_properties',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/tempus_dominus',
     'analytix/js/google',
     'analytix/js/kissmetrix',
-    'reports/js/filters/bootstrap3/main',
+    'reports/js/filters/bootstrap5/main',
     'reports/js/reports.util',
     'export/js/utils',
-    'hqwebapp/js/daterangepicker.config',   // createDateRangePicker
     'jquery.cookie/jquery.cookie',      // for resuming export downloads on refresh
 ], function (
     $,
@@ -26,6 +26,7 @@ hqDefine('export/js/download_export', [
     _,
     assertProperties,
     initialPageData,
+    hqTempusDominus,
     googleAnalytics,
     kissmetricsAnalytics,
     reportFilters,
@@ -435,12 +436,7 @@ hqDefine('export/js/download_export', [
 
         $(".hqwebapp-datespan").each(function () {
             var $el = $(this).find("input");
-            $el.createDateRangePicker(
-                $el.data("labels"),
-                $el.data("separator"),
-                $el.data('startDate'),
-                $el.data('endDate')
-            );
+            hqTempusDominus.createDateRangePicker($el.get(0), $el.data("separator"));
         });
     });
 });
diff --git a/corehq/apps/export/static/export/js/export_list.js b/corehq/apps/export/static/export/js/export_list.js
index a56d048268d7..d7811c1cc313 100644
--- a/corehq/apps/export/static/export/js/export_list.js
+++ b/corehq/apps/export/static/export/js/export_list.js
@@ -16,18 +16,22 @@ hqDefine("export/js/export_list", [
     'knockout',
     'underscore',
     'hqwebapp/js/assert_properties',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'clipboard/dist/clipboard',
     'analytix/js/google',
     'analytix/js/kissmetrix',
     'export/js/utils',
-    'hqwebapp/js/bootstrap3/validators.ko',        // needed for validation of startDate and endDate
-    'hqwebapp/js/bootstrap3/components.ko',        // pagination & feedback widget
+    'hqwebapp/js/bootstrap5/validators.ko',        // needed for validation of startDate and endDate
+    'hqwebapp/js/components/inline_edit',
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/bootstrap5/feedback',
     'select2/dist/js/select2.full.min',
 ], function (
     $,
     ko,
     _,
     assertProperties,
+    bootstrap,
     Clipboard,
     googleAnalytics,
     kissmetricsAnalytics,
@@ -181,7 +185,8 @@ hqDefine("export/js/export_list", [
                         self.isAutoRebuildEnabled(data.isAutoRebuildEnabled);
                     }
                     $button.enableButton();
-                    $('#modalEnableDisableAutoRefresh-' + self.id() + '-' + self.emailedExport.groupId()).modal('hide');
+                    const modalId = 'modalEnableDisableAutoRefresh-' + self.id() + '-' + self.emailedExport.groupId();
+                    bootstrap.Modal.getInstance('#' + modalId).hide();
                 },
             });
         };
@@ -261,7 +266,9 @@ hqDefine("export/js/export_list", [
         };
 
         self.updateData = function () {
-            $('#modalRefreshExportConfirm-' + exportId + '-' + self.groupId()).modal('hide');
+            const modalId = 'modalRefreshExportConfirm-' + exportId + '-' + self.groupId();
+            bootstrap.Modal.getInstance('#' + modalId).hide();
+
             self.updatingData(true);
             $.ajax({
                 method: 'POST',
@@ -462,29 +469,12 @@ hqDefine("export/js/export_list", [
             return true;
         };
 
-        var tooltipText = "";
-        if (self.isOData || self.isFeed) {
-            tooltipText = gettext("All of the selected feeds will be deleted.");
-        } else {
-            tooltipText = gettext("All of the selected exports will be deleted.");
-        }
-
-        $(function () {
-            $('[data-toggle="tooltip-bulkExport"]').attr('title',
-                gettext("All of the selected exports will be collected for download to a " +
-                "single Excel file, with each export as a separate sheet.")).tooltip();
-        });
-
-        $(function () {
-            $('[data-toggle="tooltip-bulkDelete"]').attr('title', tooltipText).tooltip({trigger: 'hover'});
-        });
-
         self.isMultiple = ko.computed(function () {
             if (self.bulkDeleteList().length > 1) { return true; }
             return false;
         });
 
-        self.BulkExportDelete = function (observable, event) {
+        self.BulkExportDelete = function () {
             var count = self.bulkExportDownloadCount;
             self.panels().forEach(panel => panel.isBulkDeleting(true));
             var bulkDelete = function () {
@@ -680,7 +670,7 @@ hqDefine("export/js/export_list", [
                         if (export_.hasEmailedExport) {
                             export_.emailedExport.pollProgressBar();
                         }
-                        self.$filterModal.modal('hide');
+                        bootstrap.Modal.getInstance(self.$filterModal.get(0)).hide();
                     } else {
                         self.formSubmitErrorMessage(data.error);
                     }
diff --git a/corehq/apps/export/static/export/js/export_list_main.js b/corehq/apps/export/static/export/js/export_list_main.js
index fc0a07f5c3d4..1d67953ed1ef 100644
--- a/corehq/apps/export/static/export/js/export_list_main.js
+++ b/corehq/apps/export/static/export/js/export_list_main.js
@@ -2,7 +2,7 @@ hqDefine("export/js/export_list_main", [
     'jquery',
     'hqwebapp/js/initial_page_data',
     'analytix/js/kissmetrix',
-    'hqwebapp/js/bootstrap3/main',
+    'hqwebapp/js/bootstrap5/main',
     'export/js/create_export',
     'export/js/export_list',
     'hqwebapp/js/select_2_ajax_widget',  // for case owner & user filters in DashboardFeedFilterForm
diff --git a/corehq/apps/export/static/export/js/incremental_export.js b/corehq/apps/export/static/export/js/incremental_export.js
index 491c5b25dabd..3327df92fbd4 100644
--- a/corehq/apps/export/static/export/js/incremental_export.js
+++ b/corehq/apps/export/static/export/js/incremental_export.js
@@ -1,7 +1,7 @@
 hqDefine('export/js/incremental_export', [
     "jquery",
     "hqwebapp/js/initial_page_data",
-    "hqwebapp/js/bootstrap3/crud_paginated_list_init",
+    "hqwebapp/js/bootstrap5/crud_paginated_list_init",
 ], function ($, initialPageData, CRUDPaginatedListInit) {
     $(function () {
         var viewModel = CRUDPaginatedListInit.paginatedListModel;
diff --git a/corehq/apps/export/static/export/js/models.js b/corehq/apps/export/static/export/js/models.js
index d898e01d53bb..8b0fbd1ea585 100644
--- a/corehq/apps/export/static/export/js/models.js
+++ b/corehq/apps/export/static/export/js/models.js
@@ -8,18 +8,20 @@ hqDefine('export/js/models', [
     'jquery',
     'knockout',
     'underscore',
+    'es6!hqwebapp/js/bootstrap5_loader',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
     'analytix/js/google',
     'analytix/js/kissmetrix',
     'export/js/const',
     'export/js/utils',
-    'hqwebapp/js/bootstrap3/validators.ko',        // needed for validation of customPathString
-    'hqwebapp/js/bootstrap3/knockout_bindings.ko', // needed for multirow_sortable binding
+    'hqwebapp/js/bootstrap5/validators.ko',        // needed for validation of customPathString
+    'hqwebapp/js/bootstrap5/knockout_bindings.ko', // needed for multirow_sortable binding
 ], function (
     $,
     ko,
     _,
+    bootstrap,
     initialPageData,
     toggles,
     googleAnalytics,
@@ -451,7 +453,7 @@ hqDefine('export/js/models', [
         table.showDeleted(!table.showDeleted());
 
         if (this.numberOfAppsToProcess > 0 && table.showDeleted()) {
-            $('#export-process-deleted-applications').modal('show');
+            bootstrap.Modal.getOrCreateInstance('#export-process-deleted-applications').show();
         }
     };
 
@@ -576,7 +578,7 @@ hqDefine('export/js/models', [
         const queryString = window.location.search;
         const urlParams = new URLSearchParams(queryString);
         if (urlParams.get('load_deprecated') !== 'True' && table.showDeprecated()) {
-            $('#export-process-deprecated-properties').modal('show');
+            bootstrap.Modal.getOrCreateInstance('#export-process-deprecated-properties').show();
         }
     };
 
diff --git a/corehq/apps/export/static/export/js/utils.js b/corehq/apps/export/static/export/js/utils.js
index f9914d37e54c..6efad48bc6e2 100644
--- a/corehq/apps/export/static/export/js/utils.js
+++ b/corehq/apps/export/static/export/js/utils.js
@@ -10,11 +10,11 @@ hqDefine('export/js/utils', [
     constants
 ) {
     var getTagCSSClass = function (tag) {
-        var cls = 'label';
+        var cls = 'badge';
         if (tag === constants.TAG_DELETED) {
-            return cls + ' label-warning';
+            return cls + ' text-bg-warning';
         } else {
-            return cls + ' label-default';
+            return cls + ' text-bg-secondary';
         }
     };
 
diff --git a/corehq/apps/export/static/export/spec/Exports.Utils.spec.js b/corehq/apps/export/static/export/spec/Exports.Utils.spec.js
index cf4c0380e48d..cacf6badb1d3 100644
--- a/corehq/apps/export/static/export/spec/Exports.Utils.spec.js
+++ b/corehq/apps/export/static/export/spec/Exports.Utils.spec.js
@@ -14,12 +14,12 @@ hqDefine("export/spec/Exports.Utils.spec", [
         describe('#getTagCSSClass', function () {
             it('Should get regular tag class', function () {
                 var cls = utils.getTagCSSClass('random-tag');
-                assert.equal(cls, 'label label-default');
+                assert.equal(cls, 'badge text-bg-secondary');
             });
 
             it('Should get warning tag class', function () {
                 var cls = utils.getTagCSSClass(constants.TAG_DELETED);
-                assert.equal(cls, 'label label-warning');
+                assert.equal(cls, 'badge text-bg-warning');
             });
         });
 
diff --git a/corehq/apps/export/templates/export/customize_export_new.html b/corehq/apps/export/templates/export/customize_export_new.html
index 857425601a48..74ee9fa955e2 100644
--- a/corehq/apps/export/templates/export/customize_export_new.html
+++ b/corehq/apps/export/templates/export/customize_export_new.html
@@ -1,8 +1,8 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'export/js/customize_export_new' %}
+{% requirejs_main_b5 'export/js/customize_export_new' %}
 
 {% block page_content %}
   {% initial_page_data 'number_of_apps_to_process' number_of_apps_to_process %}
@@ -15,10 +15,10 @@
   {% initial_page_data 'export_instance' export_instance %}
   {% initial_page_data 'geo_properties' geo_properties %}
 
-  <div id="customize-export" style="display: none;" data-bind="visible: true">
+  <div id="customize-export" class="d-none" data-bind="css: { 'd-none': false }">
     {# content for multi-select help popover #}
     {% if export_instance.type == 'case' %}
-      <div id="popover_content_wrapper" style="display: none">
+      <div id="popover_content_wrapper" class="d-none">
         {% blocktrans %}
           These options allow you to configure how CommCare exports data from multi-select questions.
           If you do not want to split the options into multiple columns select the 'plain' option.
@@ -40,205 +40,187 @@
           method="post">
       {% csrf_token %}
       <fieldset>
-        <div class="form-group">
-          <label for="export-type"
-                 class="col-sm-3 col-md-2 control-label">
+        <div class="mb-3">  {# Updated from form-group to mb-3 #}
+          <label for="export-type" class="form-label">
             {% if export_instance.type == 'case' %}
               {% trans "Case Type" %}
             {% else %}
               {% trans "Form" %}
             {% endif %}
           </label>
-          <div class="col-sm-9 col-md-8 col-lg-6">
-            <p class="form-control-static">
+
+            <h4>
               {% if export_instance.type == 'case' %}
                 {{ export_instance.case_type }}
               {% else %}
                 {{ export_instance.formname }}
               {% endif %}
-            </p>
-          </div>
+            </h4>
+
         </div>
-        <div class="form-group">
-          <label for="export-name"
-                 class="col-sm-3 col-md-2 control-label">
+        <div class="mb-3">  {# Updated from form-group to mb-3 #}
+          <label for="export-name" class="form-label">
             {{ terminology.name_label }}
           </label>
-          <div class="col-sm-9 col-md-8 col-lg-6">
-            <input type="text"
-                   class="form-control"
-                   id="export-name"
-                   data-bind="value: name" />
-          </div>
+          <input type="text"
+                 class="form-control"
+                 id="export-name"
+                 data-bind="value: name" />
         </div>
-        <div class="form-group">
-          <label for="export-description"
-                 class="col-sm-3 col-md-2 control-label">
+        <div class="mb-3">  {# Updated from form-group to mb-3 #}
+          <label for="export-description" class="form-label">
             {% trans "Description" %}
           </label>
-          <div class="col-sm-9 col-md-8 col-lg-6">
-            <textarea data-bind="value: description"
-                      id="export-description"
-                      class="form-control vertical-resize"
-                      rows="3">
-            </textarea>
-          </div>
+          <textarea data-bind="value: description"
+                    id="export-description"
+                    class="form-control vertical-resize"
+                    rows="3">
+          </textarea>
         </div>
-        <div class="form-group"
-             data-bind="css: {
-                          'has-error': hasDisallowedHtmlFormat
-                        },
-                        visible: formatOptions.length > 1">
-          <label for="format-select"
-                 class="col-sm-3 col-md-2 control-label">
+        <div class="mb-3"  {# Updated from form-group to mb-3 #}
+             data-bind="visible: formatOptions.length > 1">
+          <label for="format-select" class="form-label">
             {% trans "Default file type" %}
           </label>
-          <div class="col-sm-9 col-md-8 col-lg-6">
-            <select class="form-control"
-                    id="format-select"
-                    data-bind="options: getFormatOptionValues(),
-                               optionsText: getFormatOptionText,
-                               value: export_format">
-            </select>
-            <div class="help-block"
-                 data-bind="visible: hasDisallowedHtmlFormat">
-              {% url "domain_subscription_view" domain as software_plan_url %}
-              {% blocktrans %}
-                Excel Dashboard Integration is only available on the Standard Plan or higher.
-                Click <a href="{{ software_plan_url }}">here</a> to manage the software plan for your project.
-              {% endblocktrans %}
-            </div>
+          <select class="form-control"
+                  id="format-select"
+                  data-bind="options: getFormatOptionValues(),
+                             optionsText: getFormatOptionText,
+                             value: export_format,
+                             css: {'is-invalid': hasDisallowedHtmlFormat}">
+          </select>
+          <div class="invalid-feedback"
+               data-bind="visible: hasDisallowedHtmlFormat">
+            {% url "domain_subscription_view" domain as software_plan_url %}
+            {% blocktrans %}
+              Excel Dashboard Integration is only available on the Standard Plan or higher.
+              Click <a href="{{ software_plan_url }}">here</a> to manage the software plan for your project.
+            {% endblocktrans %}
           </div>
-
         </div>
-        <div class="form-group">
-          <div class="col-sm-offset-4 col-md-offset-3 col-lg-offset-2 col-sm-6">
-            {% if not export_instance.is_odata_config %}
-              <div class="checkbox">
-                <label>
-                  <input type="checkbox"
-                         id="transform-dates-checkbox"
-                         data-bind="checked: transform_dates" />
-                  <strong>{% trans "Automatically convert dates and multimedia links for Excel" %}</strong><br/>
-                  {% blocktrans %}
-                    Leaving this checked will ensure dates appear in excel format.
-                    Otherwise they will appear as a normal text format. This also allows for
-                    hyperlinks to the multimedia captured by your form submission.
-                  {% endblocktrans %}
-                </label>
-              </div>
-
-              {% if export_instance.type == 'form' and export_instance.export_format != 'html' %}
-              <div class="checkbox">
-                <label>
-                  <input type="checkbox"
-                         id="format-data-in-excel-checkbox"
-                         data-bind="checked: format_data_in_excel" />
-                  <strong>{% trans "Automatically format cells for Excel 2007+" %}</strong><br/>
-                  {% blocktrans %}
-                    If this setting is not selected, your export will be in Excel’s general format.
-                    If you enable this setting, Excel will format dates, integers, decimals,
-                    Boolean values (True/False) and currencies.
-                  {% endblocktrans %}
-                </label>
-              </div>
-              {% endif %}
+        <div class="mb-3">  {# Updated from form-group to mb-3 #}
+          {% if not export_instance.is_odata_config %}
+            <div class="form-check">
+              <input type="checkbox" class="form-check-input"
+                     id="transform-dates-checkbox"
+                     data-bind="checked: transform_dates" />
+              <label class="form-check-label" for="transform-dates-checkbox">
+                <strong>{% trans "Automatically convert dates and multimedia links for Excel" %}</strong><br/>
+                {% blocktrans %}
+                  Leaving this checked will ensure dates appear in excel format.
+                  Otherwise they will appear as a normal text format. This also allows for
+                  hyperlinks to the multimedia captured by your form submission.
+                {% endblocktrans %}
+              </label>
+            </div>
 
-              <div class="checkbox">
-                <label>
-                  <input type="checkbox"
-                         id="daily-saved-export-checkbox"
-                         data-bind="checked: is_daily_saved_export,
-                                    attr: { disabled: hasHtmlFormat() || !{{ has_daily_saved_export_access|JSON }}}"/>
-                  {% trans "Create a Daily Saved Export" %}
-                </label>
-                {% if not has_daily_saved_export_access %}
-                  <span class="hq-help-template"
-                        data-content='{% blocktrans %}
-                                        Daily saved exports are only available on the Standard Plan or higher.
-                                        Click <a href="{{ software_plan_url }}">here</a> to manage the software plan for your project.
-                                      {% endblocktrans %}'
-                  ></span>
-                {% endif %}
-              </div>
+            {% if export_instance.type == 'form' and export_instance.export_format != 'html' %}
+            <div class="form-check">
+              <input type="checkbox" class="form-check-input"
+                     id="format-data-in-excel-checkbox"
+                     data-bind="checked: format_data_in_excel" />
+              <label class="form-check-label" for="format-data-in-excel-checkbox">
+                <strong>{% trans "Automatically format cells for Excel 2007+" %}</strong><br/>
+                {% blocktrans %}
+                  If this setting is not selected, your export will be in Excel’s general format.
+                  If you enable this setting, Excel will format dates, integers, decimals,
+                  Boolean values (True/False) and currencies.
+                {% endblocktrans %}
+              </label>
+            </div>
             {% endif %}
-            <div class="checkbox">
-              <label>
-                <input type="checkbox"
-                       id="det-config-checkbox"
-                       data-bind="checked: show_det_config_download,
-                                  attr: { disabled: !{{ has_api_access|JSON }} || {{ is_all_case_types_export|JSON }}}" />
-                {% trans "Generate a Data Export Tool config file" %}
+
+            <div class="form-check">
+              <input type="checkbox" class="form-check-input"
+                     id="daily-saved-export-checkbox"
+                     data-bind="checked: is_daily_saved_export,
+                                attr: { disabled: hasHtmlFormat() || !{{ has_daily_saved_export_access|JSON }}}"/>
+              <label class="form-check-label" for="daily-saved-export-checkbox">
+                {% trans "Create a Daily Saved Export" %}
               </label>
-              {% trans "Download a Data Export Tool configuration file for this export" as det_help %}
-              <span class="hq-help-template"
-                    data-content='{% blocktrans %}
-                                    <p>Checking this will add a button to download a configuration file
-                                       for the <a href="https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143955952/CommCare+Data+Export+Tool+DET" target="_blank">
-                                       CommCare Data Export Tool</a> for the export.</p>
-                                   {% endblocktrans %}
-                                   {% if not has_api_access %}
-                                   {% blocktrans %}
-                                    <p>The Data Export Tool requires API access, which is only available on the Pro Plan or higher.
-                                       Click <a href="{{ software_plan_url }}">here</a> to manage the software plan for your project.</p>
-                                  {% endblocktrans %}
-                                  {% endif %}'
+              {% if not has_daily_saved_export_access %}
+                <span class="hq-help-template"
+                      data-content='{% blocktrans %}
+                                      Daily saved exports are only available on the Standard Plan or higher.
+                                      Click <a href="{{ software_plan_url }}">here</a> to manage the software plan for your project.
+                                    {% endblocktrans %}'
                 ></span>
+              {% endif %}
             </div>
-            {% if export_instance.type == 'form' %}
-              <div class="checkbox"
-                   {% if not request|toggle_enabled:'SUPPORT' %}data-bind="visible: initiallyIncludeErrors"{% endif %}>
-                <label>
-                  <input type="checkbox"
-                         id="include-errors-checkbox"
-                         data-bind="checked: include_errors" />
-                  {% trans "Include duplicates and other unprocessed forms" %}
-                </label>
-              </div>
-
-              <div id="split-multiselects-checkbox-div" class="checkbox">
-                <label>
-                  <input type="checkbox"
-                         id="split-multiselects-checkbox"
-                         data-bind="checked: split_multiselects" />
-                  {% trans "Expand Checkbox Questions" %}
-                </label>
-              </div>
-            {% endif %}
+          {% endif %}
+          <div class="form-check">
+            <input type="checkbox" class="form-check-input"
+                   id="det-config-checkbox"
+                   data-bind="checked: show_det_config_download,
+                              attr: { disabled: !{{ has_api_access|JSON }} || {{ is_all_case_types_export|JSON }}}" />
+            <label class="form-check-label" for="det-config-checkbox">
+              {% trans "Generate a Data Export Tool config file" %}
+            </label>
+            {% trans "Download a Data Export Tool configuration file for this export" as det_help %}
+            <span class="hq-help-template"
+                  data-content='{% blocktrans %}
+                                  <p>Checking this will add a button to download a configuration file
+                                     for the <a href="https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143955952/CommCare+Data+Export+Tool+DET" target="_blank">
+                                     CommCare Data Export Tool</a> for the export.</p>
+                                 {% endblocktrans %}
+                                 {% if not has_api_access %}
+                                 {% blocktrans %}
+                                  <p>The Data Export Tool requires API access, which is only available on the Pro Plan or higher.
+                                     Click <a href="{{ software_plan_url }}">here</a> to manage the software plan for your project.</p>
+                                {% endblocktrans %}
+                                {% endif %}'
+              ></span>
           </div>
+          {% if export_instance.type == 'form' %}
+            <div class="form-check"
+                 {% if not request|toggle_enabled:'SUPPORT' %}data-bind="visible: initiallyIncludeErrors"{% endif %}>
+              <input type="checkbox" class="form-check-input"
+                     id="include-errors-checkbox"
+                     data-bind="checked: include_errors" />
+              <label class="form-check-label" for="include-errors-checkbox">
+                {% trans "Include duplicates and other unprocessed forms" %}
+              </label>
+            </div>
+
+            <div id="split-multiselects-checkbox-div" class="form-check">
+              <input type="checkbox" class="form-check-input"
+                     id="split-multiselects-checkbox"
+                     data-bind="checked: split_multiselects" />
+              <label class="form-check-label" for="split-multiselects-checkbox">
+                {% trans "Expand Checkbox Questions" %}
+              </label>
+            </div>
+          {% endif %}
         </div>
         {% if request|request_has_privilege:"EXPORT_OWNERSHIP" %}
-          <div class="form-group"
+          <div class="mb-3"
                data-bind="css: { 'has-warning': hasOtherOwner && sharing() != initialSharing }">
-            <label for="sharing-select"
-                   class="col-sm-3 col-md-2 control-label">
+            <label for="sharing-select" class="form-label">
               {% trans "Sharing" %}
               <span data-bind="makeHqHelp: {description: getSharingHelpText}"></span>
             </label>
-            <div class="col-sm-9 col-md-8 col-lg-6">
-              <select class="form-control" id="sharing-select"
-                      data-bind="options: getSharingOptionValues(),
-                                 optionsText: getSharingOptionText,
-                                 value: sharing">
-              </select>
-              <div class="help-block"
-                   data-bind="visible: hasOtherOwner && sharing() != initialSharing">
-                <div data-bind="visible: sharing() == 'private'">
-                  {% blocktrans %}
-                    This export was created by <strong>{{ owner_name }}</strong>.
-                    If you change the sharing settings for this export you will lose the ability
-                    to view and edit the export.
-                    Only <strong>{{ owner_name }}</strong> will have access to it.
-                  {% endblocktrans %}
-                </div>
-                <div data-bind="visible: sharing() == 'export_only'">
-                  {% blocktrans %}
-                    This export was created by <strong>{{ owner_name }}</strong>.
-                    If you change the sharing settings for this export you will lose the ability
-                    to edit the export.
-                    Only <strong>{{ owner_name }}</strong> will be able to edit it.
-                  {% endblocktrans %}
-                </div>
+            <select class="form-control" id="sharing-select"
+                    data-bind="options: getSharingOptionValues(),
+                               optionsText: getSharingOptionText,
+                               value: sharing">
+            </select>
+            <div class="help-block"
+                 data-bind="visible: hasOtherOwner && sharing() != initialSharing">
+              <div data-bind="visible: sharing() == 'private'">
+                {% blocktrans %}
+                  This export was created by <strong>{{ owner_name }}</strong>.
+                  If you change the sharing settings for this export you will lose the ability
+                  to view and edit the export.
+                  Only <strong>{{ owner_name }}</strong> will have access to it.
+                {% endblocktrans %}
+              </div>
+              <div data-bind="visible: sharing() == 'export_only'">
+                {% blocktrans %}
+                  This export was created by <strong>{{ owner_name }}</strong>.
+                  If you change the sharing settings for this export you will lose the ability
+                  to edit the export.
+                  Only <strong>{{ owner_name }}</strong> will be able to edit it.
+                {% endblocktrans %}
               </div>
             </div>
           </div>
@@ -254,8 +236,8 @@
 
       {% if request|toggle_enabled:"ALLOW_USER_DEFINED_EXPORT_COLUMNS" %}
         <fieldset>
-          <div class="col-sm-10">
-            <button class="btn btn-default"
+          <div class="col-md-10">
+            <button class="btn btn-outline-primary"
                     data-bind="click: addUserDefinedTableConfiguration">
               {% trans "Add custom table configuration " %}
             </button>
@@ -264,92 +246,82 @@
       {% endif %}
 
       {% if allow_deid %}
-        <fieldset>
+        <fieldset class="mb-3">
           <legend>
             {% trans "Privacy Settings" %}
           </legend>
-          <div class="form-group">
-            <label for="is_safe"
-                   class="col-sm-3 col-md-2 control-label"></label>
-            <div class="col-sm-9 col-md-8 col-lg-6 deid-column">
-              <div data-bind="visible: isDeidColumnVisible()">
-                <div class="checkbox">
-                  <label>
-                    <input type="checkbox"
-                           id="is_deidentified"
-                           data-bind="checked: is_deidentified" />
-                    {% trans "Publish as De-Identified" %}
-                  </label>
-                </div>
-                <span class="help-inline">
-                  {% trans "Check only if this export has been fully and safely de-identified." %}
-                </span>
-              </div>
-              <button class="btn btn-default"
-                      data-bind="visible: !isDeidColumnVisible() && !{{ is_all_case_types_export|JSON }},
-                                 click: showDeidColumn">
-                {% trans "Allow me to mark sensitive data" %}
-              </button>
+          <div class="mb-3" data-bind="visible: isDeidColumnVisible()">
+            <div class="form-check">
+              <input type="checkbox" class="form-check-input"
+                     id="is_deidentified"
+                     data-bind="checked: is_deidentified" />
+              <label class="form-check-label" for="is_deidentified">
+                {% trans "Publish as De-Identified" %}
+              </label>
             </div>
+            <span class="help-inline">
+              {% trans "Check only if this export has been fully and safely de-identified." %}
+            </span>
           </div>
+          <button class="btn btn-outline-primary"
+                  data-bind="visible: !isDeidColumnVisible() && !{{ is_all_case_types_export|JSON }},
+                             click: showDeidColumn">
+            {% trans "Allow me to mark sensitive data" %}
+          </button>
         </fieldset>
       {% endif %}
-      <div class="form-actions">
-        <div class="col-sm-offset-4 col-md-offset-3 col-lg-offset-2 col-sm-8 col-md-9 col-lg-10 controls">
-          {% if can_edit %}
-            <button type="submit"
-                    class="btn btn-lg btn-primary"
-                    data-bind="click: save,
-                               disable: saveStateSaving() || saveStateSuccess() || !isValid()">
-              <span data-bind="visible: saveStateReady(),
-                               text: getSaveText()"></span>
-              <span data-bind="visible: saveStateSaving()">
-                <i class="fa fa-refresh fa-spin"></i>
-                {% trans "Saving" %}
-              </span>
-              <span data-bind="visible: saveStateError()">
-                {% trans "Try Again" %}
-              </span>
-              <span data-bind="visible: saveStateSuccess()">
-                {% trans "Saved!" %}
-              </span>
-            </button>
-          {% endif %}
-          <a class="btn btn-default btn-lg" href="{{ export_home_url }}">
-            {% if can_edit %}
-              {% trans "Cancel" %}
-            {% else %}
-              {% trans "Back" %}
-            {% endif %}
-          </a>
-          {% if export_instance.get_id and can_edit %}
-            <a class="btn btn-lg btn-default pull-right"
-               href="{% url 'copy_export' domain export_instance.get_id %}?next={{ export_home_url }}">
-              <i class="fa fa-copy fa-white"></i>
-              {% trans "Copy this Export" %}
-            </a>
-          {% endif %}
-
-          {% if export_instance.is_odata_config %}
-            <div style="display: inline-block"
-                 data-bind="if: hasDuplicateColumnLabels">
-              <div class="alert alert-danger">
-                {% blocktrans %}
-                  Column labels must be unique. '<span data-bind="text: duplicateLabel"></span>'
-                  has been used more than once.
-                {% endblocktrans %}
-              </div>
-            </div>
-          {% endif %}
+      {% if can_edit %}
+        <button type="submit"
+                class="btn btn-lg btn-primary"
+                data-bind="click: save,
+                           disable: saveStateSaving() || saveStateSuccess() || !isValid()">
+          <span data-bind="visible: saveStateReady(),
+                           text: getSaveText()"></span>
+          <span data-bind="visible: saveStateSaving()">
+            <i class="fa fa-refresh fa-spin"></i>
+            {% trans "Saving" %}
+          </span>
+          <span data-bind="visible: saveStateError()">
+            {% trans "Try Again" %}
+          </span>
+          <span data-bind="visible: saveStateSuccess()">
+            {% trans "Saved!" %}
+          </span>
+        </button>
+      {% endif %}
+      <a class="btn btn-outline-primary btn-lg" href="{{ export_home_url }}">
+        {% if can_edit %}
+          {% trans "Cancel" %}
+        {% else %}
+          {% trans "Back" %}
+        {% endif %}
+      </a>
+      {% if export_instance.get_id and can_edit %}
+        <a class="btn btn-lg btn-outline-primary float-end"
+           href="{% url 'copy_export' domain export_instance.get_id %}?next={{ export_home_url }}">
+          <i class="fa fa-copy fa-white"></i>
+          {% trans "Copy this Export" %}
+        </a>
+      {% endif %}
 
-          <div class="text-danger"
-               data-bind="if: !isValid(){% if export_instance.is_odata_config %} && !hasDuplicateColumnLabels(){% endif %}">
-            {% trans "There are errors with your configuration. Please fix them before creating the export." %}
+      {% if export_instance.is_odata_config %}
+        <div class="d-inline-block"
+             data-bind="if: hasDuplicateColumnLabels">
+          <div class="alert alert-danger">
+            {% blocktrans %}
+              Column labels must be unique. '<span data-bind="text: duplicateLabel"></span>'
+              has been used more than once.
+            {% endblocktrans %}
           </div>
         </div>
-        {% include "export/dialogs/process_deleted_questions.html" %}
-        {% include "export/dialogs/process_deprecated_properties.html" %}
+      {% endif %}
+
+      <div class="text-danger"
+           data-bind="if: !isValid(){% if export_instance.is_odata_config %} && !hasDuplicateColumnLabels(){% endif %}">
+        {% trans "There are errors with your configuration. Please fix them before creating the export." %}
       </div>
+    {% include "export/dialogs/process_deleted_questions.html" %}
+    {% include "export/dialogs/process_deprecated_properties.html" %}
     </form>
   </div>
   {% include "export/partials/new_customize_export_templates.html" %}
diff --git a/corehq/apps/export/templates/export/datasource_export_view.html b/corehq/apps/export/templates/export/datasource_export_view.html
index 8f1505b593e2..167552de8281 100644
--- a/corehq/apps/export/templates/export/datasource_export_view.html
+++ b/corehq/apps/export/templates/export/datasource_export_view.html
@@ -1,10 +1,10 @@
-{%  extends 'hqwebapp/bootstrap3/base_section.html' %}
+{%  extends 'hqwebapp/bootstrap5/base_section.html' %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load compress %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'export/js/datasource_export' %}
+{% requirejs_main_b5 'export/js/datasource_export' %}
 
 {% block page_title %}
 {% trans "Export Data Source Data" %}
@@ -13,13 +13,13 @@
 {% block page_content %}
   <p>
     {% blocktrans %}
-    Generate a query file for the Data Export Tool from any of the project's data sources.
+      Generate a query file for the Data Export Tool from any of the project's data sources.
     {% endblocktrans %}
   </p>
   <div id="datasources_export_id" class="form form-horizontal">
     <div data-bind='hidden: haveDatasources'>
       {% blocktrans %}
-      The project has no data sources configured.
+        The project has no data sources configured.
       {% endblocktrans %}
     </div>
     {% crispy form %}
diff --git a/corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html b/corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
index 38fb26f79638..51d476a87288 100644
--- a/corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+++ b/corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
@@ -3,8 +3,7 @@
 <div data-bind="attr: {id: 'bulk-delete-export-modal'}" class="modal fade">
   <div class="modal-dialog">
     <div class="modal-content">
-      <div class="modal-header" style="color:black;">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+      <div class="modal-header">
         <h4 class="modal-title">
           <!-- ko if: isOData || isFeed -->
             <!-- ko if: isMultiple -->
@@ -27,8 +26,9 @@ <h4 class="modal-title">
             <!-- /ko -->
           <!-- /ko -->
         </h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
       </div>
-      <div class="modal-body" style="color:black;">
+      <div class="modal-body">
         <p>
           <!-- ko if: isOData || isFeed -->
             <!-- ko if: isMultiple -->
@@ -61,7 +61,7 @@ <h4 class="modal-title">
         </p>
       </div>
       <div class="modal-footer">
-        <button class="btn btn-danger" data-bind="click: BulkExportDelete" data-dismiss="modal">
+        <button class="btn btn-outline-danger" data-bind="click: BulkExportDelete" data-bs-dismiss="modal">
           <i class="fa fa-remove"></i>
           <!-- ko if: isOData || isFeed -->
             <!-- ko if: isMultiple -->
@@ -84,7 +84,7 @@ <h4 class="modal-title">
             <!-- /ko -->
           <!-- /ko -->
         </button>
-        <a href="#" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</a>
+        <a href="#" class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "Cancel" %}</a>
       </div>
     </div>
   </div>
diff --git a/corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html b/corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
index fe9da02ae71a..61b6cd75367d 100644
--- a/corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+++ b/corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
@@ -4,7 +4,6 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <h4 class="modal-title">
           <!-- ko if: isOData() -->
             {% blocktrans %}
@@ -17,6 +16,7 @@ <h4 class="modal-title">
             {% endblocktrans %}
           <!-- /ko -->
         </h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
       </div>
       <form name="drop_report" data-bind="attr: {action: deleteUrl}" method="post">
         {% csrf_token %}
@@ -35,12 +35,12 @@ <h4 class="modal-title">
           </p>
         </div>
         <div class="modal-footer">
-          <button class="btn btn-danger"
+          <button class="btn btn-outline-danger"
                   data-bind="click: deleteExport">
             <i class="fa fa-remove"></i>
             {% trans "Delete" %}
           </button>
-          <a href="#" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</a>
+          <a href="#" class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "Cancel" %}</a>
         </div>
       </form>
     </div>
diff --git a/corehq/apps/export/templates/export/dialogs/process_deleted_questions.html b/corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
index 052618f352c7..d3a7f3a01a84 100644
--- a/corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+++ b/corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
@@ -4,9 +4,6 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
         <h4 class="modal-title">
           {% if export_instance.type == 'form' %}
             {% trans "Show Deleted Questions" %}
@@ -14,6 +11,7 @@ <h4 class="modal-title">
             {% trans "Show Deleted Properties" %}
           {% endif %}
         </h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
       </div>
       <div class="modal-body">
         <p>
@@ -34,8 +32,8 @@ <h4 class="modal-title">
           {% trans "Unable to process applications. Please report an issue if this persists" %}
         </p>
         <div class="spacer"></div>
-        <div class="progress " data-bind="visible: showBuildSchemaProgressBar">
-          <div class="progress-bar" role="progressbar" data-bind="
+        <div class="progress" role="progressbar" data-bind="visible: showBuildSchemaProgressBar">
+          <div class="progress-bar" data-bind="
               style: {
                   width: buildSchemaProgress() + '%'
               }
@@ -43,7 +41,7 @@ <h4 class="modal-title">
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "Close" %}</button>
         <button type="button" class="btn btn-primary" data-bind="
             click: onBeginSchemaBuild,
             text: schemaProgressText
diff --git a/corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html b/corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
index eb1113560d4b..96ff213304ab 100644
--- a/corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+++ b/corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
@@ -4,12 +4,10 @@
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
         <h4 class="modal-title">
           {% trans "Show Deprecated Properties" %}
         </h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
       </div>
       <div class="modal-body">
         <p>
@@ -21,7 +19,7 @@ <h4 class="modal-title">
         <div class="spacer"></div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
+        <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">{% trans "Close" %}</button>
         <button type="button" class="btn btn-primary" data-bind="
             click: onLoadAllProperties,
             ">
diff --git a/corehq/apps/export/templates/export/download_data_files.html b/corehq/apps/export/templates/export/download_data_files.html
index d136dec339b8..11a11d900aa4 100644
--- a/corehq/apps/export/templates/export/download_data_files.html
+++ b/corehq/apps/export/templates/export/download_data_files.html
@@ -1,4 +1,4 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load compress %}
@@ -6,7 +6,7 @@
 {% block title %}{% trans "Download Files" %}{% endblock %}
 
 
-{% requirejs_main 'export/js/download_data_files' %}
+{% requirejs_main_b5 'export/js/download_data_files' %}
 
 
 {% block page_content %}
@@ -17,7 +17,7 @@ <h2>{% trans "Download Files" %}</h2>
 
     {% if data_files %}
       <div class="row">
-        <div class="col-sm-9 col-md-8 col-lg-8">
+        <div class="col-md-9 col-lg-8 col-xl-8">
           <table class="table table-hover">
             {% for data_file in data_files %}
               <tr id="row_{{ data_file.id }}">
@@ -29,12 +29,12 @@ <h2>{% trans "Download Files" %}</h2>
                 </td>
                 <td>
                   {{ data_file.description }}
-                  <textarea id="url_{{ data_file.id }}" style="display: none">{{ url_base }}{% url 'download_data_file' domain data_file.id data_file.filename %}</textarea>
+                  <textarea id="url_{{ data_file.id }}" class="d-none">{{ url_base }}{% url 'download_data_file' domain data_file.id data_file.filename %}</textarea>
                 </td>
                 <td>
                   {% trans "Available until" %}: {{ data_file.delete_after|to_user_time:request }}
                 </td>
-                <td style="width: 6em; text-align: right;">
+                <td class="text-end" style="width: 6em;">
                   <a href="#"
                      class="copy-data-file"
                      data-id={{ data_file.id }}
@@ -69,47 +69,42 @@ <h2>{% trans "Download Files" %}</h2>
     {% if is_admin %}
       <div class="spacer"></div>
       <div class="row">
-        <div class="col-sm-9 col-md-8 col-lg-8">
+        <div class="col-md-9 col-lg-8 col-xl-8">
           <form action="#" method="POST" enctype="multipart/form-data" class="form form-horizontal">
             {% csrf_token %}
             <fieldset>
               <legend>{% trans "Upload file for transfer" %}</legend>
 
-              <div class="form-group">
-                <label class="control-label col-md-2 requiredField">
+              <div class="mb-3">
+                <label class="form-label requiredField">
                   {% trans "Description" %}<span class="asteriskField">*</span>
                 </label>
-                <div class="controls col-md-6">
-                  <input class="textinput textInput form-control"
-                         name="description"
-                         required=""
-                         type="text" />
-                </div>
+                <input class="form-control"
+                       name="description"
+                       required=""
+                       type="text" />
               </div>
 
-              <div class="form-group">
-                <label class="control-label col-md-2 requiredField">
+              <div class="mb-3">
+                <label class="requiredField form-label">
                   {% trans "File" %}<span class="asteriskField">*</span>
                 </label>
-                <div class="controls col-md-6">
-                  <input name="file"
-                         required=""
-                         type="file" />
-                </div>
+                <input name="file"
+                       class="form-control"
+                       required=""
+                       type="file" />
               </div>
 
-              <div class="form-group">
-                <label class="control-label col-md-2 requiredField">
+              <div class="mb-3">
+                <label class="form-label requiredField">
                   {% trans "Delete after" %}<span class="asteriskField">*</span>
                 </label>
-                <div class="controls col-md-6">
-                  <select name="ttl" class="form-control">
-                    <option value="12">{% trans "12 hours" %}</option>
-                    <option selected="selected" value="24">{% trans "1 day" %}</option>
-                    <option value="48">{% trans "2 days" %}</option>
-                    <option value="72">{% trans "3 days" %}</option>
-                  </select>
-                </div>
+                <select name="ttl" class="form-select">
+                  <option value="12">{% trans "12 hours" %}</option>
+                  <option selected="selected" value="24">{% trans "1 day" %}</option>
+                  <option value="48">{% trans "2 days" %}</option>
+                  <option value="72">{% trans "3 days" %}</option>
+                </select>
               </div>
 
             </fieldset>
diff --git a/corehq/apps/export/templates/export/download_export.html b/corehq/apps/export/templates/export/download_export.html
index a9f968f38e24..3345472240d8 100644
--- a/corehq/apps/export/templates/export/download_export.html
+++ b/corehq/apps/export/templates/export/download_export.html
@@ -1,40 +1,10 @@
-{% extends 'hqwebapp/bootstrap3/base_section.html' %}
+{% extends 'hqwebapp/bootstrap5/base_section.html' %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% block stylesheets %}
-  <style type="text/css">
-    .form-notice-container {
-      position: relative;
-    }
-    .form-notice {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background-color: rgba(255, 255, 255, 0.6);
-      /*The z-index is set to cover date input text-box with class .input-group .form-control */
-      /*Its z-index is set to 2 by bootstrap, so making this 3 */
-      z-index: 3;
-
-    }
-    .form-notice .label {
-      display: block;
-    }
-    .progress-exports {
-      margin-bottom: 2px;
-      margin-top: 6px;
-    }
-    .form-actions-exports {
-      margin-bottom: 30px;
-    }
-  </style>
-{% endblock stylesheets %}
-
-{% requirejs_main 'export/js/download_export' %}
+{% requirejs_main_b5 'export/js/download_export' %}
 
 {% block page_title %}
   {{ current_page.title }}
diff --git a/corehq/apps/export/templates/export/export_list.html b/corehq/apps/export/templates/export/export_list.html
index 70e69cbbd3a6..77ae7a6b78dc 100644
--- a/corehq/apps/export/templates/export/export_list.html
+++ b/corehq/apps/export/templates/export/export_list.html
@@ -1,10 +1,10 @@
-{%  extends 'hqwebapp/bootstrap3/base_section.html' %}
+{%  extends 'hqwebapp/bootstrap5/base_section.html' %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% requirejs_main 'export/js/export_list_main' %}
+{% requirejs_main_b5 'export/js/export_list_main' %}
 
 {% block page_title %}
   {{ current_page.title }}
@@ -35,7 +35,7 @@
   <p>{{ lead_text }}</p>
 
   {% if is_odata %}
-    <div class="pull-right">
+    <div class="float-end">
       <feedback params="featureName: '{% trans_html_attr 'PowerBI / Tableau Integration' %}'"></feedback>
     </div>
   {% endif %}
diff --git a/corehq/apps/export/templates/export/partials/delete_bulk_notice.html b/corehq/apps/export/templates/export/partials/delete_bulk_notice.html
index 098c0179a2e0..9f7e33113458 100644
--- a/corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+++ b/corehq/apps/export/templates/export/partials/delete_bulk_notice.html
@@ -1,31 +1,27 @@
 {% load i18n %}
-<div data-bind="visible: bulkExportDownloadCount()">
-  <div class="pull-right" data-toggle="tooltip-bulkDelete" data-placement="top">
-    <input name="delete_list" type="hidden"/>
-    <p style="float:right">
-      <a class="btn btn-danger btn-primary"
-         data-toggle="modal"
-         data-bind="attr: {
-                      href: '#bulk-delete-export-modal'
-                    }">
-        <!-- ko if: isOData || isFeed -->
-          <!-- ko if: isMultiple -->
-            {% trans "Delete Selected Feeds" %}
-          <!-- /ko -->
-          <!-- ko if: !isMultiple() -->
-            {% trans "Delete Selected Feed" %}
-          <!-- /ko -->
-        <!-- /ko -->
-        <!-- ko if: !isOData && !isFeed -->
-          <!-- ko if: isMultiple -->
-            {% trans "Delete Selected Exports" %}
-          <!-- /ko -->
-          <!-- ko if: !isMultiple() -->
-            {% trans "Delete Selected Export" %}
-          <!-- /ko -->
-        <!-- /ko -->
-      </a>
-      {% include "export/dialogs/bulk_delete_custom_export_dialog.html" %}
-    </p>
-  </div>
-</div>
+<span data-bind="visible: bulkExportDownloadCount()">
+  <input name="delete_list" type="hidden"/>
+  <a class="btn btn-outline-danger float-end"
+     data-bs-toggle="modal"
+     data-bind="attr: {
+                  href: '#bulk-delete-export-modal'
+                }">
+    <!-- ko if: isOData || isFeed -->
+      <!-- ko if: isMultiple -->
+        {% trans "Delete Selected Feeds" %}
+      <!-- /ko -->
+      <!-- ko if: !isMultiple() -->
+        {% trans "Delete Selected Feed" %}
+      <!-- /ko -->
+    <!-- /ko -->
+    <!-- ko if: !isOData && !isFeed -->
+      <!-- ko if: isMultiple -->
+        {% trans "Delete Selected Exports" %}
+      <!-- /ko -->
+      <!-- ko if: !isMultiple() -->
+        {% trans "Delete Selected Export" %}
+      <!-- /ko -->
+    <!-- /ko -->
+  </a>
+  {% include "export/dialogs/bulk_delete_custom_export_dialog.html" %}
+</span>
diff --git a/corehq/apps/export/templates/export/partials/export_bulk_notice.html b/corehq/apps/export/templates/export/partials/export_bulk_notice.html
index 8ba87d2999ec..f806de9cf125 100644
--- a/corehq/apps/export/templates/export/partials/export_bulk_notice.html
+++ b/corehq/apps/export/templates/export/partials/export_bulk_notice.html
@@ -1,24 +1,19 @@
 {% load i18n %}
-<div data-bind="visible: bulkExportDownloadCount()"
-     style="float:right; margin-left:8px; margin-bottom:8px">
-  <form class="form form-inline" method="post"
+<span class="d-inline-block ms-2 float-end" data-bind="visible: bulkExportDownloadCount()">
+  <form class="form d-inline" method="post"
         data-bind="submit: submitBulkExportDownload"
         action="{{ bulk_download_url }}">
     {% csrf_token %}
-    <div style="min-width:110px;" data-toggle="tooltip-bulkExport" data-container=".tooltip-bulk-export" data-placement="top">
-      <input name="export_list" type="hidden" data-bind="value: bulkExportList" />
-      <button type="submit"
-              class="btn btn-primary tooltip-bulk-export"
-              style="width: 100%;">
-        {% trans 'Bulk Export' %}
-        (<!-- ko text: bulkExportDownloadCount() --><!-- /ko -->)
-      </button>
-    </div>
+    <input name="export_list" type="hidden" data-bind="value: bulkExportList" />
+    <button type="submit"
+            class="btn btn-primary">
+      {% trans 'Bulk Export' %}
+      (<!-- ko text: bulkExportDownloadCount() --><!-- /ko -->)
+    </button>
+    <span class="hq-help-template"
+          data-title="{% trans "Bulk Export" %}"
+          data-content="{% trans "All of the selected exports will be collected for download to a single Excel file, with each export as a separate sheet." %}"
+          data-placement="left"
+    ></span>
   </form>
-</div>
-
-<style>
-.tooltip-bulk-export .tooltip .tooltip-inner {
-  margin-right: 10px;
-}
-</style>
+</span>
diff --git a/corehq/apps/export/templates/export/partials/export_download_prepare.html b/corehq/apps/export/templates/export/partials/export_download_prepare.html
index 9aeff0f6ad13..c7343374ec58 100644
--- a/corehq/apps/export/templates/export/partials/export_download_prepare.html
+++ b/corehq/apps/export/templates/export/partials/export_download_prepare.html
@@ -2,19 +2,19 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-<form class="form form-horizontal form-notice-container" name="exportFiltersForm" data-bind="submit: prepareExport">
-  <div class="form-notice-container">
+<form class="form form-horizontal" name="exportFiltersForm" data-bind="submit: prepareExport">
+  <div class="position-relative">
     {% if dynamic_filters %}
-      <div class="form-group"
-           data-bind="allowDescendantBindings: false"> {# IMPORTANT: needed because some of the dynamic_filters have their own ko bindings #}
+      <div class="mb-3" data-bind="allowDescendantBindings: false"> {# IMPORTANT: needed because some of the dynamic_filters have their own ko bindings #}
         {{ dynamic_filters }}
       </div>
     {% endif %}
     {% crispy download_export_form %}
-    <div class="form-notice" data-bind="visible: downloadInProgress()">
+    <div class="form-notice position-absolute top-0 start-0 bottom-0 end-0 opacity-75 bg-white"
+         data-bind="visible: downloadInProgress()">
       <div class="row">
-        <div class="col-sm-9 col-lg-5 col-sm-offset-3">
-          <div class="label label-default label-lg">
+        <div class="col-md-9 col-xl-5">
+          <div class="badge text-bg-secondary label-lg bg-secondary">
             <i class="fa fa-info-circle"></i>
             {% trans "Filters inactive while download in progress. " %}
           </div>
@@ -22,14 +22,14 @@
       </div>
     </div>
   </div>
-  <div class="form-actions form-actions-exports" data-bind="visible: !downloadInProgress()">
-    <div class="col-sm-9 col-sm-offset-3">
+  <div data-bind="visible: !downloadInProgress()">
+    <div class="col-md-9">
       <div class="alert alert-warning" data-bind="visible: prepareExportError()">
         <i class="fa-solid fa-triangle-exclamation"></i>
         <span data-bind="text: prepareExportError"></span>
       </div>
       <div class="row">
-        <div class="col-xs-6 col-sm-4 col-md-3">
+        <div class="col-sm-6 col-md-4 col-lg-3">
           <button type="submit" class="btn btn-primary btn-full-width" data-bind="disable: disablePrepareExport">
             <i data-bind="visible: !preparingExport()" class="fa-solid fa-cloud-arrow-down"></i>
             <span data-bind="visible: !preparingExport()">{% trans "Prepare Export" %}</span>
@@ -38,8 +38,8 @@
             <span data-bind="visible: preparingExport()">{% trans "Preparing Export" %}</span>
           </button>
         </div>
-        <div class="col-xs-6 col-sm-4 col-md-3" data-bind="visible: hasMultimedia">
-          <button type="button" class="btn btn-default btn-full-width"
+        <div class="col-sm-6 col-md-4 col-lg-3" data-bind="visible: hasMultimedia">
+          <button type="button" class="btn btn-outline-primary btn-full-width"
                   data-bind="
                                 click: prepareMultimediaExport,
                                 disable: disablePrepareMultimediaExport,
diff --git a/corehq/apps/export/templates/export/partials/export_download_progress.html b/corehq/apps/export/templates/export/partials/export_download_progress.html
index c194098df860..a843845b4cbd 100644
--- a/corehq/apps/export/templates/export/partials/export_download_progress.html
+++ b/corehq/apps/export/templates/export/partials/export_download_progress.html
@@ -3,10 +3,10 @@
 {% load hq_shared_tags %}
 
 <div id="download-progress" class="ko-template">
-  <div class="form-actions form-actions-exports" data-bind="visible: showDownloadStatus">
-    <div class="col-sm-9 col-sm-offset-3">
+  <div data-bind="visible: showDownloadStatus">
+    <div class="col-md-9">
       <div class="row" data-bind="visible: showError">
-        <div class="col-sm-12">
+        <div class="col-md-12">
           <div data-bind="css: {'alert-warning': celeryError(), 'alert-danger': downloadError()}" class="alert">
             <i class="fa fa-spin"></i>
             <strong data-bind="visible: celeryError, text: celeryError"></strong>
@@ -14,15 +14,15 @@
             <p>
               {% blocktrans %}
                 If the problem persists, please
-                <a href="#modalReportIssue" data-toggle="modal"> Report an Issue</a>.
+                <a href="#modalReportIssue" data-bs-toggle="modal"> Report an Issue</a>.
               {% endblocktrans %}
             </p>
           </div>
         </div>
       </div>
       <div class="row" data-bind="visible: !showError()">
-        <div class="col-xs-6 col-sm-4 col-md-3">
-          <form class="form-inline download-form" method="POST" data-bind="attr: {action: dropboxUrl}">
+        <div class="col-sm-6 col-md-4 col-lg-3">
+          <form class="download-form" method="POST" data-bind="attr: {action: dropboxUrl}">
             {% csrf_token %}
             <a data-bind="attr: {href: downloadUrl}, visible: isDownloadReady(), click: clickDownload"
                class="btn btn-primary btn-full-width">
@@ -30,19 +30,19 @@
               <span data-bind="visible: !isMultimediaDownload()">{% trans "Download" %}</span>
               <span data-bind="visible: isMultimediaDownload()">{% trans "Download Multimedia" %}</span>
             </a>
-            <button type="button" class="btn btn-default btn-disabled btn-full-width"
+            <button type="button" class="btn btn-outline-primary btn-disabled btn-full-width"
                     data-bind="visible: !isDownloadReady()" disabled="disabled">
               <i class="fa-spin fa fa-spinner"></i>
               <span data-bind="visible: !isMultimediaDownload()">{% trans "Collecting Data" %}</span>
               <span data-bind="visible: isMultimediaDownload()">{% trans "Collecting Multimedia" %}</span>
             </button>
-            <button type="button" style="margin-top: 5px;" class="btn btn-full-width"
+            <button type="button" class="btn btn-full-width mt-1"
                     title="{% trans 'For exports that may take a while to prepare, email a link when download is ready' %}"
                     data-bind="
                                     visible: downloadId() && !isDownloadReady(),
                                     disable: sendEmailFlag,
                                     click: sendEmailUponCompletion,
-                                    css: {'btn-default': sendEmailFlag(), 'btn-primary': !sendEmailFlag()},
+                                    css: {'btn-outline-primary': sendEmailFlag(), 'btn-primary': !sendEmailFlag()},
                                 ">
               <i class="fa fa-envelope"></i>
               {% trans "Email me when ready" %}
@@ -50,25 +50,22 @@
             </button>
           </form>
         </div>
-        <div class="col-xs-6 col-md-4" data-bind="visible: !isDownloaded() && !showError()">
-          <div class="progress progress-exports">
+        <div class="col-sm-6 col-lg-4" data-bind="visible: !isDownloaded() && !showError()">
+          <div class="progress progress-exports mb-1 mt-2" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100">
             <div id="download-progress-bar" class="progress-bar"
-                 role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"
-                 data-bind="css: {'progress-bar-success': isDownloadReady}, style: {width: progress() + '%'}">
-                            <span class="sr-only">
-                                <span data-bind="text: progress"></span>%
-                                {% trans 'Complete' %}
-                            </span>
+                 data-bind="css: {'bg-success': isDownloadReady}, style: {width: progress() + '%'}">
+              <!-- ko text: progress --><!-- /ko -->%
+              {% trans 'Complete' %}
             </div>
           </div>
-          <div class="label label-danger label-lg" data-bind="visible: progressError">
+          <div class="badge text-bg-danger label-lg" data-bind="visible: progressError">
             <i class="fa-solid fa-triangle-exclamation"></i>
             <strong>{% trans "Something went wrong!" %}</strong>
             <span data-bind="text: progressError"></span>
           </div>
         </div>
-        <div class="col-sm-9 col-md-8" data-bind="visible: isDownloaded">
-          <button type="button" class="btn btn-default" data-bind="click: resetDownload">
+        <div class="col-md-9 col-lg-8" data-bind="visible: isDownloaded">
+          <button type="button" class="btn btn-outline-primary" data-bind="click: resetDownload">
             {% trans "Update Filters" %}
           </button>
         </div>
diff --git a/corehq/apps/export/templates/export/partials/export_list_controller.html b/corehq/apps/export/templates/export/partials/export_list_controller.html
index 3afad8e054f9..3c4f6d0af7b3 100644
--- a/corehq/apps/export/templates/export/partials/export_list_controller.html
+++ b/corehq/apps/export/templates/export/partials/export_list_controller.html
@@ -4,7 +4,7 @@
 {% load humanize %}
 
 {% if request|toggle_enabled:"PAGINATED_EXPORTS" %}
-  <div class="alert alert-info">
+  <div class="help-block">
     {% blocktrans with max_rows=max_normal_export_size|intcomma %}
       These exports are paginated. That means exports that have over {{ max_rows }} rows will be split into multiple files.
     {% endblocktrans %}
@@ -22,7 +22,7 @@
 {% if has_edit_permissions %}
   <div id="create-export" class="ko-template">
     <p>
-      <a href="{{ create_url }}" data-toggle="modal" class="btn btn-primary">
+      <a href="{{ create_url }}" data-bs-toggle="modal" class="btn btn-primary">
         <i class="fa fa-plus"></i>
         {% blocktrans %}
           Add {{ export_type_caps }}
@@ -38,7 +38,7 @@
 {% endif %}
 
 <div id="export-list" class="ko-template">
-  <div class="container-fluid" style="padding-left: 0; padding-right: 0">
+  <div class="mt-n3 clearfix" data-bind="visible: bulkExportDownloadCount()">
     {% if allow_bulk_export %} {# form exports only #}
       {% include 'export/partials/export_bulk_notice.html' %}
     {% endif %}
@@ -46,10 +46,10 @@
       {% include 'export/partials/delete_bulk_notice.html' %}
     {% endif %}
   </div>
-  <div data-bind="foreach: panels" style="display: inline">
-    <div class="panel panel-default">
-      <div class="panel-heading" data-bind="text: header"></div>
-      <div class="panel-body">
+  <div data-bind="foreach: panels">
+    <div class="card mt-3">
+      <div class="card-header" data-bind="text: header"></div>
+      <div class="card-body">
         {% include 'export/partials/loading_exports.html' %}
         {% include 'export/partials/table.html' %}
         <pagination data-apply-bindings="false"
diff --git a/corehq/apps/export/templates/export/partials/export_list_create_export_modal.html b/corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
index 692e8910cbe6..852032a76a2e 100644
--- a/corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+++ b/corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
@@ -7,10 +7,8 @@
     <form name="exportOptionsForm" class="form form-horizontal" data-bind="submit: handleSubmitForm">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{% trans 'Close' %}</span>
-          </button>
           <h4 class="modal-title">{{ create_export_form_title }}</h4>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
         </div>
         <div class="modal-body" data-bind="visible: !isLoaded()">
           <i class="fa fa-spinner fa-spin"></i> {% trans 'Loading Form' %}
@@ -20,7 +18,7 @@ <h4 class="modal-title">{{ create_export_form_title }}</h4>
             <i class="fa-solid fa-triangle-exclamation"></i>
             <strong data-bind="text: drilldownSubmissionError"></strong>
             <p>
-              {% blocktrans %}If this problem persists, please <a href="#modalReportIssue" data-toggle="modal">Report an Issue</a>.{% endblocktrans %}
+              {% blocktrans %}If this problem persists, please <a href="#modalReportIssue" data-bs-toggle="modal">Report an Issue</a>.{% endblocktrans %}
             </p>
           </div>
           {% crispy create_export_form %}
@@ -38,22 +36,27 @@ <h4 class="modal-title">{{ create_export_form_title }}</h4>
             <i class="fa-solid fa-triangle-exclamation"></i>
             {% trans "Mislabeled" %}
           </div>
-          <div class="well" data-bind="visible: showSuggestions">
-            <h4>{% trans "Suggestions" %}</h4>
-            <div data-bind="visible: showAppDoesNotExist">
-              {% trans "These form submissions are tagged as if they belong to an application that doesn't exist." %}
-            </div>
-            <div data-bind="visible: showDuplicate">
-              <p>{% trans "These submissions could belong to one of the following forms:" %}</p>
-              <ul data-bind="foreach: duplicatePossibilities">
-                <ul>
-                  <span data-bind="text: app.name"></span> &gt;
-                  <span data-bind="text: $root.selectedFormName"></span>
-                  <span data-bind="visible: app_deleted">
-                                        {% trans "App was deleted." %}
-                                    </span>
-                  </li>
-                </ul>
+          <div class="card" data-bind="visible: showSuggestions">
+            <div class="card-body">
+              <h5 class="card-title">{% trans "Suggestions" %}</h5>
+              <div class="card-text">
+                <div data-bind="visible: showAppDoesNotExist">
+                  {% trans "These form submissions are tagged as if they belong to an application that doesn't exist." %}
+                </div>
+                <div data-bind="visible: showDuplicate">
+                  <p>{% trans "These submissions could belong to one of the following forms:" %}</p>
+                  <ul data-bind="foreach: duplicatePossibilities">
+                    <ul>
+                      <li>
+                        <span data-bind="text: app.name"></span> &gt;
+                        <span data-bind="text: $root.selectedFormName"></span>
+                        <span data-bind="visible: app_deleted">
+                          {% trans "App was deleted." %}
+                        </span>
+                      </li>
+                    </ul>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -79,7 +82,7 @@ <h4>{% trans "Suggestions" %}</h4>
           <p>
             {% blocktrans %}
               If this problem persists, please <a href="#modalReportIssue"
-                                                  data-toggle="modal">Report an Issue</a> and include this error
+                                                  data-bs-toggle="modal">Report an Issue</a> and include this error
               message in the description.
             {% endblocktrans %}
           </p>
@@ -99,8 +102,8 @@ <h4>{% trans "Suggestions" %}</h4>
         </div>
         <div class="modal-footer">
           <button type="button"
-                  class="btn btn-default"
-                  data-dismiss="modal"
+                  class="btn btn-outline-primary"
+                  data-bs-dismiss="modal"
                   data-bind="disabled: isSubmitting">{% trans 'Cancel' %}</button>
           <button type="submit"
                   class="btn btn-primary"
diff --git a/corehq/apps/export/templates/export/partials/feed_filter_modal.html b/corehq/apps/export/templates/export/partials/feed_filter_modal.html
index c35dac1686b6..5decbfb92195 100644
--- a/corehq/apps/export/templates/export/partials/feed_filter_modal.html
+++ b/corehq/apps/export/templates/export/partials/feed_filter_modal.html
@@ -7,10 +7,8 @@
     <form name="feedFiltersForm" class="form form-horizontal" data-bind="submit: commitFilters">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal">
-            <span aria-hidden="true">&times;</span><span class="sr-only">{% trans 'Close' %}</span>
-          </button>
           <h4 class="modal-title">{% trans "Filter Feed" %}</h4>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
         </div>
 
         <div class="modal-body" data-bind="validationOptions: {errorMessageClass: 'help-block'}">
@@ -33,13 +31,13 @@ <h4>
         </div>
 
         <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal" data-bind="disabled: isSubmittingForm">
+          <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal" data-bind="disabled: isSubmittingForm">
             {% trans 'Cancel' %}
           </button>
           <button type="submit" class="btn btn-primary" data-bind="visible: !isSubmittingForm(), disable: disableSubmit">
             {% trans "Save filters"%}
           </button>
-          <button class="btn btn-default" disabled data-bind="visible: isSubmittingForm()">
+          <button class="btn btn-outline-primary" disabled data-bind="visible: isSubmittingForm()">
             {% trans "Saving..." %}
           </button>
         </div>
diff --git a/corehq/apps/export/templates/export/partials/new_customize_export_templates.html b/corehq/apps/export/templates/export/partials/new_customize_export_templates.html
index 19723f019f4a..a5ffc2c99202 100644
--- a/corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+++ b/corehq/apps/export/templates/export/partials/new_customize_export_templates.html
@@ -14,15 +14,15 @@
         <span data-bind="text: table.label()" />
       </span>
       <span>
-        <span class="label label-warning"
+        <span class="badge text-bg-warning"
               data-bind="visible: table.is_deleted">
           {% trans "deleted" %}
         </span>
       </span>
 
       <!-- ko if: table.is_user_defined -->
-      <div class="remove-user-defined-table pull-right">
-        <button class="btn btn-danger btn-xs"
+      <div class="remove-user-defined-table float-end">
+        <button class="btn btn-outline-danger btn-sm"
                 data-bind="click: function() {
                              $parent.tables.remove(table)
                            }">
@@ -31,46 +31,39 @@
       </div>
       <!-- /ko -->
     </legend>
-    <div class="col-sm-12"
+    <div class="col-md-12"
          data-bind="slideVisible: table.selected">
       {% if not export_instance.is_odata_config %}
-        <div class="form-group">
-          <label class="col-sm-4 col-md-3 col-lg-2 control-label">
+        <div class="mb-3">
+          <label class="form-label">
             {% trans "Sheet Name" %}
           </label>
-          <div class="col-sm-9 col-md-8 col-lg-6">
-            <input type="text"
-                   class="form-control"
-                   data-bind="value: table.label" />
-          </div>
+          <input type="text"
+                 class="form-control"
+                 data-bind="value: table.label" />
         </div>
       {% endif %}
       <!-- ko if: table.is_user_defined -->
-      <div class="form-group">
-        <label class="col-sm-4 col-md-3 col-lg-2 control-label">
+      <div class="mb-3">
+        <label class="form-label">
           {% trans "Custom Path" %}
         </label>
-        <div class="col-sm-4 col-md-3 col-lg-2">
-          <input type="text"
-                 class="form-control"
-                 data-bind="value: table.customPathString" />
-        </div>
+        <input type="text"
+               class="form-control"
+               data-bind="value: table.customPathString" />
       </div>
       <!-- /ko -->
 
       {% if request|toggle_enabled:"SUPPORT_GEO_JSON_EXPORT" %}
-      <div id="select-geo-property" class="form-group" hidden>
-        <label class="col-sm-4 col-md-3 col-lg-2 control-label" for="geo-property-select">
+      <div id="select-geo-property" class="mb-3" hidden>
+        <label class="form-label" for="geo-property-select">
           {% trans 'Select geo property' %}
         </label>
-        <div class="col-sm-9 col-md-8 col-lg-6">
-          <select
-            id="geo-property-select"
-            class="control form-control"
-            data-bind="options: $parent.geoProperties,
-              value: table.selected_geo_property">
-          </select>
-        </div>
+        <select
+          id="geo-property-select"
+          class="control form-control"
+          data-bind="options: $parent.geoProperties, value: table.selected_geo_property">
+        </select>
       </div>
       {% endif %}
 
@@ -128,13 +121,13 @@ <h4>{{ terminology.choose_fields_label }}</h4>
              id="field-select">
         <thead>
           <tr class="nodrag nodrop">
-            <th class="col-sm-1">
+            <th class="col-md-1">
               {% trans "Include?" %}<br />
-              <a class="btn btn-xs btn-primary"
+              <a class="btn btn-sm btn-primary"
                  data-bind="click: table.selectAll">
                 {% trans "Select All" %}
               </a>
-              <a class="btn btn-xs btn-default"
+              <a class="btn btn-sm btn-outline-primary"
                  data-bind="click: table.selectNone">
                 {% trans "Select None" %}
               </a>
@@ -159,7 +152,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
 
               <!-- Advanced Button -->
               <button type="button"
-                      class="btn btn-default btn-xs"
+                      class="btn btn-outline-primary btn-sm"
                       data-bind="click: table.toggleShowAdvanced,
                                  css: {
                                    active: table.showAdvanced
@@ -173,7 +166,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
               </button>
 
               <!-- Deleted Button -->
-              <button class="btn btn-default btn-xs"
+              <button class="btn btn-outline-primary btn-sm"
                       data-bind="click: $root.toggleShowDeleted.bind($root),
                                  css: {
                                    active: table.showDeleted
@@ -198,7 +191,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
               <!-- Deprecated Button -->
               {% if show_deprecated_filter %}
                 <button type="button"
-                        class="btn btn-default btn-xs"
+                        class="btn btn-outline-primary btn-sm"
                         data-bind="click: table.toggleShowDeprecated,
                                   css: {
                                     active: table.showDeprecated
@@ -215,18 +208,18 @@ <h4>{{ terminology.choose_fields_label }}</h4>
             <th data-bind="attr: { 'class': $root.displayColumnClass }">
               {% trans "Display" %}<br />
               {% if export_instance.type == 'form' %}
-                <a class="btn btn-xs btn-default"
+                <a class="btn btn-sm btn-outline-primary"
                    data-bind="click: table.useLabels">
                   {% trans "Use question labels" %}
                 </a>
-                <a class="btn btn-xs btn-default"
+                <a class="btn btn-sm btn-outline-primary"
                    data-bind="click: table.useIds">
                   {% trans "Use question ids" %}
                 </a>
               {% endif %}
             </th>
             {% if export_instance.type == 'case' and request|feature_preview_enabled:"SPLIT_MULTISELECT_CASE_EXPORT"%}
-              <th class="col-sm-2">
+              <th class="col-md-2">
                 {% trans "Type" %}
                 <span data-bind="makeHqHelp: {
                                    name: '{% trans "Split multi-select data" %}',
@@ -235,7 +228,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
               </th>
             {% endif %}
             {% if allow_deid %}
-              <th class="col-sm-2 deid-column"
+              <th class="col-md-2 deid-column"
                   data-bind="visible: $root.isDeidColumnVisible()">
                 {% trans "Sensitivity" %}
               </th>
@@ -247,7 +240,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
           <tfoot>
             <tr>
               <td colspan="100%">
-                <button class="btn btn-default btn-sm"
+                <button class="btn btn-outline-primary btn-sm"
                         data-bind="click: table.addUserDefinedExportColumn">
                   {% trans "Add custom export property" %}
                 </button>
@@ -277,7 +270,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
                            success: column.selectedForSort,
                            'selected-for-sort': column.selectedForSort
                          }"
-              {% if request|request_has_privilege:"EXPORT_MULTISORT" %}style="cursor:pointer"{% endif %}>
+              {% if request|request_has_privilege:"EXPORT_MULTISORT" %}class="clickable"{% endif %}>
             <td class="text-center">
               <span class="sortable-handle">
                 <i class="fa-solid fa-up-down"></i>
@@ -286,13 +279,13 @@ <h4>{{ terminology.choose_fields_label }}</h4>
               <!--ko if: ($root.is_deidentified() && column.item.isCaseName()) -->
               <input type="checkbox"
                      class="field-include"
-                     disabled="disabled" />
+                     disabled="disabled" />aaa
               <!--/ko-->
               <!--ko if: $root.isReservedOdataColumn(column, $parentContext.$index()) -->
               <input type="checkbox"
                      class="field-include"
                      checked="checked"
-                     disabled="disabled" />
+                     disabled="disabled" />bbb
               <!--/ko-->
               <!--ko ifnot: ($root.is_deidentified() && column.item.isCaseName()) || $root.isReservedOdataColumn(column, $parentContext.$index()) -->
               <input type="checkbox"
@@ -300,8 +293,8 @@ <h4>{{ terminology.choose_fields_label }}</h4>
                      data-bind="checked: column.selected" />
               <!--/ko-->
               <!-- ko if: column.isEditable() -->
-              <div class="remove-user-defined-column pull-right">
-                <button class="btn btn-danger btn-xs"
+              <div class="remove-user-defined-column float-end">
+                <button class="btn btn-outline-danger btn-sm"
                         data-bind="click: function() {
                                      $parent.columns.remove(column)
                                    }">
@@ -313,14 +306,14 @@ <h4>{{ terminology.choose_fields_label }}</h4>
           {% if request|request_has_privilege:"EXPORT_MULTISORT" %}
             <td class="text-center">
               <span class="send-to-bottom">
-                <button class="btn btn-default btn-sm">
+                <button class="btn btn-outline-primary btn-sm">
                   <i class="fa fa-angle-double-down"></i>
                 </button>
               </span>
             </td>
             <td class="text-center">
               <span class="send-to-top">
-                <button class="btn btn-default btn-sm">
+                <button class="btn btn-outline-primary btn-sm">
                   <i class="fa fa-angle-double-up"></i>
                 </button>
               </span>
@@ -336,12 +329,12 @@ <h4>{{ terminology.choose_fields_label }}</h4>
               </span>
               <span
                 data-bind="text: column.item.case_property_group_name"
-                class="label label-default"
-                style="background-color: #495057"
+                class="badge text-bg-secondary"
               ></span>
               <!-- ko if: !column.isEditable() -->
-              <code data-toggle="tooltip"
+              <span data-bs-toggle="tooltip"
                     data-placement="top"
+                    class="font-monospace"
                     data-bind="text: column.formatProperty(),
                                attr: {
                                  'data-original-title': column.help_text,
@@ -350,7 +343,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
                                css: {
                                  'export-tooltip': column.translatedHelp(),
                                  'break-all-words': 1,
-                               }"></code>
+                               }"></span>
               <!-- /ko -->
               <!-- ko if: column.isEditable() -->
               <input type="text"
@@ -358,7 +351,7 @@ <h4>{{ terminology.choose_fields_label }}</h4>
                      data-bind="value: column.customPathString"/>
               <!-- /ko -->
               <!-- ko if: $root.isReservedOdataColumn(column, $parentContext.$index()) -->
-              <span class="label label-info">
+              <span class="badge text-bg-info">
                 {% trans "Required for OData" %}
               </span>
               <!-- /ko -->
@@ -371,57 +364,48 @@ <h4>{{ terminology.choose_fields_label }}</h4>
             </td>
           {% if export_instance.type == 'case' and request|feature_preview_enabled:"SPLIT_MULTISELECT_CASE_EXPORT"%}
             <td>
-              <div class="form-horizontal col-xs-12"
+              <div class="form-horizontal col-sm-12"
                     data-bind="if: column.doc_type() === 'SplitUserDefinedExportColumn',
                                submit: column.addUserDefinedOption">
-                <div class="form-group">
-                  <select style="width:200px"
-                          class="form-control"
-                          data-bind="options: $root.splitTypes.userDefined,
-                                     value: column.split_type"></select>
-                </div>
+                <select style="width:200px"
+                        class="form-select"
+                        data-bind="options: $root.splitTypes.userDefined,
+                                   value: column.split_type"></select>
                 <!-- ko if: column.split_type() === $root.splitTypes.multiselect -->
-                <div class="form-group">
-                  <button class="btn btn-default btn-xs"
-                          data-bind="visible: !column.showOptions(),
-                                     click: function() {
-                                       column.showOptions(true);
-                                     }">
-                    {% trans "Show Options" %}
-                  </button>
+                <button class="btn btn-outline-primary btn-sm my-2"
+                        data-bind="visible: !column.showOptions(),
+                                   click: function() {
+                                     column.showOptions(true);
+                                   }">
+                  {% trans "Show Options" %}
+                </button>
 
-                  <button class="btn btn-default btn-xs"
-                          data-bind="visible: column.showOptions(),
-                                     click: function() {
-                                       column.showOptions(false);
-                                     }">
-                    {% trans "Hide Options" %}
-                  </button>
-                </div>
+                <button class="btn btn-outline-primary btn-sm"
+                        data-bind="visible: column.showOptions(),
+                                   click: function() {
+                                     column.showOptions(false);
+                                   }">
+                  {% trans "Hide Options" %}
+                </button>
                 <div data-bind="visible: column.showOptions()">
                   <ul class="list-group"
                       data-bind="foreach: column.user_defined_options">
                     <li class="list-group-item">
                       <span data-bind="text: $data"></span>
-                      <i style="cursor: pointer"
-                         class="text-danger fa-regular fa-trash-can pull-right"
+                      <i class="clickable text-danger fa-regular fa-trash-can float-end"
                          data-bind="click: column.removeUserDefinedOption.bind(column)"></i>
                     </li>
                   </ul>
-                  <div class="form-group">
-                    <div style="max-width: 200px"
-                         class="input-group">
-                      <input class="form-control input-sm"
-                             type="text"
-                             data-bind="value: column.userDefinedOptionToAdd"/>
-                      <span class="input-group-btn">
-                        <button type="submit"
-                                class="btn btn-default btn-sm"
-                                data-bind="click: column.addUserDefinedOption">
-                          {% trans "Add" %}
-                        </button>
-                      </span>
-                    </div>
+                  <div style="max-width: 200px"
+                       class="input-group">
+                    <input class="form-control input-sm"
+                           type="text"
+                           data-bind="value: column.userDefinedOptionToAdd"/>
+                    <button type="submit"
+                            class="btn btn-outline-primary btn-sm"
+                            data-bind="click: column.addUserDefinedOption">
+                      {% trans "Add" %}
+                    </button>
                   </div>
                 </div>
                 <!-- /ko -->
diff --git a/corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html b/corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
index bb283e11b6db..812d10ea93c2 100644
--- a/corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+++ b/corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
@@ -4,14 +4,12 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal">
-          <span aria-hidden="true">&times;</span><span class="sr-only">{% trans 'Close' %}</span>
-        </button>
         <h4 class="modal-title">
           {% blocktrans %}
             Maximum number of OData feeds reached.
           {% endblocktrans %}
         </h4>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
       </div>
       <div class="modal-body">
         {% blocktrans %}
@@ -20,7 +18,7 @@ <h4 class="modal-title">
         {% endblocktrans %}
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">
+        <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">
           {% trans "Ok" %}
         </button>
       </div>
diff --git a/corehq/apps/export/templates/export/partials/table.html b/corehq/apps/export/templates/export/partials/table.html
index de75713471f3..87e864ece193 100644
--- a/corehq/apps/export/templates/export/partials/table.html
+++ b/corehq/apps/export/templates/export/partials/table.html
@@ -8,33 +8,33 @@
   <thead>
     <tr>
       {% if has_edit_permissions or allow_bulk_export %}
-        <th class="col-sm-1">
+        <th class="col-md-1">
           {% blocktrans %}Select{% endblocktrans %}
           <br>
           <button type="button"
-                  class="btn btn-xs btn-default"
+                  class="btn btn-sm btn-outline-primary"
                   data-bind="click: selectAll">
             {% trans 'All' %}
           </button>
           {%trans 'or'%}
           <button type="button"
-                  class="btn btn-xs btn-default"
+                  class="btn btn-sm btn-outline-primary"
                   data-bind="click: selectNone">
             {% trans 'None' %}
           </button>
         </th>
       {% endif %}
-      <th class="col-sm-4">
+      <th class="col-md-4">
         {% trans 'Name' %}
       </th>
 
     {% if model_type == "case" %}
-      <th class="col-sm-2">
+      <th class="col-md-2">
         {% trans 'Case Type' %}
       </th>
     {% endif %}
 
-    <th class="col-sm-1">
+    <th class="col-md-1">
       {% if export_filter_form %}
         {% if has_edit_permissions %}
           {% trans "Filters and Files" %}
@@ -45,28 +45,28 @@
     </th>
 
     {% if is_daily_saved_export %}
-      <th class="col-sm-1">{% trans "Enable/Disable" %}</th>
+      <th class="col-md-1">{% trans "Enable/Disable" %}</th>
     {% endif %}
 
     {% if has_edit_permissions %}
-      <th class="col-sm-1">
+      <th class="col-md-1">
         {% if is_daily_saved_export %}
           {% trans "Edit Columns" %}
         {% elif not is_odata %}
           {% trans 'Edit' %}
         {% else %}
           {% blocktrans %}
-            Copy &amp; Edit Feed
+            Copy &amp; Edit
           {% endblocktrans %}
         {% endif %}
       </th>
-      <th class="col-sm-1">
+      <th class="col-md-1">
         {% trans 'Delete' %}
       </th>
     {% endif %}
 
     {% if request|request_has_privilege:"EXPORT_OWNERSHIP" %}
-      <th class="col-sm-1"
+      <th class="col-md-1"
           data-bind="visible: showOwnership">
         <span data-bind="visible: myExports">
           {% trans "Share" %}
@@ -82,29 +82,28 @@
     <tr>
     {% if has_edit_permissions or allow_bulk_export %}
       <td>
-        <div class="checkbox checkbox-table-cell">
-          <label>
-            <input type="checkbox"
-                   data-bind="checked: addedToBulk" />
-          </label>
+        <div class="form-check checkbox-table-cell">
+          <input type="checkbox"
+                 class="form-check-input"
+                 data-bind="checked: addedToBulk" />
         </div>
       </td>
     {% endif %}
       <td>
-        <h4 data-bind="css: {'text-muted': hasEmailedExport && !isAutoRebuildEnabled()}">
+        <div data-bind="css: {'text-body-secondary': hasEmailedExport && !isAutoRebuildEnabled()}">
           <inline-edit params="value: name,
                                url: editNameUrl,
                                placeholder: '{% trans "Enter name here"|escapejs %}',
                                cols: 50"
                        data-apply-bindings="false"></inline-edit>
-          <label class="label label-default label-default"
+          <label class="badge text-bg-secondary label-default"
                  data-bind="visible: isDeid()">
             {% trans 'De-Identified' %}
           </label>
-        </h4>
+        </div>
         <p data-bind="visible: formname,
                       css: {
-                        'text-muted': hasEmailedExport && !isAutoRebuildEnabled()
+                        'text-body-secondary': hasEmailedExport && !isAutoRebuildEnabled()
                       }">
           <i class="fa-regular fa-file"></i>
           <strong>
@@ -129,16 +128,11 @@ <h4 data-bind="css: {'text-muted': hasEmailedExport && !isAutoRebuildEnabled()}"
         <!-- ko if: isOData -->
           <!-- ko with: odataFeedUrl -->
           <p>
-            <div class="input-group">
-              <span data-bind="css: {
-                                 'input-group-btn': showLink
-                               },
-                               click: copyLinkRequested">
-                <a class="btn btn-default btn-sm">
-                  <i class="fa fa-clipboard"></i>
-                  {% trans "Copy OData Feed Link" %}
-                </a>
-              </span>
+            <div data-bind="css: {'input-group': showLink}">
+              <button class="btn btn-outline-primary btn-sm" data-bind="click: copyLinkRequested">
+                <i class="fa fa-clipboard"></i>
+                {% trans "Copy OData Feed Link" %}
+              </button>
               <input data-bind="visible: showLink,
                                 value: url"
                      type="text"
@@ -149,12 +143,12 @@ <h4 data-bind="css: {'text-muted': hasEmailedExport && !isAutoRebuildEnabled()}"
           <!-- /ko -->
           <!-- ko if: hasAdditionalODataFeeds -->
             <p>
-              <a class="btn btn-link btn-sm"
+              <a class="btn btn-sm btn-outline-primary"
                  data-bind="attr: {
                               href: '#' + id() + '-odata-additional'
                             },
                             click: sendAnalyticsOpenAdditionalFeeds"
-                 data-toggle="modal">
+                 data-bs-toggle="modal">
                 <i class="fa fa-rss"></i>
                 <!-- ko if: exportType() == 'form' -->
                   {% trans "Show additional feeds for Repeat Group data." %}
@@ -169,17 +163,10 @@ <h4 data-bind="css: {'text-muted': hasEmailedExport && !isAutoRebuildEnabled()}"
               <div class="modal-dialog">
                 <div class="modal-content">
                   <div class="modal-header">
-                    <button type="button"
-                            class="close"
-                            data-dismiss="modal">
-                      <span aria-hidden="true">&times;</span>
-                      <span class="sr-only">
-                        {% trans 'Close' %}
-                      </span>
-                    </button>
                     <h4 class="modal-title">
                       {% trans "Additional Feeds" %}
                     </h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
                   </div>
                   <div class="modal-body">
                     <p class="lead">
@@ -197,16 +184,11 @@ <h4 class="modal-title">
                     </p>
                     <!-- ko foreach: odataAdditionalFeedUrls -->
                     <p>
-                      <div class="input-group">
-                        <span data-bind="css: {
-                                           'input-group-btn': url.showLink
-                                         },
-                                         click: url.copyLinkRequested">
-                          <a class="btn btn-default btn-sm">
-                            <i class="fa fa-clipboard"></i>
-                            <span data-bind="text: label"></span>
-                          </a>
-                        </span>
+                      <div data-bind="css: {'input-group': url.showLink}">
+                        <button class="btn btn-outline-primary btn-sm" data-bind="click: url.copyLinkRequested">
+                          <i class="fa fa-clipboard"></i>
+                          <span data-bind="text: label"></span>
+                        </button>
                         <input data-bind="visible: url.showLink,
                                           value: url.url"
                                type="text"
@@ -218,9 +200,9 @@ <h4 class="modal-title">
                   </div>
                   <div class="modal-footer">
                     <a href="#"
-                       class="btn btn-default"
+                       class="btn btn-outline-primary"
                        data-bind="click: sendAnalyticsCloseAdditionalFeeds"
-                       data-dismiss="modal">
+                       data-bs-dismiss="modal">
                       {% trans "Close" %}
                     </a>
                   </div>
@@ -231,7 +213,7 @@ <h4 class="modal-title">
         <!-- /ko -->
 
         <!-- ko if: hasEmailedExport && !isAutoRebuildEnabled() -->
-        <p class="text-warning">
+        <p class="text-danger">
           <i class="fa-solid fa-triangle-exclamation"></i>
           {% blocktrans %}
             Automatic updates for this saved {{ export_type }} have been disabled. Click 'Enable'
@@ -272,32 +254,26 @@ <h4 class="modal-title">
             &nbsp;&nbsp;
             <div data-bind="if: isLocationSafeForUser()">
               <button type="button"
-                      class="btn btn-default btn-xs"
+                      class="btn btn-outline-primary btn-sm"
                       data-bind="visible: emailedExport.canUpdateData,
                                  attr: {
-                                   'data-target': '#modalRefreshExportConfirm-' + id() + '-' + emailedExport.groupId()
+                                   'data-bs-target': '#modalRefreshExportConfirm-' + id() + '-' + emailedExport.groupId()
                                  }"
-                      data-toggle="modal">
+                      data-bs-toggle="modal">
                 <i class="fa fa-refresh"></i>
                 {% trans "Update Data" %}
               </button>
               <button type="button"
-                      class="btn btn-default btn-xs btn-disabled"
+                      class="btn btn-outline-primary btn-sm btn-disabled"
                       data-bind="visible: emailedExport.updatingData() && !emailedExport.prepareExportError()"
                       disabled="disabled">
                 <i class="fa fa-refresh fa-spin"></i>
                 {% trans "Updating Data, please wait..." %}
               </button>
               <div data-bind="if: emailedExport.taskStatus && emailedExport.taskStatus.started()">
-                <div class="progress">
-                  <div class="progress-bar progress-bar-striped active"
-                       role="progressbar"
-                       aria-valuemin="0"
-                       aria-valuemax="100"
-                       data-bind="attr: {
-                                    'aria-valuenow': emailedExport.taskStatus.percentComplete(),
-                                    'style': 'width: ' + emailedExport.taskStatus.percentComplete() + '%',
-                                  }">
+                <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100" data-bind="attr: {'aria-valuenow': emailedExport.taskStatus.percentComplete()}">
+                  <div class="progress-bar progress-bar-striped"
+                       data-bind="attr: {style: 'width: ' + emailedExport.taskStatus.percentComplete() + '%'}">
                   </div>
                 </div>
               </div>
@@ -312,34 +288,29 @@ <h4 class="modal-title">
                             href: emailedExport.fileData.downloadUrl()
                           },
                           click: downloadRequested"
-               class="btn btn-info btn-xs">
+               class="btn btn-info btn-sm">
               <i class="fa-solid fa-cloud-arrow-down"></i>
               {% trans "Download" %}
             </a>
             <!-- ko if: isFeed -->
-              <div class="input-group">
-                <!-- ko with: feedUrl -->
-                <span data-bind="css: {
-                                   'input-group-btn': showLink
-                                 },
-                                 click: copyLinkRequested">
-                  <a class="btn btn-default btn-sm">
-                    <i class="fa fa-clipboard"></i>
-                    {% trans "Copy Dashboard Feed Link" %}
-                  </a>
-                </span>
+              <!-- ko with: feedUrl -->
+                <div data-bind="css: {'input-group': showLink}">
+                <button class="btn btn-outline-primary btn-sm" data-bind="click: copyLinkRequested">
+                  <i class="fa fa-clipboard"></i>
+                  {% trans "Copy Dashboard Feed Link" %}
+                </button>
                 <input data-bind="visible: showLink,
                                   value: url"
                        type="text"
                        class="form-control input-sm"
                        readonly />
-                <!-- /ko -->
-              </div>
+                </div>
+              <!-- /ko -->
             <!-- /ko -->
           </div>
 
           <div data-bind="if: isLocationSafeForUser()">
-            <p class="text-warning"
+            <p class="text-danger"
                data-bind="if: emailedExport.hasFile() && emailedExport.fileData.showExpiredWarning() && isAutoRebuildEnabled()">
               <i class="fa-solid fa-triangle-exclamation"></i>
               {% blocktrans %}
@@ -353,7 +324,7 @@ <h4 class="modal-title">
                data-bind="if: emailedExport.taskStatus && emailedExport.taskStatus.failed() == 'too_large'">
               <i class="fa-solid fa-triangle-exclamation"></i>
               {% blocktrans with max_rows=max_daily_export_size|intcomma %}
-                Your export exceeds the limit of {{ max_rows }} rows. Please see <a href="https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare" data-toggle="modal">documentation</a> for more information.
+                Your export exceeds the limit of {{ max_rows }} rows. Please see <a href="https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare" data-bs-toggle="modal">documentation</a> for more information.
               {% endblocktrans %}
             </p>
 
@@ -372,7 +343,7 @@ <h4 class="modal-title">
                 {% trans "Data update failed!" %}
               </strong>
               {% blocktrans %}
-                If this problem persists, please <a href="#modalReportIssue" data-toggle="modal">Report an Issue</a>.
+                If this problem persists, please <a href="#modalReportIssue" data-bs-toggle="modal">Report an Issue</a>.
               {% endblocktrans %}
             </p>
 
@@ -402,17 +373,10 @@ <h4 class="modal-title">
               <div class="modal-dialog">
                 <div class="modal-content">
                   <div class="modal-header">
-                    <button type="button"
-                            class="close"
-                            data-dismiss="modal">
-                      <span aria-hidden="true">&times;</span>
-                      <span class="sr-only">
-                        {% trans 'Close' %}
-                      </span>
-                    </button>
                     <h4 class="modal-title">
                       {% trans "Confirm data updates" %}
                     </h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
                   </div>
                   <div class="modal-body"
                        data-bind="visible: emailedExport.hasFile() && emailedExport.fileData.showExpiredWarning()">
@@ -445,8 +409,8 @@ <h4 class="modal-title">
                   </div>
                   <div class="modal-footer">
                     <a href="#"
-                       class="btn btn-default"
-                       data-dismiss="modal">
+                       class="btn btn-outline-primary"
+                       data-bs-dismiss="modal">
                       {% trans "Cancel" %}
                     </a>
                     <button type="button"
@@ -463,17 +427,10 @@ <h4 class="modal-title">
               <div class="modal-dialog">
                 <div class="modal-content">
                   <div class="modal-header">
-                    <button type="button"
-                            class="close"
-                            data-dismiss="modal">
-                      <span aria-hidden="true">&times;</span>
-                      <span class="sr-only">
-                        {% trans 'Close' %}
-                      </span>
-                    </button>
                     <h4 class="modal-title">
                       {% trans "Confirm data updates." %}
                     </h4>
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{% trans_html_attr "Close" %}"></button>
                   </div>
                   <div class="modal-body">
                     <p data-bind="if: isDailySaved() && !isAutoRebuildEnabled()">
@@ -489,8 +446,8 @@ <h4 class="modal-title">
                   </div>
                   <div class="modal-footer">
                     <a href="#"
-                       class="btn btn-default"
-                       data-dismiss="modal">
+                       class="btn btn-outline-primary"
+                       data-bs-dismiss="modal">
                       {% trans "Cancel" %}
                     </a>
                     <button type="button"
@@ -513,8 +470,8 @@ <h4 class="modal-title">
       </td>
     {% if model_type == "case" %}
       <td>
-        <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
-        <span data-bind="visible: is_case_type_deprecated" class="label label-warning" style="display: inline-block;">{% trans "deprecated" %}</span>
+        <span class="h4" data-bind="text: case_type"></span>
+        <span data-bind="visible: is_case_type_deprecated" class="badge text-bg-warning">{% trans "deprecated" %}</span>
       </td>
     {% endif %}
 
@@ -526,19 +483,19 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
         {{ export_type_caps }}
       </a>
       {% if has_edit_permissions %}
-        <a class="btn btn-default"
+        <a class="btn btn-outline-primary"
            data-bind="visible: showSavedFilters && isLocationSafeForUser(),
                       click: function (model) {
                         $root.filterModalExportId(model.id());
                       }"
            href="#setFeedFiltersModal"
-           data-toggle="modal">
+           data-bs-toggle="modal">
           <i class="fa fa-filter"></i>
           {% trans "Edit Filters" %}
         </a>
       {% endif %}
       {% trans "Download a Data Export Tool configuration file for this export" as det_help %}
-      <a data-bind="visible: showDetDownload, attr: {href: detSchemaUrl}" class="btn btn-default" title="{{ det_help }}">
+      <a data-bind="visible: showDetDownload, attr: {href: detSchemaUrl}" class="btn btn-outline-primary" title="{{ det_help }}">
         <i class="fa fa-download"></i>
         {% trans "DET Config" %}
       </a>
@@ -547,11 +504,11 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
     {% if is_daily_saved_export %}
       <td>
         <!-- ko if: isLocationSafeForUser() -->
-        <a class="btn btn-default"
+        <a class="btn btn-outline-primary"
            data-bind="attr: {
-                        'data-target': '#modalEnableDisableAutoRefresh-' + id() + '-' + emailedExport.groupId(),
+                        'data-bs-target': '#modalEnableDisableAutoRefresh-' + id() + '-' + emailedExport.groupId(),
                       }"
-           data-toggle="modal">
+           data-bs-toggle="modal">
           <span data-bind="visible: !isAutoRebuildEnabled()">
             {% trans "Enable" %}
           </span>
@@ -568,10 +525,10 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
         <div data-bind="if: $parent.showOwnership">
           <div data-bind="if: can_edit()">
             <div data-bind="if: isLocationSafeForUser()">
-              <a class="btn btn-default"
+              <a class="btn btn-outline-primary"
                  {% if odata_feeds_over_limit %}
                  href="#odataFeedLimitReachedModal"
-                 data-toggle="modal"
+                 data-bs-toggle="modal"
                  {% else %}
                  data-bind="attr: {href: editUrl}"
                  {% endif %}>
@@ -588,7 +545,7 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
                   <i class="fa fa-pencil"></i>
                   <span>
                     {% blocktrans %}
-                      Copy &amp; Edit Feed
+                      Copy &amp; Edit
                     {% endblocktrans %}
                   </span>
                 </div>
@@ -597,7 +554,7 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
           </div>
           <div data-bind="ifnot: can_edit()">
             <div data-bind="if: isLocationSafeForUser()">
-              <a class="btn btn-default disabled"
+              <a class="btn btn-outline-primary disabled"
                  data-bind="visible: $parent.myExports">
                 <div data-bind="ifnot: isOData()">
                   <i class="fa fa-pencil"></i>
@@ -612,14 +569,14 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
                   <i class="fa fa-pencil"></i>
                   <span>
                     {% blocktrans %}
-                      Copy &amp; Edit Feed
+                      Copy &amp; Edit
                     {% endblocktrans %}
                   </span>
                 </div>
               </a>
               <a data-bind="attr: {href: editUrl},
                             visible: !$parent.myExports"
-                 class="btn btn-default">
+                 class="btn btn-outline-primary">
                 <div data-bind="ifnot: isOData()">
                   <span data-bind="visible: !isDailySaved()">
                     {% trans 'View' %}
@@ -640,10 +597,10 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
         </div>
         <div data-bind="ifnot: $parent.showOwnership">
           <div data-bind="if: isLocationSafeForUser()">
-            <a class="btn btn-default"
+            <a class="btn btn-outline-primary"
                     {% if odata_feeds_over_limit %}
                     href="#odataFeedLimitReachedModal"
-                    data-toggle="modal"
+                    data-bs-toggle="modal"
                     {% else %}
                     data-bind="click: editExport"
                     {% endif %}>
@@ -660,7 +617,7 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
                 <i class="fa fa-pencil"></i>
                 <span>
                   {% blocktrans %}
-                    Copy &amp; Edit Feed
+                    Copy &amp; Edit
                   {% endblocktrans %}
                 </span>
               </div>
@@ -670,8 +627,8 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
       </td>
       <td>
         <div data-bind="if: isLocationSafeForUser()">
-          <a class="btn btn-danger"
-             data-toggle="modal"
+          <a class="btn btn-outline-danger"
+             data-bs-toggle="modal"
              data-bind="attr: {
                           href: '#delete-export-modal-' + id()
                         }">
@@ -698,7 +655,7 @@ <h4 data-bind="text: case_type" style="display: inline-block;"></h4>
         </div>
         <div data-bind="visible: !$parent.myExports">
           <div data-bind="visible: owner_username === 'unknown'">
-            <div class="label label-default">
+            <div class="badge text-bg-secondary">
               {% trans 'Unknown' %}
             </div>
           </div>
diff --git a/corehq/apps/export/templates/export/paywall.html b/corehq/apps/export/templates/export/paywall.html
index 7af8f56c158e..85d1f11f7850 100644
--- a/corehq/apps/export/templates/export/paywall.html
+++ b/corehq/apps/export/templates/export/paywall.html
@@ -1,4 +1,4 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load compress %}
@@ -8,8 +8,8 @@
 {% block page_content %}
   {% block main_column_content %}
     <div class="row">
-      <div class="col-md-2"></div>
-      <div class="col-md-8">
+      <div class="col-lg-2"></div>
+      <div class="col-lg-8">
         <h1>
           {% blocktrans %}
             Share Daily Data with Excel and Other Systems
@@ -24,14 +24,14 @@ <h1>
             higher software plans.
           {% endblocktrans %}
         </p>
-        <a class="btn btn-default" href="{% prelogin_url "go_to_pricing" %}">
+        <a class="btn btn-outline-primary" href="{% prelogin_url "go_to_pricing" %}">
           {% trans "Learn More About Pricing Plans" %}
         </a>
-        <a class="btn btn-primary pull-right" href="{% url "domain_select_plan" domain %}">
+        <a class="btn btn-primary float-end" href="{% url "domain_select_plan" domain %}">
           {% trans "Change My Subscription" %}
         </a>
       </div>
-      <div class="col-md-2"></div>
+      <div class="col-lg-2"></div>
     </div>
   {% endblock main_column_content %}
 {% endblock %}
diff --git a/corehq/apps/export/tests/test_dbaccessors.py b/corehq/apps/export/tests/test_dbaccessors.py
index ce236d8b87da..aa03c11ae551 100644
--- a/corehq/apps/export/tests/test_dbaccessors.py
+++ b/corehq/apps/export/tests/test_dbaccessors.py
@@ -1,6 +1,7 @@
 from datetime import datetime, timedelta
+
+import pytest
 from django.test import TestCase
-from nose.plugins.attrib import attr
 
 from corehq.apps.export.dbaccessors import (
     get_brief_deid_exports,
@@ -291,7 +292,7 @@ def test_get_form_inferred_schema_missing(self):
         self.assertIsNone(result)
 
 
-@attr('slow')
+@pytest.mark.slow
 class TestODataExportFetcher(TestCase):
     def setUp(self):
         self.fetcher = ODataExportFetcher()
diff --git a/corehq/apps/export/tests/test_export_models_new.py b/corehq/apps/export/tests/test_export_models_new.py
index 098643c1176f..b1982c896d3c 100644
--- a/corehq/apps/export/tests/test_export_models_new.py
+++ b/corehq/apps/export/tests/test_export_models_new.py
@@ -1,6 +1,6 @@
+import pytest
 from django.test import TestCase
 from unittest.mock import patch
-from nose.plugins.attrib import attr
 from corehq.apps.es.tests.utils import es_test
 
 import pytz
@@ -13,7 +13,7 @@
 from corehq.apps.export.models.new import CaseExportInstance, FormExportInstance
 
 
-@attr('slow')
+@pytest.mark.slow
 @es_test
 class FormExportInstanceTests(TestCase):
     def setUp(self):
@@ -61,7 +61,7 @@ def test_get_count_returns_total_row_count(self, mock_get_timezone):
         self.assertEqual(export.get_count(), 2)
 
 
-@attr('slow')
+@pytest.mark.slow
 @es_test
 class CaseExportInstanceTests(TestCase):
     def setUp(self):
diff --git a/corehq/apps/export/tests/test_export_views.py b/corehq/apps/export/tests/test_export_views.py
index 54553fcdbd33..31d564e17163 100644
--- a/corehq/apps/export/tests/test_export_views.py
+++ b/corehq/apps/export/tests/test_export_views.py
@@ -151,6 +151,15 @@ def test_create_form_export(self):
         )
         self.assertEqual(resp.status_code, 200)
 
+    @patch("corehq.apps.export.views.new.get_case_types_for_domain", lambda *a: ['random_case'])
+    def test_create_case_export_with_invalid_case(self):
+        resp = self.client.get(
+            reverse(CreateNewCustomCaseExportView.urlname, args=[self.domain.name]),
+            {'export_tag': 'some_case'}
+        )
+        self.assertEqual(resp.status_code, 302)
+
+    @patch("corehq.apps.export.views.new.get_case_types_for_domain", lambda *a: ['random_case'])
     def test_create_case_export(self):
         resp = self.client.get(
             reverse(CreateNewCustomCaseExportView.urlname, args=[self.domain.name]),
diff --git a/corehq/apps/export/urls.py b/corehq/apps/export/urls.py
index 9417c824d43c..2a958a87d91f 100644
--- a/corehq/apps/export/urls.py
+++ b/corehq/apps/export/urls.py
@@ -32,6 +32,7 @@
     DeIdDailySavedExportListView,
     DeIdDashboardFeedListView,
     DeIdFormExportListView,
+    DeIdCaseExportListView,
     FormExportListView,
     ODataFeedListView,
     CommCareAnalyticsListView,
@@ -73,6 +74,9 @@
     url(r"^custom/form_deid/$",
         DeIdFormExportListView.as_view(),
         name=DeIdFormExportListView.urlname),
+    url(r"^custom/case_deid/$",
+        DeIdCaseExportListView.as_view(),
+        name=DeIdCaseExportListView.urlname),
     url(r"^custom/daily_saved_deid/$",
         DeIdDailySavedExportListView.as_view(),
         name=DeIdDailySavedExportListView.urlname),
diff --git a/corehq/apps/export/views/download.py b/corehq/apps/export/views/download.py
index 0e2515f263c8..b59d24a130bb 100644
--- a/corehq/apps/export/views/download.py
+++ b/corehq/apps/export/views/download.py
@@ -61,7 +61,7 @@
     ExportsPermissionsManager,
     case_type_or_app_limit_exceeded
 )
-from corehq.apps.hqwebapp.decorators import use_daterangepicker
+from corehq.apps.hqwebapp.decorators import use_bootstrap5, use_tempusdominus
 from corehq.apps.hqwebapp.widgets import DateRangePickerWidget
 from corehq.apps.locations.permissions import location_safe
 from corehq.apps.reports.analytics.esaccessors import media_export_is_too_big
@@ -157,7 +157,8 @@ class BaseDownloadExportView(BaseProjectDataView):
     # To serve filters for export from mobile_user_and_group_slugs
     export_filter_class = None
 
-    @use_daterangepicker
+    @use_bootstrap5
+    @use_tempusdominus
     @method_decorator(login_and_domain_required)
     def dispatch(self, request, *args, **kwargs):
         self.permissions = ExportsPermissionsManager(self.form_or_case, request.domain, request.couch_user)
@@ -530,6 +531,7 @@ class DownloadNewDatasourceExportView(BaseProjectDataView):
     page_title = gettext_noop("Export Data Source Data")
     template_name = 'export/datasource_export_view.html'
 
+    @use_bootstrap5
     def dispatch(self, *args, **kwargs):
         if not EXPORT_DATA_SOURCE_DATA.enabled(self.domain):
             raise Http404()
diff --git a/corehq/apps/export/views/list.py b/corehq/apps/export/views/list.py
index 9de8a6766417..7cc792a310ff 100644
--- a/corehq/apps/export/views/list.py
+++ b/corehq/apps/export/views/list.py
@@ -68,6 +68,7 @@
     ExportsPermissionsManager,
     user_can_view_deid_exports,
 )
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
 from corehq.apps.locations.models import SQLLocation
 from corehq.apps.locations.permissions import (
     location_restricted_response,
@@ -123,6 +124,8 @@ def param_is_true(param):
                 return DeIdFormExportListHelper(request)
             return FormExportListHelper(request)
         elif form_or_case == 'case':
+            if is_deid:
+                return DeIdCaseExportListHelper(request)
             return CaseExportListHelper(request)
 
         raise ValueError("Could not determine ExportListHelper subclass")
@@ -479,6 +482,14 @@ def create_export_form(self):
         return None
 
 
+class DeIdCaseExportListHelper(CaseExportListHelper):
+    is_deid = True
+
+    @property
+    def create_export_form(self):
+        return None
+
+
 class DeIdDailySavedExportListHelper(DailySavedExportListHelper):
     is_deid = True
 
@@ -506,6 +517,7 @@ class BaseExportListView(BaseProjectDataView):
     page_title = gettext_lazy("Export Form Data")
 
     @method_decorator(login_and_domain_required)
+    @method_decorator(use_bootstrap5)
     def dispatch(self, request, *args, **kwargs):
         self.permissions = ExportsPermissionsManager(self.form_or_case, request.domain, request.couch_user)
         self.permissions.access_list_exports_or_404(is_deid=self.is_deid, is_odata=self.is_odata)
@@ -721,12 +733,6 @@ class CaseExportListView(BaseExportListView, CaseExportListHelper):
     urlname = 'list_case_exports'
     page_title = gettext_noop("Export Case Data")
 
-    @property
-    def page_name(self):
-        if self.is_deid:
-            return _("Export De-Identified Cases")
-        return self.page_title
-
     @method_decorator(login_and_domain_required)
     def dispatch(self, request, *args, **kwargs):
         bulk_export_progress = cache.get(f'{BULK_CASE_EXPORT_CACHE}:{request.domain}')
@@ -773,6 +779,11 @@ class DeIdFormExportListView(FormExportListView, DeIdFormExportListHelper):
     urlname = 'list_form_deid_exports'
 
 
+class DeIdCaseExportListView(CaseExportListView, DeIdCaseExportListHelper):
+    page_title = gettext_noop("Export De-Identified Case Data")
+    urlname = 'list_case_deid_exports'
+
+
 @location_safe
 class DeIdDailySavedExportListView(DailySavedExportListView, DeIdDailySavedExportListHelper):
     urlname = 'list_deid_daily_saved_exports'
@@ -866,7 +877,7 @@ def get_app_data_drilldown_values(request, domain):
     permissions = ExportsPermissionsManager(model_type, domain, request.couch_user)
     permissions.access_list_exports_or_404(is_deid=False, is_odata=is_odata)
 
-    rmi_helper = ApplicationDataRMIHelper(domain, request.couch_user)
+    rmi_helper = ApplicationDataRMIHelper(domain, request.project, request.couch_user)
     if model_type == 'form':
         response = rmi_helper.get_form_rmi_response()
     elif model_type == 'case':
@@ -994,7 +1005,7 @@ def create_export_form(self):
         form.fields['model_type'].label = _("Feed Type")
 
         model_type_choices = [
-            ('', _("Select field type")),
+            ('', _("Select feed type")),
         ]
         if self.has_case_export_permissions:
             model_type_choices.append(('case', _('Case')))
diff --git a/corehq/apps/export/views/new.py b/corehq/apps/export/views/new.py
index 4d1c2c1ccbf4..4caa61546cb4 100644
--- a/corehq/apps/export/views/new.py
+++ b/corehq/apps/export/views/new.py
@@ -15,6 +15,8 @@
 from memoized import memoized
 
 from corehq.apps.accounting.decorators import requires_privilege_with_fallback
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
+from corehq.apps.reports.analytics.esaccessors import get_case_types_for_domain
 from dimagi.utils.web import json_response
 
 from corehq import privileges, toggles
@@ -60,6 +62,7 @@
 from corehq.apps.data_dictionary.models import CaseProperty
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 class BaseExportView(BaseProjectDataView):
     """Base class for all create and edit export views"""
     template_name = 'export/customize_export_new.html'
@@ -100,7 +103,7 @@ def terminology(self):
             'help_text': mark_safe(  # nosec: no user input
                 _("""
                 Learn more about exports on our <a
-                href="https://help.commcarehq.org/display/commcarepublic/Data+Export+Overview"
+                href="https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143954661/Data+Exports"
                 target="_blank">Help Site</a>.
             """)),
             'name_label': _("Export Name"),
@@ -412,6 +415,16 @@ def create_new_export_instance(self, schema, username, export_settings=None):
     def get(self, request, *args, **kwargs):
         case_type = request.GET.get('export_tag').strip('"')
 
+        if (
+            case_type not in get_case_types_for_domain(request.domain)
+            and case_type != ALL_CASE_TYPE_EXPORT
+        ):
+            messages.error(
+                request,
+                _("Case type '{case_type}' does not exist for this project.").format(case_type=case_type)
+            )
+            url = self.export_home_url
+            return HttpResponseRedirect(url)
         # First check if project is allowed to do a bulk export and redirect if necessary
         if case_type == ALL_CASE_TYPE_EXPORT and case_type_or_app_limit_exceeded(self.domain):
             messages.error(
diff --git a/corehq/apps/export/views/utils.py b/corehq/apps/export/views/utils.py
index 3ba95e4f56c2..bedfa919dd31 100644
--- a/corehq/apps/export/views/utils.py
+++ b/corehq/apps/export/views/utils.py
@@ -38,6 +38,7 @@
 )
 from corehq.apps.export.models.new import DataFile, DatePeriod, CaseExportInstance
 from corehq.apps.export.tasks import generate_schema_for_all_builds, process_populate_export_tables
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
 from corehq.apps.locations.models import SQLLocation
 from corehq.apps.locations.permissions import location_safe
 from corehq.apps.reports.util import datespan_from_beginning
@@ -298,11 +299,13 @@ def post(self, request, *args, **kwargs):
         })
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 class DailySavedExportPaywall(BaseProjectDataView):
     urlname = 'daily_saved_paywall'
     template_name = 'export/paywall.html'
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 class DashboardFeedPaywall(BaseProjectDataView):
     urlname = 'dashboard_feeds_paywall'
     template_name = 'export/paywall.html'
@@ -310,6 +313,7 @@ class DashboardFeedPaywall(BaseProjectDataView):
 
 @location_safe
 @method_decorator(login_and_domain_required, name='dispatch')
+@method_decorator(use_bootstrap5, name='dispatch')
 class DataFileDownloadList(BaseProjectDataView):
     urlname = 'download_data_files'
     template_name = 'export/download_data_files.html'
diff --git a/corehq/apps/fixtures/download.py b/corehq/apps/fixtures/download.py
index e56102a4ef81..fb86ea1f81e6 100644
--- a/corehq/apps/fixtures/download.py
+++ b/corehq/apps/fixtures/download.py
@@ -68,23 +68,7 @@ def _prepare_fixture(table_ids, domain, html_response=False, task=None):
     # Please remove this flag when this method no longer triggers an 'E' or 'F'
     # classification from the radon code static analysis
 
-    if table_ids and table_ids[0]:
-        try:
-            data_types_view = [LookupTable.objects.get(id=id) for id in table_ids]
-        except LookupTable.DoesNotExist:
-            if html_response:
-                raise FixtureDownloadError(
-                    _("Sorry, we couldn't find that table. If you think this "
-                      "is a mistake please report an issue."))
-            data_types_view = LookupTable.objects.by_domain(domain)
-    else:
-        data_types_view = LookupTable.objects.by_domain(domain)
-
-    if html_response:
-        data_types_view = list(data_types_view)[0:1]
-    else:
-        data_types_view = list(data_types_view)
-
+    data_types_view = _generate_data_types_view(table_ids, domain, html_response)
     total_tables = len(data_types_view)
     # when total_tables < 4 the final percentage can be >= 100%, but for
     # a small number of tables it renders more accurate progress
@@ -320,6 +304,25 @@ def empty_padding_list(length):
     return data_types_book, excel_sheets
 
 
+def _generate_data_types_view(table_ids, domain, html_response):
+    if table_ids and table_ids[0]:
+        try:
+            data_types_view = [LookupTable.objects.get(id=id, domain=domain) for id in table_ids]
+        except LookupTable.DoesNotExist:
+            if html_response:
+                raise FixtureDownloadError(
+                    _("Sorry, we couldn't find that table. If you think this "
+                      "is a mistake please report an issue."))
+            data_types_view = LookupTable.objects.by_domain(domain)
+    else:
+        data_types_view = LookupTable.objects.by_domain(domain)
+
+    if html_response:
+        return list(data_types_view)[0:1]
+    else:
+        return list(data_types_view)
+
+
 class OwnerNames:
 
     def __init__(self, tables):
diff --git a/corehq/apps/geospatial/const.py b/corehq/apps/geospatial/const.py
index 14142a7815ae..77ac9ce80061 100644
--- a/corehq/apps/geospatial/const.py
+++ b/corehq/apps/geospatial/const.py
@@ -133,3 +133,6 @@
         }
     }
 }
+
+# Case property to identify cases assigned through disbursement on the Case Management Page
+ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY = 'commcare_assigned_via_disbursement'
diff --git a/corehq/apps/geospatial/exceptions.py b/corehq/apps/geospatial/exceptions.py
index 4b4df36c98f1..f9e6e7b68a92 100644
--- a/corehq/apps/geospatial/exceptions.py
+++ b/corehq/apps/geospatial/exceptions.py
@@ -14,3 +14,11 @@ def __init__(self, msg=None, *args, **kwargs):
 
 class InvalidDistributionParam(GeoSpatialException):
     pass
+
+
+class CaseReassignmentValidationError(Exception):
+    pass
+
+
+class GeoPolygonValidationError(Exception):
+    pass
diff --git a/corehq/apps/geospatial/forms.py b/corehq/apps/geospatial/forms.py
index ad95c5a13375..d3d47d583f30 100644
--- a/corehq/apps/geospatial/forms.py
+++ b/corehq/apps/geospatial/forms.py
@@ -1,15 +1,18 @@
-from corehq.apps.hqwebapp import crispy as hqcrispy
-from crispy_forms import layout as crispy
-from crispy_forms.bootstrap import StrictButton
-from django.forms.widgets import Select
-
+from django import forms
 from django.core.exceptions import ValidationError
+from django.forms.widgets import Select
 from django.utils.translation import gettext_lazy as _
-from django import forms
+
+from crispy_forms import layout as crispy
+from crispy_forms.bootstrap import PrependedText, StrictButton
+
+from corehq import toggles
+from corehq.apps.geospatial.const import (
+    ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY,
+)
 from corehq.apps.geospatial.models import GeoConfig, validate_travel_mode
+from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.hqwebapp.utils.translation import format_html_lazy
-from corehq import toggles
-
 
 LOCATION_SOURCE_OPTIONS = [
     (GeoConfig.CUSTOM_USER_PROPERTY, _("Custom user field")),
@@ -18,7 +21,6 @@
 
 
 class GeospatialConfigForm(forms.ModelForm):
-
     RADIAL_ALGORITHM_OPTION = (GeoConfig.RADIAL_ALGORITHM, _('Radial Algorithm'))
     ROAD_NETWORK_ALGORITHM_OPTION = (GeoConfig.ROAD_NETWORK_ALGORITHM, _('Road Network Algorithm'))
 
@@ -42,6 +44,7 @@ class Meta:
             "max_case_distance",
             "max_case_travel_time",
             "travel_mode",
+            "flag_assigned_cases",
         ]
 
     user_location_property_name = forms.CharField(
@@ -147,6 +150,14 @@ class Meta:
         required=False,
         widget=forms.PasswordInput(),
     )
+    flag_assigned_cases = forms.BooleanField(
+        label=_("Flag assigned cases"),
+        help_text=_(
+            "When enabled, cases that are assigned through disbursement from the Case Management page"
+            " will include a case property '{}' with value as True."
+        ).format(ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY),
+        required=False,
+    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -222,6 +233,7 @@ def __init__(self, *args, **kwargs):
                 ),
                 hqcrispy.FieldsetAccordionGroup(
                     _('Advanced Settings'),
+                    PrependedText('flag_assigned_cases', '', data_bind="checked: flagAssignedCases"),
                     crispy.Fieldset(
                         _("Location Data Properties"),
                         crispy.Field(
diff --git a/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py b/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py
new file mode 100644
index 000000000000..2419a88483ae
--- /dev/null
+++ b/corehq/apps/geospatial/management/commands/index_geolocation_case_properties.py
@@ -0,0 +1,88 @@
+import math
+
+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.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):
+    help = 'Index geopoint data in ES'
+
+    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)
+
+
+def index_case_docs(domain, query_limit=DEFAULT_QUERY_LIMIT, chunk_size=DEFAULT_CHUNK_SIZE, case_type=None):
+    geo_case_property = get_geo_case_property(domain)
+    query = _es_case_query(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)
+    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)
+            )
+        )
+    )
diff --git a/corehq/apps/geospatial/migrations/0008_geoconfig_flag_assigned_cases.py b/corehq/apps/geospatial/migrations/0008_geoconfig_flag_assigned_cases.py
new file mode 100644
index 000000000000..02afddc9eddf
--- /dev/null
+++ b/corehq/apps/geospatial/migrations/0008_geoconfig_flag_assigned_cases.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-08-27 12:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('geospatial', '0007_geoconfig_max_case_distance_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='geoconfig',
+            name='flag_assigned_cases',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/corehq/apps/geospatial/models.py b/corehq/apps/geospatial/models.py
index 4d62a7927ecc..df6966c3310c 100644
--- a/corehq/apps/geospatial/models.py
+++ b/corehq/apps/geospatial/models.py
@@ -98,20 +98,7 @@ class GeoConfig(models.Model):
         max_length=50
     )
     api_token = models.CharField(max_length=255, blank=True, null=True, db_column="api_token")
-
-    def save(self, *args, **kwargs):
-        super().save(*args, **kwargs)
-        self._clear_caches()
-
-    def delete(self, *args, **kwargs):
-        self._clear_caches()
-        return super().delete(*args, **kwargs)
-
-    def _clear_caches(self):
-        from .utils import get_geo_case_property, get_geo_user_property
-
-        get_geo_case_property.clear(self.domain)
-        get_geo_user_property.clear(self.domain)
+    flag_assigned_cases = models.BooleanField(default=False)
 
     @property
     def supports_travel_mode(self):
diff --git a/corehq/apps/geospatial/reports.py b/corehq/apps/geospatial/reports.py
index e6b28dad2a90..362eeb7a1548 100644
--- a/corehq/apps/geospatial/reports.py
+++ b/corehq/apps/geospatial/reports.py
@@ -93,8 +93,8 @@ class CaseManagementMap(BaseCaseMapReport):
     name = gettext_noop("Case Management Map")
     slug = "case_management_map"
 
-    base_template = "geospatial/map_visualization_base.html"
-    report_template_path = "map_visualization.html"
+    base_template = "geospatial/case_management_base.html"
+    report_template_path = "case_management.html"
 
     def default_report_url(self):
         return reverse('geospatial_default', args=[self.request.project.name])
@@ -109,6 +109,7 @@ def headers(self):
             DataTablesColumn(_("case_id"), prop_name="type.exact"),
             DataTablesColumn(_("gps_point"), prop_name="type.exact"),
             DataTablesColumn(_("link"), prop_name="name.exact", css_class="case-name-link"),
+            DataTablesColumn(_("name"), prop_name="name.exact"),
         )
         headers.custom_sort = [[2, 'desc']]
         return headers
@@ -125,7 +126,8 @@ def rows(self):
             cases.append([
                 display.case_id,
                 coordinates,
-                display.case_link
+                display.case_link,
+                display.case_name,
             ])
         return cases
 
diff --git a/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js b/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
index b20b43280bf1..a92854cf5b76 100644
--- a/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+++ b/corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
@@ -68,17 +68,18 @@ hqDefine("geospatial/js/case_grouping_map",[
                 exportableCases = self.casesToExport();
             }
 
-            const casesToExport = _.map(exportableCases, function (caseItem) {
-                return caseItem.toJson();
-            });
-
-            let csvStr = "";
-            let groupNameByID = _.object(_.map(caseGroupsInstance.generatedGroups, function(group) {
+            const groupNameByID = _.object(_.map(caseGroupsInstance.generatedGroups, function(group) {
                 return [group.groupId, group.name]
             }));
 
+            const casesToExport = _.map(exportableCases, function (caseItem) {
+                let caseJson = caseItem.toJson();
+                caseJson.groupName = groupNameByID[caseJson.groupId];
+                return caseJson;
+            });
+
             // Write headers first
-            let headers = [
+            const headers = [
                 gettext('Group ID'),
                 gettext('Group Name'),
                 gettext('Group Center Coordinates'),
@@ -87,29 +88,17 @@ hqDefine("geospatial/js/case_grouping_map",[
                 gettext('Case Coordinates'),
                 gettext('Case ID'),
             ]
-            csvStr = (headers).join(",");
-            csvStr += "\n";
-
-            _.forEach(casesToExport, function (caseToExport) {
-                csvStr += [
-                    caseToExport.groupId,
-                    groupNameByID[caseToExport.groupId],
-                    caseToExport.groupCenterCoordinates,
-                    caseToExport.caseName,
-                    caseToExport.owner_name,
-                    caseToExport.coordinates,
-                    caseToExport.caseId,
-                ].join(",");
-                csvStr += "\n";
-            });
+            const cols = [
+                'groupId',
+                'groupName',
+                'groupCenterCoordinates',
+                'caseName',
+                'owner_name',
+                'coordinates',
+                'caseId'
+            ]
 
-            // Download CSV file
-            const hiddenElement = document.createElement('a');
-            hiddenElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(csvStr);
-            hiddenElement.target = '_blank';
-            hiddenElement.download = `Grouped Cases (${utils.getTodayDate()}).csv`;
-            hiddenElement.click();
-            hiddenElement.remove();
+            utils.downloadCsv(casesToExport, headers, cols, 'Group Export');
         };
 
         self.addGroupDataToCases = function(caseGroups, groupsData, assignDefaultGroup) {
diff --git a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js b/corehq/apps/geospatial/static/geospatial/js/case_management.js
similarity index 91%
rename from corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
rename to corehq/apps/geospatial/static/geospatial/js/case_management.js
index 245686a940f3..5d630dfc9ae5 100644
--- a/corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+++ b/corehq/apps/geospatial/static/geospatial/js/case_management.js
@@ -1,6 +1,6 @@
 'use strict';
 
-hqDefine("geospatial/js/geospatial_map", [
+hqDefine("geospatial/js/case_management", [
     "jquery",
     "hqwebapp/js/initial_page_data",
     "knockout",
@@ -35,6 +35,7 @@ hqDefine("geospatial/js/geospatial_map", [
 
     var mapModel;
     var polygonFilterModel;
+    var assignmentManagerModel;
 
     function showMapControls(state) {
         $("#geospatial-map").toggle(state);
@@ -76,19 +77,21 @@ hqDefine("geospatial/js/geospatial_map", [
                 mapModel.caseMapItems().forEach((caseModel) => {
                     if (result[userId].includes(caseModel.itemId)) {
                         cases.push(caseModel);
-                        mapModel.caseGroupsIndex[caseModel.itemId] = {groupId: groupId, item: caseModel};
+                        mapModel.caseGroupsIndex[caseModel.itemId] = {
+                            groupId: groupId,
+                            item: caseModel,
+                            assignedUserId: userId,
+                        };
                     }
                 });
-                connectUserWithCasesOnMap(user, cases);
+                self.connectUserWithCasesOnMap(user, cases);
                 groupId += 1;
             });
             self.setBusy(false);
         };
 
-        self.runCaseDisbursementAlgorithm = function (cases, users) {
-            self.setBusy(true);
+        self.clearConnectionLines = function (cases) {
             let mapInstance = mapModel.mapInstance;
-
             let caseData = [];
             cases.forEach(function (c) {
                 const layerId = mapModel.getLineFeatureId(c.itemId);
@@ -106,6 +109,13 @@ hqDefine("geospatial/js/geospatial_map", [
                 });
             });
 
+            return caseData;
+        };
+
+        self.runCaseDisbursementAlgorithm = function (cases, users) {
+            self.setBusy(true);
+            const caseData = self.clearConnectionLines(cases);
+
             self.setDisbursementParameters = function (parameters) {
                 var parametersList = [
                     {name: gettext("Max cases per user"), value: parameters.max_cases_per_user},
@@ -163,7 +173,7 @@ hqDefine("geospatial/js/geospatial_map", [
             });
         };
 
-        function connectUserWithCasesOnMap(user, cases) {
+        self.connectUserWithCasesOnMap = function (user, cases) {
             cases.forEach((caseModel) => {
                 const lineCoordinates = [
                     [user.itemData.coordinates.lng, user.itemData.coordinates.lat],
@@ -194,7 +204,7 @@ hqDefine("geospatial/js/geospatial_map", [
                     },
                 });
             });
-        }
+        };
 
         return self;
     };
@@ -265,7 +275,7 @@ hqDefine("geospatial/js/geospatial_map", [
                 // disbursement if this is the case
                 const hasValidData = selectedCases.length && selectedUsers.length;
                 if (!hasValidData) {
-                    const errorMessage = gettext("Please ensure that the filtered area includes both cases" +
+                    const errorMessage = gettext("Please ensure that the filtered area includes both cases " +
                                                  "and mobile workers before attempting to run disbursement.");
                     disbursementRunner.disbursementErrorMessage(errorMessage);
                 } else {
@@ -299,6 +309,9 @@ hqDefine("geospatial/js/geospatial_map", [
                 $filterSelect.append(new Option(userLocationName, self.selectedLocation));
                 $filterSelect.val(self.selectedLocation).trigger('change');
                 self.loadUsers();
+            } else if (shouldShowUsers) {
+                // If only checkbox is ticked, then load all users
+                self.loadUsers();
             }
         };
 
@@ -325,7 +338,17 @@ hqDefine("geospatial/js/geospatial_map", [
                         const editUrl = initialPageData.reverse('edit_commcare_user', userData.id);
                         const link = `<a class="ajax_dialog" href="${editUrl}" target="_blank">${userData.username}</a>`;
 
-                        return [userData.id, {'coordinates': {'lat': lat, 'lng': lng}, 'link': link, 'type': 'user'}];
+                        const userInfo = {
+                            'coordinates': {
+                                'lat': lat,
+                                'lng': lng,
+                            },
+                            'link': link,
+                            'type': 'user',
+                            'name': userData.username,
+                            'primary_loc_name': userData.primary_loc_name,
+                        };
+                        return [userData.id, userInfo];
                     }));
 
                     const userMapItems = mapModel.addMarkersToMap(userData, userMarkerColors);
@@ -407,6 +430,14 @@ hqDefine("geospatial/js/geospatial_map", [
         }
     }
 
+    function initAssignmentReview() {
+        const $manageAssignmentModal = $("#assignments-results");
+        if ($manageAssignmentModal.length) {
+            assignmentManagerModel = models.AssignmentManager(mapModel, disbursementRunner);
+            $manageAssignmentModal.koApplyBindings(assignmentManagerModel);
+        }
+    }
+
     function loadCases(caseData) {
         mapModel.removeMarkersFromMap(mapModel.caseMapItems());
         mapModel.caseMapItems([]);
@@ -416,7 +447,7 @@ hqDefine("geospatial/js/geospatial_map", [
         // Index by case_id
         var casesById = _.object(_.map(casesWithGPS, function (item) {
             if (item[1]) {
-                return [item[0], {'coordinates': item[1], 'link': item[2], 'type': 'case'}];
+                return [item[0], {'coordinates': item[1], 'link': item[2], 'type': 'case', 'name': item[3]}];
             }
         }));
         const caseMapItems = mapModel.addMarkersToMap(casesById, caseMarkerColors);
@@ -439,6 +470,7 @@ hqDefine("geospatial/js/geospatial_map", [
             mapModel.mapInstance.on('load', () => {
                 initPolygonFilters();
                 initUserFilters();
+                initAssignmentReview();
             });
 
             // Hide controls until data is displayed
diff --git a/corehq/apps/geospatial/static/geospatial/js/geo_config.js b/corehq/apps/geospatial/static/geospatial/js/geo_config.js
index 9a54607826c8..49df2b0c7aa8 100644
--- a/corehq/apps/geospatial/static/geospatial/js/geo_config.js
+++ b/corehq/apps/geospatial/static/geospatial/js/geo_config.js
@@ -59,6 +59,7 @@ hqDefine("geospatial/js/geo_config", [
         self.maxCaseDistance = ko.observable(data.max_case_distance);
         self.maxTravelTime = ko.observable(data.max_case_travel_time);
         self.travelMode = ko.observable(data.travelMode);
+        self.flagAssignedCases = ko.observable(data.flag_assigned_cases);
 
         self.captureApiToken = ko.computed(function () {
             return self.selectedAlgorithm() === ROAD_NETWORK_ALGORITHM;
diff --git a/corehq/apps/geospatial/static/geospatial/js/gps_capture.js b/corehq/apps/geospatial/static/geospatial/js/gps_capture.js
index dcac9d58c956..dde428badc71 100644
--- a/corehq/apps/geospatial/static/geospatial/js/gps_capture.js
+++ b/corehq/apps/geospatial/static/geospatial/js/gps_capture.js
@@ -1,9 +1,10 @@
-hqDefine("geospatial/js/gps_capture",[
+hqDefine("geospatial/js/gps_capture", [
     "jquery",
     "knockout",
     'underscore',
     'hqwebapp/js/initial_page_data',
-    "hqwebapp/js/bootstrap3/components.ko", // for pagination
+    "hqwebapp/js/components/pagination",
+    "hqwebapp/js/components/search_box",
     'select2/dist/js/select2.full.min',
 ], function (
     $,
diff --git a/corehq/apps/geospatial/static/geospatial/js/models.js b/corehq/apps/geospatial/static/geospatial/js/models.js
index f7d6e60fc1bb..a201051ff20e 100644
--- a/corehq/apps/geospatial/static/geospatial/js/models.js
+++ b/corehq/apps/geospatial/static/geospatial/js/models.js
@@ -20,7 +20,11 @@ hqDefine('geospatial/js/models', [
     const DEFAULT_CENTER_COORD = [-20.0, -0.0];
     const DISBURSEMENT_LAYER_PREFIX = 'route-';
     const saveGeoPolygonUrl = initialPageData.reverse('geo_polygons');
-    const unexpectedErrorMessage = "Oops! Something went wrong! Please report an issue if the problem persists.";
+    const reassignCasesUrl = initialPageData.reverse('reassign_cases');
+    const unexpectedErrorMessage = gettext(
+        "Oops! Something went wrong!" +
+        " Please report an issue if the problem persists."
+    );
 
     var MissingGPSModel = function () {
         this.casesWithoutGPS = ko.observable([]);
@@ -83,6 +87,13 @@ hqDefine('geospatial/js/models', [
             var color = self.isSelected() ? self.markerColors.selected : self.markerColors.default;
             changeMarkerColor(self, color);
         });
+
+        self.getJson = function () {
+            return {
+                'id': self.itemId,
+                'text': self.itemData.name,
+            };
+        };
     };
 
     var GroupedCaseMapItem = function (itemId, itemData, link) {
@@ -659,7 +670,7 @@ hqDefine('geospatial/js/models', [
 
         self.exportSelectedPolygonGeoJson = function (data, event) {
             if (self.activeSavedPolygon()) {
-                const convertedData = 'text/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(self.activeSavedPolygon().geoJson));
+                const convertedData = 'application/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(self.activeSavedPolygon().geoJson));
                 $(event.target).attr('href', 'data:' + convertedData);
                 $(event.target).attr('download',self.activeSavedPolygon().text + '.geojson');
                 return true;
@@ -684,7 +695,7 @@ hqDefine('geospatial/js/models', [
                     }, 2000);
                 },
                 error: function () {
-                    alertUser.alert_user(gettext(unexpectedErrorMessage), 'danger');
+                    alertUser.alert_user(unexpectedErrorMessage, 'danger');
                 },
             });
         };
@@ -790,9 +801,9 @@ hqDefine('geospatial/js/models', [
                     error: function (response) {
                         const responseText = response.responseText;
                         if (responseText) {
-                            alertUser.alert_user(gettext(responseText), 'danger');
+                            alertUser.alert_user(responseText, 'danger');
                         } else {
-                            alertUser.alert_user(gettext(unexpectedErrorMessage), 'danger');
+                            alertUser.alert_user(unexpectedErrorMessage, 'danger');
                         }
                     },
                 });
@@ -811,6 +822,239 @@ hqDefine('geospatial/js/models', [
         }
     };
 
+    var AssignmentRow = function (caseName, caseId, userId, userName, userPrimaryLocName, mapItem) {
+        let self = this;
+
+        self.caseName = ko.observable(caseName);
+        self.caseId = caseId;
+        self.assignedUsername = ko.observable(userName);
+        self.assignedUserId = userId;
+        self.assignedUserPrimaryLocName = ko.observable(userPrimaryLocName);
+        self.mapItem = mapItem;
+        self.isSelected = ko.observable(false);
+
+        self.getJson = function () {
+            return {
+                caseName: self.caseName(),
+                caseId: self.caseId,
+                assignedUsername: self.assignedUsername(),
+                assignedUserId: self.assignedUserId,
+                assignedUserPrimaryLocName: self.assignedUserPrimaryLocName(),
+            };
+        };
+
+        return self;
+    };
+
+    var AssignmentManager = function (mapModel, disbursementModel) {
+        let self = this;
+
+        const emptyColStr = '---';
+
+        self.itemsPerPage = ko.observable(5);
+        self.totalItems = ko.observable(0);
+        self.currentPage = ko.observable(1);
+
+        self.mapModel = mapModel;
+        self.disbursementModel = disbursementModel;
+
+        self.caseData = [];
+        self.filteredCaseData = ko.observableArray([]);
+        self.caseDataPage = ko.computed(function () {
+            const end = self.currentPage() * self.itemsPerPage();
+            const start = end - self.itemsPerPage();
+            return self.filteredCaseData().slice(start, end);
+        });
+
+        self.userData = ko.observableArray([]);
+        self.canOpenModal = ko.computed(function () {
+            return self.mapModel.caseGroupsIndex.length;
+        });
+
+        self.selectedUserId = ko.observable();
+        self.includeRelatedCases = ko.observable(false);
+
+        self.assignedFilter = ko.observable();
+        self.assignedFilter.subscribe(() => {
+            if (self.assignedFilter() === 'all') {
+                self.filteredCaseData(self.caseData);
+            } else {
+                self.filteredCaseData(self.caseData.filter(function (caseItem) {
+                    if (self.assignedFilter() === 'unassigned') {
+                        return !caseItem.assignedUserId;
+                    }
+                    return caseItem.assignedUserId;
+                }));
+            }
+            self.totalItems(self.filteredCaseData().length);
+            self.goToPage(1);
+        });
+
+        self.hasCheckedRows = ko.computed(function () {
+            return _.some(self.caseDataPage(), function (caseItem) {
+                return caseItem.isSelected();
+            });
+        });
+
+        self.isAllChecked = ko.observable(false);
+        self.toggleSelectAll = function (selectAll) {
+            self.isAllChecked(selectAll);
+            for (const caseItem of self.caseDataPage()) {
+                caseItem.isSelected(self.isAllChecked());
+            }
+        };
+
+        self.loadCaseData = function () {
+            const groupData = self.mapModel.caseGroupsIndex;
+            self.caseData = [];
+            for (const item of self.mapModel.caseMapItems()) {
+                const assignedUserId = groupData[item.itemId].assignedUserId;
+                let assignedUsername = emptyColStr;
+                let primaryLocName = emptyColStr;
+                if (assignedUserId) {
+                    const userData = groupData[assignedUserId].item.itemData;
+                    assignedUsername = userData.name;
+                    primaryLocName = userData.primary_loc_name;
+                }
+                self.caseData.push(
+                    new AssignmentRow(
+                        item.itemData.name, item.itemId, assignedUserId, assignedUsername, primaryLocName, item
+                    )
+                );
+            }
+
+            loadUserData();
+            self.filteredCaseData(self.caseData);
+            self.totalItems(self.filteredCaseData().length);
+        };
+
+        function loadUserData() {
+            self.userData([]);
+            for (const item of self.mapModel.userMapItems()) {
+                self.userData.push(item.getJson());
+            }
+
+            $('#user-assignment-select').select2({
+                placeholder: gettext('No user selected (unassign mode)'),
+                allowClear: true,
+                data: self.userData(),
+            }).val(null).trigger('change');
+        }
+
+        self.goToPage = function (pageNumber) {
+            self.toggleSelectAll(false);
+            self.currentPage(pageNumber);
+        };
+
+        self.assignUserToCases = function () {
+            const selectedUser = self.mapModel.caseGroupsIndex[self.selectedUserId()];
+            for (const caseItem of self.caseDataPage()) {
+                if (!caseItem.isSelected()) {
+                    continue;
+                }
+
+                caseItem.assignedUsername(
+                    (selectedUser) ? selectedUser.item.itemData.name : emptyColStr
+                );
+                caseItem.assignedUserPrimaryLocName(
+                    (selectedUser) ? selectedUser.item.itemData.primary_loc_name : emptyColStr
+                );
+                caseItem.assignedUserId = self.selectedUserId();
+                caseItem.isSelected(false);
+            }
+        };
+
+        self.finishAssignment = function () {
+            let userCasesToConnect = {};
+            let casesToClear = [];
+            for (const caseItem of self.caseData) {
+                const userItem = self.mapModel.caseGroupsIndex[caseItem.assignedUserId];
+                const groupId = (userItem) ? userItem.groupId : null;
+                self.mapModel.caseGroupsIndex[caseItem.caseId].assignedUserId = caseItem.assignedUserId;
+                self.mapModel.caseGroupsIndex[caseItem.caseId].groupId = groupId;
+
+                casesToClear.push(caseItem.mapItem);
+                if (caseItem.assignedUserId) {
+                    if (!userCasesToConnect[caseItem.assignedUserId]) {
+                        userCasesToConnect[caseItem.assignedUserId] = [];
+                    }
+                    userCasesToConnect[caseItem.assignedUserId].push(caseItem.mapItem);
+                }
+            }
+
+            self.disbursementModel.clearConnectionLines(casesToClear);
+            for (const userId in userCasesToConnect) {
+                const user = self.mapModel.caseGroupsIndex[userId].item;
+                const cases = userCasesToConnect[userId];
+                self.disbursementModel.connectUserWithCasesOnMap(user, cases);
+            }
+        };
+
+        self.exportAssignments = function () {
+            const headers = [
+                gettext('Case Name'),
+                gettext('Case ID'),
+                gettext('Assigned User ID'),
+                gettext('Assigned Username'),
+                gettext('Assigned User Primary Location'),
+            ];
+            const cols = [
+                'caseName',
+                'caseId',
+                'assignedUserId',
+                'assignedUsername',
+                'assignedUserPrimaryLocName',
+            ];
+            const casesToExport = self.filteredCaseData().map(function (caseItem) {
+                return caseItem.getJson();
+            });
+            utils.downloadCsv(casesToExport, headers, cols, 'Case Assignment Export');
+        };
+
+        self.assignmentAjaxInProgress = ko.observable(false);
+        self.acceptAssignments = function () {
+            let caseIdToOwnerId = {};
+            for (const caseItem of self.mapModel.caseMapItems()) {
+                const caseData = self.mapModel.caseGroupsIndex[caseItem.itemId];
+                if (caseData.assignedUserId) {
+                    caseIdToOwnerId[caseData.item.itemId] = caseData.assignedUserId;
+                }
+            }
+            let requestData = {
+                'case_id_to_owner_id': caseIdToOwnerId,
+                'include_related_cases': self.includeRelatedCases(),
+            };
+
+            self.assignmentAjaxInProgress(true);
+            $.ajax({
+                type: 'post',
+                url: reassignCasesUrl,
+                dataType: 'json',
+                data: JSON.stringify(requestData),
+                contentType: "application/json; charset=utf-8",
+                success: function (response) {
+                    if (!response.success) {
+                        return alertUser.alert_user(response.message, 'danger');
+                    }
+                    alertUser.alert_user(response.message, 'success', false, true);
+                },
+                error: function (response) {
+                    const responseText = response.responseText;
+                    if (responseText) {
+                        alertUser.alert_user(responseText, 'danger');
+                    } else {
+                        alertUser.alert_user(unexpectedErrorMessage, 'danger', false, true);
+                    }
+                },
+                complete: function () {
+                    self.assignmentAjaxInProgress(false);
+                },
+            });
+        };
+
+        return self;
+    };
+
     return {
         MissingGPSModel: MissingGPSModel,
         SavedPolygon: SavedPolygon,
@@ -818,5 +1062,6 @@ hqDefine('geospatial/js/models', [
         GroupedCaseMapItem: GroupedCaseMapItem,
         Map: Map,
         PolygonFilter: PolygonFilter,
+        AssignmentManager: AssignmentManager,
     };
 });
diff --git a/corehq/apps/geospatial/static/geospatial/js/utils.js b/corehq/apps/geospatial/static/geospatial/js/utils.js
index 4d0c98394f50..c48d24ccf1b1 100644
--- a/corehq/apps/geospatial/static/geospatial/js/utils.js
+++ b/corehq/apps/geospatial/static/geospatial/js/utils.js
@@ -1,3 +1,4 @@
+'use strict';
 hqDefine('geospatial/js/utils', [], function () {
 
     const DEFAULT_MARKER_OPACITY = 1.0;
@@ -58,6 +59,29 @@ hqDefine('geospatial/js/utils', [], function () {
         return true;
     }
 
+    function downloadCsv(items, headers, cols, fileName) {
+        let csvStr = "";
+        csvStr = (headers).join(',');
+        csvStr += '\n';
+
+        _.forEach(items, function (itemToExport) {
+            let dataToExport = [];
+            for (const col of cols) {
+                dataToExport.push(itemToExport[col]);
+            }
+            csvStr += dataToExport.join(',');
+            csvStr += '\n';
+        });
+
+        // Download CSV file
+        const hiddenElement = document.createElement('a');
+        hiddenElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(csvStr);
+        hiddenElement.target = '_blank';
+        hiddenElement.download = `${fileName} (${getTodayDate()}).csv`;
+        hiddenElement.click();
+        hiddenElement.remove();
+    }
+
     return {
         getRandomRGBColor: getRandomRGBColor,
         uuidv4: uuidv4,
@@ -66,5 +90,6 @@ hqDefine('geospatial/js/utils', [], function () {
         setQueryParam: setQueryParam,
         clearQueryParam: clearQueryParam,
         fetchQueryParam: fetchQueryParam,
+        downloadCsv: downloadCsv,
     };
 });
\ No newline at end of file
diff --git a/corehq/apps/geospatial/tasks.py b/corehq/apps/geospatial/tasks.py
new file mode 100644
index 000000000000..69b354aa16da
--- /dev/null
+++ b/corehq/apps/geospatial/tasks.py
@@ -0,0 +1,16 @@
+from corehq.apps.celery import task
+from corehq.apps.geospatial.utils import (
+    CeleryTaskTracker,
+    get_flag_assigned_cases_config,
+    update_cases_owner,
+)
+
+
+@task(queue="background_queue", ignore_result=True)
+def geo_cases_reassignment_update_owners(domain, case_owner_updates_dict, task_key):
+    try:
+        flag_assigned_cases = get_flag_assigned_cases_config(domain)
+        update_cases_owner(domain, case_owner_updates_dict, flag_assigned_cases)
+    finally:
+        celery_task_tracker = CeleryTaskTracker(task_key)
+        celery_task_tracker.mark_completed()
diff --git a/corehq/apps/geospatial/templates/map_visualization.html b/corehq/apps/geospatial/templates/case_management.html
similarity index 94%
rename from corehq/apps/geospatial/templates/map_visualization.html
rename to corehq/apps/geospatial/templates/case_management.html
index f48d59a7c08e..dcb46694a9cd 100644
--- a/corehq/apps/geospatial/templates/map_visualization.html
+++ b/corehq/apps/geospatial/templates/case_management.html
@@ -125,6 +125,16 @@ <h4 class="text-center">
 </div>
 
 <div id="case-buttons">
+    <div id="assignments-results" class="pull-left">
+        <button class="btn btn-default" data-toggle="modal" data-target="#review-assignment-results" data-bind="click: loadCaseData, enable: canOpenModal">
+            {% trans 'Review Results' %}
+        </button>
+        <button id="accept-assignment-results" class="btn btn-default"  data-bind="click: acceptAssignments, enable: canOpenModal && !assignmentAjaxInProgress">
+            {% trans 'Accept Results' %}
+            <i class="spinner fa-spin fa fa-refresh" data-bind="visible: assignmentAjaxInProgress"></i>
+        </button>
+        {% include 'geospatial/partials/review_assignment_modal.html' %}
+    </div>
     <div id="user-modals" class="pull-right">
         <button class="btn btn-default" data-toggle="modal" data-target="#selected-user-list" data-bind="enable: selectedUsers().length">
             <span data-bind="text: selectedUsers().length"></span>
diff --git a/corehq/apps/geospatial/templates/geospatial/case_grouping_map_base.html b/corehq/apps/geospatial/templates/geospatial/case_grouping_map_base.html
index a839b91b9de4..032f2e86495c 100644
--- a/corehq/apps/geospatial/templates/geospatial/case_grouping_map_base.html
+++ b/corehq/apps/geospatial/templates/geospatial/case_grouping_map_base.html
@@ -18,4 +18,5 @@
     {% initial_page_data "saved_polygons" saved_polygons %}
     {% registerurl 'geo_polygons' domain %}
     {% registerurl 'geo_polygon' domain '---' %}
+    {% registerurl 'reassign_cases' domain %}
 {% endblock %}
diff --git a/corehq/apps/geospatial/templates/geospatial/map_visualization_base.html b/corehq/apps/geospatial/templates/geospatial/case_management_base.html
similarity index 84%
rename from corehq/apps/geospatial/templates/geospatial/map_visualization_base.html
rename to corehq/apps/geospatial/templates/geospatial/case_management_base.html
index 5b35c6c5a198..78e070943920 100644
--- a/corehq/apps/geospatial/templates/geospatial/map_visualization_base.html
+++ b/corehq/apps/geospatial/templates/geospatial/case_management_base.html
@@ -9,7 +9,7 @@
 
 {% block js %}{{ block.super }}
     {% compress js %}
-        <script src="{% static 'geospatial/js/geospatial_map.js' %}"></script>
+        <script src="{% static 'geospatial/js/case_management.js' %}"></script>
     {% endcompress %}
 {% endblock %}
 
@@ -21,4 +21,5 @@
     {% registerurl 'get_users_with_gps' domain %}
     {% registerurl 'edit_commcare_user' domain '---' %}
     {% registerurl 'location_search' domain %}
+    {% registerurl 'reassign_cases' domain %}
 {% endblock %}
diff --git a/corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html b/corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
new file mode 100644
index 000000000000..20bc3dd89a9c
--- /dev/null
+++ b/corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
@@ -0,0 +1,100 @@
+{% load i18n %}
+
+<div class="modal fade" id="review-assignment-results" tabindex="-1" role="dialog">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal">
+                <span aria-hidden="true">&times;</span>
+                </button>
+                <h4 class="modal-title">
+                {% trans 'Review Assignment Results' %}
+                </h4>
+            </div>
+            <div class="modal-body">
+                <p>
+                    {% blocktrans %}
+                        All potential cases for each mobile worker will be pre-selected and de-selecting a case will
+                        remove it from final assignments once the "Assign" button is clicked.
+                    {% endblocktrans %}
+                </p>
+                <div class="row">
+                    <div class="form-group col-lg-6">
+                        <label>
+                            {% trans 'Assignment Status' %}
+                        </label>
+                        <select class="select form-control" data-bind="value: assignedFilter">
+                            <option value="all">{% trans 'Show All' %}</option>
+                            <option value="assigned">{% trans 'Assigned Only' %}</option>
+                            <option value="unassigned">{% trans 'Unassigned Only' %}</option>
+                        </select>
+                    </div>
+                    <div class="form-group col-lg-6">
+                        <label>
+                            {% trans 'Select mobile worker for case assignment' %}
+                        </label>
+                        <select class="select form-control"
+                                type="text"
+                                id="user-assignment-select"
+                                data-bind="value: selectedUserId">
+                        </select>
+                    </div>
+                </div>
+                <table class="table table-striped table-bordered">
+                    <thead>
+                    <tr>
+                        <th class="col-sm-3">
+                            <span>{% trans 'Select' %}</span>
+                            <button class="btn btn-xs btn-default" data-bind="click: toggleSelectAll(true)">{% trans 'All' %}</button>
+                            <button class="btn btn-xs btn-default" data-bind="click: toggleSelectAll(false)">{% trans 'None' %}</button>
+                        </th>
+                        <th>{% trans "Case Name" %}</th>
+                        <th>{% trans "Potential Mobile Worker" %}</th>
+                        <th>{% trans "Mobile Worker Primary Location" %}</th>
+                    </tr>
+                    </thead>
+                    <tbody data-bind="foreach: caseDataPage">
+                        <tr data-bind="css: { active: isSelected }">
+                            <td>
+                                <input type="checkbox" data-bind="checked: isSelected" />
+                            </td>
+                            <td data-bind="text: $data.caseName"></td>
+                            <td data-bind="text: $data.assignedUsername"></td>
+                            <td data-bind="text: $data.assignedUserPrimaryLocName"></td>
+                        </tr>
+                    </tbody>
+                </table>
+                <pagination data-apply-bindings="false"
+                            params="goToPage: goToPage,
+                                    slug: 'assigned-cases',
+                                    perPage: itemsPerPage,
+                                    totalItems: totalItems">
+                </pagination>
+            </div>
+            <div class="modal-footer">
+                <div class="row form-horizontal">
+                    <label class="checkbox col-sm-4">
+                        <input type="checkbox" data-bind="checked: includeRelatedCases"/>
+                        {% trans 'Include related cases' %}
+                    </label>
+                    <div class="col-sm-8 pull-right">
+                        <a class="btn btn-default" data-bind="click: assignUserToCases, attr: { disabled: !hasCheckedRows() }">
+                            <span data-bind="visible: selectedUserId">
+                                {% trans 'Assign Cases' %}
+                            </span>
+                            <span data-bind="hidden: selectedUserId">
+                                {% trans 'Unassign Cases' %}
+                            </span>
+                        </a>
+                        <button class="btn btn-default" data-bind="click: exportAssignments">
+                            {% trans 'Export' %}
+                        </button>
+                        <button class="btn btn-default" data-dismiss="modal" data-bind="click: finishAssignment">
+                            {% trans 'Finish' %}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/corehq/apps/geospatial/templates/gps_capture_view.html b/corehq/apps/geospatial/templates/gps_capture_view.html
index ced8d1f17afc..819dd74bad7d 100644
--- a/corehq/apps/geospatial/templates/gps_capture_view.html
+++ b/corehq/apps/geospatial/templates/gps_capture_view.html
@@ -38,7 +38,7 @@
 
   <div class="tab-pane fade" id="tabs-users">
     {% include 'gps_capture.html' with data_type='user' %}
-      <div class="module-banner alert alert-info">
+      <div class="alert alert-info">
         <span>
           {% blocktrans %}
             To create new Mobile Workers navigate to the Mobile Workers page under the Users tab.
diff --git a/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py b/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py
new file mode 100644
index 000000000000..c5f174e35fb1
--- /dev/null
+++ b/corehq/apps/geospatial/tests/test_index_geolocation_case_properties.py
@@ -0,0 +1,76 @@
+from django.test import TestCase
+
+from casexml.apps.case.mock import CaseFactory
+
+from corehq.apps.es import CaseSearchES
+from corehq.apps.es.case_search import case_search_adapter
+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.models import GeoConfig
+
+
+@es_test(requires=[case_search_adapter], setup_class=True)
+class TestGetFormCases(TestCase):
+    domain = 'foobar'
+    primary_case_type = 'primary'
+    secondary_case_type = 'secondary'
+    gps_prop_name = 'gps_coordinates'
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        factory = CaseFactory(cls.domain)
+        case1 = factory.create_case(
+            case_name='foo',
+            case_type=cls.primary_case_type,
+            update={cls.gps_prop_name: '1.1 2.2'},
+        )
+        case2 = factory.create_case(
+            case_name='bar',
+            case_type=cls.primary_case_type,
+            update={cls.gps_prop_name: '3.3 4.4'},
+        )
+        case3 = factory.create_case(
+            case_name='other',
+            case_type=cls.secondary_case_type,
+            update={cls.gps_prop_name: '5.5 6.6'},
+        )
+        case4 = factory.create_case(
+            case_name='no_props',
+            case_type=cls.primary_case_type,
+        )
+        case_search_adapter.bulk_index([case1, case2, case3, case4], refresh=True)
+        cls.geo_config = GeoConfig.objects.create(
+            domain=cls.domain,
+            case_location_property_name=cls.gps_prop_name
+        )
+        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)
+        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)
+        case_count = query.count()
+        self.assertEqual(case_count, 0)
+        doc = (
+            CaseSearchES()
+            .domain(self.domain)
+            .case_type(self.secondary_case_type)
+        ).run().hits[0]
+        case_props = doc['case_properties']
+        expected_geopoint_val = {
+            'key': self.gps_prop_name,
+            'value': '5.5 6.6',
+            'geopoint_value': {
+                'lat': 5.5,
+                'lon': 6.6
+            }
+        }
+        self.assertTrue(expected_geopoint_val in case_props)
diff --git a/corehq/apps/geospatial/tests/test_utils.py b/corehq/apps/geospatial/tests/test_utils.py
index fbec0f277c65..77592468e29c 100644
--- a/corehq/apps/geospatial/tests/test_utils.py
+++ b/corehq/apps/geospatial/tests/test_utils.py
@@ -2,21 +2,28 @@
 
 from django.test import TestCase
 
+from dimagi.utils.couch.cache.cache_core import get_redis_client
+
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.es import case_search_adapter
 from corehq.apps.es.tests.utils import es_test
-from corehq.form_processor.models import CommCareCase
-from corehq.apps.users.models import CommCareUser
-from corehq.form_processor.tests.utils import create_case
+from corehq.apps.geospatial.const import ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY, GPS_POINT_CASE_PROPERTY
 from corehq.apps.geospatial.models import GeoConfig
 from corehq.apps.geospatial.utils import (
+    CaseOwnerUpdate,
+    CeleryTaskTracker,
+    create_case_with_gps_property,
+    get_flag_assigned_cases_config,
     get_geo_case_property,
     get_geo_user_property,
     set_case_gps_property,
     set_user_gps_property,
-    create_case_with_gps_property,
+    update_cases_owner,
 )
-from corehq.apps.geospatial.const import GPS_POINT_CASE_PROPERTY
+from corehq.apps.users.models import CommCareUser
+from corehq.form_processor.models import CommCareCase, CommCareCaseIndex
+from corehq.form_processor.tests.utils import create_case
+from corehq.tests.locks import real_redis_client
 
 
 class TestGetGeoProperty(TestCase):
@@ -116,3 +123,139 @@ def test_set_user_gps_property(self):
         set_user_gps_property(self.DOMAIN, submit_data)
         user = CommCareUser.get_by_user_id(self.user.user_id, self.DOMAIN)
         self.assertEqual(user.get_user_data(self.DOMAIN)[GPS_POINT_CASE_PROPERTY], '1.23 4.56 0.0 0.0')
+
+
+class TestUpdateCasesOwner(TestCase):
+    domain = 'test-domain'
+
+    def setUp(self):
+        super().setUp()
+        self.user_a = CommCareUser.create(self.domain, 'User_A', '1234', None, None)
+        self.case_1 = create_case(self.domain, case_id=uuid4().hex, save=True, owner_id=self.user_a.user_id)
+
+        self.user_b = CommCareUser.create(self.domain, 'User_B', '1234', None, None)
+        self.case_2 = create_case(self.domain, case_id=uuid4().hex, save=True, owner_id=self.user_b.user_id)
+        self.related_case_2 = create_case(
+            self.domain,
+            case_id=uuid4().hex,
+            save=True,
+            owner_id=self.user_b.user_id
+        )
+        self._create_parent_index(self.related_case_2, self.case_2.case_id)
+
+        self.cases = [self.case_1, self.case_2, self.related_case_2]
+
+    def tearDown(self):
+        self.user_a.delete(self.domain, None)
+        self.user_b.delete(self.domain, None)
+        CommCareCase.objects.hard_delete_cases(
+            self.domain,
+            [case.case_id for case in self.cases]
+        )
+        super().tearDown()
+
+    def _create_parent_index(self, case, parent_case_id):
+        index = CommCareCaseIndex(
+            case=case,
+            identifier='parent',
+            referenced_id=parent_case_id,
+            referenced_type='parent',
+            relationship_id=CommCareCaseIndex.CHILD
+        )
+        case.track_create(index)
+        case.save(with_tracked_models=True)
+
+    def _refresh_cases(self):
+        for case in self.cases:
+            case.refresh_from_db()
+
+    def _assert_for_assigned_cases_flag_absent(self):
+        for case in self.cases:
+            self.assertIsNone(case.case_json.get(ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY))
+
+    def _assert_for_assigned_cases_flag_present(self):
+        for case in self.cases:
+            self.assertTrue(case.case_json.get(ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY))
+
+    def test_update_cases_owner(self):
+        case_owner_updates = [
+            CaseOwnerUpdate(case_id=self.case_1.case_id, owner_id=self.user_b.user_id),
+            CaseOwnerUpdate(
+                case_id=self.case_2.case_id,
+                owner_id=self.user_a.user_id,
+                related_case_ids=[self.related_case_2.case_id]),
+        ]
+
+        update_cases_owner(self.domain, CaseOwnerUpdate.to_dict(case_owner_updates))
+
+        self._refresh_cases()
+        self.assertEqual(self.case_1.owner_id, self.user_b.user_id)
+        self.assertEqual(self.case_2.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_a.user_id)
+        self._assert_for_assigned_cases_flag_absent()
+
+    def test_update_cases_owner_with_flag_assigned_cases(self):
+        case_owner_updates = [
+            CaseOwnerUpdate(case_id=self.case_1.case_id, owner_id=self.user_b.user_id),
+            CaseOwnerUpdate(
+                case_id=self.case_2.case_id,
+                owner_id=self.user_a.user_id,
+                related_case_ids=[self.related_case_2.case_id]),
+        ]
+
+        update_cases_owner(self.domain, CaseOwnerUpdate.to_dict(case_owner_updates), flag_assigned_cases=True)
+
+        self._refresh_cases()
+        self.assertEqual(self.case_1.owner_id, self.user_b.user_id)
+        self.assertEqual(self.case_2.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_a.user_id)
+        self._assert_for_assigned_cases_flag_present()
+
+
+class TestCeleryTaskTracker(TestCase):
+    TASK_KEY = 'test-key'
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        with real_redis_client():
+            cls.redis_client = get_redis_client()
+            cls.celery_task_tracker = CeleryTaskTracker(cls.TASK_KEY)
+
+    def tearDown(self):
+        self.redis_client.clear()
+        super().tearDown()
+
+    def test_mark_active(self):
+        self.celery_task_tracker.mark_requested()
+        self.assertTrue(self.redis_client.has_key(self.TASK_KEY))
+
+    def test_get_active(self):
+        self.redis_client.set(self.TASK_KEY, 'ACTIVE')
+        self.assertTrue(self.celery_task_tracker.is_active())
+
+    def test_mark_inactive(self):
+        self.redis_client.set(self.TASK_KEY, 'ACTIVE')
+        self.celery_task_tracker.mark_completed()
+        self.assertFalse(self.redis_client.has_key(self.TASK_KEY))
+
+
+class TestGetFlagAssignedCasesConfig(TestCase):
+
+    DOMAIN = "test-domain"
+
+    def test_flag_not_set(self):
+        self.assertFalse(get_flag_assigned_cases_config(self.DOMAIN))
+
+    def test_flag_set(self):
+        config = GeoConfig(
+            domain=self.DOMAIN,
+            flag_assigned_cases=True,
+        )
+        config.save()
+        self.addCleanup(config.delete)
+
+        self.assertTrue(get_flag_assigned_cases_config(self.DOMAIN))
+
+    def test_invalid_domain_provided(self):
+        self.assertFalse(get_flag_assigned_cases_config(None))
diff --git a/corehq/apps/geospatial/tests/test_views.py b/corehq/apps/geospatial/tests/test_views.py
index 3f400c52fad1..b5108620f1c5 100644
--- a/corehq/apps/geospatial/tests/test_views.py
+++ b/corehq/apps/geospatial/tests/test_views.py
@@ -1,5 +1,7 @@
+from unittest.mock import patch
 from uuid import uuid4
 
+from django.http import JsonResponse
 from django.test import Client, TestCase
 from django.urls import reverse
 
@@ -7,9 +9,10 @@
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.es import case_adapter, case_search_adapter, user_adapter
 from corehq.apps.es.tests.utils import es_test
-from corehq.apps.geospatial.const import GPS_POINT_CASE_PROPERTY
+from corehq.apps.geospatial.const import ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY, GPS_POINT_CASE_PROPERTY
 from corehq.apps.geospatial.models import GeoConfig, GeoPolygon
 from corehq.apps.geospatial.views import (
+    CasesReassignmentView,
     GeoPolygonDetailView,
     GeoPolygonListView,
     GeospatialConfigPage,
@@ -17,13 +20,12 @@
 )
 from corehq.apps.locations.models import LocationType, SQLLocation
 from corehq.apps.users.models import CommCareUser, WebUser
-from corehq.form_processor.models import CommCareCase
+from corehq.form_processor.models import CommCareCase, CommCareCaseIndex
 from corehq.form_processor.tests.utils import create_case
 from corehq.util.test_utils import flag_enabled
 
 
 class BaseGeospatialViewClass(TestCase):
-
     domain = 'test-domain'
 
     @classmethod
@@ -126,7 +128,7 @@ def construct_data(case_property, user_property=None, extra_data=None):
 
     def test_feature_flag_not_enabled(self):
         result = self._make_post({})
-        self.assertTrue(result.status_code == 404)
+        self.assertEqual(result.status_code, 404)
 
     @flag_enabled('GEOSPATIAL')
     def test_new_config_create(self):
@@ -141,7 +143,7 @@ def test_new_config_create(self):
         )
         config = GeoConfig.objects.get(domain=self.domain)
 
-        self.assertTrue(config.location_data_source == GeoConfig.CUSTOM_USER_PROPERTY)
+        self.assertEqual(config.location_data_source, GeoConfig.CUSTOM_USER_PROPERTY)
         self.assertEqual(config.user_location_property_name, 'some_user_field')
         self.assertEqual(config.case_location_property_name, self.gps_case_prop_name)
         self.assertEqual(config.selected_grouping_method, GeoConfig.MIN_MAX_GROUPING)
@@ -391,11 +393,13 @@ def test_get_users_with_gps(self):
                 'id': self.user_a.user_id,
                 'username': self.user_a.raw_username,
                 'gps_point': '12.34 45.67',
+                'primary_loc_name': self.country_a.name,
             },
             self.user_c.user_id: {
                 'id': self.user_c.user_id,
                 'username': self.user_c.raw_username,
                 'gps_point': '45.67 12.34',
+                'primary_loc_name': '---',
             }
         }
         self.client.login(username=self.username, password=self.password)
@@ -438,7 +442,7 @@ def test_not_logged_in(self):
 
     def test_feature_flag_not_enabled(self):
         response = self._make_post_request({'geo_json': _sample_geojson_data()})
-        self.assertTrue(response.status_code == 404)
+        self.assertEqual(response.status_code, 404)
 
     @flag_enabled('GEOSPATIAL')
     def test_save_polygon(self):
@@ -447,7 +451,7 @@ def test_save_polygon(self):
         self.assertEqual(response.status_code, 200)
         saved_polygons = GeoPolygon.objects.filter(domain=self.domain)
         self.assertEqual(len(saved_polygons), 1)
-        self.assertTrue(saved_polygons[0].name == geo_json_data["name"])
+        self.assertEqual(saved_polygons[0].name, geo_json_data["name"])
         geo_json_data.pop("name")
         for feature in geo_json_data["features"]:
             del feature['id']
@@ -476,6 +480,14 @@ def test_geo_json_validation(self):
             message='Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons'
         )
 
+    @flag_enabled('GEOSPATIAL')
+    def test_empty_name_validation(self):
+        response = self._make_post_request({'geo_json': _sample_geojson_data(name='')})
+        self._assert_error_message(
+            response,
+            message='Please specify a name for the GeoPolygon area.'
+        )
+
     @flag_enabled('GEOSPATIAL')
     def test_name_validation(self):
         GeoPolygon.objects.create(
@@ -521,7 +533,7 @@ def test_not_logged_in(self):
     def test_feature_flag_not_enabled(self):
         geo_polygon = self._create_sample_polygon()
         response = self.client.get(self._endpoint(geo_polygon.id))
-        self.assertTrue(response.status_code == 404)
+        self.assertEqual(response.status_code, 404)
 
     @flag_enabled('GEOSPATIAL')
     def test_get_polygon(self):
@@ -566,3 +578,387 @@ def _sample_geojson_data(name='test-2'):
         "name": name,
     }
     return data
+
+
+@es_test(requires=[case_search_adapter, user_adapter])
+class TestCasesReassignmentView(BaseGeospatialViewClass):
+    urlname = CasesReassignmentView.urlname
+
+    def setUp(self):
+        super().setUp()
+        self.user_a = CommCareUser.create(self.domain, 'User_A', '1234', None, None)
+        self.user_b = CommCareUser.create(self.domain, 'User_B', '1234', None, None)
+        user_adapter.bulk_index([self.user_a, self.user_b], refresh=True)
+
+        self.case_1 = create_case(self.domain, case_id=uuid4().hex, save=True, owner_id=self.user_a.user_id)
+        self.related_case_1 = create_case(
+            self.domain,
+            case_id=uuid4().hex,
+            save=True,
+            owner_id=self.user_a.user_id
+        )
+        self._create_parent_index(self.related_case_1, self.case_1.case_id)
+
+        self.case_2 = create_case(
+            self.domain,
+            case_id=uuid4().hex,
+            save=True,
+            owner_id=self.user_b.user_id
+        )
+        self.related_case_2 = create_case(
+            self.domain,
+            case_id=uuid4().hex,
+            save=True,
+            owner_id=self.user_b.user_id
+        )
+        self._create_parent_index(self.related_case_2, self.case_2.case_id)
+
+        self.cases = [self.case_1, self.related_case_1, self.case_2, self.related_case_2]
+        case_search_adapter.bulk_index(self.cases, refresh=True)
+
+        self.client.login(username=self.username, password=self.password)
+
+    def tearDown(self):
+        self.user_a.delete(self.domain, None, None)
+        self.user_b.delete(self.domain, None, None)
+        CommCareCase.objects.hard_delete_cases(self.domain, [case.case_id for case in self.cases])
+        super().tearDown()
+
+    def _create_parent_index(self, case, parent_case_id):
+        index = CommCareCaseIndex(
+            case=case,
+            identifier='parent',
+            referenced_id=parent_case_id,
+            referenced_type='parent',
+            relationship_id=CommCareCaseIndex.CHILD
+        )
+        case.track_create(index)
+        case.save(with_tracked_models=True)
+
+    def _refresh_cases(self):
+        for case in self.cases:
+            case.refresh_from_db()
+
+    def _assert_for_request_cases_success(self, response):
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(self.case_1.owner_id, self.user_b.user_id)
+        self.assertEqual(self.case_2.owner_id, self.user_a.user_id)
+
+    @flag_enabled('GEOSPATIAL')
+    def test_not_logged_in(self):
+        response = Client().post(self.endpoint)
+        self.assertRedirects(response, f"{self.login_url}?next={self.endpoint}")
+
+    def test_feature_flag_not_enabled(self):
+        response = self.client.post(self.endpoint)
+        self.assertEqual(response.status_code, 404)
+
+    def _assert_for_assigned_cases_flag_disabled(self, cases):
+        for case in cases:
+            self.assertIsNone(case.case_json.get(ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY))
+
+    def _assert_for_assigned_cases_flag_enabled(self, cases):
+        for case in cases:
+            self.assertTrue(case.case_json.get(ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY))
+
+    @flag_enabled('GEOSPATIAL')
+    def test_cases_reassignment(self):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_b.user_id)
+        self._assert_for_assigned_cases_flag_disabled([self.case_1, self.case_2])
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.get_flag_assigned_cases_config', return_value=True)
+    def test_cases_reassignment_with_assigned_cases_flag_enabled(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_b.user_id)
+        self._assert_for_assigned_cases_flag_enabled([self.case_1, self.case_2])
+
+    @flag_enabled('GEOSPATIAL')
+    def test_cases_reassignment_with_related_cases(self):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+                'include_related_cases': True,
+            }
+        )
+
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_b.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_a.user_id)
+        self._assert_for_assigned_cases_flag_disabled(
+            [self.case_1, self.case_2, self.related_case_1, self.related_case_2]
+        )
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.get_flag_assigned_cases_config', return_value=True)
+    def test_cases_reassignment_with_related_cases_and_assigned_cases_flag_enabled(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+                'include_related_cases': True,
+            }
+        )
+
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_b.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_a.user_id)
+        self._assert_for_assigned_cases_flag_enabled(
+            [self.case_1, self.case_2, self.related_case_1, self.related_case_2]
+        )
+
+    @flag_enabled('GEOSPATIAL')
+    def test_cases_reassignment_with_related_case_in_request(self):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+            self.related_case_1.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+                'include_related_cases': True,
+            }
+        )
+
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_a.user_id)
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView.REQUEST_CASES_LIMIT', 1)
+    def test_cases_reassignment_cases_limit_error(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.content.decode("utf-8"), "Maximum number of cases that can be reassigned is 1")
+
+    @flag_enabled('GEOSPATIAL')
+    def test_cases_reassignment_cases_json_error(self, *args):
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data='hello'
+        )
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.content.decode("utf-8"), "POST Body must be a valid json")
+
+    @flag_enabled('GEOSPATIAL')
+    def test_cases_reassignment_cases_invalid_case_ids(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            'invalid-case-id': self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.content.decode("utf-8"),
+            "Following Case ids in request are invalid: {}".format(['invalid-case-id'])
+        )
+
+    @flag_enabled('GEOSPATIAL')
+    def test_cases_reassignment_cases_invalid_owner_ids(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: 'invalid-owner-id',
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.content.decode("utf-8"),
+            "Following Owner ids in request are invalid: {}".format(['invalid-owner-id'])
+        )
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView.ASYNC_CASES_UPDATE_THRESHOLD', 2)
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView._process_as_async')
+    def test_cases_reassignment_async_invocation(self, mocked_process_as_async):
+        mocked_process_as_async.return_value = JsonResponse({})
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+                'include_related_cases': True,
+            }
+        )
+        mocked_process_as_async.assert_called_once()
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView.ASYNC_CASES_UPDATE_THRESHOLD', 2)
+    @patch('corehq.apps.geospatial.views.CeleryTaskTracker.is_active', return_value=False)
+    def test_cases_reassignment_async(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+            self.related_case_1.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_b.user_id)
+        self._assert_for_assigned_cases_flag_disabled([self.case_1, self.case_2, self.related_case_1])
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.tasks.get_flag_assigned_cases_config', return_value=True)
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView.ASYNC_CASES_UPDATE_THRESHOLD', 2)
+    @patch('corehq.apps.geospatial.views.CeleryTaskTracker.is_active', return_value=False)
+    def test_cases_reassignment_async_with_assigned_cases_flag_enabled(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+            self.related_case_1.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+        self._refresh_cases()
+        self._assert_for_request_cases_success(response)
+        self.assertEqual(self.related_case_1.owner_id, self.user_a.user_id)
+        self.assertEqual(self.related_case_2.owner_id, self.user_b.user_id)
+        self._assert_for_assigned_cases_flag_enabled([self.case_1, self.case_2, self.related_case_1])
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView.ASYNC_CASES_UPDATE_THRESHOLD', 2)
+    @patch('corehq.apps.geospatial.views.CeleryTaskTracker.is_active', return_value=True)
+    def test_cases_reassignment_async_task_invoked_and_not_completed(self, *args):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+            self.related_case_1.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+            }
+        )
+
+        self.assertEqual(response.status_code, 409)
+        self.assertEqual(
+            response.content.decode("utf-8"),
+            "Case reassignment is currently in progress. Please try again later."
+        )
+
+    @flag_enabled('GEOSPATIAL')
+    @patch('corehq.apps.geospatial.views.CasesReassignmentView.TOTAL_CASES_LIMIT', 3)
+    def test_cases_reassignment_max_limit_error(self):
+        case_id_to_owner_id = {
+            self.case_1.case_id: self.user_b.user_id,
+            self.case_2.case_id: self.user_a.user_id,
+        }
+
+        response = self.client.post(
+            self.endpoint,
+            content_type='application/json',
+            data={
+                'case_id_to_owner_id': case_id_to_owner_id,
+                'include_related_cases': True,
+            }
+        )
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.content.decode("utf-8"),
+            ("Case reassignment limit exceeded. Please select fewer cases to update"
+             " or consider deselecting 'include related cases'."
+             " Reach out to support if you still need assistance.")
+        )
diff --git a/corehq/apps/geospatial/urls.py b/corehq/apps/geospatial/urls.py
index 231cbe8a5c15..0473d5cf6f58 100644
--- a/corehq/apps/geospatial/urls.py
+++ b/corehq/apps/geospatial/urls.py
@@ -2,6 +2,7 @@
 
 from .dispatchers import CaseManagementMapDispatcher
 from .views import (
+    CasesReassignmentView,
     GeoPolygonDetailView,
     GeoPolygonListView,
     GeospatialConfigPage,
@@ -25,6 +26,7 @@
         name='get_paginated_cases_or_users'),
     url(r'^gps_capture/$', GPSCaptureView.as_view(), name=GPSCaptureView.urlname),
     url(r'^users/json/$', get_users_with_gps, name='get_users_with_gps'),
+    url(r'^reassign_cases/$', CasesReassignmentView.as_view(), name=CasesReassignmentView.urlname),
 
     CaseManagementMapDispatcher.url_pattern(),
 ]
diff --git a/corehq/apps/geospatial/utils.py b/corehq/apps/geospatial/utils.py
index 6939a8997ce7..7fbc75805daa 100644
--- a/corehq/apps/geospatial/utils.py
+++ b/corehq/apps/geospatial/utils.py
@@ -1,31 +1,38 @@
+from dataclasses import asdict, dataclass, field
+
 import jsonschema
 from jsonobject.exceptions import BadValueError
 
+from casexml.apps.case.mock import CaseBlock
+from corehq.apps.geospatial.const import ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY
 from couchforms.geopoint import GeoPoint
+from dimagi.utils.couch.cache.cache_core import get_redis_client
 
+from corehq.apps.geospatial.models import GeoConfig
 from corehq.apps.hqcase.case_helper import CaseHelper
+from corehq.apps.hqcase.utils import submit_case_blocks
 from corehq.apps.users.models import CommCareUser
-from corehq.util.quickcache import quickcache
-
-from .models import GeoConfig
+from corehq.const import ONE_DAY
 
 
-@quickcache(['domain'], timeout=24 * 60 * 60)
 def get_geo_case_property(domain):
-    try:
-        config = GeoConfig.objects.get(domain=domain)
-    except GeoConfig.DoesNotExist:
-        config = GeoConfig()
-    return config.case_location_property_name
+    return get_geo_config(domain).case_location_property_name
 
 
-@quickcache(['domain'], timeout=24 * 60 * 60)
 def get_geo_user_property(domain):
+    return get_geo_config(domain).user_location_property_name
+
+
+def get_flag_assigned_cases_config(domain):
+    return get_geo_config(domain).flag_assigned_cases
+
+
+def get_geo_config(domain):
     try:
         config = GeoConfig.objects.get(domain=domain)
     except GeoConfig.DoesNotExist:
         config = GeoConfig()
-    return config.user_location_property_name
+    return config
 
 
 def _format_coordinates(lat, lon):
@@ -165,3 +172,73 @@ def geojson_to_es_geoshape(geojson):
     es_geoshape = geojson['geometry'].copy()
     es_geoshape['type'] = es_geoshape['type'].lower()
     return es_geoshape
+
+
+@dataclass
+class CaseOwnerUpdate:
+    case_id: str
+    owner_id: str
+    related_case_ids: list = field(default_factory=list)
+
+    @classmethod
+    def from_case_to_owner_id_dict(cls, case_to_owner_id):
+        result = []
+        for case_id, owner_id in case_to_owner_id.items():
+            result.append(cls(case_id=case_id, owner_id=owner_id))
+        return result
+
+    @classmethod
+    def total_cases_count(cls, case_owner_updates):
+        count = len(case_owner_updates)
+        for case_owner_update in case_owner_updates:
+            count += len(case_owner_update.related_case_ids)
+        return count
+
+    @classmethod
+    def to_dict(cls, case_owner_updates):
+        return [asdict(obj) for obj in case_owner_updates]
+
+
+def update_cases_owner(domain, case_owner_updates_dict, flag_assigned_cases=False):
+    case_properties = {}
+    if flag_assigned_cases:
+        case_properties[ASSIGNED_VIA_DISBURSEMENT_CASE_PROPERTY] = True
+
+    for case_owner_update in case_owner_updates_dict:
+        case_blocks = []
+        cases_to_updates = [case_owner_update['case_id']] + case_owner_update['related_case_ids']
+        for case_id in cases_to_updates:
+            case_blocks.append(
+                CaseBlock(
+                    create=False,
+                    case_id=case_id,
+                    owner_id=case_owner_update['owner_id'],
+                    update=case_properties,
+                ).as_text()
+            )
+        submit_case_blocks(
+            case_blocks=case_blocks,
+            domain=domain,
+            device_id=__name__ + '.update_cases_owners'
+        )
+
+
+class CeleryTaskTracker(object):
+    """
+    Simple Helper class using redis to track if a celery task was requested and is not completed yet.
+    """
+
+    def __init__(self, task_key):
+        self.task_key = task_key
+        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._client.set(self.task_key, 'ACTIVE', timeout=timeout)
+
+    def is_active(self):
+        return self._client.has_key(self.task_key)
+
+    def mark_completed(self):
+        return self._client.delete(self.task_key)
diff --git a/corehq/apps/geospatial/views.py b/corehq/apps/geospatial/views.py
index 3a684141431e..746730bb6202 100644
--- a/corehq/apps/geospatial/views.py
+++ b/corehq/apps/geospatial/views.py
@@ -1,9 +1,11 @@
 import json
+from collections import defaultdict
 
 from django.conf import settings
 from django.core.paginator import Paginator
 from django.http import (
     Http404,
+    HttpResponse,
     HttpResponseBadRequest,
     HttpResponseRedirect,
     JsonResponse,
@@ -20,16 +22,24 @@
 from dimagi.utils.web import json_request, json_response
 
 from corehq import toggles
+from corehq.apps.case_search.const import (
+    IDENTIFIER,
+    INDICES_PATH,
+    REFERENCED_ID,
+)
 from corehq.apps.data_dictionary.models import CaseProperty
 from corehq.apps.domain.decorators import login_and_domain_required
 from corehq.apps.domain.views.base import BaseDomainView
 from corehq.apps.es import CaseSearchES, UserES
 from corehq.apps.es.users import missing_or_empty_user_data_property
+from corehq.apps.geospatial.exceptions import CaseReassignmentValidationError, GeoPolygonValidationError
 from corehq.apps.geospatial.filters import GPSDataFilter
 from corehq.apps.geospatial.forms import GeospatialConfigForm
 from corehq.apps.geospatial.reports import CaseManagementMap
+from corehq.apps.geospatial.tasks import geo_cases_reassignment_update_owners
 from corehq.apps.hqwebapp.crispy import CSS_ACTION_CLASS
 from corehq.apps.hqwebapp.decorators import use_datatables, use_jquery_ui
+from corehq.apps.locations.models import SQLLocation
 from corehq.apps.reports.generic import get_filter_classes
 from corehq.apps.reports.standard.cases.basic import CaseListMixin
 from corehq.apps.reports.standard.cases.filters import CaseSearchFilter
@@ -40,12 +50,16 @@
 from .const import GPS_POINT_CASE_PROPERTY, POLYGON_COLLECTION_GEOJSON_SCHEMA
 from .models import GeoConfig, GeoPolygon
 from .utils import (
+    CaseOwnerUpdate,
+    CeleryTaskTracker,
     create_case_with_gps_property,
+    get_flag_assigned_cases_config,
     get_geo_case_property,
     get_geo_user_property,
     get_lat_lon_from_dict,
     set_case_gps_property,
     set_user_gps_property,
+    update_cases_owner,
 )
 
 
@@ -79,24 +93,16 @@ def post(self, request, *args, **kwargs):
             geo_json = json.loads(request.body).get('geo_json', None)
         except json.decoder.JSONDecodeError:
             return HttpResponseBadRequest(
-                'POST Body must be a valid json in {"geo_json": <geo_json>} format'
+                _('POST Body must be a valid json in {"geo_json": <geo_json>} format')
             )
 
-        if not geo_json:
-            return HttpResponseBadRequest('Empty geo_json POST field')
-
         try:
-            jsonschema.validate(geo_json, POLYGON_COLLECTION_GEOJSON_SCHEMA)
-        except jsonschema.exceptions.ValidationError:
-            return HttpResponseBadRequest(
-                'Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons'
-            )
+            self._validate_request_geo_json(geo_json)
 
-        geo_polygon_name = geo_json.pop('name')
-        if GeoPolygon.objects.filter(domain=self.domain, name__iexact=geo_polygon_name).exists():
-            return HttpResponseBadRequest(
-                'GeoPolygon with given name already exists! Please use a different name.'
-            )
+            geo_polygon_name = geo_json.pop('name')
+            self._validate_request_geo_polygon_name(geo_polygon_name)
+        except GeoPolygonValidationError as error:
+            return HttpResponseBadRequest(error)
 
         # Drop ids since they are specific to the Mapbox draw event
         for feature in geo_json["features"]:
@@ -111,6 +117,26 @@ def post(self, request, *args, **kwargs):
             'id': geo_polygon.id,
         })
 
+    def _validate_request_geo_json(self, geo_json):
+        if not geo_json:
+            raise GeoPolygonValidationError(_('Empty geo_json POST field'))
+
+        try:
+            jsonschema.validate(geo_json, POLYGON_COLLECTION_GEOJSON_SCHEMA)
+        except jsonschema.exceptions.ValidationError:
+            raise GeoPolygonValidationError(
+                _('Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons')
+            )
+
+    def _validate_request_geo_polygon_name(self, geo_polygon_name):
+        if geo_polygon_name == '':
+            raise GeoPolygonValidationError(_('Please specify a name for the GeoPolygon area.'))
+
+        if GeoPolygon.objects.filter(domain=self.domain, name__iexact=geo_polygon_name).exists():
+            raise GeoPolygonValidationError(
+                _('GeoPolygon with given name already exists! Please use a different name.')
+            )
+
 
 @method_decorator(toggles.GEOSPATIAL.required_decorator(), name="dispatch")
 class GeoPolygonDetailView(BaseDomainView):
@@ -407,18 +433,192 @@ def get_users_with_gps(request, domain):
         .domain(domain)
         .mobile_users()
         .NOT(missing_or_empty_user_data_property(location_prop_name))
+        .fields(['location_id', '_id'])
     )
     selected_location_id = request.GET.get('location_id')
     if selected_location_id:
         query = query.location(selected_location_id)
-    user_ids = query.scroll_ids()
+
+    user_ids = []
+    primary_loc_ids = set()
+    for user_doc in query.run().hits:
+        primary_loc_ids.add(user_doc['location_id'])
+        user_ids.append(user_doc['_id'])
+
+    user_primary_locs = dict(SQLLocation.objects.filter(
+        domain=domain, location_id__in=primary_loc_ids
+    ).values_list('location_id', 'name'))
+
     users = map(CouchUser.wrap_correctly, iter_docs(CommCareUser.get_db(), user_ids))
     user_data = [
         {
             'id': user.user_id,
             'username': user.raw_username,
             'gps_point': user.get_user_data(domain).get(location_prop_name, ''),
+            'primary_loc_name': user_primary_locs.get(user.location_id, '---'),
         } for user in users
     ]
 
     return json_response({'user_data': user_data})
+
+
+@method_decorator(toggles.GEOSPATIAL.required_decorator(), name="dispatch")
+class CasesReassignmentView(BaseDomainView):
+    urlname = "reassign_cases"
+    REQUEST_CASES_LIMIT = 100
+    # Below values denotes the number of cases to be reassigned including the related cases
+    ASYNC_CASES_UPDATE_THRESHOLD = 500  # threshold for asynchronous operation
+    TOTAL_CASES_LIMIT = 5000    # maximum number of cases that can be reassigned
+
+    def post(self, request, domain, *args, **kwargs):
+        try:
+            request_data = json.loads(request.body)
+        except json.decoder.JSONDecodeError:
+            return HttpResponseBadRequest(
+                _('POST Body must be a valid json')
+            )
+
+        case_id_to_owner_id = request_data.get('case_id_to_owner_id', {})
+        include_related_cases = request_data.get('include_related_cases')
+
+        try:
+            self._validate_request_cases_limit(case_id_to_owner_id)
+            self._validate_request_case_ids(list(case_id_to_owner_id.keys()))
+            self._validate_request_owner_ids(set(case_id_to_owner_id.values()))
+
+            case_owner_updates = CaseOwnerUpdate.from_case_to_owner_id_dict(case_id_to_owner_id)
+            if include_related_cases:
+                self._include_related_cases(case_id_to_owner_id, case_owner_updates)
+        except CaseReassignmentValidationError as error:
+            return HttpResponseBadRequest(error)
+
+        if CaseOwnerUpdate.total_cases_count(case_owner_updates) <= self.ASYNC_CASES_UPDATE_THRESHOLD:
+            flag_assigned_cases = get_flag_assigned_cases_config(self.domain)
+            update_cases_owner(domain, CaseOwnerUpdate.to_dict(case_owner_updates), flag_assigned_cases)
+            return JsonResponse({'success': True, 'message': _('Cases were reassigned successfully')})
+        else:
+            return self._process_as_async(case_owner_updates)
+
+    def _validate_request_cases_limit(self, case_id_to_owner_id):
+        if len(case_id_to_owner_id) > self.REQUEST_CASES_LIMIT:
+            raise CaseReassignmentValidationError(
+                _("Maximum number of cases that can be reassigned is {limit}").format(
+                    limit=self.REQUEST_CASES_LIMIT
+                )
+            )
+
+    def _validate_request_case_ids(self, case_ids):
+        existing_case_ids = CaseSearchES().domain(self.domain).case_ids(case_ids).get_ids()
+        invalid_case_ids = list(set(case_ids) - set(existing_case_ids))
+        if invalid_case_ids:
+            raise CaseReassignmentValidationError(
+                _("Following Case ids in request are invalid: {}").format(invalid_case_ids)
+            )
+
+    def _validate_request_owner_ids(self, owner_ids):
+        existing_user_ids = UserES().domain(self.domain).user_ids(owner_ids).get_ids()
+        invalid_owner_ids = list(owner_ids - set(existing_user_ids))
+        if invalid_owner_ids:
+            raise CaseReassignmentValidationError(
+                _("Following Owner ids in request are invalid: {}").format(invalid_owner_ids)
+            )
+
+    def _include_related_cases(self, case_id_to_owner_id, case_owner_updates):
+        request_cases_id = list(case_id_to_owner_id.keys())
+
+        parent_to_child_cases_id = self.get_child_cases(self.domain, request_cases_id)
+        for parent_case_id, child_cases_ids in parent_to_child_cases_id.items():
+            for child_case_id in child_cases_ids:
+                self._add_related_case(case_id_to_owner_id, parent_case_id, child_case_id, case_owner_updates)
+        self._validate_assignment_limit(case_owner_updates)
+
+        child_to_parent_case_id = self.get_parent_cases(self.domain, request_cases_id)
+        for child_case_id, parent_case_id in child_to_parent_case_id.items():
+            self._add_related_case(case_id_to_owner_id, child_case_id, parent_case_id, case_owner_updates)
+        self._validate_assignment_limit(case_owner_updates)
+
+        return case_id_to_owner_id
+
+    def _validate_assignment_limit(self, case_owner_updates):
+        if CaseOwnerUpdate.total_cases_count(case_owner_updates) > self.TOTAL_CASES_LIMIT:
+            raise CaseReassignmentValidationError(
+                _("Case reassignment limit exceeded. Please select fewer cases to update or"
+                  " consider deselecting 'include related cases'."
+                  " Reach out to support if you still need assistance.")
+            )
+
+    def get_child_cases(self, domain, case_ids):
+        """
+        For a given list of case_ids, finds their child case ids
+        and returns a dict with key as the given case_id and value as the list of child case ids.
+        """
+        case_docs = (
+            CaseSearchES()
+            .domain(domain)
+            .get_child_cases(case_ids, 'parent')
+            .values('doc_id', f'{INDICES_PATH}.{REFERENCED_ID}', f'{INDICES_PATH}.{IDENTIFIER}')
+        )
+        parent_to_child_cases_id = defaultdict(list)
+        for doc in case_docs:
+            doc[INDICES_PATH] = self._format_as_list(doc[INDICES_PATH])
+            parent_index = self._get_parent_index(doc)
+            if parent_index:
+                parent_to_child_cases_id[parent_index[REFERENCED_ID]].append(doc['doc_id'])
+        return parent_to_child_cases_id
+
+    def get_parent_cases(self, domain, case_ids):
+        """
+        For a given list of case_ids, finds their parent case_id
+        and returns a dict with the key as the given case_id and value as their parent case_id.
+        """
+        case_docs = (
+            CaseSearchES()
+            .domain(domain)
+            .case_ids(case_ids)
+            .values('doc_id', f'{INDICES_PATH}.{REFERENCED_ID}', f'{INDICES_PATH}.{IDENTIFIER}')
+        )
+        child_to_parent_case_id = defaultdict(str)
+        for doc in case_docs:
+            if doc.get(INDICES_PATH):
+                doc[INDICES_PATH] = self._format_as_list(doc[INDICES_PATH])
+                parent_index = self._get_parent_index(doc)
+                if parent_index:
+                    child_to_parent_case_id[doc['doc_id']] = parent_index[REFERENCED_ID]
+        return child_to_parent_case_id
+
+    def _format_as_list(self, data):
+        if isinstance(data, dict):
+            data = [data]
+        return data
+
+    def _get_parent_index(self, doc):
+        return next((index for index in doc[INDICES_PATH] if index[IDENTIFIER] == 'parent'), None)
+
+    def _add_related_case(self, case_id_to_owner_id, case_id, related_case_id, case_owner_updates):
+        if related_case_id not in case_id_to_owner_id:
+            case_owner_update = next(case_owner_update for case_owner_update in case_owner_updates
+                                     if case_owner_update.case_id == case_id)
+            case_owner_update.related_case_ids.append(related_case_id)
+
+    def _process_as_async(self, case_owner_updates):
+        task_key = f'geo_cases_reassignment_update_owners_{self.domain}'
+        celery_task_tracker = CeleryTaskTracker(task_key)
+
+        if celery_task_tracker.is_active():
+            return HttpResponse(
+                _('Case reassignment is currently in progress. Please try again later.'),
+                status=409,
+            )
+
+        geo_cases_reassignment_update_owners.delay(
+            self.domain,
+            CaseOwnerUpdate.to_dict(case_owner_updates),
+            task_key,
+        )
+        celery_task_tracker.mark_requested()
+        return JsonResponse(
+            {
+                'success': True,
+                'message': _('Case reassignment request has been accepted and will be completed in some time')
+            }
+        )
diff --git a/corehq/apps/groups/static/groups/js/group_members.js b/corehq/apps/groups/static/groups/js/group_members.js
index cef668901bd1..27ea927ff3c6 100644
--- a/corehq/apps/groups/static/groups/js/group_members.js
+++ b/corehq/apps/groups/static/groups/js/group_members.js
@@ -8,7 +8,7 @@ hqDefine("groups/js/group_members", [
     "hqwebapp/js/bootstrap5/alert_user",
     "hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-list",
     "hqwebapp/js/select_2_ajax_widget",     // "Group Membership" select2
-    "hqwebapp/js/bootstrap5/components.ko",            // select toggle for "Edit Setings" popup
+    "hqwebapp/js/components/select_toggle",            // select toggle for "Edit Setings" popup
 ], function (
     $,
     _,
diff --git a/corehq/apps/hqadmin/service_checks.py b/corehq/apps/hqadmin/service_checks.py
index ec32f18cd751..57883a20095b 100644
--- a/corehq/apps/hqadmin/service_checks.py
+++ b/corehq/apps/hqadmin/service_checks.py
@@ -19,6 +19,9 @@
 
 import attr
 import gevent
+
+from dimagi.utils.logging import notify_exception
+
 from corehq.apps.app_manager.models import Application
 from corehq.apps.change_feed.connection import (
     get_kafka_client,
@@ -78,9 +81,7 @@ def check_all_rabbitmq():
         return ServiceStatus(True, 'RabbitMQ OK')
 
     else:
-        return ServiceStatus(False, '; '.join(['{}:{}'.format(rabbit[0], rabbit[1])
-                                        for rabbit in unwell_rabbits])
-                      )
+        return ServiceStatus(False, "; ".join(["{}:{}".format(rabbit[0], rabbit[1]) for rabbit in unwell_rabbits]))
 
 
 def check_rabbitmq(broker_url):
@@ -123,7 +124,12 @@ def check_kafka():
 
 @change_log_level('urllib3.connectionpool', logging.WARNING)
 def check_elasticsearch():
-    cluster_health = check_es_cluster_health()
+    try:
+        cluster_health = check_es_cluster_health()
+    except Exception:
+        notify_exception(None, message="Error while checking elasticsearch cluster health")
+        return ServiceStatus(False, "Something went wrong checking cluster health")
+
     if cluster_health == 'red':
         return ServiceStatus(False, "Cluster health at %s" % cluster_health)
 
@@ -176,8 +182,9 @@ def check_celery():
                     bad_queues.append(
                         f"{queue} has been blocked for {blockage_duration} (max allowed is {threshold})"
                     )
-                elif (heartbeat_time_to_start is not None and
-                      heartbeat_time_to_start > max(threshold, datetime.timedelta(minutes=5))):
+                elif heartbeat_time_to_start is not None and heartbeat_time_to_start > max(
+                    threshold, datetime.timedelta(minutes=5)
+                ):
                     bad_queues.append(
                         f"{queue} is delayed for {heartbeat_time_to_start} (max allowed is {threshold})"
                     )
@@ -194,7 +201,7 @@ def check_postgres():
     for db in settings.DATABASES:
         db_conn = connections[db]
         try:
-            c = db_conn.cursor()
+            db_conn.cursor()
             c_status = 'OK'
         except OperationalError:
             c_status = 'FAIL'
diff --git a/corehq/apps/hqadmin/templates/hqadmin/hqadmin_base_report.html b/corehq/apps/hqadmin/templates/hqadmin/hqadmin_base_report.html
index a591d6dcd6f5..374241b4b965 100644
--- a/corehq/apps/hqadmin/templates/hqadmin/hqadmin_base_report.html
+++ b/corehq/apps/hqadmin/templates/hqadmin/hqadmin_base_report.html
@@ -5,7 +5,7 @@
 {% block title %}{% if current_page and section %}{% if current_page.title %}{{ current_page.title }} : {% endif %}{{ section.page_name }} {% else %}{{ report.title }}{% endif %}: Admin Reports{% endblock %}
 
 {% block js %}{{ block.super }}
-  {% if not requirejs_main %}
+  {% if not use_js_bundler %}
     {% if request.use_datatables %}
       <script src="{% static 'reports/js/bootstrap3/config.dataTables.bootstrap.js' %}"></script>
     {% endif %}
diff --git a/corehq/apps/hqadmin/tests/test_corrupt_couch.py b/corehq/apps/hqadmin/tests/test_corrupt_couch.py
index ec79803aa31f..ca7c89c305b8 100644
--- a/corehq/apps/hqadmin/tests/test_corrupt_couch.py
+++ b/corehq/apps/hqadmin/tests/test_corrupt_couch.py
@@ -1,24 +1,25 @@
+import pytest
 from testil import eq
 
 from ..corrupt_couch import find_missing_ids
 
 
-def test_find_missing_ids():
-    def test(result_sets, expected_missing, expected_tries, min_tries=5):
-        def get_ids():
-            while len(results) > 1:
-                return results.pop()
-            return results[0]
+@pytest.mark.parametrize("result_sets, expected_missing, expected_tries, min_tries", [
+    ([{1, 2}], set(), 5, 5),
+    ([{1, 2}], set(), 6, 6),
+    ([{1, 2}], set(), 10, 10),
+    ([{1, 2}, {1, 3}, {2, 3}], {1, 2, 3}, 7, 5),
+    ([{1, 2}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {2, 3}], {1, 2, 3}, 10, 5),
+    ([{1, 2}] + [{1, 3}] * 5 + [{2, 4}], {2, 3}, 6, 5),
+    ([{1, 2}] + [{1, 3}] * 10 + [{2, 4}], {2, 3}, 11, 10),
+])
+def test_find_missing_ids(result_sets, expected_missing, expected_tries, min_tries):
+    def get_ids():
+        while len(results) > 1:
+            return results.pop()
+        return results[0]
 
-        results = list(reversed(result_sets))
-        missing, tries = find_missing_ids(get_ids, min_tries)
-        eq(missing, expected_missing)
-        eq(tries, expected_tries)
-
-    yield test, [{1, 2}], set(), 5
-    yield test, [{1, 2}], set(), 6, 6
-    yield test, [{1, 2}], set(), 10, 10
-    yield test, [{1, 2}, {1, 3}, {2, 3}], {1, 2, 3}, 7
-    yield test, [{1, 2}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {2, 3}], {1, 2, 3}, 10
-    yield test, [{1, 2}] + [{1, 3}] * 5 + [{2, 4}], {2, 3}, 6
-    yield test, [{1, 2}] + [{1, 3}] * 10 + [{2, 4}], {2, 3}, 11, 10
+    results = list(reversed(result_sets))
+    missing, tries = find_missing_ids(get_ids, min_tries)
+    eq(missing, expected_missing)
+    eq(tries, expected_tries)
diff --git a/corehq/apps/hqadmin/views/data.py b/corehq/apps/hqadmin/views/data.py
index 56b9e7efb2b9..7d0ac1a1ae29 100644
--- a/corehq/apps/hqadmin/views/data.py
+++ b/corehq/apps/hqadmin/views/data.py
@@ -1,6 +1,6 @@
 import json
 
-from django.http import Http404, HttpResponse
+from django.http import Http404, HttpResponse, JsonResponse
 from django.shortcuts import render
 from django.utils.translation import gettext as _
 
@@ -66,8 +66,8 @@ def raw_doc(request):
         if 'doc' in context:
             return HttpResponse(context['doc'], content_type="application/json")
         else:
-            return HttpResponse(json.dumps({"status": "missing"}),
-                                content_type="application/json", status=404)
+            return JsonResponse({"status": "missing"},
+                                status=404)
 
     context['all_databases'] = [db for db in get_databases()]
     return render(request, "hqadmin/raw_doc.html", context)
diff --git a/corehq/apps/hqadmin/views/system.py b/corehq/apps/hqadmin/views/system.py
index 230d31ad000b..b94b149f482f 100644
--- a/corehq/apps/hqadmin/views/system.py
+++ b/corehq/apps/hqadmin/views/system.py
@@ -1,4 +1,3 @@
-import json
 import socket
 from collections import defaultdict, namedtuple
 
@@ -146,8 +145,8 @@ def system_ajax(request):
                     traw['name'] = None
                 ret.append(traw)
             ret = sorted(ret, key=lambda x: x['succeeded'], reverse=True)
-            return HttpResponse(json.dumps(ret), content_type='application/json')
-    return HttpResponse('{}', content_type='application/json')
+            return JsonResponse(ret, safe=False)
+    return JsonResponse({})
 
 
 @require_superuser_or_contractor
diff --git a/corehq/apps/hqcase/api/updates.py b/corehq/apps/hqcase/api/updates.py
index 0468ffc8f6b1..271bc665fe21 100644
--- a/corehq/apps/hqcase/api/updates.py
+++ b/corehq/apps/hqcase/api/updates.py
@@ -158,7 +158,7 @@ def get_case_id(self, case_db):
         return case_db.get_by_external_id(self.external_id)
 
 
-def handle_case_update(domain, data, user, device_id, is_creation):
+def handle_case_update(domain, data, user, device_id, is_creation, xmlns=None):
     is_bulk = isinstance(data, list)
     if is_bulk:
         updates = _get_bulk_updates(domain, data, user)
@@ -171,7 +171,7 @@ def handle_case_update(domain, data, user, device_id, is_creation):
         validate_update_permission(domain, updates, user, case_db)
 
     case_blocks = [update.get_caseblock(case_db) for update in updates]
-    xform, cases = _submit_case_blocks(case_blocks, domain, user, device_id)
+    xform, cases = _submit_case_blocks(case_blocks, domain, user, device_id, xmlns)
     if xform.is_error:
         raise SubmissionError(xform.problem, xform.form_id,)
 
@@ -289,13 +289,13 @@ def _get_owner_id(self):
         }
 
 
-def _submit_case_blocks(case_blocks, domain, user, device_id):
+def _submit_case_blocks(case_blocks, domain, user, device_id, xmlns):
     return submit_case_blocks(
         case_blocks=case_blocks,
         domain=domain,
         username=user.username,
         user_id=user.user_id,
-        xmlns='http://commcarehq.org/case_api',
+        xmlns=xmlns or 'http://commcarehq.org/case_api',
         device_id=device_id,
         max_wait=15
     )
diff --git a/corehq/apps/hqcase/utils.py b/corehq/apps/hqcase/utils.py
index 1bcc71f1431e..9ad8ac3208de 100644
--- a/corehq/apps/hqcase/utils.py
+++ b/corehq/apps/hqcase/utils.py
@@ -26,13 +26,15 @@
 SYSTEM_FORM_XMLNS = 'http://commcarehq.org/case'
 EDIT_FORM_XMLNS = 'http://commcarehq.org/case/edit'
 AUTO_UPDATE_XMLNS = 'http://commcarehq.org/hq_case_update_rule'
+REPEATER_RESPONSE_XMLNS = 'http://commcarehq.org/data_forwarding/response'
 
 SYSTEM_FORM_XMLNS_MAP = {
     SYSTEM_FORM_XMLNS: gettext_lazy('System Form'),
     EDIT_FORM_XMLNS: gettext_lazy('Data Cleaning Form'),
     AUTO_UPDATE_XMLNS: gettext_lazy('Automatic Case Update Rule'),
     DEDUPE_XMLNS: gettext_lazy('Deduplication Rule'),
-    XMLNS_DHIS2: gettext_lazy('DHIS2 Integration')
+    XMLNS_DHIS2: gettext_lazy('DHIS2 Integration'),
+    REPEATER_RESPONSE_XMLNS: gettext_lazy('Data Forwarding Response'),
 }
 
 ALLOWED_CASE_IDENTIFIER_TYPES = [
diff --git a/corehq/apps/hqmedia/cache.py b/corehq/apps/hqmedia/cache.py
index 681eb83b652c..47d9abe8f4e4 100644
--- a/corehq/apps/hqmedia/cache.py
+++ b/corehq/apps/hqmedia/cache.py
@@ -15,13 +15,17 @@
 
 class BaseMultimediaStatusCache(object):
     upload_type = None
-    cache_expiry = 60 * 60 # defaults to one hour
+    cache_expiry = 60 * 60  # defaults to one hour
 
     def __init__(self, processing_id):
         self.processing_id = processing_id
         self.in_celery = False
         self.complete = False
-        self.progress = 0
+        self.progress = {
+            'percent': 0,
+            'current': 0,
+            'total': 1,
+        }
         self.errors = []
         if self.upload_type is None:
             raise NotImplementedError("You need to specify an upload type.")
@@ -29,7 +33,7 @@ def __init__(self, processing_id):
     def __str__(self):
         return "Status of process id %(processing_id)s: %(progress)d%%" % {
             'processing_id': self.processing_id,
-            'progress': self.progress,
+            'progress': self.progress['percent'],
         }
 
     def save(self):
@@ -47,6 +51,7 @@ def get_response(self):
         return {
             'type': self.upload_type,
             'in_celery': self.in_celery,
+            'is_ready': self.complete,
             'complete': self.complete,
             'progress': self.progress,
             'errors': self.errors,
@@ -81,10 +86,15 @@ def get_response(self):
         response = super(BulkMultimediaStatusCache, self).get_response()
         response.update({
             'unmatched_files': self.unmatched_files,
+            'unmatched_count': len(self.unmatched_files),
             'matched_files': self.matched_files,
+            'matched_count': len([f for files in self.matched_files.values() for f in files]),
             'total_files': self.total_files,
             'processed_files': self.processed_files,
             'skipped_files': self.skipped_files,
+            'image_count': len(self.matched_files['CommCareImage']),
+            'audio_count': len(self.matched_files['CommCareAudio']),
+            'video_count': len(self.matched_files['CommCareVideo']),
         })
         return response
 
@@ -92,8 +102,12 @@ def update_progress(self, num_files_processed):
         if self.total_files is None:
             raise ValueError("You need to set total_files before you can update progress.")
         self.processed_files = num_files_processed
-        self.progress = int(100 * (self.processed_files / self.total_files))
-        if self.progress >= 100:
+        self.progress = {
+            'percent': int(100 * (self.processed_files / self.total_files)),
+            'current': self.processed_files,
+            'total': self.total_files,
+        }
+        if self.progress['percent'] >= 100:
             self.complete = True
         self.save()
 
diff --git a/corehq/apps/hqmedia/controller.py b/corehq/apps/hqmedia/controller.py
index 0573a61db103..48ecfc90719b 100644
--- a/corehq/apps/hqmedia/controller.py
+++ b/corehq/apps/hqmedia/controller.py
@@ -3,15 +3,15 @@
 from django.utils.translation import gettext_noop
 
 
-class BaseMultimediaUploadController(object):
+class BaseMultimediaFileUploadController(object):
     """
         Media type is the user-facing term for the type of media that the uploader is uploading
     """
     media_type = None
-    uploader_type = None
-    is_multi_file = False
+    uploader_type = "file"
 
     errors_template = "hqmedia/uploader/errors.html"
+    queue_template = "hqmedia/uploader/queue_single.html"
 
     def __init__(self, slug, destination):
         self.slug = slug
@@ -47,7 +47,6 @@ def js_options(self):
             'fileFilters': self.supported_files,
             'uploadURL': self.destination,
             'processingURL': self.processing_url,
-            'isMultiFileUpload': self.is_multi_file,
             'uploadParams': self.upload_params,
             'licensingParams': self.licensing_params,
         }
@@ -70,30 +69,6 @@ def js_options(self):
         }
 
 
-class MultimediaBulkUploadController(BaseMultimediaUploadController):
-    is_multi_file = True
-    uploader_type = "bulk"
-    media_type = gettext_noop("zip")
-
-    queue_template = "hqmedia/uploader/queue_multi.html"
-    status_template = "hqmedia/uploader/status_multi.html"
-    details_template = "hqmedia/uploader/details_multi.html"
-
-    @property
-    def supported_files(self):
-        return [
-            {
-                'description': 'Zip',
-                'extensions': '*.zip',
-            },
-        ]
-
-
-class BaseMultimediaFileUploadController(BaseMultimediaUploadController):
-    uploader_type = "file"
-    queue_template = "hqmedia/uploader/queue_single.html"
-
-
 class MultimediaImageUploadController(BaseMultimediaFileUploadController):
     media_type = gettext_noop("image")
     existing_file_template = "hqmedia/uploader/preview_image_single.html"
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js b/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
new file mode 100644
index 000000000000..eae53c88e8c0
--- /dev/null
+++ b/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
@@ -0,0 +1,6 @@
+hqDefine("hqmedia/js/bulk_upload", [
+    "hqwebapp/js/bulk_upload_file",
+    "app_manager/js/download_async_modal",
+], 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 f83bc82a6448..1f8360667fc7 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
@@ -2,7 +2,7 @@ hqDefine("hqmedia/js/manage_paths_main", [
     "jquery",
     "knockout",
     "hqwebapp/js/assert_properties",
-    "hqwebapp/js/bootstrap3/components.ko",    // select toggle widget
+    "hqwebapp/js/components/select_toggle",
 ], function (
     $,
     ko,
diff --git a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
index 8947f107c5a1..d539a7b242ae 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
@@ -1,80 +1,8 @@
 {% extends "hqmedia/uploader_base.html" %}
 {% load hq_shared_tags %}
-{% load i18n %}
 
-{% block stylesheets %}{{ block.super }}
-  <style type="text/css">
-    .hqm-select-files-container {
-      display: inline-block;
-    }
-    .hqm-upload {
-      margin-right: 5px;
-    }
-  </style>
-{% endblock %}
+{% requirejs_main "hqmedia/js/bulk_upload" %}
 
 {% block page_content %}
-  {% initial_page_data 'uploaders' uploaders_js %}
-
-  <p class="lead">{{ current_page.page_name }}</p>
-
-  <p>{% blocktrans %}Use this tool to upload ZIP files of your multimedia, so you don't have to
-    upload each file one-by-one.{% endblocktrans %}</p>
-  <p>{% blocktrans %}The bulk uploader will compare the file paths in your form with the file paths
-    in your zip to find a matching file.{% endblocktrans %}</p>
-  <p>{% blocktrans %}For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your zip's
-    <code>commcare/images/hin/image.jpg</code> file would match, but it would <strong>not</strong> match
-    <code>commcare/images/image.jpg</code>.{% endblocktrans %}</p>
-
-  {% for uploader in uploaders %}
-    <div id="{{ uploader.slug }}">
-      <div class="alert alert-info hqm-not-supported hide">
-        <i class="fa-solid fa-triangle-exclamation"></i>
-        {% blocktrans %}
-          Your browser does not support this uploader.
-          We recommend <a href="https://www.google.com/intl/en/chrome/browser/">Google Chrome</a>.
-        {% endblocktrans %}
-      </div>
-      <div class="btn-toolbar">
-        <div class="hqm-select-files-container">
-          <button class="hqm-select btn btn-primary" role="button">{% trans 'Select Files' %}</button>
-        </div>
-        <a class="hqm-upload hqm-upload-confirm btn btn-primary disabled" data-toggle="modal">
-          <i class="fa-solid fa-cloud-arrow-up"></i> {% trans 'Begin Upload' %}
-        </a>
-      </div>
-      <h3>{% trans 'Bulk Upload File Queue' %}</h3>
-      <table class="table table-striped table-bordered hqm-upload-list">
-        <thead>
-        <tr>
-          <th class="col-sm-2">{% trans 'Filename' %}</th>
-          <th class="col-sm-1">{% trans 'Size' %}</th>
-          <th class="col-sm-2">{% trans 'Upload Progress' %}</th>
-          <th class="col-sm-2">{% trans 'Match Status' %}</th>
-          <th class="col-sm-5">{% trans 'Details' %}</th>
-        </tr>
-        </thead>
-        <thead>
-        <tr>
-          <th class="text-muted" colspan="5"  style="text-align: center;">{% trans 'Queued Files' %}</th>
-        </tr>
-        </thead>
-        <tbody class="hqm-queue">
-        <tr class="hqm-empty">
-          <td colspan="5">{% blocktrans %}Select files above to add to the queue.{% endblocktrans %}</td>
-        </tr>
-        </tbody>
-        <tbody class="hqm-upload-processing">
-        <tr class="hqm-list-notice">
-          <th colspan="5">{% trans 'Processing Upload' %}</th>
-        </tr>
-        </tbody>
-        <tbody class="hqm-uploaded-files">
-        <tr class="hqm-list-notice">
-          <th colspan="5">{% trans 'Uploaded Files' %}</th>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  {% endfor %}
-{% endblock %}
+  {% include "hqmedia/partials/bulk_upload.html" with include_modal=True %}
+{% endblock page_content %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload_status.html b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload_status.html
new file mode 100644
index 000000000000..114f02b036a0
--- /dev/null
+++ b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload_status.html
@@ -0,0 +1,5 @@
+{% extends "hqwebapp/bootstrap3/soil_status_full.html" %}
+
+{% block page_navigation %}
+  {% include 'hqwebapp/partials/bootstrap3/navigation_left_sidebar.html' with sections=navigation_sections %}
+{% endblock page_navigation %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html b/corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
new file mode 100644
index 000000000000..900c176ddf64
--- /dev/null
+++ b/corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
@@ -0,0 +1,22 @@
+{% extends "hqwebapp/partials/bootstrap3/bulk_upload.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% block prerequisites %}
+  {% blocktrans %}
+    <p>
+      Use this tool to upload ZIP files of your multimedia.
+      The bulk uploader will compare the file paths in your form with the file paths
+      in your zip to find a matching file.
+    </p>
+    <p>
+      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your zip's
+      <code>commcare/images/hin/image.jpg</code> file would match, but it would <strong>not</strong> match
+      <code>commcare/images/image.jpg</code>.
+    </p>
+  {% endblocktrans %}
+{% endblock %}
+
+{% block download_file %}
+  {% include "hqmedia/partials/multimedia_zip_notice.html" with include_modal=True %}
+{% endblock download_file %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html b/corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
new file mode 100644
index 000000000000..9217e6879166
--- /dev/null
+++ b/corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
@@ -0,0 +1,106 @@
+{% extends "hqwebapp/partials/download_status.html" %}
+{% load i18n %}
+
+{% block results %}
+  {% if errors %}
+    <div class="alert alert-danger">
+      {% for e in errors %}
+        <p>{{ e }}</p>
+      {% endfor %}
+    </div>
+  {% endif %}
+
+  {% if matched_files %}
+    <div class="alert alert-success">
+      {% blocktrans count matched_count=matched_count %}
+        One match found.
+      {% plural %}
+        {{ matched_count }} matches found.
+      {% endblocktrans %}
+    </div>
+  {% else %}
+    <div class="alert alert-danger">
+      {% trans 'No Matches Found' %}
+    </div>
+  {% endif %}
+
+  {% if unmatched_files %}
+    <h4>{% trans 'No Matches' %} <span class="badge badge-important">{{ unmatched_count}} </h4>
+    <ul>
+      {% for unmatched in unmatched_files %}
+        <li>
+          <p>
+            {{ unmatched.reason }}
+            <code>{{ unmatched.path }}</code>
+          </p>
+        </li>
+      {% endfor %}
+    </ul>
+  {% endif %}
+
+  {% if matched_files.CommCareImage %}
+    <h4>{% trans 'Matched Images' %} <span class="badge badge-success">{{ image_count }}</span></h4>
+    <ul>
+      {% for image in matched_files.CommCareImage %}
+        <li>
+          <p>
+            <img src="{{ image.url }}?thumb=50" style="width: 50px; height: 50px;" alt="{{ image.path }}" />
+            {% if image.updated %}
+              <span class="label label-success">{% trans 'Updated' %}</span>
+            {% endif %}
+            <a href="{{ image.url }}"
+               target="_blank"
+               data-content="<img src='{{ image.url }}?thumb=220' width='220' alt='{{ image.path }}' />">
+              {% trans 'View Full Image' %}
+              <i class="fa fa-external-link"></i>
+            </a>
+          </p>
+          <p><code>{{ image.path }}</code></p>
+        </li>
+      {% endfor %}
+    </ul>
+  {% endif %}
+
+  {% if matched_files.CommCareAudio %}
+    <h4>{% trans 'Matched Audio' %} <span class="badge badge-success">{{ audio_count }}</span></h4>
+    <ul>
+      {% for audio in matched_files.CommCareAudio %}
+        <li>
+          <p>
+            {% if audio.updated %}
+              <span class="label label-success">{% trans 'Updated' %}</span>
+            {% endif %}
+            <a href="{{ audio.url }}"
+                  target="_blank"
+                  data-content="{% trans 'Playing audio directly on this page is currently not supported.' %}">
+              {% trans 'Listen to Audio' %}</a>
+              <i class="fa fa-external-link"></i>
+          </p>
+          <p><code>{{ audio.path }}</code></p>
+        </li>
+      {% endfor %}
+    </ul>
+  {% endif %}
+
+  {% if matched_files.CommCareVideo %}
+    <h4>{% trans 'Matched Video' %} <span class="badge badge-success">{{ video_count }}</span></h4>
+    <ul>
+      {% for video in matched_files.CommCareVideo %}
+        <li>
+          <p>
+            {% if video.updated %}
+              <span class="label label-success">{% trans 'Updated' %}</span>
+            {% endif %}
+            <a href="{{ video.url }}"
+                  target="_blank"
+                  data-content="{% trans 'Watching video directly on this page is not supported. Opens a new tab.' %}">
+              {% trans 'Watch Video' %}</a>
+              <i class="fa fa-external-link"></i>
+          </p>
+          <p><code>{{ video.path }}</code></p>
+        </li>
+      {% endfor %}
+    </ul>
+  {% endif %}
+
+{% endblock results %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html b/corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
deleted file mode 100644
index 59f42a0049e2..000000000000
--- a/corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
+++ /dev/null
@@ -1,29 +0,0 @@
-{% load i18n %}
-<fieldset class="hqm-sharing hide">
-  <legend>{% trans "Multimedia Sharing Options" %}</legend>
-  <div class="form-group">
-    <div class="control-label col-sm-3">{% trans "License" %}</div>
-    <div class="col-sm-9">
-      <select name="license">
-        <option value="cc-nc">{% trans "Creative Commons Attribution, Non-Commercial (CC BY-NC)" %}</option>
-        <option value="cc-nd">{% trans "Creative Commons Attribution, No Derivatives (CC BY-ND)" %}</option>
-        <option value="cc" selected="selected">{% trans "Creative Commons Attribution (CC BY)" %}</option>
-        <option value="cc-nc-sa">{% trans "Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)" %}</option>
-        <option value="cc-nc-nd">{% trans "Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-ND)" %}</option>
-        <option value="cc-sa">{% trans "Creative Commons Attribution, Share Alike (CC BY-SA)" %}</option>
-      </select>
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="control-label col-sm-3">{% trans "Author" %}</div>
-    <div class="controls col-sm-9">
-      <input type="text" name="author" placeholder="{% trans "Enter the name of the author" %}" />
-    </div>
-  </div>
-  <div class="form-group">
-    <div class="control-label col-sm-3">{% trans "Attribution Notes" %}</div>
-    <div class="controls col-sm-9">
-      <textarea name="attribution-notes" rows="2"></textarea>
-    </div>
-  </div>
-</fieldset>
diff --git a/corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html b/corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
index db77f0053bcb..75cc1fdd4349 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
@@ -1,34 +1,61 @@
 {% load i18n %}
 
-<div class="modal fade" id="{{ uploader.slug }}">
+<div class="modal fade" id="{{ id }}">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h3 class="modal-title">{% trans "Upload" %} {{ uploader.media_type|title }}</h3>
+        <h4 class="modal-title">
+          {% if type == "image" %}
+            {% trans 'Upload Icon Image' %}
+          {% elif type == "audio" %}
+            {% trans 'Upload Audio' %}
+          {% elif type == "video" %}
+            {% trans 'Upload Video' %}
+          {% elif type == "logo" %}
+            {% trans 'Upload Logo' %}
+          {% else %}
+            {% trans 'Upload File' %}
+          {% endif %}
+        </h4>
       </div>
       <div class="modal-body form form-horizontal">
         <div class="form-group">
           <label class="control-label col-sm-3">
-            {% trans 'Select New' %} {{ uploader.media_type|title }}
+            {% if type == "image" %}
+              {% trans 'Select Icon Image' %}
+            {% elif type == "audio" %}
+              {% trans 'Select Menu Audio' %}
+            {% elif type == "video" %}
+              {% trans 'Select Video' %}
+            {% elif type == "logo" %}
+              {% trans 'Select Logo' %}
+            {% else %}
+              {% trans 'Select File' %}
+            {% endif %}
           </label>
-          <div class="controls col-sm-9">
+          <div class="col-sm-9">
             <div class="hqm-select-files-container">
-              <button class="hqm-select btn btn-primary" role="button">
-                {% trans 'Select File' %}
-              </button>
+              <button class="hqm-select btn btn-primary" role="button">{% trans 'Select' %}</button>
             </div>
             <div class="hqm-queue"></div>
           </div>
         </div>
         <div class="form-group hqm-existing hide">
           <label class="control-label col-sm-3">
-            {% trans 'Current' %} {{ uploader.media_type|title }}
+            {% if type == "image" %}
+              {% trans 'Current Icon' %}
+            {% elif type == "audio" %}
+              {% trans 'Current Audio' %}
+            {% elif type == "video" %}
+              {% trans 'Current Video' %}
+            {% elif type == "logo" %}
+              {% trans 'Current Logo' %}
+            {% else %}
+              {% trans 'Current File' %}
+            {% endif %}
           </label>
-          <div class="hqm-existing-controls col-sm-9"></div>
-        </div>
-        <div class="hqm-upload-form">
-          {% include 'hqmedia/partials/hqm_upload_form.html' %}
+          <div class="col-sm-9 hqm-existing-controls"></div>
         </div>
       </div>
       <div class="modal-footer">
diff --git a/corehq/apps/hqmedia/templates/hqmedia/references.html b/corehq/apps/hqmedia/templates/hqmedia/references.html
index 86ef58a087da..dcab1e209d6b 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/references.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/references.html
@@ -156,7 +156,7 @@
     </script>
 
     {% for uploader in uploaders %}
-      {% include 'hqmedia/partials/multimedia_uploader.html' %}
+      {% include 'hqmedia/partials/multimedia_uploader.html' with id=uploader.slug type=uploader.media_type %}
     {% endfor %}
 
   </div>
diff --git a/corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html b/corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
deleted file mode 100644
index 314045534bdf..000000000000
--- a/corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
+++ /dev/null
@@ -1,88 +0,0 @@
-{% load i18n %}
-<% if (unknowns.length > 0) { %>
-<div class="well well-small">
-  <h4>{% trans 'No Matches' %} <span class="badge badge-important"><%- unknowns.length %></span></h4>
-  <ul>
-    <% for (var u=0; u < unknowns.length; u++) {
-    var unknown = unknowns[u]; %>
-    <li><p>
-      <%- unknown.reason %>
-      <code class="hqm-path"><span><%- unknown.path %></span></code>
-    </p></li>
-    <% } %>
-  </ul>
-</div>
-<% } %>
-<% var m = 0; %>
-<% if (images.length > 0) { %>
-<div class="well well-small">
-  <h4>{% trans 'Matched Images' %} <span class="badge badge-success"><%- images.length %></span></h4>
-  <ul>
-    <% for (var i=0; i < images.length; i++) {
-    var image = images[i]; %>
-    <li>
-      <p>
-        <img src="<%- image.url %>?thumb=50" style="height: 50px;" alt="<%- image.path %>" />
-        <a href="<%- image.url %>"
-           target="_blank"
-           class="btn btn-primary match-info"
-           data-content="<img src='<%- image.url %>?thumb=220' width='220' alt='<%- image.path %>' />">
-          <i class="<%- image.icon_class %>"></i> {% trans 'View Full Image' %}</a>
-        <% if (image.updated) { %>
-        <span class="label label-info">{% trans 'Updated' %}</span>
-        <% } %>
-      </p>
-      <p><code class="hqm-path"><span><%- image.path %></span></code></p>
-    </li>
-    <% } %>
-  </ul>
-</div>
-<% } %>
-<% if (audio.length > 0) { %>
-<div class="well well-small">
-  <h4>{% trans 'Matched Audio' %} <span class="badge badge-success"><%- audio.length %></span></h4>
-  <ul>
-    <% for (var a=0; a < audio.length; a++) {
-    var sound = audio[a]; %>
-    <li>
-      <p><a href="<%- sound.url %>"
-            target="_blank"
-            class="btn btn-primary match-info"
-            data-content="{% trans 'Playing audio directly on this page is currently not supported.' %}">
-        <i class="<%- sound.icon_class %>"></i> {% trans 'Listen to Audio' %}</a>
-        <% if (sound.updated) { %>
-        <span class="label label-info">{% trans 'Updated' %}</span>
-        <% } %>
-      </p>
-      <p>
-        <code class="hqm-path"><span><%- sound.path %></span></code>
-      </p>
-    </li>
-    <% } %>
-  </ul>
-</div>
-<% } %>
-<% if (video.length > 0) { %>
-<div class="well well-small">
-  <h4>{% trans 'Matched Videos' %} <span class="badge badge-success"><%- video.length %></span></h4>
-  <ul>
-    <% for (var v=0; v < video.length; v++) {
-    var vid = video[v]; %>
-    <li>
-      <p><a href="<%- vid.url %>"
-            target="_blank"
-            class="btn btn-primary match-info"
-            data-content="{% trans 'Watching video directly on this page is not supported. Opens a new tab.' %}">
-        <i class="<%- vid.icon_class %>"></i> {% trans 'Watch Video' %}</a>
-        <% if (vid.updated) { %>
-        <span class="label label-info">{% trans 'Updated' %}</span>
-        <% } %>
-      </p>
-      <p>
-        <code class="hqm-path"><span><%- vid.path %></span></code>
-      </p>
-    </li>
-    <% } %>
-  </ul>
-</div>
-<% } %>
diff --git a/corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html b/corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
deleted file mode 100644
index 0afe7c8995b5..000000000000
--- a/corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% load i18n %}
-<tr id="<%- unique_id %>">
-  <td><%- file_name %></td>
-  <td><%- file_size %> MB</td>
-  <td class="hqm-progress">
-    <div class="progress" style="margin-bottom: 5px;">
-      <div class="progress-bar progress-bar-striped active" style="width: 0%;"></div>
-    </div>
-    <p class="text-success hqm-begin">
-      {% blocktrans %}Added to queue. Click <strong>Begin Upload</strong> above to start.{% endblocktrans %}
-    </p>
-    <p class="text-info hqm-processing-queued hide">
-      {% trans 'Queued for processing. Please wait.' %}
-    </p>
-    <p class="text-info hqm-processing hide">
-            <span class="label label-info hide">
-                <span class="numerator">0</span>/<span class="denominator">0</span>
-                {% trans 'Files' %}
-            </span>
-      {% trans 'Processing upload, please wait.' %}
-    </p>
-    <p class="text-success hqm-upload-completed hide">
-      <span class="label label-success">{% trans 'Upload Finished' %}</span>
-    </p>
-    <p class="text-error hqm-error hide">
-      <span class="label label-danger">{% trans 'There were errors' %}</span>
-    </p>
-    <a href="#" class="btn btn-default btn-xs pull-right hqm-remove">
-      <i class="fa fa-remove"></i> {% trans 'Remove from queue' %}
-    </a>
-    <a href="#" class="btn btn-danger btn-xs pull-right hqm-cancel hide">
-      <i class="fa fa-remove"></i> {% trans 'Cancel Upload' %}
-    </a>
-  </td>
-  <td class="hqm-status"></td>
-  <td class="hqm-details"></td>
-</tr>
diff --git a/corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html b/corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
deleted file mode 100644
index 01f00bb73373..000000000000
--- a/corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% load i18n %}
-<p>
-  <% if (num > 0) { %>
-  <span class="label label-success">
-        <i class="fa fa-check"></i>
-        <% if (num == 1) { %>
-            {% trans '1 Match Found' %}
-        <% } else { %>
-            {% trans '<%- num %> Matches Found' %}
-        <% } %>
-    </span>
-  <% } else { %>
-  <span class="label label-danger">{% trans 'No Matches Found' %}</span>
-  <% } %>
-</p>
diff --git a/corehq/apps/hqmedia/urls.py b/corehq/apps/hqmedia/urls.py
index 689d924d9a26..c53205c12821 100644
--- a/corehq/apps/hqmedia/urls.py
+++ b/corehq/apps/hqmedia/urls.py
@@ -2,6 +2,8 @@
 
 from corehq.apps.hqmedia.views import (
     BulkUploadMultimediaView,
+    BulkUploadMultimediaPollView,
+    BulkUploadMultimediaStatusView,
     DownloadMultimediaZip,
     ManageMultimediaPathsView,
     MultimediaAudioTranslatorFileView,
@@ -30,13 +32,18 @@
 
 application_urls = [
     url(r'^upload/$', BulkUploadMultimediaView.as_view(), name=BulkUploadMultimediaView.urlname),
+    url(r'^upload/poll/(?P<processing_id>(?:dl-)?[0-9a-fA-Z]{25,32})/$',
+        BulkUploadMultimediaPollView.as_view(), name=BulkUploadMultimediaPollView.urlname),
+    url(r'^upload/status/(?P<processing_id>(?:dl-)?[0-9a-fA-Z]{25,32})/$',
+        BulkUploadMultimediaStatusView.as_view(), name=BulkUploadMultimediaStatusView.urlname),
     url(r'^paths/$', ManageMultimediaPathsView.as_view(), name=ManageMultimediaPathsView.urlname),
     url(r'^paths/download/$', download_multimedia_paths, name='download_multimedia_paths'),
     url(r'^audio_translator_file/$', MultimediaAudioTranslatorFileView.as_view(),
         name=MultimediaAudioTranslatorFileView.urlname),
     url(r'^translations/$', MultimediaTranslationsCoverageView.as_view(),
         name=MultimediaTranslationsCoverageView.urlname),
-    url(r'^uploaded/bulk/$', ProcessBulkUploadView.as_view(), name=ProcessBulkUploadView.urlname),
+    url(r'^uploaded/bulk/$', waf_allow('XSS_BODY')(ProcessBulkUploadView.as_view()),
+        name=ProcessBulkUploadView.urlname),
     url(r'^uploaded/image/$', waf_allow('XSS_BODY')(ProcessImageFileUploadView.as_view()),
         name=ProcessImageFileUploadView.urlname),
     url(r'^uploaded/app_logo/(?P<logo_name>[\w\-]+)/$', waf_allow('XSS_BODY')(ProcessLogoFileUploadView.as_view()),
diff --git a/corehq/apps/hqmedia/views.py b/corehq/apps/hqmedia/views.py
index 9fd9db010c87..c813245baa8d 100644
--- a/corehq/apps/hqmedia/views.py
+++ b/corehq/apps/hqmedia/views.py
@@ -16,8 +16,10 @@
     Http404,
     HttpResponse,
     HttpResponseBadRequest,
+    HttpResponseRedirect,
     JsonResponse,
 )
+from django.http.response import HttpResponseServerError
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -35,7 +37,8 @@
 from couchexport.models import Format
 from couchexport.shortcuts import export_response
 from soil import DownloadBase
-from soil.util import expose_cached_download
+from soil.exceptions import TaskFailedError
+from soil.util import expose_cached_download, get_download_context
 
 from corehq import privileges, toggles
 from corehq.apps.accounting.utils import domain_has_privilege
@@ -59,7 +62,6 @@
 )
 from corehq.apps.hqmedia.controller import (
     MultimediaAudioUploadController,
-    MultimediaBulkUploadController,
     MultimediaImageUploadController,
     MultimediaVideoUploadController,
 )
@@ -113,25 +115,29 @@ def section_url(self):
     @property
     def page_context(self, **kwargs):
         context = super(BaseMultimediaTemplateView, self).page_context
-        views = [MultimediaReferencesView, BulkUploadMultimediaView]
+
+        def _section(view, icon):
+            return {
+                'title': view.page_title,
+                'url': reverse(view.urlname, args=[self.domain, self.app.id]),
+                'is_active': view.urlname == self.urlname,
+                'icon': f'fa {icon}'
+            }
+
+        sections = [
+            _section(MultimediaReferencesView, 'fa-check-square'),
+            _section(BulkUploadMultimediaView, 'fa-cloud-upload-alt'),
+        ]
         if toggles.BULK_UPDATE_MULTIMEDIA_PATHS.enabled_for_request(self.request):
-            views.append(ManageMultimediaPathsView)
+            sections.append(_section(ManageMultimediaPathsView, 'fa-route'))
             if len(self.app.langs) > 1:
-                views.append(MultimediaAudioTranslatorFileView)
-                views.append(MultimediaTranslationsCoverageView)
-        views = sorted(views, key=lambda v: v.page_title)
+                sections.append(_section(MultimediaAudioTranslatorFileView, 'fa-volume-up'))
+                sections.append(_section(MultimediaTranslationsCoverageView, 'fa-globe'))
+
         context.update({
             "domain": self.domain,
             "app": self.app,
-            "navigation_sections": (
-                (_("Multimedia"), [
-                    {
-                        'title': view.page_title,
-                        'url': reverse(view.urlname, args=[self.domain, self.app.id]),
-                        'is_active': view.urlname == self.urlname,
-                    } for view in views
-                ]),
-            ),
+            "navigation_sections": ((_("Multimedia"), sections),),
         })
         return context
 
@@ -250,7 +256,7 @@ def _add_references(source, reference_index, references):
         return (reference_index, references)
 
 
-class BulkUploadMultimediaView(BaseMultimediaUploaderView):
+class BulkUploadMultimediaView(BaseMultimediaTemplateView):
     urlname = "hqmedia_bulk_upload"
     template_name = "hqmedia/bulk_upload.html"
     page_title = gettext_noop("Bulk Upload Multimedia")
@@ -263,9 +269,63 @@ def parent_pages(self):
         }]
 
     @property
-    def upload_controllers(self):
-        return [MultimediaBulkUploadController("hqmedia_bulk", reverse(ProcessBulkUploadView.urlname,
-                                                                       args=[self.domain, self.app_id]))]
+    def page_context(self):
+        context = super().page_context
+        context.update({
+            'bulk_upload': {
+                "help_site": {
+                    "address": "https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143946840/Multimedia+Manager#Option-3:-Multimedia-Manager---Bulk-Media-Upload",  # noqa: E501
+                    "name": _("CommCare Help Site"),
+                },
+                "download_url": reverse(DownloadMultimediaZip.urlname, args=[self.domain, self.app.get_id]),
+                "adjective": _("multimedia"),
+                "plural_noun": _("multimedia files"),
+                "action": reverse(ProcessBulkUploadView.urlname, args=[self.domain, self.app.get_id]),
+            },
+            'multimedia_state': self.app.check_media_state(),
+        })
+        context.update({
+            'bulk_upload_form': get_bulk_upload_form(context),
+        })
+        return context
+
+
+class BulkUploadMultimediaPollView(BaseMultimediaTemplateView):
+    urlname = "hqmedia_bulk_upload_poll"
+
+    def get(self, request, domain, app_id, processing_id):
+        try:
+            context = get_download_context(processing_id)
+        except TaskFailedError:
+            return HttpResponseServerError()
+        status = BulkMultimediaStatusCache.get(processing_id)
+        context.update(status.get_response())
+        return render(request, 'hqmedia/partials/bulk_upload_status.html', context)
+
+
+class BulkUploadMultimediaStatusView(BaseMultimediaTemplateView):
+    urlname = "hqmedia_bulk_upload_status"
+    page_title = gettext_noop('Bulk Upload Multimedia Status')
+    template_name = "hqmedia/bulk_upload_status.html"
+
+    def get(self, request, *args, **kwargs):
+        context = self.get_context_data(**kwargs)
+        context.update({
+            'domain': self.domain,
+            'download_id': kwargs['processing_id'],   # soil templates and js use "download_id"
+            'poll_url': reverse(BulkUploadMultimediaPollView.urlname,
+                                args=[self.domain, self.app.get_id, kwargs['processing_id']]),
+            'title': _("Bulk Upload Multimedia Status"),
+            'progress_text': _("Importing your multimedia. This may take some time..."),
+            'error_text': _("Problem importing data! Please try again or report an issue."),
+            'next_url': reverse(MultimediaReferencesView.urlname, args=[self.domain, self.app.get_id]),
+            'next_url_text': _("Return to multimedia reference checker"),
+
+        })
+        return render(self.request, self.template_name, context)
+
+    def page_url(self):
+        return reverse(self.urlname, args=self.args, kwargs=self.kwargs)
 
 
 @method_decorator(toggles.BULK_UPDATE_MULTIMEDIA_PATHS.required_decorator(), name='dispatch')
@@ -485,6 +545,7 @@ def get(self, request, *args, **kwargs):
 
 
 class BaseProcessUploadedView(BaseMultimediaView):
+    upload_filename = 'Filedata'
 
     @property
     def username(self):
@@ -509,7 +570,7 @@ def attribution_notes(self):
     @property
     @memoized
     def uploaded_file(self):
-        return self.request.FILES.get('Filedata')
+        return self.request.FILES.get(self.upload_filename)
 
     @property
     @memoized
@@ -552,6 +613,7 @@ def process_upload(self):
 
 class ProcessBulkUploadView(BaseProcessUploadedView):
     urlname = "hqmedia_uploader_bulk"
+    upload_filename = "bulk_upload_file"
 
     @property
     @memoized
@@ -573,7 +635,8 @@ def validate_file(self, replace_diff_ext=False):
 
     def process_upload(self):
         if hasattr(self.uploaded_file, 'temporary_file_path') and settings.SHARED_DRIVE_CONF.temp_dir:
-            processing_id = uuid.uuid4().hex
+            prefix = DownloadBase.new_id_prefix
+            processing_id = prefix + uuid.uuid4().hex
             path = settings.SHARED_DRIVE_CONF.get_temp_file(suffix='.upload')
             shutil.move(self.uploaded_file.temporary_file_path(), path)
             status = BulkMultimediaStatusCacheNfs(processing_id, path)
@@ -598,6 +661,23 @@ def process_upload(self):
 
         return status.get_response()
 
+    def post(self, request, *args, **kwargs):
+        self.errors = []
+        try:
+            self.validate_file()
+            response = self.process_upload()
+        except BadMediaFileException as e:
+            messages.error(request, str(e))
+            return HttpResponseRedirect(
+                reverse(BulkUploadMultimediaView.urlname, args=[self.domain, self.app.id])
+            )
+        return HttpResponseRedirect(
+            reverse(
+                BulkUploadMultimediaStatusView.urlname,
+                args=[self.domain, self.app.id, response['processing_id']],
+            )
+        )
+
     @classmethod
     def valid_mime_types(cls):
         return [
@@ -948,7 +1028,7 @@ def post(self, request, *args, **kwargs):
             response = fake_status.get_response()
         else:
             response = status.get_response()
-        return HttpResponse(json.dumps(response))
+        return JsonResponse(response)
 
 
 class ViewMultimediaFile(View):
diff --git a/corehq/apps/hqwebapp/decorators.py b/corehq/apps/hqwebapp/decorators.py
index 7347c6c9a73c..a1b8f47a2096 100644
--- a/corehq/apps/hqwebapp/decorators.py
+++ b/corehq/apps/hqwebapp/decorators.py
@@ -75,20 +75,6 @@ def dispatch(self, request, *args, **kwargs):
     return set_request_flag(view_func, 'use_nvd3_v3')
 
 
-def use_timeago(view_func):
-    """Use this decorator on the dispatch method of a TemplateView subclass
-    to enable the inclusion of the timeago library at the base template
-    level.
-
-    Example:
-
-    @use_timeago
-    def dispatch(self, request, *args, **kwargs):
-        return super(MyView, self).dispatch(request, *args, **kwargs)
-    """
-    return set_request_flag(view_func, 'use_timeago')
-
-
 def use_datatables(view_func):
     """Use this decorator on the dispatch method of a TemplateView subclass
     to enable the inclusion of the datatables library at the base template
@@ -131,20 +117,6 @@ def dispatch(self, request, *args, **kwargs):
     return set_request_flag(view_func, 'use_timepicker')
 
 
-def use_maps(view_func):
-    """Use this decorator on the dispatch method of a TemplateView subclass
-    to enable the inclusion of the maps (with sync utils) library at the base
-    template level.
-
-    Example:
-
-    @use_maps
-    def dispatch(self, request, *args, **kwargs):
-        return super(MyView, self).dispatch(request, *args, **kwargs)
-    """
-    return set_request_flag(view_func, 'use_maps')
-
-
 def use_ko_validation(view_func):
     """Use this decorator to use knockout validation in knockout forms
 
diff --git a/corehq/apps/hqwebapp/management/commands/complete_bootstrap5_migration.py b/corehq/apps/hqwebapp/management/commands/complete_bootstrap5_migration.py
index 487461e45b4d..687ab6f1d0ac 100644
--- a/corehq/apps/hqwebapp/management/commands/complete_bootstrap5_migration.py
+++ b/corehq/apps/hqwebapp/management/commands/complete_bootstrap5_migration.py
@@ -247,7 +247,7 @@ def update_references_and_print_summary(self, app_name, bootstrap5_short_path,
         ])
 
     def optional_display_list(self, confirmation_message, list_to_display):
-        confirm = get_confirmation(confirmation_message)
+        confirm = get_confirmation(confirmation_message) if len(list_to_display) > 5 else True
         if confirm:
             self.stdout.write("\n\n")
             self.stdout.write("\n".join(list_to_display))
diff --git a/corehq/apps/hqwebapp/management/commands/generate_webpack_settings.py b/corehq/apps/hqwebapp/management/commands/generate_webpack_settings.py
new file mode 100644
index 000000000000..0097ebc222d2
--- /dev/null
+++ b/corehq/apps/hqwebapp/management/commands/generate_webpack_settings.py
@@ -0,0 +1,19 @@
+import json
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+from corehq.apps.hqwebapp.utils.webpack import WEBPACK_BUILD_DIR
+
+
+class Command(BaseCommand):
+    help = ("Generates a settings file for webpack so that the same staticfiles directory "
+            "that Django is using is passed to the Webpack build.")
+
+    def handle(self, **options):
+        webpack_settings = {
+            'staticfilesPath': settings.STATIC_ROOT,
+        }
+        WEBPACK_BUILD_DIR.mkdir(parents=True, exist_ok=True)
+        with open(WEBPACK_BUILD_DIR / "settings.json", "w") as f:
+            json.dump(webpack_settings, f)
diff --git a/corehq/apps/hqwebapp/management/commands/migrate_app_to_bootstrap5.py b/corehq/apps/hqwebapp/management/commands/migrate_app_to_bootstrap5.py
index 6b44a6664a1a..2867bee046ea 100644
--- a/corehq/apps/hqwebapp/management/commands/migrate_app_to_bootstrap5.py
+++ b/corehq/apps/hqwebapp/management/commands/migrate_app_to_bootstrap5.py
@@ -1,7 +1,5 @@
 import time
-from pathlib import Path
 
-from django.conf import settings
 from django.core.management import BaseCommand
 
 from corehq.apps.hqwebapp.utils.bootstrap import BOOTSTRAP_3, BOOTSTRAP_5
@@ -9,6 +7,7 @@
     get_spec,
     make_direct_css_renames,
     make_numbered_css_renames,
+    make_select_form_control_renames,
     make_template_tag_renames,
     make_data_attribute_renames,
     make_javascript_dependency_renames,
@@ -17,7 +16,9 @@
     flag_stateful_button_changes_bootstrap5,
     flag_changed_javascript_plugins,
     flag_crispy_forms_in_template,
+    flag_file_inputs,
     flag_inline_styles,
+    flag_selects_without_form_control,
     add_todo_comments_for_flags,
     update_gruntfile,
 )
@@ -87,14 +88,6 @@ def add_arguments(self, parser):
         )
 
     def handle(self, app_name, **options):
-        if not settings.BOOTSTRAP_MIGRATION_LOGS_DIR:
-            self.stderr.write("\nPlease make sure BOOTSTRAP_MIGRATION_LOGS_DIR is "
-                              "set in your localsettings.py before continuing...\n\n")
-            self.stdout.write(self.style.MIGRATE_LABEL(
-                "TIP: path should be outside of this repository\n\n"
-            ))
-            return
-
         selected_filename = options.get('filename')
 
         is_app_migration_complete = is_app_completed(app_name)
@@ -328,7 +321,6 @@ def migrate_single_file(self, app_name, file_path, spec, is_template, review_cha
                 self.stdout.write(self.style.WARNING(
                     self.format_header(f"Finalizing changes for {short_path}...")
                 ))
-                self.record_file_changes(file_path, app_name, file_changelog, is_template)
                 if self.no_split:
                     self.migrate_file_in_place(app_name, file_path, new_lines, is_template)
                     if is_template:
@@ -403,31 +395,6 @@ def display_rename_summary(self, changelog):
         self.stdout.write("\n\n\nAnswering 'y' below will automatically make this change "
                           "in the Bootstrap 5 version of this file.\n\n")
 
-    def record_file_changes(self, template_path, app_name, changelog, is_template):
-        if is_split_path(template_path):
-            parent_dir = template_path.parent.parent
-        else:
-            parent_dir = template_path.parent
-        short_path = get_short_path(app_name, parent_dir, is_template)
-        readme_directory = Path(settings.BOOTSTRAP_MIGRATION_LOGS_DIR) / short_path
-        readme_directory.mkdir(parents=True, exist_ok=True)
-        extension = '.html' if is_template else '.js'
-        readme_filename = template_path.name.replace(extension, '.md')
-        readme_path = readme_directory / readme_filename
-        with open(readme_path, 'w') as readme_file:
-            readme_file.writelines(changelog)
-        self.show_information_about_readme(readme_path)
-
-    def show_information_about_readme(self, readme_path):
-        if self.no_split:
-            self.stdout.write("\nThe changelog summarizing the "
-                              "migration changes can be found here:\n")
-        else:
-            self.stdout.write("\nThe changelog for all changes to the Bootstrap 5 "
-                              "version of this file can be found here:\n")
-        self.stdout.write(f"\n{readme_path}\n\n")
-        self.stdout.write("** Please make a note of this for reviewing later.\n\n\n")
-
     def migrate_file_in_place(self, app_name, file_path, bootstrap5_lines, is_template):
         short_path = get_short_path(app_name, file_path, is_template)
         confirm = get_confirmation(f"Apply changes to '{short_path}'?", default='y')
@@ -612,6 +579,8 @@ def make_template_line_changes(old_line, spec, is_fresh_migration):
 
         new_line, attribute_renames = make_data_attribute_renames(new_line, spec)
         renames.extend(attribute_renames)
+        new_line, select_renames = make_select_form_control_renames(new_line, spec)
+        renames.extend(select_renames)
         new_line, template_dependency_renames = make_template_dependency_renames(new_line, spec)
         renames.extend(template_dependency_renames)
         new_line, template_tag_renames = make_template_tag_renames(new_line, spec)
@@ -623,7 +592,9 @@ def get_flags_in_template_line(template_line, spec):
         flags = flag_changed_css_classes(template_line, spec)
         flags.extend(flag_stateful_button_changes_bootstrap5(template_line))
         flags.extend(flag_crispy_forms_in_template(template_line))
+        flags.extend(flag_file_inputs(template_line))
         flags.extend(flag_inline_styles(template_line))
+        flags.extend(flag_selects_without_form_control(template_line))
         return flags
 
     @staticmethod
diff --git a/corehq/apps/hqwebapp/static/app_manager/less/preview_app-main.less b/corehq/apps/hqwebapp/static/app_manager/less/preview_app-main.less
index eb7950fe16ee..c442d7b2f590 100644
--- a/corehq/apps/hqwebapp/static/app_manager/less/preview_app-main.less
+++ b/corehq/apps/hqwebapp/static/app_manager/less/preview_app-main.less
@@ -6,7 +6,7 @@
 EXTERNAL styling of the preview app container in app manager.
 
 For the styling of the app preview content and layout, please check out
-preview_app/less */
+preview_app/scss/ */
 
 @transition-speed: .5s;
 
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/debugger/debugger.less b/corehq/apps/hqwebapp/static/cloudcare/less/debugger/debugger.less
deleted file mode 100644
index 731952bbeede..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/debugger/debugger.less
+++ /dev/null
@@ -1,76 +0,0 @@
-.debugger {
-  width: 800px;
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  z-index: @zindex-cloudcare-debugger;
-  background-color: white;
-  overflow: hidden;
-
-  -webkit-transition: height 0.5s;
-  transition: height 0.5s;
-}
-
-.debugger .debugger-content {
-  overflow-y: auto;
-  margin-top: 12px;
-  padding: 10px;
-  padding-bottom: 0;
-}
-
-.debugger-updating {
-  #debugger-form-data, #debugger-xml-instance {
-    opacity: 0.5;
-  }
-}
-
-
-.debugger.debugger-minimized {
-  height: 30px;
-  overflow-y: hidden;
-}
-
-.debugger.debugger-maximized {
-  height: 400px;
-}
-
-.debugger .debugger-state {
-  cursor: pointer;
-}
-
-.debugger-code {
-  font-family: monospace;
-}
-
-.debugger-navbar {
-  border-radius: 0px;
-  border: none;
-  background-color: @cc-bg;
-}
-
-.debugger-tab-title {
-  line-height: 18px;
-  color: white;
-  background-color: @cc-brand-low;
-  border-bottom: #ddd solid 4px;
-  border-top: 0;
-  border-left: 0;
-  border-right: 0;
-  padding: 6px;
-  cursor: pointer;
-  .debugger-title {
-    text-transform: uppercase;
-    font-size: 11px;
-  }
-
-  &:hover {
-    background-color: darken(@cc-brand-low, 5);
-  }
-
-  -webkit-transition: background-color 0.5s;
-  transition: background-color 0.5s;
-}
-
-.debugger .query-container:hover {
-  cursor: pointer;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer.less b/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer.less
deleted file mode 100644
index 233c5d03cc0e..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer.less
+++ /dev/null
@@ -1,6 +0,0 @@
-// Based on the Structure of FontAwesome
-
-@import "font-formplayer/variables.less";
-@import "font-formplayer/path.less";
-@import "font-formplayer/core.less";
-@import "font-formplayer/icons.less";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/core.less b/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/core.less
deleted file mode 100644
index edb1454e83c4..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/core.less
+++ /dev/null
@@ -1,9 +0,0 @@
-.@{css-prefix} {
-  display: inline-block;
-  font-family: @font-family;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/icons.less b/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/icons.less
deleted file mode 100644
index f7af76a0f169..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/icons.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.@{css-prefix}-start-full:before { content: @var-start-full; }
-.@{css-prefix}-start-fg:before { content: @var-start-fg; }
-.@{css-prefix}-start-bg:before { content: @var-start-bg; }
-
-.@{css-prefix}-saved-full:before { content: @var-saved-full; }
-.@{css-prefix}-saved-fg:before { content: @var-saved-fg; }
-.@{css-prefix}-saved-bg:before { content: @var-saved-bg; }
-
-.@{css-prefix}-sync:before { content: @var-sync; }
-
-.@{css-prefix}-incomplete-full:before { content: @var-incomplete-full; }
-.@{css-prefix}-incomplete-fg:before { content: @var-incomplete-fg; }
-.@{css-prefix}-incomplete-bg:before { content: @var-incomplete-bg; }
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/path.less b/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/path.less
deleted file mode 100644
index eb0ccd278cfb..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/path.less
+++ /dev/null
@@ -1,13 +0,0 @@
-/* FONT PATH
- * -------------------------- */
-
-@font-face {
-  font-family: @font-family;
-  src: ~"url('@{font-path}/@{font-name}.eot?v=@{version}')";
-  src: ~"url('@{font-path}/@{font-name}.eot?#iefix&v=@{version}') format('embedded-opentype')",
-       ~"url('@{font-path}/@{font-name}.woff?v=@{version}') format('woff')",
-       ~"url('@{font-path}/@{font-name}.ttf?v=@{version}') format('truetype')",
-       ~"url('@{font-path}/@{font-name}.svg?v=@{version}#@{font-family}') format('svg')";
-  font-weight: normal;
-  font-style: normal;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/variables.less b/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/variables.less
deleted file mode 100644
index 7261dfefe1fc..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/font-formplayer/variables.less
+++ /dev/null
@@ -1,17 +0,0 @@
-@font-path: "/static/cloudcare/font";
-@css-prefix: ff;
-@inverse: #ffffff;
-@font-family: 'FormplayerFontRegular';
-@font-name: 'formplayerfont-regular';
-@version: '1.1';
-
-@var-start-full: "\f000";
-@var-start-fg: "\f001";
-@var-start-bg: "\f002";
-@var-saved-full: "\f003";
-@var-saved-fg: "\f004";
-@var-saved-bg: "\f005";
-@var-sync: "\f006";
-@var-incomplete-full: "\f007";
-@var-incomplete-fg: "\f008";
-@var-incomplete-bg: "\f009";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
deleted file mode 100644
index 8cdfa45726ca..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common-main.less
+++ /dev/null
@@ -1,27 +0,0 @@
-@import '../../hqwebapp/less/_hq/includes/variables.less';
-@import '../../hqwebapp/less/_hq/includes/mixins.less';
-
-/**
-These are the styles shared across both PREVIEW and the FULL PAGE WEB APP
-version of FORMPLAYER
-**/
-
-@import "formplayer-common/mixins";
-
-@import "formplayer-common/navigation";
-@import "formplayer-common/notifications";
-@import "formplayer-common/grid";
-@import "formplayer-common/breadcrumbs";
-@import "formplayer-common/paginate";
-@import "formplayer-common/appicon";
-@import "formplayer-common/case";
-@import "formplayer-common/request";
-@import "formplayer-common/module";
-@import "formplayer-common/version";
-@import "formplayer-common/form";
-@import "formplayer-common/formnav";
-@import "formplayer-common/markdown-table";
-@import "formplayer-common/address";
-@import "formplayer-common/webforms";
-
-@import "debugger/debugger";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common.less
deleted file mode 100644
index fe43084c5bee..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@b3-import-variables: '../../../../../../../../node_modules/bootstrap/less/variables';
-@b3-import-mixins: '../../../../../../../../node_modules/bootstrap/less/mixins';
-
-@import "formplayer-common-main";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/address.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/address.less
deleted file mode 100644
index 6e3986511261..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/address.less
+++ /dev/null
@@ -1,6 +0,0 @@
-// Overwrite mapboxgl geocoder library styling.
-.widget .mapboxgl-ctrl-geocoder {
-  max-width: 30000px;
-  width: 100%;
-  min-width: 30px;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/appicon.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/appicon.less
deleted file mode 100644
index 1c573600b903..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/appicon.less
+++ /dev/null
@@ -1,203 +0,0 @@
-@appicon-height-xs: 150px;
-@appicon-icon-height-xs: @appicon-height-xs - 30px;
-
-
-.make-appicon-size(@container-height, @icon-height, @title-height, @title-size) {
-  .appicon {
-    min-height: @container-height;
-
-    .appicon-title {
-      height: @title-height;
-      bottom: @container-height * 0.05;
-      h3 {
-        font-size: @title-size;
-        padding: 0 @title-size/2;
-      }
-    }
-    .appicon-icon {
-      top: 0.05*@icon-height;
-      margin-left: -@icon-height/2;
-      width: @icon-height;
-      height: @icon-height;
-      line-height: @icon-height;
-      font-size: @icon-height;
-      &[class*='fa-'] {
-        font-size: @icon-height * .8;
-      }
-    }
-    .appicon-custom {
-      // the default icons have internal padding in the image itself.
-      // this prevents users from needing to replicate that
-      top: 0.05*@icon-height + 10;
-      height: @icon-height - 10;
-    }
-  }
-  .appicon-default .appicon-icon {
-    font-size: @icon-height * .9;
-  }
-}
-
-.make-gridicon-size(@icon-height) {
-  .gridicon {
-    width: @icon-height;
-    height: @icon-height;
-    margin: 10% auto;
-
-    .gridicon-icon {
-      top: 0;
-      right: 0;
-      bottom: 0;
-      left: 0;
-      max-width: 100%;
-      max-height: 100%;
-      line-height: @icon-height;
-      font-size: @icon-height / 2;
-    }
-  }
-  .gridicon-circle {
-    border-radius: 2 * @icon-height;
-  }
-}
-
-.appicon, .gridicon {
-  background-color: @cc-neutral-mid;
-  text-align: center;
-  color: white;
-  position: relative;
-  box-sizing: border-box;
-  margin-bottom: 15px;
-
-  .border-top-radius(5px);
-  .border-bottom-radius(5px);
-  .transition(background 1s);
-  .box-shadow(0 0 5px 0 rgba(0, 0, 0, 0.45));
-
-  .appicon-title {
-    width: 100%;
-    position: absolute;
-    text-overflow: ellipsis;
-    h3 {
-      text-overflow: ellipsis;
-      margin: 0;
-      height: 100%;
-      overflow: hidden;
-      font-weight: 300;
-    }
-  }
-
-  .appicon-custom {
-    background-size: contain;
-    background-repeat: no-repeat;
-    background-position: center;
-  }
-
-  .appicon-icon, .gridicon-icon {
-    position: absolute;
-    box-sizing: border-box;
-    top: 0;
-    left: 50%;
-    .transition(color 1s);
-  }
-
-  &:hover {
-    .box-shadow(0 0 2x 3px rgba(0, 0, 0, 0.45));
-  }
-}
-
-.gridicon {
-  background-size: contain;
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-position: 50%;
-  // For icons with their own image, don't make assumptions about the shadowing
-  .box-shadow(0 0 0 0 rgba(0, 0, 0, 0));
-}
-
-.gridicon.gridicon-circle {
-  background-color: @cc-neutral-mid;
-  .box-shadow(0 0 5px 0 rgba(0, 0, 0, 0.45));
-}
-
-.make-appicon-size(170px, 115px, 35px, 16px);
-.make-gridicon-size(70px);
-
-@media(min-width: @screen-xs) {
-  .make-appicon-size(200px, 135px, 35px, 16px);
-  .make-gridicon-size(60px);
-}
-
-@media(min-width: @screen-sm) {
-  .make-appicon-size(210px, 140px, 40px, 18px);
-  .make-gridicon-size(70px);
-}
-
-@media(min-width: @screen-md) {
-  .make-appicon-size(230px, 150px, 45px, 20px);
-  .make-gridicon-size(130px);
-}
-
-.appicon-start {
-  background-color: @cc-att-pos-mid;
-  .appicon-icon-fg { color: @cc-att-pos-hi; }
-  .appicon-icon-bg { color: @cc-att-pos-low; }
-  &:hover {
-    background-color: darken(@cc-att-pos-mid, 5);
-    .appicon-icon-fg { color: lighten(@cc-att-pos-hi, 5); }
-    .appicon-icon-bg { color: darken(@cc-att-pos-low, 10); }
-  }
-}
-
-.appicon-incomplete {
-  background-color: @cc-dark-warm-accent-mid;
-  .appicon-icon-fg { color: @cc-dark-warm-accent-hi; }
-  .appicon-icon-bg { color: @cc-dark-warm-accent-low; }
-  &:hover {
-    background-color: darken(@cc-dark-warm-accent-mid, 7);
-    .appicon-icon-fg { color: lighten(@cc-dark-warm-accent-hi, 5); }
-    .appicon-icon-bg { color: darken(@cc-dark-warm-accent-low, 10); }
-  }
-}
-
-.appicon-sync {
-  background-color: @cc-brand-mid;
-  .appicon-icon {
-    top: 2px;
-    color: @cc-brand-hi;
-  }
-  &:hover {
-    background-color: darken(@cc-brand-mid, 10);
-    .appicon-icon { color: lighten(@cc-brand-hi, 5); }
-  }
-}
-
-.appicon-restore-as {
-  background-color: @cc-dark-cool-accent-mid;
-  .appicon-icon {
-    color: @cc-dark-cool-accent-hi;
-  }
-  &:hover {
-    background-color: darken(@cc-dark-cool-accent-mid, 5);
-    .appicon-icon { color: lighten(@cc-dark-cool-accent-hi, 5); }
-  }
-}
-
-.appicon-settings {
-  background-color: @cc-neutral-low;
-  .appicon-icon {
-    color: @cc-neutral-hi;
-  }
-  &:hover {
-    background-color: darken(@cc-neutral-low, 5);
-    .appicon-icon { color: lighten(@cc-neutral-hi, 5); }
-  }
-}
-
-.appicon-default {
-  background-color: white;
-  color: lighten(@cc-text, 30);
-  .box-shadow(0 0 10px 0 rgba(0, 0, 0, 0.2));
-  .appicon-icon { color: @cc-brand-mid; }
-  &:hover {
-    background-color: darken(white, 5);
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/breadcrumbs.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/breadcrumbs.less
deleted file mode 100644
index 52eb1bf27b33..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/breadcrumbs.less
+++ /dev/null
@@ -1,37 +0,0 @@
-#breadcrumb-region {
-    position: sticky;
-    position: -webkit-sticky;
-    top: 0;
-    z-index: @zindex-navbar-cloudcare;
-}
-
-#breadcrumb-region .breadcrumb-text, .single-app-view .breadcrumb-text {
-    cursor: pointer;
-}
-
-#breadcrumb-region .breadcrumb,
-.single-app-view .breadcrumb,
-.breadcrumb-form-container .breadcrumb {
-  background-color: @cc-brand-mid;
-  color: white;
-  .border-top-radius(0);
-  .border-bottom-radius(0);
-  .box-shadow(0 0 5px 2px rgba(0,0,0,.3));
-  border: none;
-
-  .breadcrumb-text {
-    &:before {
-      content: '\f054';
-      font-family: 'FontAwesome';
-    }
-  }
-  .breadcrumb-text:first-child {
-    &:before {
-      display: none;
-    }
-  }
-}
-
-#breadcrumb__menu-dropdown {
-    cursor: pointer;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/case.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/case.less
deleted file mode 100644
index 4a7b580d063f..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/case.less
+++ /dev/null
@@ -1,4 +0,0 @@
-#case-details > div > .breadcrumb > .active {
-    font-weight: 600;
-    color: inherit;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less
deleted file mode 100644
index 2d3004ec149a..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/form.less
+++ /dev/null
@@ -1,43 +0,0 @@
-.hint-text {
-  font-size: 80%;
-  font-style: italic;
-}
-
-.help-popover, .help-popover:hover, .help-popover:focus {
-  text-decoration: none;
-  outline: 0;
-}
-
-.unsupported-question-type-trigger {
-  float: right;
-  margin-bottom: 5px;
-  margin-left: 5px;
-}
-
-.help-text-trigger {
-  padding: 0;
-}
-
-.atwho-view:after {
-  text-align: center;
-  content: attr(data-message);
-  display: block;
-  text-align: center;
-  line-height: 20px;
-}
-
-legend {
-  border: none;
-}
-
-.gr.repetition:not(:first-child) {
-    border-top: @cc-neutral-hi solid 1px;
-    padding-top: 20px;
-}
-
-.question-tile-row {
-  .gr {
-    padding-right: 20px !important;
-    padding-left: 20px !important;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/formnav.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/formnav.less
deleted file mode 100644
index 4d14a7494a4b..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/formnav.less
+++ /dev/null
@@ -1,61 +0,0 @@
-.webforms-nav {
-  margin-bottom: 10px;
-  width: 100%;
-}
-
-.formnav-title {
-  position: absolute;
-  z-index: 1001;
-  color: white;
-  top: -41px;
-  font-size: 14px;
-  margin: 0;
-  font-weight: 400;
-  left: 50px;
-  line-height: 40px;
-  width: 144px;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-}
-
-.formnav-container {
-  transition: width 1s;
-  width: 100%;
-  background-color: @cc-bg;
-  box-sizing: border-box;
-  height: 33px;
-  padding: 0;
-}
-
-.btn-formnav {
-  background-color: transparent;
-  line-height: 12px;
-  padding: 12px 17px 9px;
-  border: none;
-  color: @cc-brand-mid;
-
-  .border-top-radius(0);
-  .border-bottom-radius(0);
-  .transition(background 1s);
-
-  &:hover {
-    background-color: darken(@cc-bg, 5);
-    color: @cc-brand-mid;
-  }
-}
-
-.btn-formnav:focus {
-  outline: none;
-}
-
-.btn-formnav.disabled {
-  color: lighten(@cc-text, 50);
-  &:hover {
-    background-color: transparent;
-  }
-}
-
-.btn-formnav-next {
-  float: right;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/grid.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/grid.less
deleted file mode 100644
index 8d7848aa21b0..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/grid.less
+++ /dev/null
@@ -1,5 +0,0 @@
-.box {
-  border-color: #685c53;
-  color: #685c53;
-  font-size: 100%;
-}
\ No newline at end of file
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/markdown-table.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/markdown-table.less
deleted file mode 100644
index 1629bfee102f..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/markdown-table.less
+++ /dev/null
@@ -1,38 +0,0 @@
-.webapp-markdown-output {
-    table {
-        padding: 0;
-        tr {
-            background-color: white;
-            margin: 0;
-            padding: 0;
-
-            &:nth-child(2n) {
-                background-color: #f8f8f8;
-            }
-
-            th, td {
-                border: 1px solid #ccc;
-                text-align: left;
-                margin: 0;
-                padding: 6px 13px;
-                &:first-child {
-                    margin-top: 0;
-                }
-                &:last-child {
-                    margin-bottom: 0;
-                }
-            }
-
-            th {
-                font-weight: bold;
-                background-color: #ddd;     // override tr background color
-            }
-        }
-    }
-}
-
-.text-center {
-  .webapp-markdown-output table {
-    margin: auto;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/mixins.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/mixins.less
deleted file mode 100644
index 1a162354bba8..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/mixins.less
+++ /dev/null
@@ -1,37 +0,0 @@
-.make-module-size(@icon-size) {
-  .module-icon-image,
-  .module-icon-container {
-    width: @icon-size;
-    height: @icon-size;
-  }
-  .module-icon-container {
-    .border-top-radius(@icon-size/2);
-    .border-bottom-radius(@icon-size/2);
-    .module-icon {
-      font-size: @icon-size * 0.5;
-      line-height: @icon-size;
-    }
-  }
-  .module-column-icon {
-    width: @icon-size + 0.4*@icon-size;
-    height: @icon-size + 0.4*@icon-size;
-  }
-  @control-size: 0.8*@icon-size;
-  .module-audio-control, .module-delete-control {
-    width: @control-size;
-    height: @control-size;
-    right: (0.4*@icon-size)/2;
-    margin-top: -@control-size/2;
-
-    .border-top-radius(@control-size/2);
-    .border-bottom-radius(@control-size/2);
-  }
-  .module-audio-icon, .module-delete-icon {
-    font-size: @control-size * 0.5;
-    line-height: @control-size;
-  }
-  .module-column-name-audio h3,
-  .module-column-name-session h3 {
-    margin-right: @control-size + 0.4*@icon-size !important;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/module.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/module.less
deleted file mode 100644
index 04437809e6d7..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/module.less
+++ /dev/null
@@ -1,317 +0,0 @@
-.module-table {
-  .module-column {
-    border: none;
-    text-align: left;
-    vertical-align: middle;
-    .transition(background 1s);
-  }
-  .module-column-name {
-    position: relative;
-  }
-  tr:hover {
-    .module-column {
-      background-color: @cc-bg;
-    }
-  }
-}
-
-.module-column-name {
-  margin: 0 10px 0 10px;
-}
-
-.badge-container {
-  position: relative;
-  > .badge {
-    position: absolute;
-    bottom: -5px;
-    right: -5px;
-  }
-}
-
-button.clickable-icon {
-  background: unset;
-  border: unset;
-  padding: unset;
-}
-
-.module-icon-image {
-  margin: 0 auto;
-  background: no-repeat center;
-  -webkit-background-size: cover;
-  -moz-background-size: cover;
-  -o-background-size: cover;
-  background-size: cover;
-}
-
-.module-icon-container {
-  background-color: @cc-neutral-mid;
-  text-align: center;
-  margin: 0 auto;
-
-  .module-icon {
-    color: white;
-  }
-}
-
-.module-icon-user {
-  background-color: @cc-dark-cool-accent-mid;
-  .module-icon {
-    color: @cc-dark-cool-accent-hi;
-  }
-}
-
-.module-audio-control, .module-delete-control {
-  text-align: center;
-  .transition(background 1s);
-  position: absolute;
-  top: 50%;
-
-}
-
-.module-audio-control {
-  .module-audio-icon {
-    color: @cc-light-cool-accent-mid;
-  }
-  &:hover {
-    background-color: @cc-light-cool-accent-hi;
-  }
-}
-
-.module-delete-control {
-  .module-delete-icon {
-    color: @cc-att-neg-mid;
-  }
-  &:hover {
-    background-color: @cc-att-neg-hi;
-  }
-}
-
-.make-module-size(45px);
-.module-column-name h3 {
-  font-size: 16px;
-}
-
-@media (min-width: @screen-md) {
-  .make-module-size(80px);
-  .module-column-name h3 {
-    font-size: 20px;
-  }
-}
-
-.query-button-container {
-  padding: 8px;
-  text-align: center;
-}
-.query-button-container .btn{
-  width: 48%;
-}
-
-.module-table .module-case-list-header {
-  background-color: @cc-brand-low;
-  color: white;
-  padding: 20px 10px;
-  cursor: default;
-  font-size: 14px;
-  text-transform: uppercase;
-  font-weight: bold;
-  border: none;
-}
-
-.module-table .module-case-list-column {
-  padding: 20px 10px;
-  font-size: 14px;
-  border: 0;
-  cursor: pointer;
-}
-
-.module-table .module-case-list-column-checkbox {
-  cursor: default;
-  width: 35px;
-  vertical-align: middle;
-}
-
-.module-table-case-list tbody tr td {
-  transition: background .6s;
-}
-
-.module-table-case-list tbody tr:nth-child(even) > td {
-  background-color: @cc-bg;
-}
-
-.module-table-case-list tbody tr:hover > td {
-  background-color: darken(@cc-bg, 5);
-}
-
-.module-search-container, .case-list-actions {
-  padding: 10px;
-}
-
-.module-go-container {
-  margin-top: 17px;
-}
-
-.pagination-container {
-  width: inherit;
-  padding-left: 17px;
-  padding-right: 17px;
-  min-height: 76px;
-}
-
-.module-per-page-container {
-  display: inline-block;
-  margin-top: 17px;
-}
-
-.module-table-case-list tbody tr:hover .module-case-list-column-empty {
-  background-color: white;
-  cursor: default;
-}
-
-.module-case-list-column-empty .alert {
-  margin-bottom: 0;
-}
-
-.module-table-case-detail {
-  margin-top: 10px;
-}
-
-.module-table-case-detail tbody tr {
-  &:hover {
-    cursor: default;
-  }
-  > td, > th {
-    border: none;
-    padding: 10px 15px;
-    &:hover {
-      cursor: default;
-    }
-  }
-
-  th, td {
-    background-color: @cc-brand-hi;
-    color: @cc-brand-low;
-  }
-}
-
-.module-banner {
-  background-color: @cc-light-warm-accent-hi;
-  color: black;
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  border: none;
-  margin-top: -1px;
-  text-align: center;
-  font-size: 14px;
-}
-
-.module-table-case-detail tbody tr:nth-child(odd) {
-  th, td {
-    background-color: darken(@cc-brand-hi, 3);
-  }
-}
-
-.module-case-detail-tabs .nav-tabs li a {
-  text-transform: uppercase;
-  font-weight: bold;
-  .transition(1s all);
-  &:hover {
-    background-color: @cc-brand-hi;
-    border-top-color: transparent;
-    border-left-color: transparent;
-    border-right-color: transparent;
-  }
-}
-
-.module-case-detail-continue {
-  width: 100%;
-  .transition(.5s all);
-}
-
-.module-case-detail-btn {
-  width: 48%;
-  display: inline;
-}
-
-.module-case-detail-modal, .module-modal {
-  .modal-header {
-    border-bottom: none;
-  }
-  .modal-body {
-    padding-bottom: 0;
-    padding-top: 0;
-  }
-  .modal-footer {
-    border-top: none;
-  }
-}
-
-.module-modal {
-  .modal-body {
-    font-size: 16px;
-  }
-}
-
-.module-pagination-container {
-  text-align: center;
-  .pagination {
-    font-size: 1.8rem;
-  }
-}
-
-.menus-container {
-  margin-bottom: 20px;
-}
-
-#formplayer-progress {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  position: fixed;
-  background-color: rgba(255, 255, 255, 0.9);
-  z-index: @zindex-formplayer-progress;
-  text-align: center;
-}
-
-#formplayer-progress .progress-container {
-  text-align: center;
-  left: 0;
-  right: 0;
-  position: absolute;
-  margin: 0 auto;
-  width: 80%;
-  top: 50%;
-
-  // Centers container vertically
-  transform: translateY(-50%);
-  -ms-transform: translateY(-50%);
-  -webkit-transform: translateY(-50%);
-
-  .progress-title {
-    display: inline-block;
-    h1 {
-      margin-bottom: 0px;
-    }
-    .subtext {
-      margin-top: 0px;
-    }
-    margin-bottom: 14px;
-  }
-}
-
-@media(max-width: @screen-sm-max) {
-  .module-case-list-table-container {
-    width: 100%;
-    overflow-x: scroll;
-  }
-  #formplayer-progress .progress-container {
-    .progress-title {
-      h1, h2 {
-        font-size: 1.3em;
-      }
-      h1 {
-        margin-bottom: 4px;
-      }
-    }
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/navigation.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/navigation.less
deleted file mode 100644
index 733071ede13c..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/navigation.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.nav-list > li > a, .nav-list > li > a:hover {
-    cursor: pointer;
-}
-
-.nav-list > li.disabled > a, .nav-list > li.disabled > a:hover {
-    cursor: wait;
-}
-
-nav#sessions > ul > li >  a.close{
-  z-index:1000;
-}
-
-nav#sessions > ul > li.nav-header {
-    color: #6c6c6c;
-}
-
-
-#hq-navigation .navbar {
-  margin-bottom: 0;
-}
-
-#hq-navigation {
-  transition: all 1s;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/notifications.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/notifications.less
deleted file mode 100644
index 8e709ff49de2..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/notifications.less
+++ /dev/null
@@ -1,11 +0,0 @@
-.notifications-container {
-  background: transparent;
-
-  .alert {
-    .box-shadow(0 0 8px 1px rgba(0, 0, 0, 0.18));
-  }
-}
-
-#cloudcare-notifications {
-  overflow-wrap: break-word;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/paginate.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/paginate.less
deleted file mode 100644
index be663eedc724..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/paginate.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.paginate-disabled {
-  cursor: not-allowed;
-  pointer-events: none;
-  opacity: .5;
-  box-shadow: none;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/request.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/request.less
deleted file mode 100644
index daac8d3f2908..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/request.less
+++ /dev/null
@@ -1,8 +0,0 @@
-.formplayer-requester-disabled {
-    pointer-events: none;
-    opacity: .5;
-}
-
-.formplayer-request {
-    cursor: pointer;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/version.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/version.less
deleted file mode 100644
index 4f77c47d78c9..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/version.less
+++ /dev/null
@@ -1,4 +0,0 @@
-#version-info {
-    text-align: center;
-    display: block
-}
\ No newline at end of file
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
deleted file mode 100644
index 9b72d1fa8f62..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-common/webforms.less
+++ /dev/null
@@ -1,124 +0,0 @@
-.webforms {
-  max-width: 800px;
-  font-family: sans-serif;
-}
-
-#sync-container {
-  padding-top: 9px;
-
-  #sync-button {
-    margin-bottom: 3px;
-    margin-top: 3px;
-  }
-}
-
-/* Override default nprogress bar color to match CommCareHQ */
-#nprogress {
-  .bar {
-    background: #4aba32;
-    height: 4px;
-  }
-
-  .peg {
-    box-shadow: 0 0 10px #004ebc, 0 0 5px #004ebc;
-  }
-}
-
-video {
-  max-width: 400px;
-}
-
-.ix {
-  display: none;
-}
-
-.widget-container {
-  position: relative;
-}
-
-.widget {
-  margin-right: 20px;
-
-  button p {
-    margin-bottom: 0;
-  }
-}
-
-.dirty .widget {
-    background-color: lightblue;
-}
-
-.loading {
-  position: absolute;
-  right: 0px;
-  line-height: 30px;
-  font-size: 18px
-}
-
-.error-message {
-  font-weight: bold;
-}
-
-input:invalid {
-  color: #b94a48;
-  border-color: #b94a48;
-}
-
-.required .caption::before,
-.required-group .gr-header .caption::before {
-  content: '*';
-  font-weight: bold;
-  color: #c0392b;
-  margin: 0 3px;
-  float: left;
-}
-
-.caption {
-  font-weight: normal;
-}
-
-.map {
-  width: 100%;
-  height: 250px;
-  background: #eee;
-  max-width: none !important;
-  isolation: isolate;
-}
-
-.widget button p {
-  margin-bottom: 0;
-}
-
-.widget button h1 {
-  margin-top: 7px;
-  margin-bottom: 5px;
-}
-
-.widget button h2 {
-  margin-top: 6.5px;
-  margin-bottom: 4.5px;
-}
-
-.widget button h3 {
-  margin-top: 6px;
-  margin-bottom: 4px;
-}
-
-.widget button h4 {
-  margin-top: 5.5px;
-  margin-bottom: 3.5px;
-}
-
-.coordinate {
-  font-weight: bold;
-  width: 8em;
-}
-
-.wait {
-  margin: auto;
-  padding-top: 60px;
-  max-width: 200px;
-  color: #bbb;
-  font-size: 24pt;
-  line-height: 28pt;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp-main.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp-main.less
deleted file mode 100644
index 834cd26cbeb9..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp-main.less
+++ /dev/null
@@ -1,24 +0,0 @@
-@import '../../hqwebapp/less/_hq/includes/variables.less';
-@import '../../hqwebapp/less/_hq/includes/mixins.less';
-
-/**
-These are all the styles relevant to the full-screen version of formplayer which
-might interfere with the app preview formplayer. Making changes here should not
-affect app preview.
-
-If you want to make changes relevant for BOTH app preview and the main
-formplayer, please make changes to the cloudcare styles.
-**/
-
-@import "formplayer-webapp/content";
-@import "formplayer-webapp/navbar";
-@import "formplayer-webapp/breadcrumbs";
-@import "formplayer-webapp/query";
-@import "formplayer-webapp/menu";
-@import "formplayer-webapp/module";
-@import "formplayer-webapp/form";
-@import "formplayer-webapp/formnav";
-@import "formplayer-webapp/version";
-@import "formplayer-webapp/print-general";
-@import "formplayer-webapp/case-tile";
-@import "formplayer-webapp/leaflet";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp.less
deleted file mode 100644
index a5c5ec05a317..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@b3-import-variables: '../../../../../../../../node_modules/bootstrap/less/variables';
-@b3-import-mixins: '../../../../../../../../node_modules/bootstrap/less/mixins';
-
-@import "formplayer-webapp-main";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/breadcrumbs.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/breadcrumbs.less
deleted file mode 100644
index 1105d012434f..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/breadcrumbs.less
+++ /dev/null
@@ -1,62 +0,0 @@
-#breadcrumb-region .breadcrumb,
-.single-app-view .breadcrumb,
-.breadcrumb-form-container .breadcrumb {
-  font-size: 2rem;
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  margin-top: -1px;
-  .breadcrumb-text {
-    &.js-home {
-      margin-right: -5px;
-    }
-    &:before {
-      padding: 0 6px 0 12px;
-      color: #ffffff;
-      font-size: 12px;
-      vertical-align: top;
-      line-height: 28px;
-    }
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden
-  }
-}
-
-#breadcrumb-region .breadcrumb-nav {
-  background-color: @cc-brand-mid;
-  box-shadow: 0 0 5px 2px rgba(0,0,0,.3);
-  display: flex;
-  align-items: center;
-  height: @breadcrumb-height-cloudcare;
-
-  .breadcrumb {
-    box-shadow: none;
-    background-color: unset;
-    padding: 10px 10px 0 10px;
-    margin-bottom: 0;
-    flex-grow: 1;
-  }
-
-  .btn-group {
-    padding-right: 10px;
-  }
-}
-
-@media print {
-  #breadcrumb-region {
-    position: static;
-  }
-
-  #breadcrumb-region .breadcrumb,
-  .breadcrumb-form-container .breadcrumb {
-    font-size: 12px;
-    margin-bottom: 0px;
-    padding-left: 33px;
-    .breadcrumb-text {
-      &:before {
-        font-size: 7px;
-        line-height: 17px;
-      }
-    }
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/case-tile.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/case-tile.less
deleted file mode 100644
index f1e93a4c5388..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/case-tile.less
+++ /dev/null
@@ -1,212 +0,0 @@
-#case-list-menu-header{
-  padding-left: 1.5rem;
-  padding-right: 1.5rem;
-  background-color: white;
-  @media (max-width: @screen-sm-max) {
-    min-height: 70px;
-  }
-  h1 {
-    padding-left: 0px;
-  }
-
-  div button {
-    margin-left: 12px;
-  }
-}
-
-#case-list-search-controls {
-  background-color: @cc-bg;
-  margin: 0 5px 5px 5px;
-  display: flex;
-  justify-content: space-between;
-    #case-list-sort-by-btn {
-      background-color: transparent;
-    }
-}
-
-#select-all-tile-checkbox {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  margin-left: 10px;
-  margin-right: 10px;
-}
-
-#select-all-tile-checkbox-label {
-  font-weight: normal;
-}
-
-.select-row-checkbox-div {
-  margin: 10px 10px 10px 10px;
-  float: left;
-}
-
-.collapsed-tile-content {
-  height: 100px;
-  overflow-y: clip;
-  -webkit-mask-image: linear-gradient(180deg, #000 60%, transparent);
-}
-
-.show-more {
-  text-align: center;
-  font-size: large;
-}
-
-.sticky {
-  position: sticky !important;
-  z-index: 1; // keep sticky elements on top of case list
-  &-header {
-    top: 32px; // header scrolls excess padding under breadcrumbs
-  }
-  &-map {
-    top: 46px; // map sits directly against breadcrumbs
-  }
-}
-
-// todo should this be a re-usable class? only used for case list right now
-.btn-circle {
-  border-radius: 50%;
-  aspect-ratio: 1;
-}
-
-#scroll-to-bottom {
-  position: fixed;
-  z-index: @zindex-formplayer-scroll-to-bottom;
-  bottom: 45px;
-  left: calc(100vw - 80px);
-}
-
-.case-tile-container {
-  background: transparent !important;
-  > div {
-    background: white;
-    margin-bottom: 20px;
-    display: grid;
-    container-type: inline-size;
-  }
-
-  #persistent-case-tile .persistent-sticky .webapp-markdown-output {
-    img {
-      max-height: 100%;
-      max-width: 100%;
-    }
-
-    h1,h2,h3 {
-      margin-top: 0px
-    }
-  }
-}
-
-@media screen {
-  .case-tile-container {
-    position: sticky;
-    top: @breadcrumb-height-cloudcare;
-    z-index: @zindex-persistent-tile-cloudcare;
-
-    #persistent-case-tile .persistent-sticky {
-      box-shadow: 0 0 10px 2px rgba(0, 0, 0, 0.1);
-      border-bottom: 1px solid @cc-neutral-hi;
-    }
-  }
-}
-
-@media print {
-  .case-tile-container {
-    > div {
-      margin-bottom: 0px;
-    }
-    > div:not(:empty) {
-      border-bottom: 1px dashed black;
-    }
-  }
-}
-
-#menu-region .module-menu-container,
-#menu-region .module-case-list-container {
-
-  .white-border {
-    border-right-color: transparent;
-    border-right-style: solid;
-    border-right-width: 5px;
-  }
-
-  // todo: determine appropriate nesting
-  #module-case-list-map {
-    height: calc(~"100vh - 65px");
-
-    @media (max-width: @screen-sm-max) {
-      height: 25vh;
-    }
-
-    .marker-pin {
-      text-align: center;
-      /* Horizontally center the text (icon) */
-      line-height: 12px;
-      /* Vertically center the text (icon) */
-      color: @call-to-action-hi;
-      text-shadow: -1px 0 @call-to-action-low, 0 1px @call-to-action-low, 1px 0 @call-to-action-low, 0 -1px @call-to-action-low;
-    }
-  }
-
-  .list-cell-wrapper-style {
-    margin: 10px 5px 0 5px;
-    border-collapse: collapse;
-    vertical-align: top;
-    background-color: @cc-bg;
-    container-type: inline-size;
-
-    a {
-      color: @cc-brand-mid;
-    }
-
-    .module-icon,
-    .webapp-markdown-output img {
-      max-height: 100%;
-      max-width: 100%;
-    }
-
-    &:hover {
-      background-color: darken(@cc-bg, 5);
-      transition: background 0.6s;
-    }
-  }
-
-  .highlighted-case {
-    border-style: solid;
-    border-color: @cc-brand-mid;
-  }
-
-  .case-tile-group{
-    margin: 10px;
-    padding: 10px 0;
-
-    .group-data{
-      flex-grow: 1;
-      display: flex;
-      flex-direction: column;
-    }
-    .group-rows{
-      display: flex;
-      flex-direction: column;
-      gap: 10px;
-      align-items: center;
-    }
-    .group-row{
-      background-color: white;
-      width: 95%;
-    }
-  }
-}
-
-@media print {
-  #menu-region .module-menu-container,
-  #menu-region .module-case-list-container {
-    #module-case-list-container__results-container {
-      grid-template-columns: [tiles] 1fr !important;
-    }
-
-    .list-cell-wrapper-style {
-      border: 1px solid @cc-bg;
-      break-inside: avoid;
-    }
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less
deleted file mode 100644
index 10cb62ae38cc..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/content.less
+++ /dev/null
@@ -1,65 +0,0 @@
-body {
-  overflow-x: hidden;
-  background-color: @cc-bg;
-}
-
-.cloudcare-home-content {
-  padding: 0 0 2rem;
-}
-
-
-#hq-footer {
-  display: none;
-}
-
-.page-header {
-  border-bottom: none;
-  padding: 14px 8px 7px;
-  margin: 0;
-  h1 {
-    font-size: 2rem;
-    text-transform: uppercase;
-    color: @cc-neutral-mid;
-    padding-left: 1.5rem;
-    font-weight: bold;
-    margin-top: 0px;
-  }
-}
-
-.page-footer {
-  padding: 14px 8px 7px;
-}
-
-.page-header-apps {
-  padding-left: 2px;
-}
-
-.page-header-apps h1 {
-  padding-left: 0;
-}
-
-#content-container {
-  background: transparent;
-}
-
-@media print {
-  * {
-    visibility: collapse;
-  }
-
-  .print-container, .print-container * {
-    visibility: visible;
-  }
-
-  .noprint-sub-container {
-    display: none !important;
-  }
-
-  #cloudcare-main {
-    padding: 0px;
-  }
-
-  video {
-    border: 1px solid #ddd;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
deleted file mode 100644
index c2879bf59f70..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/form.less
+++ /dev/null
@@ -1,270 +0,0 @@
-@form-text-indent: 23px;
-@form-text-size: 16px; // If updating, update .checkbox, .radio margin-top to fit
-@group-indent: 15px;
-
-.form-container {
-  background-color: white;
-  .box-shadow(0 0 10px 2px rgba(0,0,0,.1));
-  margin-bottom: 2rem;
-  font-size: @form-text-size;   // Don't overshadow inputs
-
-  .page-header h1 {
-    padding-left: @form-text-indent - 8px;
-  }
-
-  .controls {
-    padding-right: 25px;
-    padding-top: 3px;
-  }
-
-  .form-control {
-    font-size: @form-text-size;
-  }
-
-  .form-actions {
-    margin: 30px 0 0 0;
-    &.form-group {
-      margin-left: -@form-text-indent;
-      margin-right: -@form-text-indent;
-    }
-
-    background-color: @call-to-action-extra-hi;
-    .border-bottom-radius(0);
-
-    .submit .btn {
-      font-size: 20px;
-      padding: 13px 24px;
-      .transition(all .5s);
-    }
-  }
-
-  .sticky-submit {
-    position: sticky;
-    /* Puts the anchored submit button in front of form elements that use bootstrap's .form-control,
-       which adds z-index of 2 (3 when focused) */
-    z-index: @zindex-formplayer-anchored-submit;
-  }
-
-  // Bootstrap introduces -10px left/right margin for row classes. This causes element to overflow parent.
-  .row {
-    margin-left: 0px;
-    margin-right: 0px;
-  }
-  .question-container {
-    padding-left: @form-text-indent;
-    padding-right: @form-text-indent;
-  }
-
-  .form-group {
-    margin-left: 0px;
-    margin-right: 0px;
-    .caption.control-label {
-      display: block;
-    }
-  }
-
-  .group-body {
-    margin-left: @group-indent;
-    margin-right: @group-indent;
-  }
-
-  .gr.panel {
-    border-radius: 0px;
-  }
-
-  .rep.panel {
-    border-radius: 0px;
-  }
-
-  .col-sm-12,
-  .col-sm-11,
-  .col-sm-10,
-  .col-sm-9,
-  .col-sm-8,
-  .col-sm-7,
-  .col-sm-6,
-  .col-sm-5,
-  .col-sm-4,
-  .col-sm-3,
-  .col-sm-2,
-  .col-sm-1 {
-    &:first-child {
-      padding-left: 0;
-    }
-    &:last-child {
-      padding-right: 0;
-    }
-  }
-
-  .panel-body {
-    @media (max-width: @screen-xs-max) {
-      padding-left: 0px;
-      padding-right: 0px;
-    }
-  }
-
-  .stripe-repeats {
-    > .row, .panel-body > .children > .row {
-      &:nth-of-type(odd) {
-        background-color: @table-bg-accent;
-      }
-      &:nth-of-type(even) {
-        background-color: white;
-      }
-      &:hover {
-        background-color: @table-bg-hover;
-      }
-    }
-  }
-
-  .group-border {
-    border: solid 1px @cc-neutral-mid;
-    border-radius: 8px;
-    margin: 2px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-  }
-
-  .info {
-    overflow-x: auto;
-  }
-
-  .gr-header {
-    .collapsible-icon-container {
-      float: left;
-      margin-right: 10px;
-    }
-    .webapp-markdown-output img {
-      height: 1em;
-      vertical-align: baseline;
-    }
-  }
-
-  .panel-heading {
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-  }
-
-}
-
-.form-group-required-label {
-  display: none;
-}
-
-.form-single-question {
-  padding-bottom: 20px;
-  padding-top: 20px;
-
-  .page-header {
-    display: none;
-  }
-
-  .form-group.required {
-    .transition(all .5s);
-    margin-bottom: 0;
-    label:before {
-      display: none;
-    }
-  }
-
-  .form-group.required.on {
-    background-color: @cc-att-neg-hi;
-    border: 10px solid @cc-att-neg-mid;
-    border-bottom: none;
-    padding-top: 10px;
-    padding-bottom: 10px;
-
-    label {
-      margin-left: 0;
-      margin-right: 0;
-    }
-  }
-
-  .form-group-required-label {
-    display: block;
-    opacity: 0;
-    .transition(all .5s);
-  }
-
-  .form-group-required-label.on {
-    opacity: 100;
-    font-size: 1.6rem;
-    background-color: @cc-att-neg-mid;
-    color: white;
-    width: auto;
-    line-height: 14px;
-    margin-left: -10px;
-    margin-right: -10px;
-    padding: 10px 10px 11px;
-    text-align: left;
-    margin-top: 0;
-    border: none;
-  }
-
-}
-
-@media print {
-  .form-container.print-container {
-    margin: 0px;
-    .page-header {
-      padding-top: 0px;
-    }
-  }
-
-  .q.form-group {
-    break-inside: avoid;
-  }
-
-  .panel.panel-default.last,
-  .panel.panel-default.last *,
-  .q.form-group.last,
-  .q.form-group.last * {
-    margin-bottom: 0px;
-    padding-bottom: 0px;
-    .widget-container {
-      margin-bottom: 0px;
-      padding-bottom: 0px;
-    }
-  }
-
-  .help-block {
-    color: #52616f !important;
-    font-size: 14px;
-  }
-}
-
-.question-tile-row:has(div.q) {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
-.question-tile-row {
-  display: flex;
-  align-items: start;
-  * .form-group, * p, * .control-label {
-    padding-top: 0px !important;
-    padding-bottom: 0px !important;
-    margin-top: 0px !important;
-    margin-bottom: 0px !important;
-  }
-}
-
-.question-tile-row {
-  .gr {
-    padding-right: 0px !important;
-    padding-left: 0px !important;
-  }
-}
-
-.gr-has-no-nested-questions {
-  display: none;
-}
-
-.checkbox, .radio {
-  input[type="checkbox"], input[type="radio"] {
-    margin-top: 3.15px;
-  }
-  // Overrides Bootstrap defaults
-  padding-top: 0px !important;
-  padding-bottom: 7px;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/formnav.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/formnav.less
deleted file mode 100644
index 2b9bdc7c3dab..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/formnav.less
+++ /dev/null
@@ -1,24 +0,0 @@
-.formnav-container {
-  background-color: white;
-  height: 45px;
-  margin-top: -16px;
-}
-
-.btn-formnav {
-  font-size: 2.2rem;
-}
-
-.btn-formnav-submit {
-  transition: width 1s;
-  width: 80%;
-  text-transform: uppercase;
-  padding: 9px 10px;
-  border: none;
-  float: right;
-  font-size: 1.9rem;
-
-  .transition(all 1s);
-
-  .border-top-radius(0);
-  .border-bottom-radius(0);
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/leaflet.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/leaflet.less
deleted file mode 100644
index 30eba98af909..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/leaflet.less
+++ /dev/null
@@ -1,9 +0,0 @@
-// override leaflet-fullscreen styles to fix icon alignment in mapbox.js
-.leaflet-touch {
-  .leaflet-control-fullscreen a {
-    background-position: 0px 0px !important;
-  }
-  &.leaflet-fullscreen-on .leaflet-control-fullscreen a {
-    background-position: 0px -26px !important;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/menu.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/menu.less
deleted file mode 100644
index 3f95e2298ad9..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/menu.less
+++ /dev/null
@@ -1,14 +0,0 @@
-#menu-region {
-  background: transparent;
-}
-
-#menu-region .module-menu-container,
-#menu-region .module-case-list-container {
-  background-color: white;
-  .box-shadow(0 0 10px 2px rgba(0,0,0,.1));
-  margin-bottom: 2rem;
-}
-
-#menu-region .module-menu-container {
-  padding-bottom: 6px;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/module.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/module.less
deleted file mode 100644
index e9d62ce41412..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/module.less
+++ /dev/null
@@ -1,13 +0,0 @@
-.module-table {
-  .module-column-icon {
-    padding-left: 20px;
-  }
-}
-
-
-@media print {
-  .module-banner {
-    padding: 0px;
-    height: 0px;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/navbar.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/navbar.less
deleted file mode 100644
index c69345f61152..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/navbar.less
+++ /dev/null
@@ -1,28 +0,0 @@
-@cloudcare-nav-height: 30px;
-
-.navbar-cloudcare {
-  margin-bottom: 0;
-  border: none;
-  background-color: @cc-brand-low;
-  min-height: @cloudcare-nav-height;
-  .transition(1s all);
-  z-index: @zindex-navbar-cloudcare;
-}
-
-.navbar-cloudcare .navbar-brand {
-  color: @cc-bg;
-  height: @cloudcare-nav-height;
-  padding: 6.5px 15px;
-  text-transform: uppercase;
-  font-size: 11px;
-}
-
-.navbar-cloudcare .navbar-nav {
-  float: right;
-  margin: 0;
-
-  > li > a {
-    padding-top: 6.5px;
-    padding-bottom: 6.5px;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/print-general.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/print-general.less
deleted file mode 100644
index 56c3a1d3d2cf..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/print-general.less
+++ /dev/null
@@ -1,194 +0,0 @@
-// Renders Bootstrap as "small" layout when printing
-@media print {
-    .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-      float: left;
-    }
-    .col-sm-12 {
-      width: 100%;
-    }
-    .col-sm-11 {
-      width: 91.66666667%;
-    }
-    .col-sm-10 {
-      width: 83.33333333%;
-    }
-    .col-sm-9 {
-      width: 75%;
-    }
-    .col-sm-8 {
-      width: 66.66666667%;
-    }
-    .col-sm-7 {
-      width: 58.33333333%;
-    }
-    .col-sm-6 {
-      width: 50%;
-    }
-    .col-sm-5 {
-      width: 41.66666667%;
-    }
-    .col-sm-4 {
-      width: 33.33333333%;
-    }
-    .col-sm-3 {
-      width: 25%;
-    }
-    .col-sm-2 {
-      width: 16.66666667%;
-    }
-    .col-sm-1 {
-      width: 8.33333333%;
-    }
-    .col-sm-pull-12 {
-      right: 100%;
-    }
-    .col-sm-pull-11 {
-      right: 91.66666667%;
-    }
-    .col-sm-pull-10 {
-      right: 83.33333333%;
-    }
-    .col-sm-pull-9 {
-      right: 75%;
-    }
-    .col-sm-pull-8 {
-      right: 66.66666667%;
-    }
-    .col-sm-pull-7 {
-      right: 58.33333333%;
-    }
-    .col-sm-pull-6 {
-      right: 50%;
-    }
-    .col-sm-pull-5 {
-      right: 41.66666667%;
-    }
-    .col-sm-pull-4 {
-      right: 33.33333333%;
-    }
-    .col-sm-pull-3 {
-      right: 25%;
-    }
-    .col-sm-pull-2 {
-      right: 16.66666667%;
-    }
-    .col-sm-pull-1 {
-      right: 8.33333333%;
-    }
-    .col-sm-pull-0 {
-      right: auto;
-    }
-    .col-sm-push-12 {
-      left: 100%;
-    }
-    .col-sm-push-11 {
-      left: 91.66666667%;
-    }
-    .col-sm-push-10 {
-      left: 83.33333333%;
-    }
-    .col-sm-push-9 {
-      left: 75%;
-    }
-    .col-sm-push-8 {
-      left: 66.66666667%;
-    }
-    .col-sm-push-7 {
-      left: 58.33333333%;
-    }
-    .col-sm-push-6 {
-      left: 50%;
-    }
-    .col-sm-push-5 {
-      left: 41.66666667%;
-    }
-    .col-sm-push-4 {
-      left: 33.33333333%;
-    }
-    .col-sm-push-3 {
-      left: 25%;
-    }
-    .col-sm-push-2 {
-      left: 16.66666667%;
-    }
-    .col-sm-push-1 {
-      left: 8.33333333%;
-    }
-    .col-sm-push-0 {
-      left: auto;
-    }
-    .col-sm-offset-12 {
-      margin-left: 100%;
-    }
-    .col-sm-offset-11 {
-      margin-left: 91.66666667%;
-    }
-    .col-sm-offset-10 {
-      margin-left: 83.33333333%;
-    }
-    .col-sm-offset-9 {
-      margin-left: 75%;
-    }
-    .col-sm-offset-8 {
-      margin-left: 66.66666667%;
-    }
-    .col-sm-offset-7 {
-      margin-left: 58.33333333%;
-    }
-    .col-sm-offset-6 {
-      margin-left: 50%;
-    }
-    .col-sm-offset-5 {
-      margin-left: 41.66666667%;
-    }
-    .col-sm-offset-4 {
-      margin-left: 33.33333333%;
-    }
-    .col-sm-offset-3 {
-      margin-left: 25%;
-    }
-    .col-sm-offset-2 {
-      margin-left: 16.66666667%;
-    }
-    .col-sm-offset-1 {
-      margin-left: 8.33333333%;
-    }
-    .col-sm-offset-0 {
-      margin-left: 0%;
-    }
-    .visible-xs {
-      display: none !important;
-    }
-    .hidden-xs {
-      display: block !important;
-    }
-    table.hidden-xs {
-      display: table;
-    }
-    tr.hidden-xs {
-      display: table-row !important;
-    }
-    th.hidden-xs,
-    td.hidden-xs {
-      display: table-cell !important;
-    }
-    .hidden-xs.hidden-print {
-      display: none !important;
-    }
-    .hidden-sm {
-      display: none !important;
-    }
-    .visible-sm {
-      display: block !important;
-    }
-    table.visible-sm {
-      display: table;
-    }
-    tr.visible-sm {
-      display: table-row !important;
-    }
-    th.visible-sm,
-    td.visible-sm {
-      display: table-cell !important;
-    }
-  }
\ No newline at end of file
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/query.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/query.less
deleted file mode 100644
index 9b73443dfb4f..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/query.less
+++ /dev/null
@@ -1,102 +0,0 @@
-.full-width {
-  width: 100%;
-}
-
-.sidebar-push {
-  @media (min-width: @screen-md-min) {
-    margin-left: 310px;
-  }
-}
-
-#sidebar-region {
-  background: transparent;
-  @media (min-width: @screen-md-min) {
-    width: 300px;
-    position: absolute;
-  }
-  @media (max-width: @screen-sm-max) {
-    max-width: 600px;
-    margin: auto;
-  }
-
-  table {
-    table-layout: fixed;
-    background: white;
-  }
-
-  .query-input-group {
-    margin-right: 18px;
-    margin-bottom: 10px;
-    margin-left: 18px;
-  }
-  .query-caption {
-    margin-top: 8px;
-    margin-right: 10px;
-    margin-left: 8px;
-  }
-
-  .query-caption > div {
-    margin-left: 10px;
-    margin-right: 10px;
-  }
-
-  .mapboxgl-ctrl-geocoder {
-    min-width: 100%;
-    font-size: 1em;
-    > .mapboxgl-ctrl-geocoder--input {
-      height: inherit;
-    }
-  }
-  .select2-container .select2-selection--multiple {
-    min-height: inherit;
-  }
-}
-
-.query-field > .checkbox {
-  &:first-of-type {
-    margin-top: 0;
-  }
-  &:last-of-type {
-    margin-bottom: 0;
-  }
-  input[type="checkbox"] {
-    margin-top: 2.5px;
-  }
-}
-
-.query-description {
-  a {
-    color: @cc-brand-mid;
-  }
-  a:hover {
-    color: @cc-brand-low;
-  }
-}
-
-.query-caption.required .control-label::before, .search-query-group-header.required .search-query-group-header-label::before {
-  content: '*';
-  font-weight: bold;
-  color: #c0392b;
-  margin: 0 3px;
-  float: left;
-}
-
-.search-query-group-header-label {
-  font-size: larger;
-}
-
-.search-query-group {
-  background-color: @cc-bg;
-}
-
-#query-group-content > tr {
-  background-color: white;
-}
-
-#query-properties td {
-  border-top: 0px;
-}
-
-.search-query-group .table {
-  border-collapse: separate; margin-bottom: 0px;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/version.less b/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/version.less
deleted file mode 100644
index 95a2c809c9dd..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/less/formplayer-webapp/version.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@media print {
-  #version-info {
-    display: none;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/debugger/debugger.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/debugger/debugger.scss
index 33c8b6504ee7..f93645470506 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/debugger/debugger.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/debugger/debugger.scss
@@ -1,5 +1,5 @@
 .debugger {
-  width: 800px;
+  width: 100%;
   position: fixed;
   bottom: 0;
   left: 0;
@@ -27,7 +27,7 @@
   .debugger-tab-title {
     line-height: 18px;
     color: white;
-    background-color: $cc-brand-low;
+    background-color: $cc-brand-mid;
     border-bottom: #ddd solid 4px;
     border-top: 0;
     border-left: 0;
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss
index 9164a16b2423..1e3682a9b5a2 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common-main.scss
@@ -11,7 +11,6 @@ version of FORMPLAYER
 @import "formplayer-common/navigation";
 @import "formplayer-common/notifications";
 @import "formplayer-common/grid";
-@import "formplayer-common/breadcrumbs";
 @import "formplayer-common/paginate";
 @import "formplayer-common/appicon";
 @import "formplayer-common/case";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss
deleted file mode 100644
index 29d6a4250a9f..000000000000
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/breadcrumbs.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-#breadcrumb-region {
-    position: sticky;
-    position: -webkit-sticky;
-    top: 0;
-    z-index: $zindex-navbar-cloudcare;
-}
-
-#breadcrumb-region .breadcrumb-item, .single-app-view .breadcrumb-item {
-    cursor: pointer;
-}
-
-#breadcrumb-region .breadcrumb,
-.single-app-view .breadcrumb,
-.breadcrumb-form-container .breadcrumb {
-  background-color: $cc-brand-mid;
-  border-radius: 0;
-  box-shadow: 0 0 5px 2px rgba(0,0,0,.3);
-  border: none;
-
-  .breadcrumb-item {
-    color: white;
-
-    &:before {
-      padding: 0 6px 0 0;
-      content: '\f054';
-      font-family: 'FontAwesome';
-    }
-
-    a {
-      color: white;
-    }
-  }
-  .breadcrumb-item:first-child {
-    &:before {
-      display: none;
-    }
-  }
-}
-
-#breadcrumb__menu-dropdown {
-    cursor: pointer;
-}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
index cec082638a49..b6335fb18108 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
@@ -176,15 +176,8 @@ button.clickable-icon {
   }
 }
 
-.module-banner {
-  background-color: $cc-light-warm-accent-hi;
-  color: black;
-  padding-top: 1rem;
-  padding-bottom: 1rem;
-  border: none;
-  margin-top: -1px;
-  text-align: center;
-  font-size: 14px;
+.restore-as-banner {
+  font-size: 11px;
 }
 
 .module-table-case-detail tbody tr:nth-child(odd) {
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/navigation.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/navigation.scss
index 4a2d062e0c76..434a33aa8485 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/navigation.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/navigation.scss
@@ -13,3 +13,7 @@
 #hq-navigation {
   transition: all 1s;
 }
+
+.bg-cc-light-warm-accent-extra-hi {
+  background-color: $cc-light-warm-accent-hi;
+}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp-main.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp-main.scss
index 8804d02f832c..cc250be74532 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp-main.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp-main.scss
@@ -10,7 +10,7 @@ If you want to make changes relevant for BOTH app preview and the main
 formplayer, please make changes to the cloudcare styles.
 **/
 
-$breadcrumb-height-cloudcare: 46px;
+$breadcrumb-height-cloudcare: 36px;
 
 @import "formplayer-webapp/content";
 @import "formplayer-webapp/navbar";
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss
index 00118218c2f7..4ba431f1b7c8 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/breadcrumbs.scss
@@ -1,38 +1,32 @@
-#breadcrumb-region .breadcrumb,
-.single-app-view .breadcrumb,
-.breadcrumb-form-container .breadcrumb {
-  font-size: 1.2rem;
-  margin-top: -1px;
-  .breadcrumb-item {
-    &:before {
-      color: #ffffff;
-      font-size: 12px;
-      vertical-align: top;
-      line-height: 28px;
-    }
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden
-  }
+// Only webapps
+#breadcrumb-region {
+  z-index: $zindex-navbar-cloudcare - 1;
 }
 
 #breadcrumb-region .breadcrumb-nav {
-  background-color: $cc-brand-mid;
-  box-shadow: 0 0 5px 2px rgba(0,0,0,.3);
+  background-color: white;
   display: flex;
   align-items: center;
   height: $breadcrumb-height-cloudcare;
 
   .breadcrumb {
-    box-shadow: none;
     background-color: unset;
-    padding: 0 0 0 10px;
+    padding: 0 0 0 $grid-gutter-width / 2;
     margin-bottom: 0;
     flex-grow: 1;
-  }
 
-  .btn-group {
-    padding-right: 10px;
+    .breadcrumb-item {
+      &::before {
+        font-family: "FontAwesome";  // supports bsbreadcrumb-divider: \f054
+        color: $cc-neutral-hi;
+      }
+      a {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: block;
+      }
+    }
   }
 }
 
@@ -46,11 +40,5 @@
     font-size: 12px;
     margin-bottom: 0px;
     padding-left: 33px;
-    .breadcrumb-item {
-      &:before {
-        font-size: 7px;
-        line-height: 17px;
-      }
-    }
   }
 }
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
index 3c7a9e3dac44..f6ad084e69df 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/form.scss
@@ -1,6 +1,5 @@
 $form-text-indent: 23px;
 $form-text-size: 16px; // If updating, update .checkbox, .radio margin-top to fit
-$group-indent: 15px;
 
 .form-container {
   background-color: white;
@@ -13,7 +12,6 @@ $group-indent: 15px;
   }
 
   .controls {
-    padding-right: 25px;
     padding-top: 3px;
   }
 
@@ -38,57 +36,21 @@ $group-indent: 15px;
     z-index: $zindex-formplayer-anchored-submit;
   }
 
-  // Bootstrap introduces -10px left/right margin for row classes. This causes element to overflow parent.
-  .row {
-    margin-left: 0px;
-    margin-right: 0px;
-  }
   .question-container {
     padding-left: $form-text-indent;
     padding-right: $form-text-indent;
   }
 
   .q {
-    margin-left: 0px;
-    margin-right: 0px;
     .caption {
       display: block;
     }
   }
 
-  .group-body {
-    margin-left: $group-indent;
-    margin-right: $group-indent;
-  }
-
-  .gr.card {
-    border-radius: 0px;
-  }
-
   .rep.card {
     border-radius: 0px;
   }
 
-  .col-md-12,
-  .col-md-11,
-  .col-md-10,
-  .col-md-9,
-  .col-md-8,
-  .col-md-7,
-  .col-md-6,
-  .col-md-5,
-  .col-md-4,
-  .col-md-3,
-  .col-md-2,
-  .col-md-1 {
-    &:first-child {
-      padding-left: 0;
-    }
-    &:last-child {
-      padding-right: 0;
-    }
-  }
-
   .card-body {
     @include media-breakpoint-down(md) {
       padding-left: 0px;
@@ -96,20 +58,6 @@ $group-indent: 15px;
     }
   }
 
-  .stripe-repeats {
-    > .row, .card-body > .children > .row {
-      &:nth-of-type(odd) {
-        background-color: $table-accent-bg;
-      }
-      &:nth-of-type(even) {
-        background-color: white;
-      }
-      &:hover {
-        background-color: $table-hover-bg;
-      }
-    }
-  }
-
   .group-border {
     border: solid 1px $cc-neutral-mid;
     border-radius: 8px;
@@ -131,6 +79,15 @@ $group-indent: 15px;
       height: 1em;
       vertical-align: baseline;
     }
+
+    .btn {
+      background-color: white;
+
+      &:hover {
+        background-color: var(--bsbtn-hover-bg);
+      }
+
+    }
   }
 
   .card-header {
@@ -246,10 +203,6 @@ $group-indent: 15px;
   }
 }
 
-.gr-has-no-nested-questions {
-  display: none;
-}
-
 .checkbox, .radio {
   input[type="checkbox"], input[type="radio"] {
     margin-top: 3.15px;
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/menu.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/menu.scss
index d976fd6be229..7d4db2897327 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/menu.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/menu.scss
@@ -12,3 +12,46 @@
 #menu-region .module-menu-container {
   padding-bottom: 6px;
 }
+
+.persistent-menu-toggle {
+  color: white;
+  background-color: $cc-brand-mid;
+  padding: $spacer / 2;
+  &:hover {
+    background-color: $cc-brand-low;
+  }
+}
+
+$persistent-menu-image-size: 2rem;
+
+.persistent-menu-image {
+  height: $persistent-menu-image-size;
+  width: $persistent-menu-image-size;
+  line-height: $persistent-menu-image-size;
+  text-align: center;
+  font-size: $persistent-menu-image-size / 2;
+  vertical-align: middle;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+}
+
+.persistent-menu {
+  ul {
+    padding-left: $spacer;
+    padding-top: $spacer / 2;
+  }
+
+  > ul {  // top level list only
+    padding-left: 0;
+    padding-top: 0;
+  }
+
+  .persistent-menu-item:hover {
+    background-color: darken($cc-bg, 5);
+  }
+}
+
+.persistent-menu-max-width {
+    max-width: 400px;
+}
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/navbar.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/navbar.scss
index 896f18aef5a3..895b23ba92dc 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/navbar.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-webapp/navbar.scss
@@ -3,7 +3,7 @@ $cloudcare-nav-height: 30px;
 .navbar-cloudcare {
   margin-bottom: 0;
   border: none;
-  background-color: $cc-brand-low;
+  background-color: $cc-brand-mid;
   min-height: $cloudcare-nav-height;
   transition: 1s all;
   z-index: $zindex-navbar-cloudcare;
@@ -11,10 +11,8 @@ $cloudcare-nav-height: 30px;
 
 .navbar-cloudcare .navbar-brand {
   color: $cc-bg;
-  height: $cloudcare-nav-height;
-  padding: 6.5px 15px;
+  padding: 6.5px 0;
   text-transform: uppercase;
-  font-size: 11px;
 }
 
 .navbar-cloudcare .navbar-nav {
diff --git a/corehq/apps/hqwebapp/static/dashboard/scss/dashboard-main.scss b/corehq/apps/hqwebapp/static/dashboard/scss/dashboard-main.scss
index fc553838577e..4953970e7448 100644
--- a/corehq/apps/hqwebapp/static/dashboard/scss/dashboard-main.scss
+++ b/corehq/apps/hqwebapp/static/dashboard/scss/dashboard-main.scss
@@ -31,7 +31,7 @@ $card-dashboard-header-bg: $navbar-default-bg;
 
 .dashboard-icon-bg {
   position: absolute;
-  top: 57px;
+  top: 4.75 * $font-size-base;
   left: 0;
   width: 100%;
   text-align: center;
@@ -58,7 +58,7 @@ $card-dashboard-header-bg: $navbar-default-bg;
 }
 
 .card-dashboard-medium {
-  height: 275px;
+  height: 22.9167 * $font-size-base;
   position: relative;
 
   .list-group {
diff --git a/corehq/apps/hqwebapp/static/data_dictionary/less/data_dictionary.less b/corehq/apps/hqwebapp/static/data_dictionary/less/data_dictionary.less
index 7e475a0a9dd5..3beaa1f717b0 100644
--- a/corehq/apps/hqwebapp/static/data_dictionary/less/data_dictionary.less
+++ b/corehq/apps/hqwebapp/static/data_dictionary/less/data_dictionary.less
@@ -67,6 +67,17 @@
     padding: 8px 4px;
   }
 
+  .row-item-big {
+    display: flex;
+    flex: 1.4;
+    padding: 8px 4px;
+  }
+
+  .std-height {
+    // Set height to the same as an input field
+    height: 31px;
+  }
+
   .w-100 {
     width: 100%;
   }
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/500.js b/corehq/apps/hqwebapp/static/hqwebapp/js/500.js
index 7c99a89603bc..12dfaa11cc1a 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/500.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/500.js
@@ -1,6 +1,7 @@
 hqDefine("hqwebapp/js/500",[
     'jquery',
     'es6!hqwebapp/js/bootstrap5_loader',
+    'commcarehq',
 ], function ($, bootstrap) {
     $(function () {
         new bootstrap.Popover('#sad-danny', {
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/base_main.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/base_main.js
index e888e4e90254..e5c25ca525fd 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/base_main.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/base_main.js
@@ -13,7 +13,7 @@ hqDefine("hqwebapp/js/bootstrap3/base_main", [
     'analytix/js/google',
     'analytix/js/hubspot',
     'analytix/js/kissmetrix',
-    'analytix/js/gtm',
+    'analytix/js/gtx',
     'hqwebapp/js/bootstrap3/mobile_experience_warning',
 ], function () {
     // nothing to do, this is just to define the dependencies for hqwebapp/base.html
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js
new file mode 100644
index 000000000000..483ebb98d2dc
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/commcarehq.js
@@ -0,0 +1,11 @@
+// Core requirements for Bootstrap 3 Webpack Entry Modules
+import ko from 'knockout';
+import mapping from 'ko.mapping';
+ko.mapping = mapping;
+
+import 'bootstrap';
+
+import 'hqwebapp/js/django';
+
+import 'hqwebapp/js/bootstrap3/common';
+import 'hqwebapp/js/bootstrap3/base_main';
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/components.ko.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/components.ko.js
deleted file mode 100644
index febe6f7d5e8b..000000000000
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/components.ko.js
+++ /dev/null
@@ -1,44 +0,0 @@
-hqDefine("hqwebapp/js/bootstrap3/components.ko", [
-    'jquery',
-    'knockout',
-    'underscore',
-    'hqwebapp/js/components/inline_edit',
-    'hqwebapp/js/components/pagination',
-    'hqwebapp/js/components/search_box',
-    'hqwebapp/js/components/select_toggle',
-    'hqwebapp/js/components/bootstrap3/feedback',
-], function (
-    $,
-    ko,
-    _,
-    inlineEdit,
-    pagination,
-    searchBox,
-    selectToggle,
-    feedback
-) {
-    var components = {
-        'inline-edit': inlineEdit,
-        'pagination': pagination,
-        'search-box': searchBox,
-        'select-toggle': selectToggle,
-        'feedback': feedback,
-    };
-
-    _.each(components, function (moduleName, elementName) {
-        ko.components.register(elementName, moduleName);
-    });
-
-    $(function () {
-        _.each(_.keys(components), function (elementName) {
-            _.each($(elementName), function (el) {
-                var $el = $(el);
-                if (!($el.data('apply-bindings') === false)) {
-                    $(el).koApplyBindings();
-                }
-            });
-        });
-    });
-
-    return 1;
-});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js
index baa6453bf36c..4221f3fd8ea0 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js
@@ -3,6 +3,7 @@ hqDefine("hqwebapp/js/bootstrap3/hq.helpers", [
     'knockout',
     'underscore',
     'analytix/js/google',
+    'bootstrap',  // for popover constructor override
 ], function (
     $,
     ko,
@@ -35,11 +36,6 @@ hqDefine("hqwebapp/js/bootstrap3/hq.helpers", [
         $(this).parents('.alert').hide(150);
     });
 
-    if ($.timeago) {
-        $.timeago.settings.allowFuture = true;
-        $(".timeago").timeago();
-    }
-
     window.onerror = function (message, file, line, col, error) {
         var stack = error ? error.stack : null;
         if (!stack && (
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/base_main.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/base_main.js
index 08589ae7c371..1016aed5144e 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/base_main.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/base_main.js
@@ -13,7 +13,7 @@ hqDefine("hqwebapp/js/bootstrap5/base_main", [
     'analytix/js/google',
     'analytix/js/hubspot',
     'analytix/js/kissmetrix',
-    'analytix/js/gtm',
+    'analytix/js/gtx',
     'hqwebapp/js/bootstrap5/mobile_experience_warning',
 ], function () {
     // nothing to do, this is just to define the dependencies for hqwebapp/base.html
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js
new file mode 100644
index 000000000000..4b704dfbae12
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js
@@ -0,0 +1,11 @@
+// Core requirements for Bootstrap 5 Webpack Entry Modules
+import ko from 'knockout';
+import mapping from 'ko.mapping';
+ko.mapping = mapping;
+
+import 'bootstrap5';
+
+import 'hqwebapp/js/django';
+
+import 'hqwebapp/js/bootstrap5/common';
+import 'hqwebapp/js/bootstrap5/base_main';
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/components.ko.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/components.ko.js
deleted file mode 100644
index 14cc4e33b354..000000000000
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/components.ko.js
+++ /dev/null
@@ -1,44 +0,0 @@
-hqDefine("hqwebapp/js/bootstrap5/components.ko", [
-    'jquery',
-    'knockout',
-    'underscore',
-    'hqwebapp/js/components/inline_edit',
-    'hqwebapp/js/components/pagination',
-    'hqwebapp/js/components/search_box',
-    'hqwebapp/js/components/select_toggle',
-    'hqwebapp/js/components/bootstrap5/feedback',
-], function (
-    $,
-    ko,
-    _,
-    inlineEdit,
-    pagination,
-    searchBox,
-    selectToggle,
-    feedback
-) {
-    var components = {
-        'inline-edit': inlineEdit,
-        'pagination': pagination,
-        'search-box': searchBox,
-        'select-toggle': selectToggle,
-        'feedback': feedback,
-    };
-
-    _.each(components, function (moduleName, elementName) {
-        ko.components.register(elementName, moduleName);
-    });
-
-    $(function () {
-        _.each(_.keys(components), function (elementName) {
-            _.each($(elementName), function (el) {
-                var $el = $(el);
-                if (!($el.data('apply-bindings') === false)) {
-                    $(el).koApplyBindings();
-                }
-            });
-        });
-    });
-
-    return 1;
-});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js
index deb7214b0fa1..070295d42cbe 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js
@@ -37,11 +37,6 @@ hqDefine("hqwebapp/js/bootstrap5/hq.helpers", [
         $(this).parents('.alert').hide(150);
     });
 
-    if ($.timeago) {
-        $.timeago.settings.allowFuture = true;
-        $(".timeago").timeago();
-    }
-
     window.onerror = function (message, file, line, col, error) {
         var stack = error ? error.stack : null;
         if (!stack && (
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components.ko.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components.ko.js
new file mode 100644
index 000000000000..8e60ba56c22d
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components.ko.js
@@ -0,0 +1,22 @@
+hqDefine("hqwebapp/js/components.ko", [
+    'jquery',
+    'knockout',
+], function (
+    $,
+    ko
+) {
+    return {
+        register: function (name, component) {
+            ko.components.register(name, component);
+
+            $(function () {
+                $(name).each(function (index, el) {
+                    var $el = $(el);
+                    if ($el.data('apply-bindings') !== false) {
+                        $(el).koApplyBindings();
+                    }
+                });
+            });
+        },
+    };
+});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap3/feedback.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap3/feedback.js
index 0b3b9aa565dc..9beadc6bfc20 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap3/feedback.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap3/feedback.js
@@ -16,13 +16,17 @@
 hqDefine('hqwebapp/js/components/bootstrap3/feedback', [
     'knockout',
     'jquery',
+    'underscore',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/components.ko',
 ], function (
     ko,
     $,
-    initialPageData
+    _,
+    initialPageData,
+    koComponents
 ) {
-    return {
+    const component = {
         viewModel: function (params) {
             var self = {};
 
@@ -74,4 +78,8 @@ hqDefine('hqwebapp/js/components/bootstrap3/feedback', [
         },
         template: '<div data-bind="template: { name: \'ko-feedback-template\' }"></div>',
     };
+
+    koComponents.register('feedback', component);
+
+    return component;
 });
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap5/feedback.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap5/feedback.js
index 89f9b0e7bda9..43f258e96864 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap5/feedback.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components/bootstrap5/feedback.js
@@ -16,13 +16,17 @@
 hqDefine('hqwebapp/js/components/bootstrap5/feedback', [
     'knockout',
     'jquery',
+    'underscore',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/components.ko',
 ], function (
     ko,
     $,
-    initialPageData
+    _,
+    initialPageData,
+    koComponents,
 ) {
-    return {
+    const component = {
         viewModel: function (params) {
             let self = {};
 
@@ -69,4 +73,8 @@ hqDefine('hqwebapp/js/components/bootstrap5/feedback', [
         },
         template: '<div data-bind="template: { name: \'ko-feedback-template\' }"></div>',
     };
+
+    koComponents.register('feedback', component);
+
+    return component;
 });
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components/inline_edit.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components/inline_edit.js
index 96c4ddbac976..5b89d0c0bf1e 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/components/inline_edit.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components/inline_edit.js
@@ -26,13 +26,15 @@ hqDefine('hqwebapp/js/components/inline_edit', [
     'knockout',
     'underscore',
     'DOMPurify/dist/purify.min',
+    'hqwebapp/js/components.ko',
 ], function (
     $,
     ko,
     _,
-    DOMPurify
+    DOMPurify,
+    koComponents
 ) {
-    return {
+    const component = {
         viewModel: function (params) {
             var self = this;
 
@@ -144,4 +146,8 @@ hqDefine('hqwebapp/js/components/inline_edit', [
         },
         template: '<div data-bind="template: { name: \'ko-inline-edit-template\' }"></div>',
     };
+
+    koComponents.register('inline-edit', component);
+
+    return component;
 });
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components/pagination.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components/pagination.js
index 6c7be9b588a7..e1e010581144 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/components/pagination.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components/pagination.js
@@ -34,12 +34,14 @@ hqDefine('hqwebapp/js/components/pagination', [
     'knockout',
     'underscore',
     'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/components.ko',
 ], function (
     ko,
     _,
-    initialPageData
+    initialPageData,
+    koComponents
 ) {
-    return {
+    const component = {
         viewModel: function (params) {
             var self = {};
 
@@ -124,4 +126,8 @@ hqDefine('hqwebapp/js/components/pagination', [
         },
         template: '<div data-bind="template: { name: \'ko-pagination-template\' }"></div>',
     };
+
+    koComponents.register('pagination', component);
+
+    return component;
 });
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components/search_box.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components/search_box.js
index dbe3f4e256a0..136df83ffdd5 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/components/search_box.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components/search_box.js
@@ -15,12 +15,14 @@ hqDefine('hqwebapp/js/components/search_box', [
     'jquery',
     'knockout',
     'underscore',
+    'hqwebapp/js/components.ko',
 ], function (
     $,
     ko,
-    _
+    _,
+    koComponents
 ) {
-    return {
+    const component = {
         viewModel: function (params) {
             var self = {};
 
@@ -53,4 +55,8 @@ hqDefine('hqwebapp/js/components/search_box', [
         },
         template: '<div data-bind="template: { name: \'ko-search-box-template\' }"></div>',
     };
+
+    koComponents.register('search-box', component);
+
+    return component;
 });
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/components/select_toggle.js b/corehq/apps/hqwebapp/static/hqwebapp/js/components/select_toggle.js
index 03bc401e43ad..9795d1d4abd9 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/components/select_toggle.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/components/select_toggle.js
@@ -22,12 +22,14 @@ hqDefine('hqwebapp/js/components/select_toggle', [
     'jquery',
     'knockout',
     'underscore',
+    'hqwebapp/js/components.ko',
 ], function (
     $,
     ko,
-    _
+    _,
+    koComponents,
 ) {
-    return {
+    const component = {
         viewModel: function (params) {
             var self = this;
 
@@ -73,4 +75,8 @@ hqDefine('hqwebapp/js/components/select_toggle', [
         },
         template: '<div data-bind="template: { name: \'ko-select-toggle\' }"></div>',
     };
+
+    koComponents.register('select-toggle', component);
+
+    return component;
 });
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js b/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js
index 292d41083ace..ddb2fa88483f 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js
@@ -57,7 +57,7 @@ function hqDefine(path, dependencies, moduleAccessor) {
     }
 
     (function (factory) {
-        if (typeof define === 'function' && define.amd && window.USE_REQUIREJS) {
+        if (typeof define === 'function' && define.amd && (window.USE_REQUIREJS || window.USE_WEBPACK)) {
             // HQ's requirejs build process (build_requirejs.py) replaces hqDefine calls with
             // define calls, so it's important that this do nothing but pass through to require
             define(path, dependencies, factory);
@@ -117,7 +117,7 @@ function hqImport(path) {
 // at module definition time, but this function can be used when doing so would
 // introduce a circular dependency.
 function hqRequire(paths, callback) {       // eslint-disable-line no-unused-vars
-    if (typeof define === 'function' && define.amd && window.USE_REQUIREJS) {
+    if (typeof define === 'function' && define.amd && (window.USE_REQUIREJS || window.USE_WEBPACK)) {
         // HQ's requirejs build process (build_requirejs.py) replaces hqRequire calls with
         // require calls, so it's important that this do nothing but pass through to require
         require(paths, callback);   // eslint-disable-line no-undef
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_and_alpine.js b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_and_alpine.js
new file mode 100644
index 000000000000..5fc3ee53495a
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_and_alpine.js
@@ -0,0 +1,17 @@
+/**
+ * Include this module as the entry point to use HTMX and Alpine.js on a page without
+ * any additional configuration.
+ *
+ * e.g.:
+ *
+ *      {% js_entry "hqwebapp/js/htmx_and_alpine" %}
+ *
+ * Tips:
+ * - Use the `HqHtmxActionMixin` to group related HTMX calls and responses as part of one class based view.
+ * - To show errors encountered by HTMX requests, include the `hqwebapp/htmx/error_modal.html` template
+ *   in the `modals` block of the page, or `include` a template that extends it.
+ */
+import 'hqwebapp/js/htmx_base';
+
+import Alpine from 'alpinejs';
+Alpine.start();
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
new file mode 100644
index 000000000000..4d605f48f0dc
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
@@ -0,0 +1,69 @@
+/**
+ * DO NOT include this module as a `js_entry` point!
+ * Use `hqwebapp/js/htmx_and_alpine` for entry points.
+ *
+ * This module requires Alpine to properly display the HTMX error modal.
+ *
+ * Instead, use this module as a starting point when you require additional javascript configuration for Alpine
+ * before `Alpine.start()` is called. For instance, you want to access `Alpine.data()` or other globals.
+ *
+ * e.g.:
+ *
+ *      import 'hqwebapp/js/htmx_base';
+ *      import Alpine from 'alpinejs';
+ *
+ *      // access Alpine globals
+ *      Alpine.data(....);
+ *
+ *      Alpine.start();
+ *
+ * Tips:
+ * - Use the `HqHtmxActionMixin` to group related HTMX calls and responses as part of one class based view.
+ * - To show errors encountered by HTMX requests, include the `hqwebapp/htmx/error_modal.html` template
+ *   in the `modals` block of the page, or `include` a template that extends it.
+ */
+import htmx from 'htmx.org';
+
+import 'hqwebapp/js/htmx_utils/hq_hx_action';
+import 'hqwebapp/js/htmx_utils/csrf_token';
+import retryHtmxRequest from 'hqwebapp/js/htmx_utils/retry_request';
+import { showHtmxErrorModal } from 'hqwebapp/js/htmx_utils/errors';
+
+// By default, there is no timeout and requests hang indefinitely, so update to reasonable value.
+htmx.config.timeout = 20000;  // 20 seconds, in milliseconds
+
+const HTTP_BAD_GATEWAY = 504;
+const HTTP_REQUEST_TIMEOUT = 408;
+
+document.body.addEventListener('htmx:responseError', (evt) => {
+    let errorCode = evt.detail.xhr.status;
+    if (errorCode === HTTP_BAD_GATEWAY) {
+        if (!retryHtmxRequest(evt.detail.elt, evt.detail.pathInfo, evt.detail.requestConfig)) {
+            showHtmxErrorModal(
+                errorCode,
+                gettext('Gateway Timeout Error. Max retries exceeded.')
+            );
+        }
+        return;
+    }
+    showHtmxErrorModal(
+        errorCode,
+        evt.detail.xhr.statusText
+    );
+});
+
+document.body.addEventListener('htmx:timeout', (evt) => {
+    /**
+     * Safely retry on GET request timeouts. Use caution on other types of requests.
+     *
+     * If you want retry on POST requests, please create a new `js_entry` point and add a
+     * similar event listener there. Also, you may want to adjust the `htmx.config.timeout`
+     * value as well.
+     */
+    if (!retryHtmxRequest(evt.detail.elt, evt.detail.pathInfo, evt.detail.requestConfig) && evt.detail.requestConfig.verb === 'get') {
+        showHtmxErrorModal(
+            HTTP_REQUEST_TIMEOUT,
+            gettext('Request timed out. Max retries exceeded.')
+        );
+    }
+});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/csrf_token.js b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/csrf_token.js
new file mode 100644
index 000000000000..73a50e23e594
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/csrf_token.js
@@ -0,0 +1,18 @@
+/*
+    Make sure this module is included with HTMX projects so that the
+    required CSRF Token is always added to the request headers.
+
+    Alternatively you can include the `hx-headers` param in a parent element:
+    ```
+    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+    ```
+ */
+import htmx from 'htmx.org';
+
+document.body.addEventListener('htmx:configRequest', (evt) => {
+    // By default, HTMX does not allow cross-origin requests
+    // We will double-check the config setting here out of an abundance of caution
+    if (htmx.config.selfRequestsOnly) {
+        evt.detail.headers['X-CSRFToken'] = document.getElementById('csrfTokenContainer').value;
+    }
+});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/errors.js b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/errors.js
new file mode 100644
index 000000000000..289d3e8066db
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/errors.js
@@ -0,0 +1,30 @@
+import { Modal } from "bootstrap5";
+
+const DEFAULT_MODAL_ID = 'htmxRequestErrorModal';
+
+/**
+ * Displays an error modal for HTMX request errors, and dispatches an event to update modal content.
+ * The default modal template can be found at
+ * `hqwebapp/htmx/error_modal.html`
+ * You can extend this template and include it in the `modals` block of a template that extends one
+ * of HQ's base templates.
+ *
+ * @param {number} errorCode - The HTTP error code representing the type of error.
+ * @param {string} errorText - A descriptive error message to display in the modal.
+ * @param {string} [errorModalId=DEFAULT_MODAL_ID] - The ID of the modal element in the DOM (default is `DEFAULT_MODAL_ID`).
+ */
+const showHtmxErrorModal = (errorCode, errorText, errorModalId = DEFAULT_MODAL_ID) => {
+    const modalElem = document.getElementById(errorModalId);
+    if (!modalElem) return; // Exit if modal element is not found
+
+    const errorModal = new Modal(modalElem);
+    window.dispatchEvent(new CustomEvent('updateHtmxRequestErrorModal', {
+        detail: {
+            errorCode: errorCode,
+            errorText: errorText,
+        },
+    }));
+    errorModal.show();
+};
+
+export { showHtmxErrorModal };
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/hq_hx_action.js b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/hq_hx_action.js
new file mode 100644
index 000000000000..5da749fc5e82
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/hq_hx_action.js
@@ -0,0 +1,22 @@
+/*
+    To use:
+
+    1) In your page's entry point, import HTMX and this module, eg:
+    import 'htmx.org';
+    import 'hqwebapp/js/htmx_utils/hq_hx_action';
+
+    2) Then, make sure your class-based view extends the `HqHtmxActionMixin`.
+
+    3) Apply the `@hq_hx_action()` decorator to methods you want to make available to
+       `hq-hx-action` attributes
+
+    4) Reference that method in the `hq-hx-action` attribute alongside `hx-get`,
+       `hx-post`, or equivalent
+ */
+document.body.addEventListener('htmx:configRequest', (evt) => {
+    // Require that the hq-hx-action attribute is present
+    if (evt.detail.elt.hasAttribute('hq-hx-action')) {
+        // insert HQ-HX-Action in the header to be processed by the `HqHtmxActionMixin`
+        evt.detail.headers['HQ-HX-Action'] = evt.detail.elt.getAttribute('hq-hx-action');
+    }
+});
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/retry_request.js b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/retry_request.js
new file mode 100644
index 000000000000..3b8b96ad4518
--- /dev/null
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/htmx_utils/retry_request.js
@@ -0,0 +1,52 @@
+import htmx from 'htmx.org';
+
+const DEFAULT_MAX_RETRIES = 20;
+const retryPathCounts = {};
+
+/**
+ * Retries an HTMX request up to a specified max retry count.
+ *
+ * @param {Object} elt - The HTMX element object (usually found in evt.detail.elt)
+ * @param {Object} pathInfo - The HTMX pathInfo object (usually found in evt.detail.pathInfo)
+ * @param {Object} requestConfig - The HTMX requestConfig object (usually found in evt.detail.requestConfig)
+ * @param {number} [maxRetries=DEFAULT_MAX_RETRIES] - The maximum number of retries allowed.
+ * @returns {boolean} - Returns `false` if max retries are exceeded, otherwise `true`.
+ */
+const retryHtmxRequest = (elt, pathInfo, requestConfig, maxRetries = DEFAULT_MAX_RETRIES) => {
+    // Extract values from the HTMX event
+    const replaceUrl = elt.getAttribute('hx-replace-url');
+    const requestPath = pathInfo.finalRequestPath;
+
+    // Initialize retry count if necessary
+    retryPathCounts[requestPath] = retryPathCounts[requestPath] || 0;
+    retryPathCounts[requestPath]++;
+
+    // Return false if the max number of retries for that path has been exceeded
+    if (retryPathCounts[requestPath] > maxRetries) {
+        return false;
+    }
+
+    // Prepare the context for the htmx request
+    const context = {
+        source: elt,
+        target: requestConfig.target,
+        swap: elt.getAttribute('hx-swap'),
+        headers: requestConfig.headers,
+        values: JSON.parse(elt.getAttribute('hx-vals')),
+    };
+
+    // Make the htmx request and handle URL update if necessary
+    htmx.ajax(requestConfig.verb, requestPath, context).then(() => {
+        if (replaceUrl === 'true') {
+            window.history.pushState(null, '', requestPath);
+        } else if (replaceUrl) {
+            const newUrl = `${window.location.origin}${window.location.pathname}${replaceUrl}`;
+            window.history.pushState(null, '', newUrl);
+        }
+        delete retryPathCounts[requestPath];
+    });
+
+    return true;
+};
+
+export default retryHtmxRequest;
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
index a617e853a26e..a653cca90e7f 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
@@ -50,12 +50,12 @@ hqDefine("hqwebapp/js/tempus_dominus", [
     };
 
     // This replaces createBootstrap3DefaultDateRangePicker in hqwebapp/js/daterangepicker.config
-    let createDefaultDateRangePicker = function (el) {
-        return createDateRangePicker(el, getDateRangeSeparator());
+    let createDefaultDateRangePicker = function (el, start, end) {
+        return createDateRangePicker(el, getDateRangeSeparator(), start, end);
     };
 
     // This replaces createDateRangePicker in hqwebapp/js/daterangepicker.config
-    let createDateRangePicker = function (el, separator) {
+    let createDateRangePicker = function (el, separator, start, end) {
         let picker = new tempusDominus.TempusDominus(
             el, {
                 dateRange: true,
@@ -77,6 +77,12 @@ hqDefine("hqwebapp/js/tempus_dominus", [
             }
         );
 
+        if (start && end) {
+            picker.dates.setValue(new tempusDominus.DateTime(start), 0);
+            picker.dates.setValue(new tempusDominus.DateTime(end), 1);
+        }
+
+
         // Handle single-date ranges
         picker.subscribe("hide.td", function () {
             if (picker.dates.picked.length === 1) {
@@ -138,7 +144,7 @@ hqDefine("hqwebapp/js/tempus_dominus", [
     };
 
     let getDateRangeSeparator = function () {
-        return ' to ';
+        return gettext(' to ');
     };
 
     const defaultTranslations = {
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/forms.less b/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/forms.less
index 93899f5be617..68208a5bac29 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/forms.less
+++ b/corehq/apps/hqwebapp/static/hqwebapp/less/_hq/forms.less
@@ -372,4 +372,10 @@ textarea.vertical-resize {
   float: none;
   position: initial;
   width: 13px;
-}
\ No newline at end of file
+}
+
+#id_bulk_upload_file.form-control {     // override .form-control styles
+  border: none;
+  box-shadow: none;
+  padding: 0;
+}
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
index 879ca77f6b42..85ffb9495fb4 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
+++ b/corehq/apps/hqwebapp/static/hqwebapp/scss/commcarehq/_variables.scss
@@ -10,6 +10,8 @@ $container-max-widths: (
   xxl: 1160px
 );
 
+// Spacing override
+$enable-negative-margins: true;
 
 // Typography Overrides
 $font-family-sans-serif: "Nunito Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app-main.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app-main.less
deleted file mode 100644
index c72cf53ab80d..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app-main.less
+++ /dev/null
@@ -1,25 +0,0 @@
-@import '../../hqwebapp/less/_hq/includes/variables.less';
-@import '../../hqwebapp/less/_hq/includes/mixins.less';
-
-/* this is included in cloudcare/preview_app.html */
-
-@import "../../cloudcare/less/formplayer-common/mixins.less";
-
-@transition-speed: .5s;
-
-@import "preview_app/base";
-@import "preview_app/variables";
-@import "preview_app/notifications";
-@import "preview_app/scrollable";
-@import "preview_app/navigation";
-@import "preview_app/grid";
-@import "preview_app/appicon";
-@import "preview_app/menu";
-@import "preview_app/breadcrumb";
-@import "preview_app/module";
-@import "preview_app/form";
-@import "preview_app/formnav";
-@import "preview_app/case";
-@import "preview_app/datepicker";
-@import "preview_app/panels";
-@import "preview_app/debugger";
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app.less
deleted file mode 100644
index d1be7e539ea1..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app.less
+++ /dev/null
@@ -1,4 +0,0 @@
-@b3-import-variables: '../../../../../../../../node_modules/bootstrap/less/variables';
-@b3-import-mixins: '../../../../../../../../node_modules/bootstrap/less/mixins';
-
-@import "preview_app-main";
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/appicon.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/appicon.less
deleted file mode 100644
index ff8db5618be6..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/appicon.less
+++ /dev/null
@@ -1,42 +0,0 @@
-@appicon-height-preview: 130px;
-@appicon-icon-height-preview: @appicon-height-preview - 40px;
-
-.appicon {
-  min-height: @appicon-height-preview;
-  margin-bottom: 10px;
-
-  .appicon-title {
-    .transition(height @transition-speed);
-    height: 30px;
-    bottom: 7px;
-    h3 {
-      font-size: 14px;
-      font-weight: 300;
-    }
-  }
-
-  .appicon-icon {
-    margin-left: -@appicon-icon-height-preview/2;
-    width: @appicon-icon-height-preview;
-    height: @appicon-icon-height-preview;
-    line-height: @appicon-icon-height-preview;
-    font-size: @appicon-icon-height-preview;
-    &[class*='fa-'] {
-      font-size: 70px;
-    }
-  }
-}
-
-.appicon-start,
-.appicon-sync,
-.appicon-settings,
-.appicon-restore-as,
-.preview-tablet-mode .appicon-incomplete {
-  .appicon-title {
-    height: 21px;
-  }
-}
-
-.container-appicons .page-header-apps {
-  display: none;
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/base.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/base.less
deleted file mode 100644
index 12e116579044..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/base.less
+++ /dev/null
@@ -1,8 +0,0 @@
-body {
-  background-color: @cc-bg;
-}
-
-#version-info {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/breadcrumb.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/breadcrumb.less
deleted file mode 100644
index a2c829dff9eb..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/breadcrumb.less
+++ /dev/null
@@ -1,55 +0,0 @@
-#breadcrumb-region .breadcrumb,
-.single-app-view .breadcrumb,
-.breadcrumb-form-container .breadcrumb {
-  text-transform: uppercase;
-  margin: 0;
-  padding: 0 10px;
-  line-height: 30px;
-  font-size: 11px;
-
-  li {
-    display: none;
-    &:before {
-      color: white;
-      vertical-align: middle;
-      font-size: 8px;
-      padding: 0 4px;
-    }
-  }
-  li:first-child {
-    display: inline-block;
-    white-space: nowrap;
-  }
-  li:last-child {
-    display: inline-block;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-}
-
-#breadcrumb-region {
-  overflow: hidden;
-  max-height: 30px;
-  width: 100%;
-}
-
-.breadcrumb-form {
-  width: 100%;
-  .box-shadow(none);
-
-  li {
-    padding-top: 1px;
-  }
-}
-
-.breadcrumb-form-container {
-  position: fixed;
-  z-index: 10;
-  width: 100%;
-  height: @webforms-breadcrumb-height;
-  .box-shadow(0 0 5px 2px rgba(0,0,0,.3));
-}
-
-.webforms-nav-single-question {
-  height: @webforms-nav-height;
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/case.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/case.less
deleted file mode 100644
index 88f5b20f8b1b..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/case.less
+++ /dev/null
@@ -1,9 +0,0 @@
-.case-list-action-button {
-  width: 100%;
-  .btn {
-    width: 100%;
-    font-size: 1.2rem;
-    .border-top-radius(0);
-    .border-bottom-radius(0);
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/datepicker.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/datepicker.less
deleted file mode 100644
index 865a9b159006..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/datepicker.less
+++ /dev/null
@@ -1,26 +0,0 @@
-@datepicker-width: 247px;
-@datepicker-width-tablet: 447px;
-@datepicker-height: 410px;
-@datepicker-height-tablet: 565px;
-
-.bootstrap-datetimepicker-widget.dropdown-menu {
-  position: fixed;
-  top: 30px !important;
-  left: 0px !important;
-  padding-bottom: 15px !important;
-  min-height: @datepicker-height !important;
-
-  padding: 5px !important;
-  width: @datepicker-width !important;
-  margin-left: 2px !important;
-  margin-right: 2px !important;
-
-  .datepicker {
-    margin: auto;
-  }
-}
-
-.preview-tablet-mode .bootstrap-datetimepicker-widget.dropdown-menu {
-  width: @datepicker-width-tablet !important;
-  min-height: @datepicker-height-tablet !important;
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/debugger.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/debugger.less
deleted file mode 100644
index 44de58a71ce6..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/debugger.less
+++ /dev/null
@@ -1,42 +0,0 @@
-.debugger {
-  -webkit-transition: all 0.5s;
-  transition: all 0.5s;
-}
-
-.debugger.debugger-maximized {
-  height: @preview-phone-height;
-  max-height: 100vh;
-}
-
-.debugger.debugger-minimized {
-  height: 30px;
-  // Javascript auto sets the width for normal web apps so we need to override that with !important
-  // This way form entry javascript doesn't need to know whether its in web apps or preview
-  width: 30px !important;
-  border-radius: 15px;
-
-  // Space the debugger button so it's not flush against the phone
-  bottom: 3px;
-  right: 3px;
-  left: initial;
-
-  .box-shadow(0 0 5px 0 rgba(0, 0, 0, 0.45));
-
-  .debugger-tab-title {
-    text-align: center;
-    .debugger-title, .fa-xmark {
-      display: none;
-    }
-  }
-}
-
-.debugger .debugger-content {
-  font-size: 1rem;
-}
-
-
-.preview-tablet-mode {
-  .debugger.debugger-maximized {
-    height: @preview-tablet-height;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/form.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/form.less
deleted file mode 100644
index 709e88260259..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/form.less
+++ /dev/null
@@ -1,133 +0,0 @@
-.form-container {
-  background-color: white;
-  min-height: -webkit-calc(~"100vh - " (@webforms-nav-height + @webforms-breadcrumb-height));
-  min-height: -moz-calc(~"100vh - " (@webforms-nav-height + @webforms-breadcrumb-height));
-  min-height: calc(~"100vh - " (@webforms-nav-height + @webforms-breadcrumb-height));
-  box-sizing: border-box;
-  padding: 0 10px;
-
-  .page-header {
-    border-bottom: none;
-    margin: 0;
-    padding: 0;
-  }
-  .page-header h1 {
-    padding: 10px 0 15px;
-    margin-bottom: 0;
-    font-size: 10px;
-    font-weight: 600;
-    text-transform: uppercase;
-    color: @cc-neutral-mid;
-    margin-top: 0;
-  }
-}
-
-.form-container .gr {
-  background-color: desaturate(lighten(@cc-brand-hi, 8), 40);
-  margin-left: -10px;
-  margin-right: -10px;
-  padding: 10px;
-  margin-bottom: 10px;
-  border-bottom: 3px solid desaturate(@cc-brand-hi, 30);
-  border-top: 3px solid desaturate(@cc-brand-hi, 30);
-}
-
-.form-container .gr-has-no-nested-questions {
-  display: none;
-}
-
-.form-container .gr.gr-no-children {
-  background-color: transparent;
-  border-bottom: none;
-  border-top: none;
-}
-
-.form-container .gr-header legend {
-  font-size: 1.3rem;
-  text-transform: uppercase;
-}
-
-.page-footer {
-  padding: 14px 8px 7px;
-}
-
-.form-single-question {
-  padding-top: 0px;
-}
-
-.form-container .form-actions {
-  background-color: transparent;
-  border-top: none;
-  margin-top: 0;
-  padding-top: 0;
-
-  .btn {
-    width: 100%;
-    font-size: 16px;
-    .transition(all .5s);
-  }
-}
-
-.form-container {
-  .loading {
-    right: 12px;
-    font-size: 14px;
-    top: 2px;
-  }
-}
-
-.form-group {
-  padding: 10px 0;
-  label {
-    margin-right: 10px;
-    margin-bottom: 10px;
-  }
-}
-
-.form-group.required {
-  .transition(all .5s);
-  margin-bottom: 0;
-  label:before {
-    display: none;
-  }
-}
-
-.form-group.required.on {
-  background-color: @cc-att-neg-hi;
-  border: 10px solid @cc-att-neg-mid;
-  border-bottom: none;
-  label {
-    margin-left: 0;
-    margin-right: 0;
-  }
-}
-
-.form-group-required-label {
-  opacity: 0;
-  .transition(all .5s);
-}
-
-.form-group-required-label.on {
-  opacity: 100;
-  font-size: 10px;
-  background-color: @cc-att-neg-mid;
-  color: white;
-  width: auto;
-  line-height: 14px;
-  margin-left: -10px;
-  margin-right: -10px;
-  padding: 6px 10px 7px;
-  text-align: left;
-  margin-top: 0;
-  border: none;
-}
-
-.form-group .help-block {
-  font-size: 11px;
-  &:before {
-    content: "\f05a";
-    font-family: 'FontAwesome';
-    display: inline-block;
-    padding-right: 5px;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/formnav.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/formnav.less
deleted file mode 100644
index df04c507756c..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/formnav.less
+++ /dev/null
@@ -1,20 +0,0 @@
-.btn-formnav-submit {
-  transition: width @transition-speed;
-  width: @preview-phone-width - 46px;
-  text-transform: uppercase;
-  padding: 8px 10px;
-  border: none;
-  .transition(all @transition-speed);
-
-  .border-top-radius(0);
-  .border-bottom-radius(0);
-}
-
-.preview-tablet-mode {
-  .formnav-container {
-    width: @preview-tablet-width;
-  }
-  .btn-formnav-submit {
-    width: @preview-tablet-width - 46px;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/grid.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/grid.less
deleted file mode 100644
index e61fd65d6dc5..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/grid.less
+++ /dev/null
@@ -1,11 +0,0 @@
-
-.container-appicons {
-  padding-left: 15px;
-  padding-right: 15px;
-  padding-top: 10px;
-
-  .grid-item {
-    padding-left: 5px;
-    padding-right: 5px;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/menu.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/menu.less
deleted file mode 100644
index fbb85d411822..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/menu.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.menu-header {
-  display: none;
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/module.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/module.less
deleted file mode 100644
index 5fe7b26259af..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/module.less
+++ /dev/null
@@ -1,155 +0,0 @@
-.make-module-size(30px);
-
-.module-column-name h3 {
-  font-size: 12px;
-  margin: 0;
-}
-
-.module-table {
-  margin-bottom: 0;
-}
-
-.module-table .module-column {
-  vertical-align: middle;
-  padding: 0;
-}
-
-.module-table .module-column-name {
-  padding: 4px;
-  padding-right: 8px;
-}
-
-.module-table .module-column-icon {
-  padding: 8px;
-}
-
-.module-menu-container {
-  padding-bottom: 5px;
-  padding-top: 5px;
-  background-color: white;
-}
-
-.module-case-list-container {
-  background-color: white;
-}
-
-.module-search-container, .module-go-container{
-  .input-group-lg .form-control,
-  .input-group-lg .btn{
-    font-size: 11px;
-    height: 28px;
-    padding: 8px;
-  }
-  .input-group-lg .btn [class*='fa-'] {
-    font-size: 11px;
-  }
-}
-
-.module-go-container {
-  width: 140px;
-}
-
-.module-per-page-container {
-  .input-group-lg .form-control,
-  .input-group-lg .btn{
-    font-size: 11px;
-    height: 30px;
-    padding: 5px 10px;
-  }
-  .input-group-lg .btn [class*='fa-'] {
-    font-size: 11px;
-  }
-}
-
-.module-table .module-case-list-header {
-  font-size: 10px;
-  padding: 13px 11px;
-}
-
-.module-table .module-case-list-column {
-  padding: 13px 11px;
-  font-size: 11px;
-  vertical-align: middle;
-
-  .module-icon {
-    max-height: 30px;
-  }
-}
-
-.module-pagination-container .pagination {
-  font-size: 10px;
-  [class*='fa-'] {
-    font-size: 14px;
-  }
-}
-
-.module-case-detail-modal {
-  padding: 0 !important;
-  width: 251px;
-  height: 100%;
-  .modal-dialog {
-    margin: 1px;
-  }
-  .modal-body {
-    height: 318px;
-    width: 263px;
-    overflow-y: scroll;
-
-  }
-  .modal-content {
-    height: 442px;
-    overflow-x: hidden;
-    .border-top-radius(0);
-    .border-bottom-radius(0);
-  }
-}
-
-.module-modal {
-  .modal-title {
-    font-size: 1.3rem;
-  }
-
-  .modal-content {
-    .border-top-radius(0);
-    .border-bottom-radius(0);
-  }
-
-  .btn-lg {
-    font-size: 1.3rem;
-    padding: 8px 13px;
-  }
-}
-
-
-.preview-tablet-mode .module-case-detail-modal {
-  width: 450px;
-  .modal-body {
-    width: 446px;
-  }
-}
-
-.module-table-case-detail {
-  th, td {
-    font-size: 11px;
-    padding: 8px;
-  }
-}
-
-.module-case-detail-tabs .nav-tabs li a {
-  font-size: 10px;
-  padding: 8px;
-}
-
-.module-banner {
-  font-size: 11px;
-  padding-left: 6px;
-  padding-right: 6px;
-}
-
-.module-menu-bar-offset {
-  padding-top: 40px;
-  .table > tbody > tr > th,
-  .table > tbody > tr > td {
-    border-top: none;
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/navigation.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/navigation.less
deleted file mode 100644
index d7d5b2b2a846..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/navigation.less
+++ /dev/null
@@ -1,36 +0,0 @@
-@preview-navbar-height: 40px;
-
-.navbar-formplayer {
-  background-color: @cc-brand-mid;
-  min-height: @preview-navbar-height;
-  color: white;
-  margin-bottom: 0;
-
-  .navbar-nav {
-    margin-top: 0;
-    margin-bottom: 0;
-    float: left;
-  }
-  .navbar-right {
-    float: right;
-  }
-  .navbar-nav > li {
-    display: inline-block;
-    font-size: 2rem;
-  }
-  .navbar-nav > li > a {
-    color: white;
-    line-height: @preview-navbar-height;
-    padding-right: 19px;
-    .transition(background @transition-speed);
-
-    &:link, &:focus, &:visited, &:hover {
-      color: white;
-      text-decoration: none;
-    }
-
-    &:hover {
-      background-color: @cc-brand-low;
-    }
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/notifications.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/notifications.less
deleted file mode 100644
index 06714571ca5c..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/notifications.less
+++ /dev/null
@@ -1,22 +0,0 @@
-.notifications-container {
-  .alert  {
-    .box-shadow(none);
-    margin-bottom: 0;
-    .border-top-radius(0);
-    .border-bottom-radius(0);
-    padding: 9px;
-    .close {
-      vertical-align: top;
-      margin-top: -4px;
-    }
-  }
-}
-
-.alert-build {
-  #build-errors > li {
-    font-size: 11px;
-    margin-bottom: 5px;
-    padding-bottom: 3px;
-    border-bottom: 1px solid fade(@cc-dark-warm-accent-low, 20);
-  }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/panels.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/panels.less
deleted file mode 100644
index fdfbc80cb67c..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/panels.less
+++ /dev/null
@@ -1,3 +0,0 @@
-.question-container .panel {
-  margin-top: 15px;
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/scrollable.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/scrollable.less
deleted file mode 100644
index dc59e34871a6..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/scrollable.less
+++ /dev/null
@@ -1,30 +0,0 @@
-.scrollable-container {
-  transition: width @transition-speed;
-  overflow-x: hidden;
-  overflow-y: scroll;
-  // 15px is the approximate width of the scrollbar in OSX.
-  // javascript is the most reliable way to hide it when pure css options fail
-  width: @preview-phone-width;
-  &.has-scrollbar-15 { width: @preview-phone-width + 15px; }
-  box-sizing: content-box;
-
-  &:hover {
-    cursor: -webkit-grab;
-    cursor: -moz-grab;
-    cursor: grab;
-  }
-}
-
-.preview-tablet-mode {
-  .scrollable-container {
-    width: @preview-tablet-width;
-    &.has-scrollbar-15 { width: @preview-tablet-width + 15px; }
-  }
-}
-
-// Hiding scrollbars for the different browsers, generally only works on windows.
-.scrollable-container::-webkit-scrollbar { width: 0 !important }
-.scrollable-container { -ms-overflow-style: none; }
-@-moz-document url-prefix() {
-    .scrollable-container { overflow-y: auto; }
-}
diff --git a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/variables.less b/corehq/apps/hqwebapp/static/preview_app/less/preview_app/variables.less
deleted file mode 100644
index ed6ccd9b96fb..000000000000
--- a/corehq/apps/hqwebapp/static/preview_app/less/preview_app/variables.less
+++ /dev/null
@@ -1,7 +0,0 @@
-@preview-phone-width: 250px;
-@preview-tablet-width: 450px;
-@preview-tablet-height: 644px;
-@preview-phone-height: 444px;
-
-@webforms-nav-height: 33px;
-@webforms-breadcrumb-height: 30px;
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
index 9b7afdae9a10..24f1daa37b01 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app-main.scss
@@ -11,7 +11,7 @@ $transition-speed: .5s;
 @import "preview_app/navigation";
 @import "preview_app/grid";
 @import "preview_app/appicon";
-@import "preview_app/breadcrumb";
+@import "preview_app/breadcrumbs";
 @import "preview_app/module";
 @import "preview_app/form";
 @import "preview_app/formnav";
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/breadcrumb.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/breadcrumbs.scss
similarity index 74%
rename from corehq/apps/hqwebapp/static/preview_app/scss/preview_app/breadcrumb.scss
rename to corehq/apps/hqwebapp/static/preview_app/scss/preview_app/breadcrumbs.scss
index c6941e1d1ac8..12625d0f860c 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/breadcrumb.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/breadcrumbs.scss
@@ -1,20 +1,24 @@
 #breadcrumb-region .breadcrumb,
 .single-app-view .breadcrumb,
 .breadcrumb-form-container .breadcrumb {
+  background-color: $cc-brand-mid;
+  color: white;
   text-transform: uppercase;
   margin: 0;
   padding: 0 10px;
   line-height: 30px;
   font-size: 11px;
 
+  .breadcrumb-item:before, .breadcrumb-item > a {
+    color: white;
+  }
+  .breadcrumb-item:before {
+    font-family: "FontAwesome";  // supports bsbreadcrumb-divider: \f054
+  }
+
+  // Show only the first and last breadcrumb item
   li {
     display: none;
-    &:before {
-      color: white;
-      vertical-align: middle;
-      font-size: 8px;
-      padding: 0 4px;
-    }
   }
   li:first-child {
     display: inline-block;
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
index e084a1e14b1b..a2f002d4764c 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/form.scss
@@ -22,18 +22,12 @@
 
 .form-container .gr {
   background-color: desaturate(lighten($cc-brand-hi, 8), 40);
-  margin-left: -10px;
-  margin-right: -10px;
   padding: 10px;
   margin-bottom: 10px;
   border-bottom: 3px solid desaturate($cc-brand-hi, 30);
   border-top: 3px solid desaturate($cc-brand-hi, 30);
 }
 
-.form-container .gr-has-no-nested-questions {
-  display: none;
-}
-
 .form-container .gr.gr-no-children {
   background-color: transparent;
   border-bottom: none;
diff --git a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
index 2ae39671a74a..21ab4a9b522c 100644
--- a/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
+++ b/corehq/apps/hqwebapp/static/preview_app/scss/preview_app/module.scss
@@ -129,11 +129,6 @@
   padding: 8px;
 }
 
-.module-banner {
-  font-size: 11px;
-  padding: 6px;
-}
-
 .module-menu-bar-offset {
   padding-top: 40px;
   .table > tbody > tr > th,
diff --git a/corehq/apps/hqwebapp/tasks.py b/corehq/apps/hqwebapp/tasks.py
index 086ae0ad20e5..22ed5c8c84ec 100644
--- a/corehq/apps/hqwebapp/tasks.py
+++ b/corehq/apps/hqwebapp/tasks.py
@@ -1,13 +1,12 @@
 from smtplib import SMTPDataError
+from urllib.parse import urlencode, urljoin
 
 from django.conf import settings
 from django.core.mail import mail_admins
 from django.core.mail.message import EmailMessage
 from django.core.management import call_command
-from django.utils.translation import gettext as _
-from dimagi.utils.django.email import get_email_configuration
 from django.urls import reverse
-from dimagi.utils.web import get_url_base
+from django.utils.translation import gettext as _
 
 from celery.exceptions import MaxRetriesExceededError
 from celery.schedules import crontab
@@ -15,18 +14,19 @@
 from dimagi.utils.django.email import (
     COMMCARE_MESSAGE_ID_HEADER,
     SES_CONFIGURATION_SET_HEADER,
+    get_email_configuration,
 )
 from dimagi.utils.logging import notify_exception
+from dimagi.utils.web import get_url_base
 
 from corehq.apps.celery import periodic_task, task
+from corehq.motech.repeaters.const import UCRRestrictionFFStatus
 from corehq.util.bounced_email_manager import BouncedEmailManager
 from corehq.util.email_event_utils import get_bounced_system_emails
 from corehq.util.log import send_HTML_email
 from corehq.util.metrics import metrics_track_errors
 from corehq.util.models import TransientBounceEmail
 
-from corehq.motech.repeaters.const import UCRRestrictionFFStatus
-
 
 def mark_subevent_gateway_error(messaging_event_id, error, retrying=False):
     from corehq.apps.sms.models import MessagingEvent, MessagingSubEvent
@@ -261,27 +261,47 @@ def clear_expired_oauth_tokens():
 
 @periodic_task(run_every=crontab(minute=0, hour=1, day_of_week='mon'))
 def send_domain_ucr_data_info_to_admins():
+    from corehq.apps.hqadmin.reports import (
+        UCRDataLoadReport,
+        UCRRebuildRestrictionTable,
+    )
     from corehq.apps.reports.dispatcher import AdminReportDispatcher
     from corehq.apps.reports.filters.select import UCRRebuildStatusFilter
-    from corehq.apps.hqadmin.reports import UCRRebuildRestrictionTable, UCRDataLoadReport
+
+    if not settings.SOLUTIONS_AES_EMAIL:
+        return
 
     table = UCRRebuildRestrictionTable(
         restriction_ff_status=UCRRestrictionFFStatus.ShouldEnable.name,
     )
-    subject = "Weekly report: projects for ucr restriction FF"
-    recipient = "solutions-tech-app-engineers@dimagi.com"
+    num_projects = len(table.rows)
+    subject = f"Weekly report: {num_projects} projects for UCR Restriction"
+    if num_projects:
+        first_few = min(num_projects, 12)
+        domain_names = '\n'.join([row[0] for row in table.rows[:first_few]])
+        if first_few < num_projects:
+            domain_names += '\n...'
+
+        endpoint = reverse(AdminReportDispatcher.name(), args=(UCRDataLoadReport.slug,))
+        params = {
+            UCRRebuildStatusFilter.slug: UCRRestrictionFFStatus.ShouldEnable.name,
+        }
+        report_url = urljoin(get_url_base(), endpoint) + '?' + urlencode(params)
 
-    endpoint = reverse(AdminReportDispatcher.name(), args=(UCRDataLoadReport.slug,))
+        message = f"""
+We have identified {num_projects} projects that require the
+RESTRICT_DATA_SOURCE_REBUILD feature flag to be enabled.
 
-    filter_name = UCRRebuildStatusFilter.slug
-    filter_value = UCRRestrictionFFStatus.ShouldEnable.name
-    report_url = f"{get_url_base()}{endpoint}?{filter_name}={filter_value}"
+{domain_names}
 
-    message = f"""
-        We have identified {len(table.rows)} projects that require the RESTRICT_DATA_SOURCE_REBUILD
-        feature flag to be enabled. Please see the detailed report: {report_url}
-    """
+Please see the detailed report: {report_url}
+"""
+    else:
+        message = """
+No projects were found that require the RESTRICT_DATA_SOURCE_REBUILD
+feature flag to be enabled.
+"""
 
     send_mail_async.delay(
-        subject, message, [recipient]
+        subject, message, [settings.SOLUTIONS_AES_EMAIL]
     )
diff --git a/corehq/apps/hqwebapp/templates/500.html b/corehq/apps/hqwebapp/templates/500.html
index 13d5d3c1f445..d315c33a560d 100644
--- a/corehq/apps/hqwebapp/templates/500.html
+++ b/corehq/apps/hqwebapp/templates/500.html
@@ -5,7 +5,7 @@
   {% trans "500 Error" %}
 {% endblock %}
 
-{% requirejs_main_b5 'hqwebapp/js/500' %}
+{% js_entry 'hqwebapp/js/500' %}
 
 {% block page_name %}{% trans "Oh no, something unexpected just happened!" %}{% endblock %}
 {% block page_content %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/base.html b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
index ce87bc4d9a7a..0843c37bc854 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/base.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
@@ -1,6 +1,7 @@
 {% load menu_tags %}{% load i18n %}{% load hq_shared_tags %}{% load cache %}{% load compress %}{% load statici18n %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}
 {% requirejs_main %}
+{% js_entry %}
 <!--[if lt IE 7]><html lang="{{ LANGUAGE_CODE }}" class="lt-ie9 lt-ie8 lt-ie7"><![endif]-->
 <!--[if IE 7]><html lang="{{ LANGUAGE_CODE }}" class="lt-ie9 lt-ie8"><![endif]-->
 <!--[if IE 8]><html lang="{{ LANGUAGE_CODE }}" class="lt-ie9"><![endif]-->
@@ -137,25 +138,17 @@
       {% endcompress %}
     {% endif %}
 
-
-    {% if request.use_maps %}
-      {% compress css %}
-        <link rel="stylesheet" href="{% static 'leaflet/dist/leaflet.css' %}" />
-        <link rel="stylesheet" href="{% static 'reports/css/maps.css' %}" />
-      {% endcompress %}
-    {% endif %}
-
     <script>
       window.USE_BOOTSTRAP5 = {{ use_bootstrap5|BOOL }};
     </script>
 
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% javascript_libraries use_bootstrap5=use_bootstrap5 underscore=True jquery_ui=request.use_jquery_ui ko=True hq=True analytics=True %}
     {% endif %}
 
     {# Up here because if daterangepicker is called from within a form widget, #}
     {# the javascript requiring the config file is run before js-inline #}
-    {% if request.use_daterangepicker and not requirejs_main and not use_bootstrap5 %}
+    {% if request.use_daterangepicker and not use_js_bundler and not use_bootstrap5 %}
       {% compress js %}
         <script src="{% static 'moment/moment.js' %}"></script>
         <script src="{% static 'bootstrap-daterangepicker/daterangepicker.js' %}"></script>
@@ -163,7 +156,7 @@
       {% endcompress %}
     {% endif %}
 
-    {% if request.use_tempusdominus and not requirejs_main and use_bootstrap5 %}
+    {% if request.use_tempusdominus and not use_js_bundler and use_bootstrap5 %}
       {% compress js %}
         <script src="{% static '@popperjs/core/dist/umd/popper.min.js' %}"></script>
         <script src="{% static '@eonasdan/tempus-dominus/dist/js/tempus-dominus.min.js' %}"></script>
@@ -318,8 +311,10 @@
 
     <script src="{% statici18n LANGUAGE_CODE %}"></script> {# DO NOT COMPRESS #}
 
+    {% include "hqwebapp/partials/webpack.html" %} {# must come after statici18n above #}
+
     {# HQ Specific Libraries #}
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% if use_bootstrap5 %}
         {% compress js %}
           <script src="{% static 'hqwebapp/js/hq_extensions.jquery.js' %}"></script>
@@ -347,7 +342,7 @@
 
     {# JavaScript Display Logic Libaries #}
 
-    {% if request.couch_user and not requirejs_main %}
+    {% if request.couch_user and not use_js_bundler %}
       {% if use_bootstrap5 %}
         <script src="{% static 'notifications/js/bootstrap5/notifications_service.js' %}"></script>
         <script src="{% static 'notifications/js/bootstrap5/notifications_service_main.js' %}"></script>
@@ -357,13 +352,13 @@
       {% endif %}
     {% endif %}
 
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'select2/dist/js/select2.full.min.js' %}"></script>
       {% endcompress %}
     {% endif %}
 
-    {% if request.use_nvd3 and not requirejs_main %}
+    {% if request.use_nvd3 and not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'nvd3/lib/d3.v2.js' %}"></script>
         <script src="{% static 'nvd3/lib/fisheye.js' %}"></script>
@@ -372,7 +367,7 @@
       {% endcompress %}
     {% endif %}
 
-    {% if request.use_nvd3_v3 and not requirejs_main %}
+    {% if request.use_nvd3_v3 and not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'nvd3/lib/d3.v3.js' %}"></script>
         <script src="{% static 'd3/d3.min.js' %}"></script>
@@ -380,7 +375,7 @@
       {% endcompress %}
     {% endif %}
 
-    {% if request.use_datatables and not requirejs_main %}
+    {% if request.use_datatables and not use_js_bundler %}
       {% if use_bootstrap5 %}
         {% compress js %}
           <script src="{% static 'datatables.net/js/jquery.dataTables.min.js' %}"></script>
@@ -397,39 +392,20 @@
       {% endif %}
     {% endif %}
 
-    {% if request.use_typeahead and not requirejs_main and not use_bootstrap5 %}
+    {% 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 requirejs_main and not use_bootstrap5 %}
+    {% 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>
       {% endcompress %}
     {% endif %}
 
-    {% if not requirejs_main %}
-      {% if request.use_maps %}
-        {% compress js %}
-          <script src="{% static 'jquery-color/dist/jquery.color.js' %}"></script>
-          <script src="{% static 'leaflet/dist/leaflet.js' %}"></script>
-        {% endcompress %}
-      {% endif %}
-    {% endif %}
-
-    {% if request.use_maps and not requirejs_main %}
-      {% compress js %}
-        <script src="{% static 'reports/js/bootstrap3/maps_utils.js' %}"></script>
-      {% endcompress %}
-    {% endif %}
-
-    {% if request.use_timeago and not requirejs_main %}
-      <script src="{% static 'jquery-timeago/jquery.timeago.js' %}"></script>
-    {% endif %}
-
-    {% if request.use_multiselect and not requirejs_main %}
+    {% if request.use_multiselect and not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
         <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
@@ -437,7 +413,7 @@
       {% endcompress %}
     {% endif %}
 
-    {% if request.use_ko_validation and not requirejs_main %}
+    {% if request.use_ko_validation and not use_js_bundler %}
       <script src="{% static 'knockout-validation/dist/knockout.validation.min.js' %}"></script>
       {% if use_bootstrap5 %}
         <script src="{% static 'hqwebapp/js/bootstrap5/validators.ko.js' %}"></script>
@@ -469,7 +445,7 @@
       {% include 'hqwebapp/partials/bootstrap3/ko_feedback.html' %}
     {% endif %}
 
-    {% if show_overdue_invoice_modal and not requirejs_main %}
+    {% if show_overdue_invoice_modal and not use_js_bundler %}
       {% if use_bootstrap5 %}
         <script src="{% static 'hqwebapp/js/bootstrap5/downgrade_modal.js' %}"></script>
       {% else %}
@@ -477,7 +453,7 @@
       {% endif %}
     {% endif %}
 
-    {% if show_prepaid_modal and not requirejs_main %}
+    {% if show_prepaid_modal and not use_js_bundler %}
       {% if use_bootstrap5 %}
         <script src="{% static 'hqwebapp/js/bootstrap5/prepaid_modal.js' %}"></script>
       {% else %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html b/corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
new file mode 100644
index 000000000000..3629c323768a
--- /dev/null
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
@@ -0,0 +1,61 @@
+{% load i18n %}
+{# Use with HTMX and Alpine.js #}
+{# To be included on pages using the showHtmxErrorModal utility from hqwebapp/js/htmx_utils/error  #}
+{# Extend this template for better formatting of modal_content and better modal_title #}
+
+<div
+    id="htmxRequestErrorModal"
+    class="modal fade"
+    x-data="{
+      errorCode: '',
+      errorText: '',
+      updateError(evt) {
+        this.errorCode = evt.detail.errorCode;
+        this.errorText = evt.detail.errorText;
+      },
+    }"
+    @update-htmx-request-error-modal.camel.window="updateError"
+    data-bs-backdrop="static"
+    data-bs-keyboard="false"
+    aria-labelledby="htmxRequestErrorModalTitle"
+    tabindex="-1"
+>
+
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5
+            class="modal-title"
+            id="htmxRequestErrorModalTitle"
+        >
+
+          {% block modal_title %}
+            {% trans "Server Error Encountered" %}
+          {% endblock %}
+
+        </h5>
+        <button
+            type="button"
+            class="btn-close"
+            data-bs-dismiss="modal"
+            aria-label="Close"
+        ></button>
+      </div>
+      <div class="modal-body">
+
+        {% block modal_content %}
+          <p x-text="errorCode"></p>
+          <p x-text="errorText"></p>
+        {% endblock %}
+
+      </div>
+      <div class="modal-footer">
+        <button
+            type="button"
+            class="btn btn-outline-primary"
+            data-bs-dismiss="modal"
+        >{% trans "Close" %}</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_report_issue.html b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_report_issue.html
index 3dd4a69eba53..882e14ebbafc 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_report_issue.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_report_issue.html
@@ -149,7 +149,7 @@ <h1 class="modal-title fs-5" id="reportAnIssueModalLabel">{% trans "Report an Is
           <div class="modal-footer">
               <button type="button"
                       id="bug-report-cancel"
-                      class="btn btn-default"
+                      class="btn btn-outline-secondary"
                       data-bs-dismiss="modal"
                       data-bind="enable: cancelBtnEnabled">{% trans 'Cancel' %}</button>
               <button type="submit"
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_solutions_feature_request.html b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_solutions_feature_request.html
index 53e9819cac32..1c33b08d009f 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_solutions_feature_request.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/modal_solutions_feature_request.html
@@ -111,7 +111,7 @@ <h1 class="modal-title fs-5" id="requestAFeatureModalLabel">{% trans "Make a Fea
           <div class="modal-footer">
               <button type="button"
                       id="request-report-cancel"
-                      class="btn btn-default"
+                      class="btn btn-outline-secondary"
                       data-bs-dismiss="modal"
                       data-bind="enable: cancelBtnEnabled">{% trans 'Cancel' %}</button>
               <button type="submit"
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/includes/core_libraries.html b/corehq/apps/hqwebapp/templates/hqwebapp/includes/core_libraries.html
index 3fe88adccc5f..06663c8f14e4 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/includes/core_libraries.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/includes/core_libraries.html
@@ -108,24 +108,24 @@
           <script src="{% static 'hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
           <script src="{% static 'hqwebapp/js/bootstrap5/knockout_bindings.ko.js' %}"></script>
           <script src="{% static 'hqwebapp/js/knockout_subscribables.ko.js' %}"></script>
+          <script src="{% static 'hqwebapp/js/components.ko.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/inline_edit.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/pagination.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/search_box.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/select_toggle.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/bootstrap5/feedback.js' %}"></script>
-          <script src="{% static 'hqwebapp/js/bootstrap5/components.ko.js' %}"></script>
         {% endcompress %}
       {% else %}
         {% compress js %}
           <script src="{% static 'hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
           <script src="{% static 'hqwebapp/js/bootstrap3/knockout_bindings.ko.js' %}"></script>
           <script src="{% static 'hqwebapp/js/knockout_subscribables.ko.js' %}"></script>
+          <script src="{% static 'hqwebapp/js/components.ko.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/inline_edit.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/pagination.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/search_box.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/select_toggle.js' %}"></script>
           <script src="{% static 'hqwebapp/js/components/bootstrap3/feedback.js' %}"></script>
-          <script src="{% static 'hqwebapp/js/bootstrap3/components.ko.js' %}"></script>
         {% endcompress %}
       {% endif %}
     {% endif %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/bulk_upload.html b/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/bulk_upload.html
index fcecfb6f78af..a8ed6ae22596 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/bulk_upload.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/bulk_upload.html
@@ -8,7 +8,7 @@ <h2>
       {{ verb }}
     {% endblocktrans %}
     {% blocktrans with plural_noun=bulk_upload.plural_noun %}
-      {{ plural_noun }} using Excel
+      {{ plural_noun }}
     {% endblocktrans %}
   </h2>
 {% endif %}
@@ -26,7 +26,7 @@ <h2>
     <li id="download_block">
       <p>
         {% blocktrans with adjective=bulk_upload.adjective %}
-          Download your current {{ adjective }} Excel file.
+          Download your current {{ adjective }} file.
         {% endblocktrans %}
       </p>
       {% block download_file %}
@@ -48,7 +48,7 @@ <h2>
           {% trans "Update the downloaded file." %}
           {% if bulk_upload.help_site %}
             {% blocktrans with address=bulk_upload.help_site.address name=bulk_upload.help_site.name %}
-              Check the <a href="{{ address }}">{{ name }}</a> for instructions.
+              Check the <a target="_blank" href="{{ address }}">{{ name }}</a> for instructions.
             {% endblocktrans %}
           {% endif %}
         </p>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/bulk_upload.html b/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/bulk_upload.html
index d8e32bfa3a38..d5fd865ad457 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/bulk_upload.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/bulk_upload.html
@@ -8,7 +8,7 @@ <h2>
       {{ verb }}
     {% endblocktrans %}
     {% blocktrans with plural_noun=bulk_upload.plural_noun %}
-      {{ plural_noun }} using Excel
+      {{ plural_noun }}
     {% endblocktrans %}
   </h2>
 {% endif %}
@@ -26,7 +26,7 @@ <h2>
     <li id="download_block">
       <p>
         {% blocktrans with adjective=bulk_upload.adjective %}
-          Download your current {{ adjective }} Excel file.
+          Download your current {{ adjective }} file.
         {% endblocktrans %}
       </p>
       {% block download_file %}
@@ -48,7 +48,7 @@ <h2>
           {% trans "Update the downloaded file." %}
           {% if bulk_upload.help_site %}
             {% blocktrans with address=bulk_upload.help_site.address name=bulk_upload.help_site.name %}
-              Check the <a href="{{ address }}">{{ name }}</a> for instructions.
+              Check the <a target="_blank" href="{{ address }}">{{ name }}</a> for instructions.
             {% endblocktrans %}
           {% endif %}
         </p>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/partials/webpack.html b/corehq/apps/hqwebapp/templates/hqwebapp/partials/webpack.html
new file mode 100644
index 000000000000..b79a9958b481
--- /dev/null
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/partials/webpack.html
@@ -0,0 +1,11 @@
+{% load hq_shared_tags %}
+
+{% if js_entry %}
+  <script>
+    window.USE_WEBPACK = {{ js_entry|BOOL }};
+    console.log("Loaded JS entry point: {{ js_entry }}");
+  </script>
+  {% for bundle_path in js_entry|webpack_bundles %}
+    <script src="{% static bundle_path %}"></script>
+  {% endfor %}
+{% endif %}
diff --git a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
index cbeec9741b9e..6ba871fa4a44 100644
--- a/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
+++ b/corehq/apps/hqwebapp/templatetags/hq_shared_tags.py
@@ -428,8 +428,8 @@ def prelogin_url(urlname):
     Fetches the correct dimagi.com url for a "prelogin" view.
     """
     urlname_to_url = {
-        'go_to_pricing': 'https://dimagi.com/commcare/pricing/',
-        'public_pricing': 'https://dimagi.com/commcare/pricing/',
+        'go_to_pricing': 'https://dimagi.com/commcare-pricing/',
+        'public_pricing': 'https://dimagi.com/commcare-pricing/',
 
     }
     return urlname_to_url.get(urlname, 'https://dimagi.com/commcare/')
@@ -642,6 +642,35 @@ def analytics_ab_test(parser, token):
     return _create_page_data(parser, token, 'analytics_ab_test')
 
 
+def _bundler_main(parser, token, flag, node_class):
+    bits = token.contents.split(None, 1)
+    if len(bits) == 1:
+        tag_name = bits[0]
+        value = None
+    else:
+        tag_name, value = bits
+
+    # Treat requirejs_main_b5 identically to requirejs_main
+    # Some templates check for {% if requirejs_main %}
+    tag_name = tag_name.rstrip("_b5")
+
+    # likewise with js_entry_b3, treat identically to js_entry
+    tag_name = tag_name.rstrip("_b3")
+
+    if getattr(parser, flag, False):
+        raise TemplateSyntaxError(
+            "multiple '%s' tags not allowed (%s)" % tuple(bits))
+    setattr(parser, flag, True)
+
+    if value and (len(value) < 2 or value[0] not in '"\'' or value[0] != value[-1]):
+        raise TemplateSyntaxError("bad '%s' argument: %s" % tuple(bits))
+
+    # use a block to allow extension template to set <bundler>_main for base
+    return loader_tags.BlockNode("__" + tag_name, NodeList([
+        node_class(tag_name, value and value[1:-1])
+    ]))
+
+
 @register.tag
 def requirejs_main_b5(parser, token):
     """
@@ -665,29 +694,31 @@ def requirejs_main(parser, token):
     will have a value of `None` unless an extending template has a
     `{% requirejs_main "..." %}` with a value.
     """
-    bits = token.contents.split(None, 1)
-    if len(bits) == 1:
-        tag_name = bits[0]
-        value = None
-    else:
-        tag_name, value = bits
+    return _bundler_main(parser, token, "__saw_requirejs_main", RequireJSMainNode)
 
-    # Treat requirejs_main_b5 identically to requirejs_main
-    # Some templates check for {% if requirejs_main %}
-    tag_name = tag_name.rstrip("_b5")
 
-    if getattr(parser, "__saw_requirejs_main", False):
-        raise TemplateSyntaxError(
-            "multiple '%s' tags not allowed (%s)" % tuple(bits))
-    parser.__saw_requirejs_main = True
+@register.tag
+def js_entry(parser, token):
+    """
+    Indicate that a page should be using Webpack, by naming the
+    JavaScript module to be used as the page's main entry point.
 
-    if value and (len(value) < 2 or value[0] not in '"\'' or value[0] != value[-1]):
-        raise TemplateSyntaxError("bad '%s' argument: %s" % tuple(bits))
+    The base template need not specify a value in its `{% js_entry %}`
+    tag, allowing it to be extended by templates that may or may not
+    use requirejs. In this case the `js_entry` template variable
+    will have a value of `None` unless an extending template has a
+    `{% js_entry "..." %}` with a value.
+    """
+    return _bundler_main(parser, token, "__saw_js_entry", WebpackMainNode)
 
-    # use a block to allow extension template to set requirejs_main for base
-    return loader_tags.BlockNode("__" + tag_name, NodeList([
-        RequireJSMainNode(tag_name, value and value[1:-1])
-    ]))
+
+@register.tag
+def js_entry_b3(parser, token):
+    """
+    Alias for js_entry. Use this to mark entry points that should be part of the
+    bootstrap 3 bundle of webpack.
+    """
+    return js_entry(parser, token)
 
 
 class RequireJSMainNode(template.Node):
@@ -700,12 +731,58 @@ def __repr__(self):
         return "<RequireJSMain Node: %r>" % (self.value,)
 
     def render(self, context):
-        if self.name not in context:
+        if self.name not in context and self.value:
             # set name in block parent context
+            context.dicts[-2]['use_js_bundler'] = True
             context.dicts[-2][self.name] = self.value
         return ''
 
 
+class WebpackMainNode(RequireJSMainNode):
+
+    def __repr__(self):
+        return "<WebpackMain Node: %r>" % (self.value,)
+
+
+@register.filter
+def webpack_bundles(entry_name):
+    from corehq.apps.hqwebapp.utils.webpack import get_webpack_manifest, WebpackManifestNotFoundError
+    from corehq.apps.hqwebapp.utils.bootstrap import get_bootstrap_version, BOOTSTRAP_5, BOOTSTRAP_3
+    bootstrap_version = get_bootstrap_version()
+
+    try:
+        if bootstrap_version == BOOTSTRAP_5:
+            manifest = get_webpack_manifest()
+            webpack_folder = 'webpack'
+        else:
+            manifest = get_webpack_manifest('manifest_b3.json')
+            webpack_folder = 'webpack_b3'
+    except WebpackManifestNotFoundError:
+        raise TemplateSyntaxError(
+            f"No webpack manifest found!\n"
+            f"'{entry_name}' will not load correctly.\n\n"
+            f"Did you run `yarn dev` or `yarn build`?\n\n\n"
+        )
+
+    bundles = manifest.get(entry_name, [])
+    if not bundles:
+        webpack_error = (
+            f"No webpack manifest entry found for '{entry_name}'.\n\n"
+            f"Is this a newly added entry point?\n"
+            f"Did you try restarting `yarn dev`?\n\n\n"
+        )
+        if bootstrap_version == BOOTSTRAP_3:
+            webpack_error = (
+                f"{webpack_error}"
+                f"Additionally, did you remember to use `js_entry_b3` "
+                f"on this Bootstrap 3 page?\n\n\n\n"
+            )
+        raise TemplateSyntaxError(webpack_error)
+    return [
+        f"{webpack_folder}/{bundle}" for bundle in bundles
+    ]
+
+
 @register.inclusion_tag('hqwebapp/basic_errors.html')
 def bootstrap_form_errors(form):
     return {'form': form}
diff --git a/corehq/apps/hqwebapp/templatetags/proptable_tags.py b/corehq/apps/hqwebapp/templatetags/proptable_tags.py
index 3054418e3daf..0fc7ccca4a06 100644
--- a/corehq/apps/hqwebapp/templatetags/proptable_tags.py
+++ b/corehq/apps/hqwebapp/templatetags/proptable_tags.py
@@ -10,7 +10,6 @@
 
 import collections
 import datetime
-from itertools import zip_longest
 
 import attr
 from django import template
@@ -23,7 +22,6 @@
 from jsonobject.exceptions import BadValueError
 
 from dimagi.ext.jsonobject import DateProperty
-from dimagi.utils.chunked import chunked
 from dimagi.utils.dates import safe_strftime
 
 from corehq.apps.hqwebapp.doc_info import get_doc_info_by_id
@@ -88,12 +86,13 @@ def _format_slug_string_for_display(key):
     return key.replace('_', ' ').replace('-', ' ')
 
 
-def _to_html(val, key=None, level=0, timeago=False):
+def _to_html(val, key=None, level=0):
     """
     Recursively convert a value to its HTML representation using <dl>s for
     dictionaries and <ul>s for lists.
     """
-    recurse = lambda k, v: _to_html(v, key=k, level=level + 1, timeago=timeago)
+    def _recurse(k, v):
+        return _to_html(v, key=k, level=level + 1)
 
     def _key_format(k, v):
         if not _is_list_like(v):
@@ -108,14 +107,14 @@ def _key_format(k, v):
             format_html_join(
                 "",
                 "<dt>{}</dt><dd>{}</dd>",
-                [(_key_format(k, v), recurse(k, v)) for k, v in val.items()]
+                [(_key_format(k, v), _recurse(k, v)) for k, v in val.items()]
             )
         )
 
     elif _is_list_like(val):
         ret = format_html(
             "<dl>{}</dl>",
-            format_html_join("", "<dt>{}</dt><dd>{}</dd>", [(key, recurse(None, v)) for v in val])
+            format_html_join("", "<dt>{}</dt><dd>{}</dd>", [(key, _recurse(None, v)) for v in val])
         )
 
     elif isinstance(val, datetime.date):
@@ -125,8 +124,7 @@ def _key_format(k, v):
             fmt = USER_DATE_FORMAT
 
         iso = val.isoformat()
-        ret = format_html("<time{timeago} title='{title}' datetime='{iso}'>{display}</time>".format(
-            timeago=mark_safe(" class='timeago'") if timeago else "",  # nosec: no user input
+        ret = format_html("<time title='{title}' datetime='{iso}'>{display}</time>".format(
             title=iso,
             iso=iso,
             display=safe_strftime(val, fmt)
@@ -159,9 +157,6 @@ class DisplayConfig:
     # String to use as the output format e.g. "<b>{}</b>"
     format = attr.ib(default=None)
 
-    # add 'timeago' class to <time/> elements
-    timeago = attr.ib(default=False)
-
     # property that is passed through in the return result
     has_history = attr.ib(default=False)
 
@@ -195,7 +190,7 @@ def get_display_data(data: dict, prop_def: DisplayConfig, timezone=pytz.utc):
             val = PhoneTime(val, timezone).user_time(timezone).done()
 
     if not processor or not processor.returns_html:
-        val = _to_html(val, timeago=prop_def.timeago)
+        val = _to_html(val)
 
     if prop_def.format:
         val = format_html(prop_def.format, val)
diff --git a/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq.html b/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq.html
index 8eb7d399842d..0efab1511daa 100644
--- a/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq.html
+++ b/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq.html
@@ -24,18 +24,18 @@
 <script src="{% static 'analytix/js/hubspot.js' %}"></script>
 <script src="{% static 'analytix/js/drift.js' %}"></script>
 <script src="{% static 'analytix/js/appcues.js' %}"></script>
-<script src="{% static 'analytix/js/gtm.js' %}"></script>
+<script src="{% static 'analytix/js/gtx.js' %}"></script>
 
 <script src="{% static 'knockout/build/output/knockout-latest.js' %}"></script>
 <script src="{% static 'hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
 <script src="{% static 'hqwebapp/js/bootstrap3/knockout_bindings.ko.js' %}"></script>
 <script src="{% static 'hqwebapp/js/knockout_subscribables.ko.js' %}"></script>
+<script src="{% static 'hqwebapp/js/components.ko.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/inline_edit.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/pagination.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/search_box.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/select_toggle.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/bootstrap3/feedback.js' %}"></script>
-<script src="{% static 'hqwebapp/js/bootstrap3/components.ko.js' %}"></script>
 
 <script src="{% static 'hqwebapp/js/bootstrap3/sticky_tabs.js' %}"></script>
 <script src="{% static 'hqwebapp/js/assert_properties.js' %}"></script>
diff --git a/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq_bootstrap5.html b/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq_bootstrap5.html
index 6b4fe829b357..3514c8cfc99c 100644
--- a/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq_bootstrap5.html
+++ b/corehq/apps/hqwebapp/templatetags/tests/rendered/javascript_libraries_hq_bootstrap5.html
@@ -24,18 +24,18 @@
 <script src="{% static 'analytix/js/hubspot.js' %}"></script>
 <script src="{% static 'analytix/js/drift.js' %}"></script>
 <script src="{% static 'analytix/js/appcues.js' %}"></script>
-<script src="{% static 'analytix/js/gtm.js' %}"></script>
+<script src="{% static 'analytix/js/gtx.js' %}"></script>
 
 <script src="{% static 'knockout/build/output/knockout-latest.js' %}"></script>
 <script src="{% static 'hqwebapp/js/lib/knockout_plugins/knockout_mapping.ko.min.js' %}"></script>
 <script src="{% static 'hqwebapp/js/bootstrap5/knockout_bindings.ko.js' %}"></script>
 <script src="{% static 'hqwebapp/js/knockout_subscribables.ko.js' %}"></script>
+<script src="{% static 'hqwebapp/js/components.ko.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/inline_edit.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/pagination.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/search_box.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/select_toggle.js' %}"></script>
 <script src="{% static 'hqwebapp/js/components/bootstrap5/feedback.js' %}"></script>
-<script src="{% static 'hqwebapp/js/bootstrap5/components.ko.js' %}"></script>
 
 <script src="{% static 'hqwebapp/js/bootstrap5/sticky_tabs.js' %}"></script>
 <script src="{% static 'hqwebapp/js/assert_properties.js' %}"></script>
diff --git a/corehq/apps/hqwebapp/templatetags/tests/templates/webpack_base.html b/corehq/apps/hqwebapp/templatetags/tests/templates/webpack_base.html
new file mode 100644
index 000000000000..d71331fd1621
--- /dev/null
+++ b/corehq/apps/hqwebapp/templatetags/tests/templates/webpack_base.html
@@ -0,0 +1,5 @@
+{% load hq_shared_tags %}
+{% if js_entry %}{{ js_entry }} before tag{% endif %}
+{% js_entry "webpack/base" %}
+{% if js_entry %}{{ js_entry }} after tag{% endif %}
+{% block content %}{% endblock %}
diff --git a/corehq/apps/hqwebapp/templatetags/tests/test_tag.py b/corehq/apps/hqwebapp/templatetags/tests/test_tag.py
index 8213b428b069..94495555ccb2 100644
--- a/corehq/apps/hqwebapp/templatetags/tests/test_tag.py
+++ b/corehq/apps/hqwebapp/templatetags/tests/test_tag.py
@@ -101,7 +101,7 @@ def test_requirejs_main(self):
                 {% extends "requirejs_base.html" %}
                 {% load hq_shared_tags %}
                 {% requirejs_main "requirejs/main" %}
-                {% block content %}{{requirejs_main}}{% endblock %}
+                {% block content %}{% if use_js_bundler %}{{requirejs_main}}{% endif %}{% endblock %}
             """).strip(),
             "requirejs/main after tag\nrequirejs/main",
         )
@@ -112,10 +112,11 @@ def test_requirejs_main_no_arg(self):
             self.render("""
                 {% load hq_shared_tags %}
                 {% requirejs_main %}
-                {% if requirejs_main %}unexpected truth{% endif %}
+                {% if use_js_bundler %}unexpected truth{% endif %}
+                {% if requirejs_main %}unexpected truth 2{% endif %}
                 {{requirejs_main}}
             """).strip(),
-            "None",
+            "",
         )
 
     def test_requirejs_main_in_context(self):
@@ -166,3 +167,76 @@ def test_requirejs_main_mismatched_delimiter(self):
                 {% load hq_shared_tags %}
                 {% requirejs_main 'x" %}
             """)
+
+    def test_js_entry(self):
+        self.assertEqual(
+            self.render("""
+                {% extends "webpack_base.html" %}
+                {% load hq_shared_tags %}
+                {% js_entry "webpack/main" %}
+                {% block content %}{% if use_js_bundler %}{{js_entry}}{% endif %}{% endblock %}
+            """).strip(),
+            "webpack/main after tag\nwebpack/main",
+        )
+
+    def test_js_entry_no_arg(self):
+        # this version can be used in a base template that may or may not use webpack
+        self.assertEqual(
+            self.render("""
+                {% load hq_shared_tags %}
+                {% js_entry %}
+                {% if use_js_bundler %}unexpected truth{% endif %}
+                {% if js_entry %}unexpected truth 2{% endif %}
+                {{js_entry}}
+            """).strip(),
+            "",
+        )
+
+    def test_js_entry_in_context(self):
+        self.assertEqual(
+            self.render(
+                """
+                {% extends "webpack_base.html" %}
+                {% load hq_shared_tags %}
+                {% js_entry "webpack/main" %}
+                {% block content %}{{js_entry}}{% endblock %}
+                """,
+                {"js_entry": "webpack/context"}
+            ).strip(),
+            "webpack/context before tag\n\n"
+            "webpack/context after tag\n"
+            "webpack/context",
+        )
+
+    def test_js_entry_multiple_tags(self):
+        msg = r"multiple 'js_entry' tags not allowed \(\"webpack/two\"\)"
+        with self.assertRaisesRegex(TemplateSyntaxError, msg):
+            self.render("""
+                {% load hq_shared_tags %}
+                {% js_entry "webpack/one" %}
+                {% js_entry "webpack/two" %}
+            """)
+
+    def test_js_entry_too_short(self):
+        msg = r"bad 'js_entry' argument: '"
+        with self.assertRaisesRegex(TemplateSyntaxError, msg):
+            self.render("""
+                {% load hq_shared_tags %}
+                {% js_entry ' %}
+            """)
+
+    def test_js_entry_bad_string(self):
+        msg = r"bad 'js_entry' argument: \.'"
+        with self.assertRaisesRegex(TemplateSyntaxError, msg):
+            self.render("""
+                {% load hq_shared_tags %}
+                {% js_entry .' %}
+            """)
+
+    def test_js_entry_mismatched_delimiter(self):
+        msg = r"bad 'js_entry' argument: 'x\""
+        with self.assertRaisesRegex(TemplateSyntaxError, msg):
+            self.render("""
+                {% load hq_shared_tags %}
+                {% js_entry 'x" %}
+            """)
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
index 75a5f82ef875..5205bc1447ed 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
@@ -583,6 +583,26 @@
       "compare_all_files": true
     }
   ],
+  "apps/reports/static/reports/v2/js": [
+    {
+      "directories": [
+        "bootstrap3",
+        "bootstrap5"
+      ],
+      "file_type": "javascript",
+      "label": "javascript/reports/v2/js",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "views/bootstrap3",
+        "views/bootstrap5"
+      ],
+      "file_type": "javascript",
+      "label": "javascript/reports/v2/js/views",
+      "compare_all_files": true
+    }
+  ],
   "apps/reports/static/reports/spec": [
     {
       "directories": [
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_report_issue.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_report_issue.html.diff.txt
index f6713c2674de..2b45abbafb33 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_report_issue.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_report_issue.html.diff.txt
@@ -297,7 +297,7 @@
 +          <div class="modal-footer">
 +              <button type="button"
 +                      id="bug-report-cancel"
-+                      class="btn btn-default"
++                      class="btn btn-outline-secondary"
 +                      data-bs-dismiss="modal"
 +                      data-bind="enable: cancelBtnEnabled">{% trans 'Cancel' %}</button>
 +              <button type="submit"
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_solutions_feature_request.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_solutions_feature_request.html.diff.txt
index 18642b3d73de..36ee0611a329 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_solutions_feature_request.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/includes/modal_solutions_feature_request.html.diff.txt
@@ -225,7 +225,7 @@
 +          <div class="modal-footer">
 +              <button type="button"
 +                      id="request-report-cancel"
-+                      class="btn btn-default"
++                      class="btn btn-outline-secondary"
 +                      data-bs-dismiss="modal"
 +                      data-bind="enable: cancelBtnEnabled">{% trans 'Cancel' %}</button>
 +              <button type="submit"
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/base_main.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/base_main.js.diff.txt
index 1439686fa252..2469268a345e 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/base_main.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/base_main.js.diff.txt
@@ -25,7 +25,7 @@
      'analytix/js/google',
      'analytix/js/hubspot',
      'analytix/js/kissmetrix',
-     'analytix/js/gtm',
+     'analytix/js/gtx',
 -    'hqwebapp/js/bootstrap3/mobile_experience_warning',
 +    'hqwebapp/js/bootstrap5/mobile_experience_warning',
  ], function () {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt
new file mode 100644
index 000000000000..546b935bda0a
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/commcarehq.js.diff.txt
@@ -0,0 +1,18 @@
+--- 
++++ 
+@@ -1,11 +1,11 @@
+-// Core requirements for Bootstrap 3 Webpack Entry Modules
++// Core requirements for Bootstrap 5 Webpack Entry Modules
+ import ko from 'knockout';
+ import mapping from 'ko.mapping';
+ ko.mapping = mapping;
+ 
+-import 'bootstrap';
++import 'bootstrap5';
+ 
+ import 'hqwebapp/js/django';
+ 
+-import 'hqwebapp/js/bootstrap3/common';
+-import 'hqwebapp/js/bootstrap3/base_main';
++import 'hqwebapp/js/bootstrap5/common';
++import 'hqwebapp/js/bootstrap5/base_main';
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components.ko.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components.ko.js.diff.txt
deleted file mode 100644
index 508ce9166d43..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components.ko.js.diff.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,4 @@
--hqDefine("hqwebapp/js/bootstrap3/components.ko", [
-+hqDefine("hqwebapp/js/bootstrap5/components.ko", [
-     'jquery',
-     'knockout',
-     'underscore',
-@@ -6,7 +6,7 @@
-     'hqwebapp/js/components/pagination',
-     'hqwebapp/js/components/search_box',
-     'hqwebapp/js/components/select_toggle',
--    'hqwebapp/js/components/bootstrap3/feedback',
-+    'hqwebapp/js/components/bootstrap5/feedback',
- ], function (
-     $,
-     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components/feedback.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components/feedback.js.diff.txt
index 7507d4c60a64..89380d7c0455 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components/feedback.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/components/feedback.js.diff.txt
@@ -8,17 +8,22 @@
 +hqDefine('hqwebapp/js/components/bootstrap5/feedback', [
      'knockout',
      'jquery',
-     'hqwebapp/js/initial_page_data',
-@@ -24,7 +24,7 @@
+     'underscore',
+@@ -24,11 +24,11 @@
+     $,
+     _,
+     initialPageData,
+-    koComponents
++    koComponents,
  ) {
-     return {
+     const component = {
          viewModel: function (params) {
 -            var self = {};
 +            let self = {};
  
              if (!params.featureName) {
                  throw new Error("Please specify a featureName in params.");
-@@ -62,11 +62,6 @@
+@@ -66,11 +66,6 @@
                          if (data.success) {
                              self.showSuccess(true);
                          }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt
index f22315526c10..cf67b47273ec 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt
@@ -1,12 +1,13 @@
 --- 
 +++ 
-@@ -1,13 +1,15 @@
+@@ -1,14 +1,15 @@
 -hqDefine("hqwebapp/js/bootstrap3/hq.helpers", [
 +hqDefine("hqwebapp/js/bootstrap5/hq.helpers", [
      'jquery',
      'knockout',
      'underscore',
      'analytix/js/google',
+-    'bootstrap',  // for popover constructor override
 +    'es6!hqwebapp/js/bootstrap5_loader',
  ], function (
      $,
@@ -18,7 +19,7 @@
  ) {
      // disable-on-submit is a class for form submit buttons so they're automatically disabled when the form is submitted
      $(document).on('submit', 'form', function (ev) {
-@@ -59,19 +61,6 @@
+@@ -55,19 +56,6 @@
          return false; // let default handler run
      };
  
@@ -38,7 +39,7 @@
      $.fn.hqHelp = function (opts) {
          var self = this;
          self.each(function (i) {
-@@ -88,22 +77,19 @@
+@@ -84,22 +72,19 @@
              if (opts) {
                  options = _.extend(options, opts);
              }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/repeaters/js/repeat_record_report.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/repeaters/js/repeat_record_report.js.diff.txt
index 1150fdec4f32..841576434146 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/repeaters/js/repeat_record_report.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/repeaters/js/repeat_record_report.js.diff.txt
@@ -1,36 +1,46 @@
 --- 
 +++ 
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  /* globals ace */
+ 'use strict';
 -hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
 +hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
-     var initialPageData = hqImport("hqwebapp/js/initial_page_data"),
+     const initialPageData = hqImport("hqwebapp/js/initial_page_data"),
          selectAll = document.getElementById('select-all'),
-         cancelAll = document.getElementById('cancel-all'),
-@@ -138,7 +138,7 @@
-         $('#confirm-button').on('click', function () {
-             var itemsToSend = getCheckboxes(), action = getAction(), $btn;
+         selectPending = document.getElementById('select-pending'),
+@@ -78,7 +78,7 @@
+                     }
+                     if (contentType === 'text/xml') {
+                         editor.session.setMode('ace/mode/xml');
+-                    } else if (['application/json', 'application/x-www-form-urlencoded'].includes(contentType)) {
++                    } else if (contentType === 'application/json') {
+                         editor.session.setMode('ace/mode/json');
+                     }
+                     editor.session.setValue(data.payload);
+@@ -142,7 +142,7 @@
+                 action = getAction();
+             let $btn;
  
 -            $popUp.modal('hide');
 +            $popUp.modal('hide');  /* todo B5: plugin:modal */
-             if (action == 'resend') {
+             if (action === 'resend') {
                  $btn = $('#resend-all-button');
                  $btn.disableButton();
-@@ -159,7 +159,7 @@
-                 if (isActionPossibleForCheckedItems(action)) {
-                     $('#warning').addClass('hide');
-                     $('#not-allowed').addClass('hide');
+@@ -167,7 +167,7 @@
+                 // leaving as is to preserve behavior
+                 if (isActionPossibleForCheckedItems(action, checkedRecords)) {
+                     hideAllWarnings();
 -                    $popUp.modal('show');
 +                    $popUp.modal('show');  /* todo B5: plugin:modal */
                  } else {
-                     $('#warning').addClass('hide');
-                     $('#not-allowed').removeClass('hide');
-@@ -244,7 +244,7 @@
+                     showWarning('not-allowed');
+                 }
+@@ -240,7 +240,7 @@
                      } else {
                          btn.text(gettext('Failed'));
                          btn.addClass('btn-danger');
 -                        $('#payload-error-modal').modal('show');
 +                        $('#payload-error-modal').modal('show');  /* todo B5: plugin:modal */
-                         $('#payload-error-modal .error-message').text(data.failure_reason);
+                         $('#payload-error-modal .error-message').text(response.failure_reason);
                      }
                  },
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/base_maps.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/base_maps.js.diff.txt
deleted file mode 100644
index 32663f2a2109..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/base_maps.js.diff.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,4 @@
--hqDefine("reports/js/bootstrap3/base_maps", function () {
-+hqDefine("reports/js/bootstrap5/base_maps", function () {
-     var done = false;
- 
-     $(document).ajaxComplete(function () {
-@@ -7,7 +7,7 @@
-             var context = $data.data("context"),
-                 iconPath = $data.data("icon_path");
-             if (iconPath && context) {
--                hqImport("reports/js/bootstrap3/maps_utils").load(context, iconPath);
-+                hqImport("reports/js/bootstrap5/maps_utils").load(context, iconPath);
-                 done = true;
-             }
-         }
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 3fb78785b622..698a873d7350 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
@@ -21,7 +21,7 @@
      'bootstrap',    // needed for $.tab
      'jquery-memoized-ajax/jquery.memoized.ajax.min',
  ], function (
-@@ -99,7 +99,7 @@
+@@ -92,7 +92,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,
-@@ -282,7 +282,7 @@
+@@ -275,7 +275,7 @@
          $propertiesModal.koApplyBindings(modalData);
          $casePropertyNames.click(function () {
              modalData.init($(this).data('property-name'));
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt
index f66f763e4b1d..b183a57c08cc 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/config.dataTables.bootstrap.js.diff.txt
@@ -15,12 +15,3 @@
                          placement: $(this).attr('data-datatable-tooltip'),
                          title: $(this).attr('data-datatable-tooltip-text'),
                      });
-@@ -155,7 +155,7 @@
-                             applyBootstrapMagic();
-                             if ('context' in data) {
-                                 var iconPath = data['icon_path'] || $(".base-maps-data").data("icon_path");
--                                hqRequire(["reports/js/bootstrap3/maps_utils"], function (mapsUtils) {
-+                                hqRequire(["reports/js/bootstrap5/maps_utils"], function (mapsUtils) {
-                                     mapsUtils.load(data['context'], iconPath);
-                                 });
-                             }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/data_corrections.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/data_corrections.js.diff.txt
index 98997739a824..cb69c577fe4d 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/data_corrections.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/data_corrections.js.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -28,15 +28,15 @@
+@@ -28,7 +28,7 @@
   *              Property is the data, plucked from the properties array. Name is displayed in the menu that lets
   *              user toggle between display properties.
   */
@@ -9,16 +9,6 @@
      "jquery",
      "knockout",
      "underscore",
-     "hqwebapp/js/assert_properties",
-     "analytix/js/kissmetrix",
--    "hqwebapp/js/bootstrap3/components.ko",     // pagination
-+    "hqwebapp/js/bootstrap5/components.ko",     // pagination
-     "select2/dist/js/select2.full.min",
--    "hqwebapp/js/bootstrap3/components.ko",    // search box
-+    "hqwebapp/js/bootstrap5/components.ko",    // search box
- ], function (
-     $,
-     ko,
 @@ -345,7 +345,7 @@
              model = DataCorrectionsModel(options);
              $modal.koApplyBindings(model);
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt
index d3df616f329a..fcf32c10d46a 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,13 +1,13 @@
+@@ -1,11 +1,11 @@
 -hqDefine("reports/js/bootstrap3/edit_scheduled_report", [
 +hqDefine("reports/js/bootstrap5/edit_scheduled_report", [
      "jquery",
@@ -12,8 +12,5 @@
 -    "hqwebapp/js/bootstrap3/widgets",  // autocomplete widget for email recipient list
 +    "hqwebapp/js/bootstrap5/widgets",  // autocomplete widget for email recipient list
      "jquery-ui/ui/widgets/datepicker",
--    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
-+    'hqwebapp/js/bootstrap5/components.ko',    // select toggle widget
+     'hqwebapp/js/components/select_toggle',
  ], function (
-     $,
-     _,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt
index f16fe7a5aae6..8f557f2d0608 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/reports.async.js.diff.txt
@@ -33,7 +33,7 @@
                      }
                      self.hqLoading = $(self.loaderClass);
                      self.reportContent.html(data.report);
-@@ -174,7 +174,7 @@
+@@ -171,7 +171,7 @@
  
                      if (!initialLoad || !self.standardReport.needsFilters) {
                          self.standardReport.filterSubmitButton
@@ -42,7 +42,7 @@
                          setTimeout(function () {
                              // Bootstrap clears all btn styles except btn on reset
                              // This gets around it by waiting 10ms.
-@@ -186,7 +186,7 @@
+@@ -183,7 +183,7 @@
                          }, 10);
                      } else {
                          self.standardReport.filterSubmitButton
@@ -51,7 +51,7 @@
                              .addClass('btn-primary')
                              .removeClass('disabled')
                              .prop('disabled', false);
-@@ -205,10 +205,10 @@
+@@ -202,10 +202,10 @@
                          self.loadingIssueModal.find('.report-error-status').html('<strong>' + data.status + '</strong> ' +
                              ((humanReadable) ? humanReadable : ""));
                          if (self.issueAttempts > 0) {
@@ -64,7 +64,7 @@
                      } else {
                          self.hqLoading = $(self.loaderClass);
                          self.hqLoading.find('h4').text(gettext("Loading Stopped"));
-@@ -216,7 +216,7 @@
+@@ -213,7 +213,7 @@
                      }
                  },
                  beforeSend: function () {
@@ -73,7 +73,7 @@
                      $('.loading-backdrop').fadeIn();
                      if (self.hqLoading) {
                          self.hqLoading.attr('style', 'position: absolute; top: 30px; left: 40%;');
-@@ -228,7 +228,7 @@
+@@ -225,7 +225,7 @@
          };
  
          $(document).on('click', '.try-again', function () {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/saved_reports_main.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/saved_reports_main.js.diff.txt
index 061a5ea70365..16cd25c2deb0 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/saved_reports_main.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/saved_reports_main.js.diff.txt
@@ -7,11 +7,10 @@
      'knockout',
      'hqwebapp/js/initial_page_data',
 -    'reports/js/bootstrap3/report_config_models',
--    'reports/js/bootstrap3/scheduled_reports_list',
--    'hqwebapp/js/bootstrap3/knockout_bindings.ko', // modal binding
 +    'reports/js/bootstrap5/report_config_models',
-+    'reports/js/bootstrap5/scheduled_reports_list',
+     'reports/js/scheduled_reports_list',
+-    'hqwebapp/js/bootstrap3/knockout_bindings.ko', // modal binding
 +    'hqwebapp/js/bootstrap5/knockout_bindings.ko', // modal binding
+     'hqwebapp/js/components/pagination',
  ], function (
      $,
-     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/scheduled_reports_list.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/scheduled_reports_list.js.diff.txt
deleted file mode 100644
index c197aa8da620..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/scheduled_reports_list.js.diff.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- 
-+++ 
-@@ -6,12 +6,12 @@
- 
- */
- 
--hqDefine("reports/js/bootstrap3/scheduled_reports_list", [
-+hqDefine("reports/js/bootstrap5/scheduled_reports_list", [
-     'jquery',
-     'knockout',
-     'underscore',
-     'hqwebapp/js/assert_properties',
--    'hqwebapp/js/bootstrap3/components.ko', // pagination & feedback widget
-+    'hqwebapp/js/bootstrap5/components.ko', // pagination & feedback widget
- ], function (
-     $,
-     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/v2/js/datagrid.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/v2/js/datagrid.js.diff.txt
new file mode 100644
index 000000000000..9a0778e8f336
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/v2/js/datagrid.js.diff.txt
@@ -0,0 +1,20 @@
+--- 
++++ 
+@@ -2,7 +2,7 @@
+  * todo add docstring
+  */
+ 
+-hqDefine('reports/v2/js/bootstrap3/datagrid', [
++hqDefine('reports/v2/js/bootstrap5/datagrid', [
+     'jquery',
+     'knockout',
+     'underscore',
+@@ -13,7 +13,7 @@
+     'analytix/js/kissmetrix',
+     'hqwebapp/js/initial_page_data',
+     'reports/v2/js/datagrid/binding_handlers',  // for custom ko bindingHandlers
+-    'hqwebapp/js/bootstrap3/knockout_bindings.ko',  // for modal bindings
++    'hqwebapp/js/bootstrap5/knockout_bindings.ko',  // for modal bindings
+ ], function (
+     $,
+     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/v2/js/views/explore_case_data.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/v2/js/views/explore_case_data.js.diff.txt
new file mode 100644
index 000000000000..b8149ec4fef7
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/v2/js/views/explore_case_data.js.diff.txt
@@ -0,0 +1,16 @@
+--- 
++++ 
+@@ -1,10 +1,10 @@
+-hqDefine('reports/v2/js/views/bootstrap3/explore_case_data', [
++hqDefine('reports/v2/js/views/bootstrap5/explore_case_data', [
+     'jquery',
+     'knockout',
+     'underscore',
+     'reports/v2/js/context',
+-    'reports/v2/js/bootstrap3/datagrid',
+-    'hqwebapp/js/components/bootstrap3/feedback',
++    'reports/v2/js/bootstrap5/datagrid',
++    'hqwebapp/js/components/bootstrap5/feedback',
+ ], function (
+     $,
+     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/partials/attempt_history.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/partials/attempt_history.html.diff.txt
index 7137393b64b7..ca5b5f43bfb4 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/partials/attempt_history.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/partials/attempt_history.html.diff.txt
@@ -15,7 +15,7 @@
                              {% if attempt.message %}
 -                                <div class="well record-attempt" style="font-family: monospace;">
 +                                <div class="card record-attempt" style="font-family: monospace;">  {# todo B5: css:well, inline style #}
-                                     {{ attempt.message }}
+                                     {{ attempt.message|escape|linebreaksbr }}
                                  </div>
                              {% endif %}
 @@ -53,7 +53,7 @@
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/repeat_record_report.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/repeat_record_report.html.diff.txt
index f7593eaa803d..a456855b63f6 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/repeat_record_report.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/repeaters/repeat_record_report.html.diff.txt
@@ -50,29 +50,29 @@
                {% trans 'Requeue' %}
              </button>
 -            <label class="checkbox" >
--              <input type="checkbox" id="select-all" data-id="{{ form_query_string|urlencode }}">
+-              <input type="checkbox" id="select-all">
 +            <label class="checkbox" >  {# todo B5: css:checkbox #}
-+              <input type="checkbox" id="select-all" data-id="{{ form_query_string|urlencode }}">  {# todo B5: css:checkbox #}
++              <input type="checkbox" id="select-all">  {# todo B5: css:checkbox #}
                  {% blocktrans %}Select all {{ total }} payloads{% endblocktrans %}
              </label>
 -            <label class="checkbox" >
--              <input type="checkbox" id="cancel-all" data-id="{{ form_query_string_pending|urlencode }}">
+-              <input type="checkbox" id="select-pending">
 +            <label class="checkbox" >  {# todo B5: css:checkbox #}
-+              <input type="checkbox" id="cancel-all" data-id="{{ form_query_string_pending|urlencode }}">  {# todo B5: css:checkbox #}
++              <input type="checkbox" id="select-pending">  {# todo B5: css:checkbox #}
                  {% blocktrans %}Select {{ total_pending }} pending payloads{% endblocktrans %}
              </label>
 -            <label class="checkbox" >
--              <input type="checkbox" id="requeue-all" data-id="{{ form_query_string_cancelled|urlencode }}">
+-              <input type="checkbox" id="select-cancelled">
 +            <label class="checkbox" >  {# todo B5: css:checkbox #}
-+              <input type="checkbox" id="requeue-all" data-id="{{ form_query_string_cancelled|urlencode }}">  {# todo B5: css:checkbox #}
++              <input type="checkbox" id="select-cancelled">  {# todo B5: css:checkbox #}
                  {% blocktrans %}Select {{ total_cancelled }} cancelled payloads{% endblocktrans %}
              </label>
            </div>
          </div>
        {% endif %}
    </div>
--  <div id="warning" class="alert alert-warning hide">
-+  <div id="warning" class="alert alert-warning d-none">
+-  <div id="no-selection" class="alert alert-warning hide">
++  <div id="no-selection" class="alert alert-warning d-none">
      {% blocktrans %}Please select at least one payload{% endblocktrans %}
    </div>
 -  <div id="not-allowed" class="alert alert-warning hide">
@@ -98,7 +98,7 @@
              {% blocktrans %}No{% endblocktrans %}
            </button>
            <button type="button" id="confirm-button" data-action="" data-flag="" class="btn btn-primary">
-@@ -98,8 +98,8 @@
+@@ -100,8 +100,8 @@
      <div class="modal fade full-screen-modal" id="view-record-payload-modal" tabindex="-1" role="dialog">
          <div class="modal-dialog" role="document">
              <div class="modal-content">
@@ -109,7 +109,7 @@
                      </button>
                      <h4 class="modal-title">{% trans "Payload" %}</h4>
                  </div>
-@@ -107,7 +107,7 @@
+@@ -109,7 +109,7 @@
                      <div class="payload"></div>
                  </div>
                  <div class="modal-footer">
@@ -118,7 +118,7 @@
                      {% trans "Close" %}
                      </button>
                  </div>
-@@ -119,8 +119,8 @@
+@@ -121,8 +121,8 @@
      <div class="modal fade" id="payload-error-modal" tabindex="-1" role="dialog">
          <div class="modal-dialog" role="document">
              <div class="modal-content">
@@ -127,9 +127,9 @@
 +                <div class="modal-header">  {# todo B5: css:modal-header #}
 +                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>  {# todo B5: css:close #}
                      </button>
-                     <h4 class="modal-title">{% trans "Payload Error" %}</h4>
+                     <h4 class="modal-title">{% trans "Error" %}</h4>
                  </div>
-@@ -128,7 +128,7 @@
+@@ -130,7 +130,7 @@
                      <div class="error-message"></div>
                  </div>
                  <div class="modal-footer">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/base_template.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/base_template.html.diff.txt
index a84432d0d9f7..71334c8e094f 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/base_template.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/base_template.html.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,17 +1,17 @@
+@@ -1,16 +1,16 @@
 -{% extends "reports/standard/bootstrap3/base_template.html" %}
 +{% extends "reports/standard/bootstrap5/base_template.html" %}
  {% load compress %}
@@ -10,10 +10,8 @@
    {% compress js %}
 -    <script src="{% static 'reports/js/bootstrap3/report_config_models.js' %}"></script>
 -    <script src="{% static "reports/js/bootstrap3/base.js" %}"></script>
--    <script src="{% static "reports/js/bootstrap3/base_maps.js" %}"></script>
 +    <script src="{% static 'reports/js/bootstrap5/report_config_models.js' %}"></script>
 +    <script src="{% static "reports/js/bootstrap5/base.js" %}"></script>
-+    <script src="{% static "reports/js/bootstrap5/base_maps.js" %}"></script>
    {% endcompress %}
  {% endblock %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/filters/sensitive_columns.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/filters/sensitive_columns.html.diff.txt
index ade3e959b8dd..e0ab207e8621 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/filters/sensitive_columns.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/filters/sensitive_columns.html.diff.txt
@@ -30,8 +30,14 @@
            <table class="table table-condensed">
              <thead>
              <th>&nbsp;</th>
-@@ -42,7 +42,7 @@
-                                                      explorerColumnsAutocomplete: $parent.suggestedProperties()"
+@@ -38,33 +38,33 @@
+               <td>
+                 <div class="has-feedback">
+                   <input type="text" class="form-control" data-bind="
+-                                                     value: name,
+-                                                     explorerColumnsAutocomplete: $parent.suggestedProperties()"
++                    value: name,
++                    explorerColumnsAutocomplete: $parent.suggestedProperties()"
                    />
                    <span class="form-control-feedback" data-bind="visible: meta_type">
 -                    <span class="label label-primary" data-bind="text: meta_type"></span>
@@ -39,7 +45,20 @@
                    </span>
                  </div>
                </td>
-@@ -57,14 +57,14 @@
+               <td>
+                 <div class="has-feedback">
+-                  <select class="form-control" data-bind="
+-                                                options: {{ property_label_options }},
+-                                                optionsText: 'name',
+-                                                optionsValue: 'type',
+-                                                value: label,
+-                                                "/>
++                  <select class="form-select" data-bind="
++                    options: {{ property_label_options }},
++                    optionsText: 'name',
++                    optionsValue: 'type',
++                    value: label,
++                  "></select>
                  </div>
                </td>
                <td>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/base_maps.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/base_maps.html.diff.txt
deleted file mode 100644
index 32829b5bf252..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/base_maps.html.diff.txt
+++ /dev/null
@@ -1,68 +0,0 @@
---- 
-+++ 
-@@ -5,13 +5,13 @@
-      data-icon_path="{{ 'leaflet/dist/images'|static }}"
-      data-context="{% html_attr context %}"></div>
- 
--<div class="panel panel-default">
--  <div class="panel-heading">
--    <h2 class="panel-title">
-+<div class="card card-default">  {# todo B5: css:panel #}
-+  <div class="card-header">
-+    <h2 class="card-title">
-       {{ report.title }}
-     </h2>
-   </div>
--  <div class="panel-body">
-+  <div class="card-body">
-     <div class="hq-graphic-report">
-       <script type="text/template" id="default_detail_popup">
-         <div class="default-popup">
-@@ -67,7 +67,7 @@
-               <div class="tickmarks-inner">
-                 <% _.each(ticks, function(e) { %>
-                 <div class="width-spacer"><%- e.label %></div>
--                <div class="ticklabel" style="top: <%- e.coord %>px;">
-+                <div class="ticklabel" style="top: <%- e.coord %>px;">  {# todo B5: inline style #}
-                   <div class="ticklabel-inner"><%- e.label %></div>
-                 </div>
-                 <% }); %>
-@@ -88,30 +88,30 @@
-         </div>
-       </script>
- 
--      <div id="results-capped" class="alert alert-info" style="display: none;">
--        <button type="button" class="close" data-dismiss="alert">&times;</button>
-+      <div id="results-capped" class="alert alert-info" style="display: none;">  {# todo B5: inline style #}
-+        <button type="button" class="btn-close" data-bs-dismiss="alert">&times;</button>  {# todo B5: css:close #}
-         There are <strong id="rows-total"></strong> results for the chosen report filters.
-         However, map display has been capped at the first <strong id="rows-capped"></strong> results.
-       </div>
- 
-       <div>
--        <div id="map" style="width: 100%;"></div>
-+        <div id="map" style="width: 100%;"></div>  {# todo B5: inline style #}
- 
--        <div id="metrics" class="control-pane" style="display: none;">
-+        <div id="metrics" class="control-pane" style="display: none;">  {# todo B5: inline style #}
-           <div data-bind="template: { name: 'metrics-group', if: root, data: root }" class="metrics-container"></div>
-         </div>
- 
--        <div id="legend" class="control-pane" style="display: none;">
-+        <div id="legend" class="control-pane" style="display: none;">  {# todo B5: inline style #}
-         </div>
- 
--        <div id="info" class="control-pane" style="display: none;">
-+        <div id="info" class="control-pane" style="display: none;">  {# todo B5: inline style #}
-         </div>
- 
--        <div id="zoomtofit" class="leaflet-control-layers" style="display: none;">
-+        <div id="zoomtofit" class="leaflet-control-layers" style="display: none;">  {# todo B5: inline style #}
-           <div id="zoomtofit-target" class="zoomtofit leaflet-control-layers-toggle" title="Fit all data into view"></div>
-         </div>
- 
--        <div id="toggletable" class="leaflet-control-layers" style="display: none;">
-+        <div id="toggletable" class="leaflet-control-layers" style="display: none;">  {# todo B5: inline style #}
-           <div id="toggletable-target" class="toggletable leaflet-control-layers-toggle" title="Show/hide data table">
-             <i class="fa fa-table"></i>
-           </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/maps.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/maps.html.diff.txt
deleted file mode 100644
index 98839e403443..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/maps.html.diff.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 
-+++ 
-@@ -1,8 +1,8 @@
--{% extends 'reports/partials/bootstrap3/base_maps.html' %}
-+{% extends 'reports/partials/bootstrap5/base_maps.html' %}
- {% load hq_shared_tags %}
- 
- {% block content %}
-   <table class="table table-striped datatable dataTable" id="tabular"></table>
--  <div class="row dataTables_control" style="height: 20px"></div>
-+  <div class="row dataTables_control" style="height: 20px"></div>  {# todo B5: inline style #}
- {% endblock content %}
- 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/saved_exports.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/saved_exports.html.diff.txt
deleted file mode 100644
index 5e4995994136..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/partials/saved_exports.html.diff.txt
+++ /dev/null
@@ -1,47 +0,0 @@
---- 
-+++ 
-@@ -8,7 +8,7 @@
-     <th>{% trans "Edit" %}</th>
-     <th>
-       {% trans "Add to Bulk Export" %} <i class="icon-white icon-info-sign bulk-export-info"></i>
--      <small style="display: block;">
-+      <small style="display: block;">  {# todo B5: inline style #}
-         {% trans "Select" %}:
-         <a href="#" class="btn btn-mini" data-all="true" data-bind="click: toggleSelectAllExports">{% trans "all" %}</a>
-         <a href="#" class="btn btn-mini btn-inverse" data-bind="click: toggleSelectAllExports">{% trans "none" %}</a>
-@@ -19,9 +19,9 @@
-   <tbody>
-   {% for export in saved_exports %}
-     <tr class="{% cycle "odd" "even" %}">
--      <td class="control-group form-inline">
-+      <td class="control-group form-inline">  {# todo B5: css:form-inline #}
-         {{ export.name|default:"[blank]" }}
--        {% if not deid and export.is_safe %}<span class="label label-default">{% trans "de-identified" %}</span>{% endif %}
-+        {% if not deid and export.is_safe %}<span class="badge text-bg-secondary">{% trans "de-identified" %}</span>{% endif %}
-         <div><p class="help-inline">{{ export.formname }}</p></div>
-       </td>
-       <td class="cell-vertical-centered">
-@@ -30,18 +30,18 @@
-         </a>
-       </td>
-       <td class="cell-vertical-centered">
--        <a class="btn btn-default" href='{% url edit_export_view_name domain export.get_id %}'>
-+        <a class="btn btn-outline-primary" href='{% url edit_export_view_name domain export.get_id %}'>
-           <i class="icon-pencil icon-white"></i> {% trans "Edit" %}
-         </a>
-       </td>
--      <td class="form-inline">
-+      <td class="form-inline">  {# todo B5: css:form-inline #}
-         {% if export.default_format == bulk_export_format %}
-           <label>
--            <input type="checkbox" class="select-export" data-bind="event: {change: updateSelectedExports}" value="{{ export.get_id }}"/>
--            <span class="label label-info">+ {% trans "Bulk Export" %}</span>
-+            <input type="checkbox" class="select-export" data-bind="event: {change: updateSelectedExports}" value="{{ export.get_id }}"/>  {# todo B5: css:checkbox #}
-+            <span class="badge text-bg-info">+ {% trans "Bulk Export" %}</span>
-           </label>
-         {% else %}
--          <span class="label custom-bulk-format-na">{{ export.default_format }} {% trans "Not Available" %}</span>
-+          <span class="badge custom-bulk-format-na">{{ export.default_format }} {% trans "Not Available" %}</span>
-         {% endif %}
-       </td>
-     </tr>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/view_form_attachment.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/view_form_attachment.html.diff.txt
index 66c45f88140d..2d96053d0249 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/view_form_attachment.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/reportdata/view_form_attachment.html.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -3,11 +3,11 @@
+@@ -3,7 +3,7 @@
    <head>
      <meta name="viewport" content="width=device-width">
    </head>
@@ -9,8 +9,12 @@
      {% if is_image %}
        <img src="{{ download_url }}">
      {% else %}
--      <video controls {% if disable_download %} controlsList="nodownload" {% endif %} autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">
-+      <video controls {% if disable_download %} controlsList="nodownload" {% endif %} autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">  {# todo B5: inline style #}
-         <source src="{{ download_url }}">
-       </video>
-     {% endif %}
+@@ -12,7 +12,7 @@
+           <source src="{{ download_url }}">
+         </audio>
+       {% else %}
+-        <video controls autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">
++        <video controls autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">  {# todo B5: inline style #}
+           <source src="{{ download_url }}">
+         </video>
+       {% endif %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/tableau_template.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/tableau_template.html.diff.txt
index d485beb7fccf..a3a22cc0f3ae 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/tableau_template.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/tableau_template.html.diff.txt
@@ -6,7 +6,7 @@
  {% load compress %}
  {% load hq_shared_tags %}
  {% load i18n %}
-@@ -23,7 +23,7 @@
+@@ -21,7 +21,7 @@
          <i class="fa fa-spin fa-spinner"></i>
      </div>
      <div id="vizContainer"></div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/debugger_debugger.debugger_debugger.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/debugger_debugger.debugger_debugger.style.diff.txt
deleted file mode 100644
index e02d017d4a62..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/debugger_debugger.debugger_debugger.style.diff.txt
+++ /dev/null
@@ -1,127 +0,0 @@
---- 
-+++ 
-@@ -3,74 +3,61 @@
-   position: fixed;
-   bottom: 0;
-   left: 0;
--  z-index: @zindex-cloudcare-debugger;
-+  z-index: $zindex-cloudcare-debugger;
-   background-color: white;
-   overflow: hidden;
- 
--  -webkit-transition: height 0.5s;
-   transition: height 0.5s;
--}
- 
--.debugger .debugger-content {
--  overflow-y: auto;
--  margin-top: 12px;
--  padding: 10px;
--  padding-bottom: 0;
--}
-+  &.debugger-minimized {
-+    height: 30px;
-+    overflow-y: hidden;
-+  }
- 
--.debugger-updating {
--  #debugger-form-data, #debugger-xml-instance {
--    opacity: 0.5;
-+  &.debugger-maximized {
-+    height: 400px;
-+  }
-+
-+  &.debugger-updating {
-+    #debugger-form-data, #debugger-xml-instance {
-+      opacity: 0.5;
-+    }
-+  }
-+
-+  .debugger-tab-title {
-+    line-height: 18px;
-+    color: white;
-+    background-color: $cc-brand-low;
-+    border-bottom: #ddd solid 4px;
-+    border-top: 0;
-+    border-left: 0;
-+    border-right: 0;
-+    padding: 6px;
-+    cursor: pointer;
-+    .debugger-title {
-+      text-transform: uppercase;
-+      font-size: 11px;
-+    }
-+
-+    &:hover {
-+      background-color: darken($cc-brand-low, 5);
-+    }
-+
-+    transition: background-color 0.5s;
-+  }
-+
-+  .debugger-navbar {
-+    background-color: $cc-bg;
-+  }
-+
-+  .debugger-content {
-+    overflow-y: auto;
-+    margin-top: 12px;
-+    padding: 10px;
-+    padding-bottom: 0;
-+  }
-+
-+  .debugger-code {
-+    font-family: monospace;
-   }
- }
--
--
--.debugger.debugger-minimized {
--  height: 30px;
--  overflow-y: hidden;
--}
--
--.debugger.debugger-maximized {
--  height: 400px;
--}
--
--.debugger .debugger-state {
--  cursor: pointer;
--}
--
--.debugger-code {
--  font-family: monospace;
--}
--
--.debugger-navbar {
--  border-radius: 0px;
--  border: none;
--  background-color: @cc-bg;
--}
--
--.debugger-tab-title {
--  line-height: 18px;
--  color: white;
--  background-color: @cc-brand-low;
--  border-bottom: #ddd solid 4px;
--  border-top: 0;
--  border-left: 0;
--  border-right: 0;
--  padding: 6px;
--  cursor: pointer;
--  .debugger-title {
--    text-transform: uppercase;
--    font-size: 11px;
--  }
--
--  &:hover {
--    background-color: darken(@cc-brand-low, 5);
--  }
--
--  -webkit-transition: background-color 0.5s;
--  transition: background-color 0.5s;
--}
--
--.debugger .query-container:hover {
--  cursor: pointer;
--}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer.font-formplayer.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer.font-formplayer.style.diff.txt
deleted file mode 100644
index b65d1aa58662..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer.font-formplayer.style.diff.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,6 @@
- // Based on the Structure of FontAwesome
- 
--@import "font-formplayer/variables.less";
--@import "font-formplayer/path.less";
--@import "font-formplayer/core.less";
--@import "font-formplayer/icons.less";
-+@import "font-formplayer/variables";
-+@import "font-formplayer/path";
-+@import "font-formplayer/core";
-+@import "font-formplayer/icons";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_core.font-formplayer_core.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_core.font-formplayer_core.style.diff.txt
deleted file mode 100644
index 6b9a26c4de06..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_core.font-formplayer_core.style.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,6 @@
--.@{css-prefix} {
-+.#{$css-prefix} {
-   display: inline-block;
--  font-family: @font-family;
-+  font-family: $font-family;
-   font-style: normal;
-   font-weight: normal;
-   line-height: 1;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_icons.font-formplayer_icons.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_icons.font-formplayer_icons.style.diff.txt
deleted file mode 100644
index 497a31ceabcc..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_icons.font-formplayer_icons.style.diff.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- 
-+++ 
-@@ -1,13 +1,13 @@
--.@{css-prefix}-start-full:before { content: @var-start-full; }
--.@{css-prefix}-start-fg:before { content: @var-start-fg; }
--.@{css-prefix}-start-bg:before { content: @var-start-bg; }
-+.#{$css-prefix}-start-full:before { content: $var-start-full; }
-+.#{$css-prefix}-start-fg:before { content: $var-start-fg; }
-+.#{$css-prefix}-start-bg:before { content: $var-start-bg; }
- 
--.@{css-prefix}-saved-full:before { content: @var-saved-full; }
--.@{css-prefix}-saved-fg:before { content: @var-saved-fg; }
--.@{css-prefix}-saved-bg:before { content: @var-saved-bg; }
-+.#{$css-prefix}-saved-full:before { content: $var-saved-full; }
-+.#{$css-prefix}-saved-fg:before { content: $var-saved-fg; }
-+.#{$css-prefix}-saved-bg:before { content: $var-saved-bg; }
- 
--.@{css-prefix}-sync:before { content: @var-sync; }
-+.#{$css-prefix}-sync:before { content: $var-sync; }
- 
--.@{css-prefix}-incomplete-full:before { content: @var-incomplete-full; }
--.@{css-prefix}-incomplete-fg:before { content: @var-incomplete-fg; }
--.@{css-prefix}-incomplete-bg:before { content: @var-incomplete-bg; }
-+.#{$css-prefix}-incomplete-full:before { content: $var-incomplete-full; }
-+.#{$css-prefix}-incomplete-fg:before { content: $var-incomplete-fg; }
-+.#{$css-prefix}-incomplete-bg:before { content: $var-incomplete-bg; }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_path.font-formplayer_path.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_path.font-formplayer_path.style.diff.txt
deleted file mode 100644
index b8100133f2c1..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_path.font-formplayer_path.style.diff.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- 
-+++ 
-@@ -2,12 +2,12 @@
-  * -------------------------- */
- 
- @font-face {
--  font-family: @font-family;
--  src: ~"url('@{font-path}/@{font-name}.eot?v=@{version}')";
--  src: ~"url('@{font-path}/@{font-name}.eot?#iefix&v=@{version}') format('embedded-opentype')",
--       ~"url('@{font-path}/@{font-name}.woff?v=@{version}') format('woff')",
--       ~"url('@{font-path}/@{font-name}.ttf?v=@{version}') format('truetype')",
--       ~"url('@{font-path}/@{font-name}.svg?v=@{version}#@{font-family}') format('svg')";
-+  font-family: $font-family;
-+  src: url('#{$font-path}/#{$font-name}.eot?v=#{$version}');
-+  src: url('#{$font-path}/#{$font-name}.eot?#iefix&v=#{$version}') format('embedded-opentype'),
-+       url('#{$font-path}/#{$font-name}.woff?v=#{$version}') format('woff'),
-+       url('#{$font-path}/#{$font-name}.ttf?v=#{$version}') format('truetype'),
-+       url('#{$font-path}/#{$font-name}.svg?v=#{$version}##{$font-family}') format('svg');
-   font-weight: normal;
-   font-style: normal;
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_variables.font-formplayer_variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_variables.font-formplayer_variables.style.diff.txt
deleted file mode 100644
index ae8144b02b65..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/font-formplayer_variables.font-formplayer_variables.style.diff.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- 
-+++ 
-@@ -1,17 +1,17 @@
--@font-path: "/static/cloudcare/font";
--@css-prefix: ff;
--@inverse: #ffffff;
--@font-family: 'FormplayerFontRegular';
--@font-name: 'formplayerfont-regular';
--@version: '1.1';
-+$font-path: "/static/cloudcare/font";
-+$css-prefix: ff;
-+$inverse: #ffffff;
-+$font-family: 'FormplayerFontRegular';
-+$font-name: 'formplayerfont-regular';
-+$version: '1.1';
- 
--@var-start-full: "\f000";
--@var-start-fg: "\f001";
--@var-start-bg: "\f002";
--@var-saved-full: "\f003";
--@var-saved-fg: "\f004";
--@var-saved-bg: "\f005";
--@var-sync: "\f006";
--@var-incomplete-full: "\f007";
--@var-incomplete-fg: "\f008";
--@var-incomplete-bg: "\f009";
-+$var-start-full: "\f000";
-+$var-start-fg: "\f001";
-+$var-start-bg: "\f002";
-+$var-saved-full: "\f003";
-+$var-saved-fg: "\f004";
-+$var-saved-bg: "\f005";
-+$var-sync: "\f006";
-+$var-incomplete-full: "\f007";
-+$var-incomplete-fg: "\f008";
-+$var-incomplete-bg: "\f009";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt
deleted file mode 100644
index b87132107d48..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common-main.formplayer-common-main.style.diff.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- 
-+++ 
-@@ -1,5 +1,5 @@
--@import '../../hqwebapp/less/_hq/includes/variables.less';
--@import '../../hqwebapp/less/_hq/includes/mixins.less';
-+@import "../../hqwebapp/scss/commcarehq/variables";
-+@import "../../hqwebapp/scss/commcarehq/mixins";
- 
- /**
- These are the styles shared across both PREVIEW and the FULL PAGE WEB APP
-@@ -22,6 +22,7 @@
- @import "formplayer-common/formnav";
- @import "formplayer-common/markdown-table";
- @import "formplayer-common/address";
-+@import "formplayer-common/query";
- @import "formplayer-common/webforms";
- 
- @import "debugger/debugger";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common.formplayer-common.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common.formplayer-common.style.diff.txt
deleted file mode 100644
index c017a3aeb493..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common.formplayer-common.style.diff.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,7 @@
--@b3-import-variables: '../../../../../../../../node_modules/bootstrap/less/variables';
--@b3-import-mixins: '../../../../../../../../node_modules/bootstrap/less/mixins';
-+@import "functions";
-+@import "../../hqwebapp/scss/commcarehq/variables";
-+@import "variables";
-+@import "../../hqwebapp/scss/commcarehq/variables_bootstrap3";
-+@import "mixins";   // media-breakpoint-up and media-breakpoint-down
- 
- @import "formplayer-common-main";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_address.formplayer-common_address.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_address.formplayer-common_address.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_appicon.formplayer-common_appicon.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_appicon.formplayer-common_appicon.style.diff.txt
deleted file mode 100644
index fb5f64ecccfc..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_appicon.formplayer-common_appicon.style.diff.txt
+++ /dev/null
@@ -1,277 +0,0 @@
---- 
-+++ 
-@@ -1,46 +1,46 @@
--@appicon-height-xs: 150px;
--@appicon-icon-height-xs: @appicon-height-xs - 30px;
--
--
--.make-appicon-size(@container-height, @icon-height, @title-height, @title-size) {
-+$appicon-height-xs: 150px;
-+$appicon-icon-height-xs: $appicon-height-xs - 30px;
-+
-+
-+@mixin make-appicon-size($container-height, $icon-height, $title-height, $title-size) {
-   .appicon {
--    min-height: @container-height;
-+    min-height: $container-height;
- 
-     .appicon-title {
--      height: @title-height;
--      bottom: @container-height * 0.05;
-+      height: $title-height;
-+      bottom: $container-height * 0.05;
-       h3 {
--        font-size: @title-size;
--        padding: 0 @title-size/2;
-+        font-size: $title-size;
-+        padding: 0 calc($title-size / 2);
-       }
-     }
-     .appicon-icon {
--      top: 0.05*@icon-height;
--      margin-left: -@icon-height/2;
--      width: @icon-height;
--      height: @icon-height;
--      line-height: @icon-height;
--      font-size: @icon-height;
-+      top: 0.05*$icon-height;
-+      margin-left: calc(-1 * $icon-height / 2);
-+      width: $icon-height;
-+      height: $icon-height;
-+      line-height: $icon-height;
-+      font-size: $icon-height;
-       &[class*='fa-'] {
--        font-size: @icon-height * .8;
-+        font-size: $icon-height * .8;
-       }
-     }
-     .appicon-custom {
-       // the default icons have internal padding in the image itself.
-       // this prevents users from needing to replicate that
--      top: 0.05*@icon-height + 10;
--      height: @icon-height - 10;
-+      top: 0.05*$icon-height + 10;
-+      height: $icon-height - 10;
-     }
-   }
-   .appicon-default .appicon-icon {
--    font-size: @icon-height * .9;
--  }
--}
--
--.make-gridicon-size(@icon-height) {
-+    font-size: $icon-height * .9;
-+  }
-+}
-+
-+@mixin make-gridicon-size($icon-height) {
-   .gridicon {
--    width: @icon-height;
--    height: @icon-height;
-+    width: $icon-height;
-+    height: $icon-height;
-     margin: 10% auto;
- 
-     .gridicon-icon {
-@@ -50,27 +50,26 @@
-       left: 0;
-       max-width: 100%;
-       max-height: 100%;
--      line-height: @icon-height;
--      font-size: @icon-height / 2;
-+      line-height: $icon-height;
-+      font-size: calc($icon-height / 2);
-     }
-   }
-   .gridicon-circle {
--    border-radius: 2 * @icon-height;
-+    border-radius: 2 * $icon-height;
-   }
- }
- 
- .appicon, .gridicon {
--  background-color: @cc-neutral-mid;
-+  background-color: $cc-neutral-mid;
-   text-align: center;
-   color: white;
-   position: relative;
-   box-sizing: border-box;
-   margin-bottom: 15px;
- 
--  .border-top-radius(5px);
--  .border-bottom-radius(5px);
--  .transition(background 1s);
--  .box-shadow(0 0 5px 0 rgba(0, 0, 0, 0.45));
-+  border-radius: 5px;
-+  transition: background 1s;
-+  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.45);
- 
-   .appicon-title {
-     width: 100%;
-@@ -96,11 +95,11 @@
-     box-sizing: border-box;
-     top: 0;
-     left: 50%;
--    .transition(color 1s);
--  }
--
--  &:hover {
--    .box-shadow(0 0 2x 3px rgba(0, 0, 0, 0.45));
-+    transition: color 1s;
-+  }
-+
-+  &:hover {
-+    box-shadow: 0 0 2x 3px rgba(0, 0, 0, 0.45);
-   }
- }
- 
-@@ -110,93 +109,93 @@
-   background-repeat: no-repeat;
-   background-position: 50%;
-   // For icons with their own image, don't make assumptions about the shadowing
--  .box-shadow(0 0 0 0 rgba(0, 0, 0, 0));
-+  box-shadow: 0 0 0 0 rgba(0, 0, 0, 0);
- }
- 
- .gridicon.gridicon-circle {
--  background-color: @cc-neutral-mid;
--  .box-shadow(0 0 5px 0 rgba(0, 0, 0, 0.45));
--}
--
--.make-appicon-size(170px, 115px, 35px, 16px);
--.make-gridicon-size(70px);
--
--@media(min-width: @screen-xs) {
--  .make-appicon-size(200px, 135px, 35px, 16px);
--  .make-gridicon-size(60px);
--}
--
--@media(min-width: @screen-sm) {
--  .make-appicon-size(210px, 140px, 40px, 18px);
--  .make-gridicon-size(70px);
--}
--
--@media(min-width: @screen-md) {
--  .make-appicon-size(230px, 150px, 45px, 20px);
--  .make-gridicon-size(130px);
-+  background-color: $cc-neutral-mid;
-+  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.45);
-+}
-+
-+@include make-appicon-size(170px, 115px, 35px, 16px);
-+@include make-gridicon-size(70px);
-+
-+@include media-breakpoint-up(sm) {
-+  @include make-appicon-size(200px, 135px, 35px, 16px);
-+  @include make-gridicon-size(60px);
-+}
-+
-+@include media-breakpoint-up(md) {
-+  @include make-appicon-size(210px, 140px, 40px, 18px);
-+  @include make-gridicon-size(70px);
-+}
-+
-+@include media-breakpoint-up(lg) {
-+  @include make-appicon-size(230px, 150px, 45px, 20px);
-+  @include make-gridicon-size(130px);
- }
- 
- .appicon-start {
--  background-color: @cc-att-pos-mid;
--  .appicon-icon-fg { color: @cc-att-pos-hi; }
--  .appicon-icon-bg { color: @cc-att-pos-low; }
--  &:hover {
--    background-color: darken(@cc-att-pos-mid, 5);
--    .appicon-icon-fg { color: lighten(@cc-att-pos-hi, 5); }
--    .appicon-icon-bg { color: darken(@cc-att-pos-low, 10); }
-+  background-color: $cc-att-pos-mid;
-+  .appicon-icon-fg { color: $cc-att-pos-hi; }
-+  .appicon-icon-bg { color: $cc-att-pos-low; }
-+  &:hover {
-+    background-color: darken($cc-att-pos-mid, 5);
-+    .appicon-icon-fg { color: lighten($cc-att-pos-hi, 5); }
-+    .appicon-icon-bg { color: darken($cc-att-pos-low, 10); }
-   }
- }
- 
- .appicon-incomplete {
--  background-color: @cc-dark-warm-accent-mid;
--  .appicon-icon-fg { color: @cc-dark-warm-accent-hi; }
--  .appicon-icon-bg { color: @cc-dark-warm-accent-low; }
--  &:hover {
--    background-color: darken(@cc-dark-warm-accent-mid, 7);
--    .appicon-icon-fg { color: lighten(@cc-dark-warm-accent-hi, 5); }
--    .appicon-icon-bg { color: darken(@cc-dark-warm-accent-low, 10); }
-+  background-color: $cc-dark-warm-accent-mid;
-+  .appicon-icon-fg { color: $cc-dark-warm-accent-hi; }
-+  .appicon-icon-bg { color: $cc-dark-warm-accent-low; }
-+  &:hover {
-+    background-color: darken($cc-dark-warm-accent-mid, 7);
-+    .appicon-icon-fg { color: lighten($cc-dark-warm-accent-hi, 5); }
-+    .appicon-icon-bg { color: darken($cc-dark-warm-accent-low, 10); }
-   }
- }
- 
- .appicon-sync {
--  background-color: @cc-brand-mid;
-+  background-color: $cc-brand-mid;
-   .appicon-icon {
-     top: 2px;
--    color: @cc-brand-hi;
--  }
--  &:hover {
--    background-color: darken(@cc-brand-mid, 10);
--    .appicon-icon { color: lighten(@cc-brand-hi, 5); }
-+    color: $cc-brand-hi;
-+  }
-+  &:hover {
-+    background-color: darken($cc-brand-mid, 10);
-+    .appicon-icon { color: lighten($cc-brand-hi, 5); }
-   }
- }
- 
- .appicon-restore-as {
--  background-color: @cc-dark-cool-accent-mid;
-+  background-color: $cc-dark-cool-accent-mid;
-   .appicon-icon {
--    color: @cc-dark-cool-accent-hi;
--  }
--  &:hover {
--    background-color: darken(@cc-dark-cool-accent-mid, 5);
--    .appicon-icon { color: lighten(@cc-dark-cool-accent-hi, 5); }
-+    color: $cc-dark-cool-accent-hi;
-+  }
-+  &:hover {
-+    background-color: darken($cc-dark-cool-accent-mid, 5);
-+    .appicon-icon { color: lighten($cc-dark-cool-accent-hi, 5); }
-   }
- }
- 
- .appicon-settings {
--  background-color: @cc-neutral-low;
-+  background-color: $cc-neutral-low;
-   .appicon-icon {
--    color: @cc-neutral-hi;
--  }
--  &:hover {
--    background-color: darken(@cc-neutral-low, 5);
--    .appicon-icon { color: lighten(@cc-neutral-hi, 5); }
-+    color: $cc-neutral-hi;
-+  }
-+  &:hover {
-+    background-color: darken($cc-neutral-low, 5);
-+    .appicon-icon { color: lighten($cc-neutral-hi, 5); }
-   }
- }
- 
- .appicon-default {
-   background-color: white;
--  color: lighten(@cc-text, 30);
--  .box-shadow(0 0 10px 0 rgba(0, 0, 0, 0.2));
--  .appicon-icon { color: @cc-brand-mid; }
-+  color: lighten($cc-text, 30);
-+  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.2);
-+  .appicon-icon { color: $cc-brand-mid; }
-   &:hover {
-     background-color: darken(white, 5);
-   }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt
deleted file mode 100644
index eb166b40948b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_breadcrumbs.formplayer-common_breadcrumbs.style.diff.txt
+++ /dev/null
@@ -1,47 +0,0 @@
---- 
-+++ 
-@@ -2,30 +2,35 @@
-     position: sticky;
-     position: -webkit-sticky;
-     top: 0;
--    z-index: @zindex-navbar-cloudcare;
-+    z-index: $zindex-navbar-cloudcare;
- }
- 
--#breadcrumb-region .breadcrumb-text, .single-app-view .breadcrumb-text {
-+#breadcrumb-region .breadcrumb-item, .single-app-view .breadcrumb-item {
-     cursor: pointer;
- }
- 
- #breadcrumb-region .breadcrumb,
- .single-app-view .breadcrumb,
- .breadcrumb-form-container .breadcrumb {
--  background-color: @cc-brand-mid;
--  color: white;
--  .border-top-radius(0);
--  .border-bottom-radius(0);
--  .box-shadow(0 0 5px 2px rgba(0,0,0,.3));
-+  background-color: $cc-brand-mid;
-+  border-radius: 0;
-+  box-shadow: 0 0 5px 2px rgba(0,0,0,.3);
-   border: none;
- 
--  .breadcrumb-text {
-+  .breadcrumb-item {
-+    color: white;
-+
-     &:before {
-+      padding: 0 6px 0 0;
-       content: '\f054';
-       font-family: 'FontAwesome';
-     }
-+
-+    a {
-+      color: white;
-+    }
-   }
--  .breadcrumb-text:first-child {
-+  .breadcrumb-item:first-child {
-     &:before {
-       display: none;
-     }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_case.formplayer-common_case.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_case.formplayer-common_case.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt
deleted file mode 100644
index 3576d2bf71d4..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_form.formplayer-common_form.style.diff.txt
+++ /dev/null
@@ -1,17 +0,0 @@
---- 
-+++ 
-@@ -31,13 +31,6 @@
- }
- 
- .gr.repetition:not(:first-child) {
--    border-top: @cc-neutral-hi solid 1px;
-+    border-top: $cc-neutral-hi solid 1px;
-     padding-top: 20px;
- }
--
--.question-tile-row {
--  .gr {
--    padding-right: 20px !important;
--    padding-left: 20px !important;
--  }
--}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_formnav.formplayer-common_formnav.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_formnav.formplayer-common_formnav.style.diff.txt
deleted file mode 100644
index e40fc9accf08..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_formnav.formplayer-common_formnav.style.diff.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---- 
-+++ 
-@@ -22,7 +22,7 @@
- .formnav-container {
-   transition: width 1s;
-   width: 100%;
--  background-color: @cc-bg;
-+  background-color: $cc-bg;
-   box-sizing: border-box;
-   height: 33px;
-   padding: 0;
-@@ -33,15 +33,14 @@
-   line-height: 12px;
-   padding: 12px 17px 9px;
-   border: none;
--  color: @cc-brand-mid;
-+  color: $cc-brand-mid;
- 
--  .border-top-radius(0);
--  .border-bottom-radius(0);
--  .transition(background 1s);
-+  border-radius: 0;
-+  transition: background 1s;
- 
-   &:hover {
--    background-color: darken(@cc-bg, 5);
--    color: @cc-brand-mid;
-+    background-color: darken($cc-bg, 5);
-+    color: $cc-brand-mid;
-   }
- }
- 
-@@ -50,7 +49,7 @@
- }
- 
- .btn-formnav.disabled {
--  color: lighten(@cc-text, 50);
-+  color: lighten($cc-text, 50);
-   &:hover {
-     background-color: transparent;
-   }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_grid.formplayer-common_grid.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_markdown-table.formplayer-common_markdown-table.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_markdown-table.formplayer-common_markdown-table.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_mixins.formplayer-common_mixins.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_mixins.formplayer-common_mixins.style.diff.txt
deleted file mode 100644
index f3ffa05dc34b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_mixins.formplayer-common_mixins.style.diff.txt
+++ /dev/null
@@ -1,59 +0,0 @@
---- 
-+++ 
-@@ -1,37 +1,37 @@
--.make-module-size(@icon-size) {
-+@mixin make-module-size($icon-size) {
-   .module-icon-image,
-   .module-icon-container {
--    width: @icon-size;
--    height: @icon-size;
-+    width: $icon-size;
-+    height: $icon-size;
-   }
-   .module-icon-container {
--    .border-top-radius(@icon-size/2);
--    .border-bottom-radius(@icon-size/2);
-+    border-radius: $icon-size / 2;
-     .module-icon {
--      font-size: @icon-size * 0.5;
--      line-height: @icon-size;
-+      font-size: $icon-size * 0.5;
-+      line-height: $icon-size;
-+      max-width: 100%;
-+      max-height: 100%;
-     }
-   }
-   .module-column-icon {
--    width: @icon-size + 0.4*@icon-size;
--    height: @icon-size + 0.4*@icon-size;
-+    width: $icon-size + 0.4 * $icon-size;
-+    height: $icon-size + 0.4 * $icon-size;
-   }
--  @control-size: 0.8*@icon-size;
-+  $control-size: 0.8*$icon-size;
-   .module-audio-control, .module-delete-control {
--    width: @control-size;
--    height: @control-size;
--    right: (0.4*@icon-size)/2;
--    margin-top: -@control-size/2;
-+    width: $control-size;
-+    height: $control-size;
-+    right: (0.4 * $icon-size) / 2;
-+    margin-top: -$control-size / 2;
- 
--    .border-top-radius(@control-size/2);
--    .border-bottom-radius(@control-size/2);
-+    border-radius: $control-size / 2;
-   }
-   .module-audio-icon, .module-delete-icon {
--    font-size: @control-size * 0.5;
--    line-height: @control-size;
-+    font-size: $control-size * 0.5;
-+    line-height: $control-size;
-   }
-   .module-column-name-audio h3,
-   .module-column-name-session h3 {
--    margin-right: @control-size + 0.4*@icon-size !important;
-+    margin-right: $control-size + 0.4 * $icon-size !important;
-   }
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
deleted file mode 100644
index 7f2058788f16..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_module.formplayer-common_module.style.diff.txt
+++ /dev/null
@@ -1,204 +0,0 @@
---- 
-+++ 
-@@ -3,14 +3,12 @@
-     border: none;
-     text-align: left;
-     vertical-align: middle;
--    .transition(background 1s);
--  }
--  .module-column-name {
--    position: relative;
--  }
-+    transition: background 1s;
-+  }
-+
-   tr:hover {
-     .module-column {
--      background-color: @cc-bg;
-+      background-color: $cc-bg;
-     }
-   }
- }
-@@ -44,7 +42,7 @@
- }
- 
- .module-icon-container {
--  background-color: @cc-neutral-mid;
-+  background-color: $cc-neutral-mid;
-   text-align: center;
-   margin: 0 auto;
- 
-@@ -54,15 +52,15 @@
- }
- 
- .module-icon-user {
--  background-color: @cc-dark-cool-accent-mid;
-+  background-color: $cc-dark-cool-accent-mid;
-   .module-icon {
--    color: @cc-dark-cool-accent-hi;
-+    color: $cc-dark-cool-accent-hi;
-   }
- }
- 
- .module-audio-control, .module-delete-control {
-   text-align: center;
--  .transition(background 1s);
-+  transition: background 1s;
-   position: absolute;
-   top: 50%;
- 
-@@ -70,29 +68,29 @@
- 
- .module-audio-control {
-   .module-audio-icon {
--    color: @cc-light-cool-accent-mid;
-+    color: $cc-light-cool-accent-mid;
-   }
-   &:hover {
--    background-color: @cc-light-cool-accent-hi;
-+    background-color: $cc-light-cool-accent-hi;
-   }
- }
- 
- .module-delete-control {
-   .module-delete-icon {
--    color: @cc-att-neg-mid;
-+    color: $cc-att-neg-mid;
-   }
-   &:hover {
--    background-color: @cc-att-neg-hi;
--  }
--}
--
--.make-module-size(45px);
-+    background-color: $cc-att-neg-hi;
-+  }
-+}
-+
-+@include make-module-size(45px);
- .module-column-name h3 {
-   font-size: 16px;
- }
- 
--@media (min-width: @screen-md) {
--  .make-module-size(80px);
-+@include media-breakpoint-up(lg) {
-+  @include make-module-size(80px);
-   .module-column-name h3 {
-     font-size: 20px;
-   }
-@@ -107,7 +105,7 @@
- }
- 
- .module-table .module-case-list-header {
--  background-color: @cc-brand-low;
-+  background-color: $cc-brand-low;
-   color: white;
-   padding: 20px 10px;
-   cursor: default;
-@@ -127,6 +125,7 @@
- .module-table .module-case-list-column-checkbox {
-   cursor: default;
-   width: 35px;
-+  border: 0;
-   vertical-align: middle;
- }
- 
-@@ -135,31 +134,15 @@
- }
- 
- .module-table-case-list tbody tr:nth-child(even) > td {
--  background-color: @cc-bg;
-+  background-color: $cc-bg;
- }
- 
- .module-table-case-list tbody tr:hover > td {
--  background-color: darken(@cc-bg, 5);
-+  background-color: darken($cc-bg, 5);
- }
- 
- .module-search-container, .case-list-actions {
-   padding: 10px;
--}
--
--.module-go-container {
--  margin-top: 17px;
--}
--
--.pagination-container {
--  width: inherit;
--  padding-left: 17px;
--  padding-right: 17px;
--  min-height: 76px;
--}
--
--.module-per-page-container {
--  display: inline-block;
--  margin-top: 17px;
- }
- 
- .module-table-case-list tbody tr:hover .module-case-list-column-empty {
-@@ -188,13 +171,13 @@
-   }
- 
-   th, td {
--    background-color: @cc-brand-hi;
--    color: @cc-brand-low;
-+    background-color: $cc-brand-hi;
-+    color: $cc-brand-low;
-   }
- }
- 
- .module-banner {
--  background-color: @cc-light-warm-accent-hi;
-+  background-color: $cc-light-warm-accent-hi;
-   color: black;
-   padding-top: 1rem;
-   padding-bottom: 1rem;
-@@ -206,16 +189,16 @@
- 
- .module-table-case-detail tbody tr:nth-child(odd) {
-   th, td {
--    background-color: darken(@cc-brand-hi, 3);
-+    background-color: darken($cc-brand-hi, 3);
-   }
- }
- 
- .module-case-detail-tabs .nav-tabs li a {
-   text-transform: uppercase;
-   font-weight: bold;
--  .transition(1s all);
-+  transition: 1s all;
-   &:hover {
--    background-color: @cc-brand-hi;
-+    background-color: $cc-brand-hi;
-     border-top-color: transparent;
-     border-left-color: transparent;
-     border-right-color: transparent;
-@@ -224,7 +207,7 @@
- 
- .module-case-detail-continue {
-   width: 100%;
--  .transition(.5s all);
-+  transition: .5s all;
- }
- 
- .module-case-detail-btn {
-@@ -269,7 +252,7 @@
-   bottom: 0;
-   position: fixed;
-   background-color: rgba(255, 255, 255, 0.9);
--  z-index: @zindex-formplayer-progress;
-+  z-index: $zindex-formplayer-progress;
-   text-align: center;
- }
- 
-@@ -299,7 +282,7 @@
-   }
- }
- 
--@media(max-width: @screen-sm-max) {
-+@include media-breakpoint-down(lg) {
-   .module-case-list-table-container {
-     width: 100%;
-     overflow-x: scroll;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_navigation.formplayer-common_navigation.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_navigation.formplayer-common_navigation.style.diff.txt
deleted file mode 100644
index 64b97b229732..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_navigation.formplayer-common_navigation.style.diff.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- 
-+++ 
-@@ -6,15 +6,6 @@
-     cursor: wait;
- }
- 
--nav#sessions > ul > li >  a.close{
--  z-index:1000;
--}
--
--nav#sessions > ul > li.nav-header {
--    color: #6c6c6c;
--}
--
--
- #hq-navigation .navbar {
-   margin-bottom: 0;
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_notifications.formplayer-common_notifications.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_notifications.formplayer-common_notifications.style.diff.txt
deleted file mode 100644
index 54f8992e18b9..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_notifications.formplayer-common_notifications.style.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -2,7 +2,7 @@
-   background: transparent;
- 
-   .alert {
--    .box-shadow(0 0 8px 1px rgba(0, 0, 0, 0.18));
-+    box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.18);
-   }
- }
- 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_paginate.formplayer-common_paginate.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_paginate.formplayer-common_paginate.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_request.formplayer-common_request.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_request.formplayer-common_request.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_version.formplayer-common_version.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt
deleted file mode 100644
index 083d7a98ae28..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-common_webforms.formplayer-common_webforms.style.diff.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- 
-+++ 
-@@ -37,8 +37,6 @@
- }
- 
- .widget {
--  margin-right: 20px;
--
-   button p {
-     margin-bottom: 0;
-   }
-@@ -68,7 +66,7 @@
- .required-group .gr-header .caption::before {
-   content: '*';
-   font-weight: bold;
--  color: #c0392b;
-+  color: $danger;
-   margin: 0 3px;
-   float: left;
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp-main.formplayer-webapp-main.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp-main.formplayer-webapp-main.style.diff.txt
deleted file mode 100644
index e9068d51f7df..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp-main.formplayer-webapp-main.style.diff.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- 
-+++ 
-@@ -1,5 +1,5 @@
--@import '../../hqwebapp/less/_hq/includes/variables.less';
--@import '../../hqwebapp/less/_hq/includes/mixins.less';
-+@import "../../hqwebapp/scss/commcarehq/variables";
-+@import "../../hqwebapp/scss/commcarehq/mixins";
- 
- /**
- These are all the styles relevant to the full-screen version of formplayer which
-@@ -9,6 +9,8 @@
- If you want to make changes relevant for BOTH app preview and the main
- formplayer, please make changes to the cloudcare styles.
- **/
-+
-+$breadcrumb-height-cloudcare: 46px;
- 
- @import "formplayer-webapp/content";
- @import "formplayer-webapp/navbar";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp.formplayer-webapp.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp.formplayer-webapp.style.diff.txt
deleted file mode 100644
index 6e391b4aa80a..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp.formplayer-webapp.style.diff.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,7 @@
--@b3-import-variables: '../../../../../../../../node_modules/bootstrap/less/variables';
--@b3-import-mixins: '../../../../../../../../node_modules/bootstrap/less/mixins';
-+@import "functions";
-+@import "../../hqwebapp/scss/commcarehq/variables";
-+@import "variables";
-+@import "../../hqwebapp/scss/commcarehq/variables_bootstrap3";
-+@import "mixins";   // media-breakpoint-up and media-breakpoint-down
- 
- @import "formplayer-webapp-main";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt
deleted file mode 100644
index 9fbc5aa9a2e3..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_breadcrumbs.formplayer-webapp_breadcrumbs.style.diff.txt
+++ /dev/null
@@ -1,50 +0,0 @@
---- 
-+++ 
-@@ -1,16 +1,10 @@
- #breadcrumb-region .breadcrumb,
- .single-app-view .breadcrumb,
- .breadcrumb-form-container .breadcrumb {
--  font-size: 2rem;
--  padding-top: 1rem;
--  padding-bottom: 1rem;
-+  font-size: 1.2rem;
-   margin-top: -1px;
--  .breadcrumb-text {
--    &.js-home {
--      margin-right: -5px;
--    }
-+  .breadcrumb-item {
-     &:before {
--      padding: 0 6px 0 12px;
-       color: #ffffff;
-       font-size: 12px;
-       vertical-align: top;
-@@ -23,16 +17,16 @@
- }
- 
- #breadcrumb-region .breadcrumb-nav {
--  background-color: @cc-brand-mid;
-+  background-color: $cc-brand-mid;
-   box-shadow: 0 0 5px 2px rgba(0,0,0,.3);
-   display: flex;
-   align-items: center;
--  height: @breadcrumb-height-cloudcare;
-+  height: $breadcrumb-height-cloudcare;
- 
-   .breadcrumb {
-     box-shadow: none;
-     background-color: unset;
--    padding: 10px 10px 0 10px;
-+    padding: 0 0 0 10px;
-     margin-bottom: 0;
-     flex-grow: 1;
-   }
-@@ -52,7 +46,7 @@
-     font-size: 12px;
-     margin-bottom: 0px;
-     padding-left: 33px;
--    .breadcrumb-text {
-+    .breadcrumb-item {
-       &:before {
-         font-size: 7px;
-         line-height: 17px;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt
deleted file mode 100644
index edb60a083e26..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_case-tile.formplayer-webapp_case-tile.style.diff.txt
+++ /dev/null
@@ -1,110 +0,0 @@
---- 
-+++ 
-@@ -2,7 +2,7 @@
-   padding-left: 1.5rem;
-   padding-right: 1.5rem;
-   background-color: white;
--  @media (max-width: @screen-sm-max) {
-+  @include media-breakpoint-down(lg) {
-     min-height: 70px;
-   }
-   h1 {
-@@ -15,7 +15,7 @@
- }
- 
- #case-list-search-controls {
--  background-color: @cc-bg;
-+  background-color: $cc-bg;
-   margin: 0 5px 5px 5px;
-   display: flex;
-   justify-content: space-between;
-@@ -70,7 +70,7 @@
- 
- #scroll-to-bottom {
-   position: fixed;
--  z-index: @zindex-formplayer-scroll-to-bottom;
-+  z-index: $zindex-formplayer-scroll-to-bottom;
-   bottom: 45px;
-   left: calc(100vw - 80px);
- }
-@@ -99,12 +99,12 @@
- @media screen {
-   .case-tile-container {
-     position: sticky;
--    top: @breadcrumb-height-cloudcare;
--    z-index: @zindex-persistent-tile-cloudcare;
-+    top: $breadcrumb-height-cloudcare;
-+    z-index: $zindex-persistent-tile-cloudcare;
- 
-     #persistent-case-tile .persistent-sticky {
-       box-shadow: 0 0 10px 2px rgba(0, 0, 0, 0.1);
--      border-bottom: 1px solid @cc-neutral-hi;
-+      border-bottom: 1px solid $cc-neutral-hi;
-     }
-   }
- }
-@@ -131,9 +131,9 @@
- 
-   // todo: determine appropriate nesting
-   #module-case-list-map {
--    height: calc(~"100vh - 65px");
--
--    @media (max-width: @screen-sm-max) {
-+    height: calc(100vh - 65px);
-+
-+    @include media-breakpoint-down(lg) {
-       height: 25vh;
-     }
- 
-@@ -142,20 +142,21 @@
-       /* Horizontally center the text (icon) */
-       line-height: 12px;
-       /* Vertically center the text (icon) */
--      color: @call-to-action-hi;
--      text-shadow: -1px 0 @call-to-action-low, 0 1px @call-to-action-low, 1px 0 @call-to-action-low, 0 -1px @call-to-action-low;
-+      color: $call-to-action-hi;
-+      text-shadow: -1px 0 $call-to-action-low, 0 1px $call-to-action-low, 1px 0 $call-to-action-low, 0 -1px $call-to-action-low;
-     }
-   }
- 
-   .list-cell-wrapper-style {
-+    display: block;         // override .card's display: flex rule
-     margin: 10px 5px 0 5px;
-     border-collapse: collapse;
-     vertical-align: top;
--    background-color: @cc-bg;
-+    background-color: $cc-bg;
-     container-type: inline-size;
- 
-     a {
--      color: @cc-brand-mid;
-+      color: $cc-brand-mid;
-     }
- 
-     .module-icon,
-@@ -165,14 +166,14 @@
-     }
- 
-     &:hover {
--      background-color: darken(@cc-bg, 5);
-+      background-color: darken($cc-bg, 5);
-       transition: background 0.6s;
-     }
-   }
- 
-   .highlighted-case {
-     border-style: solid;
--    border-color: @cc-brand-mid;
-+    border-color: $cc-brand-mid;
-   }
- 
-   .case-tile-group{
-@@ -205,7 +206,7 @@
-     }
- 
-     .list-cell-wrapper-style {
--      border: 1px solid @cc-bg;
-+      border: 1px solid $cc-bg;
-       break-inside: avoid;
-     }
-   }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt
deleted file mode 100644
index 2c08374c8af6..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_content.formplayer-webapp_content.style.diff.txt
+++ /dev/null
@@ -1,50 +0,0 @@
---- 
-+++ 
-@@ -1,6 +1,6 @@
- body {
-   overflow-x: hidden;
--  background-color: @cc-bg;
-+  background-color: $cc-bg;
- }
- 
- .cloudcare-home-content {
-@@ -13,29 +13,26 @@
- }
- 
- .page-header {
--  border-bottom: none;
-   padding: 14px 8px 7px;
--  margin: 0;
-   h1 {
--    font-size: 2rem;
-+    font-size: 1.5rem;
-     text-transform: uppercase;
--    color: @cc-neutral-mid;
--    padding-left: 1.5rem;
-+    color: $cc-neutral-mid;
-+    padding-left: 12px;
-     font-weight: bold;
-     margin-top: 0px;
-   }
- }
- 
-+.page-header-apps {
-+  padding-left: 0;
-+  h1 {
-+    padding-left: 0;
-+  }
-+}
-+
- .page-footer {
-   padding: 14px 8px 7px;
--}
--
--.page-header-apps {
--  padding-left: 2px;
--}
--
--.page-header-apps h1 {
--  padding-left: 0;
- }
- 
- #content-container {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
deleted file mode 100644
index 17a35c24b1e3..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_form.formplayer-webapp_form.style.diff.txt
+++ /dev/null
@@ -1,284 +0,0 @@
---- 
-+++ 
-@@ -1,15 +1,15 @@
--@form-text-indent: 23px;
--@form-text-size: 16px; // If updating, update .checkbox, .radio margin-top to fit
--@group-indent: 15px;
-+$form-text-indent: 23px;
-+$form-text-size: 16px; // If updating, update .checkbox, .radio margin-top to fit
-+$group-indent: 15px;
- 
- .form-container {
-   background-color: white;
--  .box-shadow(0 0 10px 2px rgba(0,0,0,.1));
-+  box-shadow: 0 0 10px 2px rgba(0,0,0,.1);
-   margin-bottom: 2rem;
--  font-size: @form-text-size;   // Don't overshadow inputs
-+  font-size: $form-text-size;   // Don't overshadow inputs
- 
-   .page-header h1 {
--    padding-left: @form-text-indent - 8px;
-+    padding-left: $form-text-indent - 8px;
-   }
- 
-   .controls {
-@@ -17,24 +17,17 @@
-     padding-top: 3px;
-   }
- 
--  .form-control {
--    font-size: @form-text-size;
-+  .form-control, .form-select {
-+    font-size: $form-text-size;
-   }
- 
-   .form-actions {
--    margin: 30px 0 0 0;
--    &.form-group {
--      margin-left: -@form-text-indent;
--      margin-right: -@form-text-indent;
--    }
--
--    background-color: @call-to-action-extra-hi;
--    .border-bottom-radius(0);
-+    margin: 30px -$form-text-indent 0 -$form-text-indent;
- 
-     .submit .btn {
-       font-size: 20px;
-       padding: 13px 24px;
--      .transition(all .5s);
-+      transition: all .5s;
-     }
-   }
- 
-@@ -42,7 +35,7 @@
-     position: sticky;
-     /* Puts the anchored submit button in front of form elements that use bootstrap's .form-control,
-        which adds z-index of 2 (3 when focused) */
--    z-index: @zindex-formplayer-anchored-submit;
-+    z-index: $zindex-formplayer-anchored-submit;
-   }
- 
-   // Bootstrap introduces -10px left/right margin for row classes. This causes element to overflow parent.
-@@ -51,43 +44,43 @@
-     margin-right: 0px;
-   }
-   .question-container {
--    padding-left: @form-text-indent;
--    padding-right: @form-text-indent;
--  }
--
--  .form-group {
-+    padding-left: $form-text-indent;
-+    padding-right: $form-text-indent;
-+  }
-+
-+  .q {
-     margin-left: 0px;
-     margin-right: 0px;
--    .caption.control-label {
-+    .caption {
-       display: block;
-     }
-   }
- 
-   .group-body {
--    margin-left: @group-indent;
--    margin-right: @group-indent;
--  }
--
--  .gr.panel {
-+    margin-left: $group-indent;
-+    margin-right: $group-indent;
-+  }
-+
-+  .gr.card {
-     border-radius: 0px;
-   }
- 
--  .rep.panel {
-+  .rep.card {
-     border-radius: 0px;
-   }
- 
--  .col-sm-12,
--  .col-sm-11,
--  .col-sm-10,
--  .col-sm-9,
--  .col-sm-8,
--  .col-sm-7,
--  .col-sm-6,
--  .col-sm-5,
--  .col-sm-4,
--  .col-sm-3,
--  .col-sm-2,
--  .col-sm-1 {
-+  .col-md-12,
-+  .col-md-11,
-+  .col-md-10,
-+  .col-md-9,
-+  .col-md-8,
-+  .col-md-7,
-+  .col-md-6,
-+  .col-md-5,
-+  .col-md-4,
-+  .col-md-3,
-+  .col-md-2,
-+  .col-md-1 {
-     &:first-child {
-       padding-left: 0;
-     }
-@@ -96,29 +89,29 @@
-     }
-   }
- 
--  .panel-body {
--    @media (max-width: @screen-xs-max) {
-+  .card-body {
-+    @include media-breakpoint-down(md) {
-       padding-left: 0px;
-       padding-right: 0px;
-     }
-   }
- 
-   .stripe-repeats {
--    > .row, .panel-body > .children > .row {
-+    > .row, .card-body > .children > .row {
-       &:nth-of-type(odd) {
--        background-color: @table-bg-accent;
-+        background-color: $table-accent-bg;
-       }
-       &:nth-of-type(even) {
-         background-color: white;
-       }
-       &:hover {
--        background-color: @table-bg-hover;
-+        background-color: $table-hover-bg;
-       }
-     }
-   }
- 
-   .group-border {
--    border: solid 1px @cc-neutral-mid;
-+    border: solid 1px $cc-neutral-mid;
-     border-radius: 8px;
-     margin: 2px;
-     padding-top: 5px;
-@@ -140,7 +133,7 @@
-     }
-   }
- 
--  .panel-heading {
-+  .card-header {
-     border-top-left-radius: 0px;
-     border-top-right-radius: 0px;
-   }
-@@ -159,17 +152,17 @@
-     display: none;
-   }
- 
--  .form-group.required {
--    .transition(all .5s);
-+  .q.required {
-+    transition: all .5s;
-     margin-bottom: 0;
-     label:before {
-       display: none;
-     }
-   }
- 
--  .form-group.required.on {
--    background-color: @cc-att-neg-hi;
--    border: 10px solid @cc-att-neg-mid;
-+  .q.required.on {
-+    background-color: $cc-att-neg-hi;
-+    border: 10px solid $cc-att-neg-mid;
-     border-bottom: none;
-     padding-top: 10px;
-     padding-bottom: 10px;
-@@ -183,13 +176,13 @@
-   .form-group-required-label {
-     display: block;
-     opacity: 0;
--    .transition(all .5s);
-+    transition: all .5s;
-   }
- 
-   .form-group-required-label.on {
-     opacity: 100;
-     font-size: 1.6rem;
--    background-color: @cc-att-neg-mid;
-+    background-color: $cc-att-neg-mid;
-     color: white;
-     width: auto;
-     line-height: 14px;
-@@ -204,6 +197,10 @@
- }
- 
- @media print {
-+  #content-container {
-+    max-width: none;
-+  }
-+
-   .form-container.print-container {
-     margin: 0px;
-     .page-header {
-@@ -211,14 +208,14 @@
-     }
-   }
- 
--  .q.form-group {
-+  .q {
-     break-inside: avoid;
-   }
- 
--  .panel.panel-default.last,
--  .panel.panel-default.last *,
--  .q.form-group.last,
--  .q.form-group.last * {
-+  .card.last,
-+  .card.last *,
-+  .q.last,
-+  .q.last * {
-     margin-bottom: 0px;
-     padding-bottom: 0px;
-     .widget-container {
-@@ -241,7 +238,7 @@
- .question-tile-row {
-   display: flex;
-   align-items: start;
--  * .form-group, * p, * .control-label {
-+  * .q, * p, * .caption {
-     padding-top: 0px !important;
-     padding-bottom: 0px !important;
-     margin-top: 0px !important;
-@@ -249,13 +246,6 @@
-   }
- }
- 
--.question-tile-row {
--  .gr {
--    padding-right: 0px !important;
--    padding-left: 0px !important;
--  }
--}
--
- .gr-has-no-nested-questions {
-   display: none;
- }
-@@ -268,3 +258,15 @@
-   padding-top: 0px !important;
-   padding-bottom: 7px;
- }
-+
-+#next-error {
-+  position: fixed;
-+  bottom: 35px;
-+}
-+
-+.my-05em-for-hs {
-+    h1, h2, h3, h4, h5, h6 {
-+        margin-top: 0.5em !important;
-+        margin-bottom: 0.5em !important;
-+    }
-+}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_formnav.formplayer-webapp_formnav.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_formnav.formplayer-webapp_formnav.style.diff.txt
deleted file mode 100644
index 641293d6b59a..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_formnav.formplayer-webapp_formnav.style.diff.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 
-+++ 
-@@ -17,8 +17,7 @@
-   float: right;
-   font-size: 1.9rem;
- 
--  .transition(all 1s);
-+  transition: all 1s;
- 
--  .border-top-radius(0);
--  .border-bottom-radius(0);
-+  border-radius: 0;
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_leaflet.formplayer-webapp_leaflet.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_leaflet.formplayer-webapp_leaflet.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_menu.formplayer-webapp_menu.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_menu.formplayer-webapp_menu.style.diff.txt
deleted file mode 100644
index f2ab96731ffd..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_menu.formplayer-webapp_menu.style.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -5,7 +5,7 @@
- #menu-region .module-menu-container,
- #menu-region .module-case-list-container {
-   background-color: white;
--  .box-shadow(0 0 10px 2px rgba(0,0,0,.1));
-+  box-shadow: 0 0 10px 2px rgba(0,0,0,.1);
-   margin-bottom: 2rem;
- }
- 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_module.formplayer-webapp_module.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_module.formplayer-webapp_module.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_navbar.formplayer-webapp_navbar.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_navbar.formplayer-webapp_navbar.style.diff.txt
deleted file mode 100644
index 7c21a26de0e1..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_navbar.formplayer-webapp_navbar.style.diff.txt
+++ /dev/null
@@ -1,35 +0,0 @@
---- 
-+++ 
-@@ -1,17 +1,17 @@
--@cloudcare-nav-height: 30px;
-+$cloudcare-nav-height: 30px;
- 
- .navbar-cloudcare {
-   margin-bottom: 0;
-   border: none;
--  background-color: @cc-brand-low;
--  min-height: @cloudcare-nav-height;
--  .transition(1s all);
--  z-index: @zindex-navbar-cloudcare;
-+  background-color: $cc-brand-low;
-+  min-height: $cloudcare-nav-height;
-+  transition: 1s all;
-+  z-index: $zindex-navbar-cloudcare;
- }
- 
- .navbar-cloudcare .navbar-brand {
--  color: @cc-bg;
--  height: @cloudcare-nav-height;
-+  color: $cc-bg;
-+  height: $cloudcare-nav-height;
-   padding: 6.5px 15px;
-   text-transform: uppercase;
-   font-size: 11px;
-@@ -22,6 +22,7 @@
-   margin: 0;
- 
-   > li > a {
-+    color: $cc-bg;
-     padding-top: 6.5px;
-     padding-bottom: 6.5px;
-   }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt
deleted file mode 100644
index 96cdd303aba2..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_print-general.formplayer-webapp_print-general.style.diff.txt
+++ /dev/null
@@ -1,272 +0,0 @@
---- 
-+++ 
-@@ -1,194 +1,194 @@
--// Renders Bootstrap as "small" layout when printing
-+// Renders Bootstrap as "medium" layout when printing
- @media print {
--    .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-+    .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-       float: left;
-     }
--    .col-sm-12 {
-+    .col-md-12 {
-       width: 100%;
-     }
--    .col-sm-11 {
-+    .col-md-11 {
-       width: 91.66666667%;
-     }
--    .col-sm-10 {
-+    .col-md-10 {
-       width: 83.33333333%;
-     }
--    .col-sm-9 {
-+    .col-md-9 {
-       width: 75%;
-     }
--    .col-sm-8 {
-+    .col-md-8 {
-       width: 66.66666667%;
-     }
--    .col-sm-7 {
-+    .col-md-7 {
-       width: 58.33333333%;
-     }
--    .col-sm-6 {
-+    .col-md-6 {
-       width: 50%;
-     }
--    .col-sm-5 {
-+    .col-md-5 {
-       width: 41.66666667%;
-     }
--    .col-sm-4 {
-+    .col-md-4 {
-       width: 33.33333333%;
-     }
--    .col-sm-3 {
-+    .col-md-3 {
-       width: 25%;
-     }
--    .col-sm-2 {
-+    .col-md-2 {
-       width: 16.66666667%;
-     }
--    .col-sm-1 {
-+    .col-md-1 {
-       width: 8.33333333%;
-     }
--    .col-sm-pull-12 {
-+    .col-md-pull-12 {
-       right: 100%;
-     }
--    .col-sm-pull-11 {
-+    .col-md-pull-11 {
-       right: 91.66666667%;
-     }
--    .col-sm-pull-10 {
-+    .col-md-pull-10 {
-       right: 83.33333333%;
-     }
--    .col-sm-pull-9 {
-+    .col-md-pull-9 {
-       right: 75%;
-     }
--    .col-sm-pull-8 {
-+    .col-md-pull-8 {
-       right: 66.66666667%;
-     }
--    .col-sm-pull-7 {
-+    .col-md-pull-7 {
-       right: 58.33333333%;
-     }
--    .col-sm-pull-6 {
-+    .col-md-pull-6 {
-       right: 50%;
-     }
--    .col-sm-pull-5 {
-+    .col-md-pull-5 {
-       right: 41.66666667%;
-     }
--    .col-sm-pull-4 {
-+    .col-md-pull-4 {
-       right: 33.33333333%;
-     }
--    .col-sm-pull-3 {
-+    .col-md-pull-3 {
-       right: 25%;
-     }
--    .col-sm-pull-2 {
-+    .col-md-pull-2 {
-       right: 16.66666667%;
-     }
--    .col-sm-pull-1 {
-+    .col-md-pull-1 {
-       right: 8.33333333%;
-     }
--    .col-sm-pull-0 {
-+    .col-md-pull-0 {
-       right: auto;
-     }
--    .col-sm-push-12 {
-+    .col-md-push-12 {
-       left: 100%;
-     }
--    .col-sm-push-11 {
-+    .col-md-push-11 {
-       left: 91.66666667%;
-     }
--    .col-sm-push-10 {
-+    .col-md-push-10 {
-       left: 83.33333333%;
-     }
--    .col-sm-push-9 {
-+    .col-md-push-9 {
-       left: 75%;
-     }
--    .col-sm-push-8 {
-+    .col-md-push-8 {
-       left: 66.66666667%;
-     }
--    .col-sm-push-7 {
-+    .col-md-push-7 {
-       left: 58.33333333%;
-     }
--    .col-sm-push-6 {
-+    .col-md-push-6 {
-       left: 50%;
-     }
--    .col-sm-push-5 {
-+    .col-md-push-5 {
-       left: 41.66666667%;
-     }
--    .col-sm-push-4 {
-+    .col-md-push-4 {
-       left: 33.33333333%;
-     }
--    .col-sm-push-3 {
-+    .col-md-push-3 {
-       left: 25%;
-     }
--    .col-sm-push-2 {
-+    .col-md-push-2 {
-       left: 16.66666667%;
-     }
--    .col-sm-push-1 {
-+    .col-md-push-1 {
-       left: 8.33333333%;
-     }
--    .col-sm-push-0 {
-+    .col-md-push-0 {
-       left: auto;
-     }
--    .col-sm-offset-12 {
-+    .col-md-offset-12 {
-       margin-left: 100%;
-     }
--    .col-sm-offset-11 {
-+    .col-md-offset-11 {
-       margin-left: 91.66666667%;
-     }
--    .col-sm-offset-10 {
-+    .col-md-offset-10 {
-       margin-left: 83.33333333%;
-     }
--    .col-sm-offset-9 {
-+    .col-md-offset-9 {
-       margin-left: 75%;
-     }
--    .col-sm-offset-8 {
-+    .col-md-offset-8 {
-       margin-left: 66.66666667%;
-     }
--    .col-sm-offset-7 {
-+    .col-md-offset-7 {
-       margin-left: 58.33333333%;
-     }
--    .col-sm-offset-6 {
-+    .col-md-offset-6 {
-       margin-left: 50%;
-     }
--    .col-sm-offset-5 {
-+    .col-md-offset-5 {
-       margin-left: 41.66666667%;
-     }
--    .col-sm-offset-4 {
-+    .col-md-offset-4 {
-       margin-left: 33.33333333%;
-     }
--    .col-sm-offset-3 {
-+    .col-md-offset-3 {
-       margin-left: 25%;
-     }
--    .col-sm-offset-2 {
-+    .col-md-offset-2 {
-       margin-left: 16.66666667%;
-     }
--    .col-sm-offset-1 {
-+    .col-md-offset-1 {
-       margin-left: 8.33333333%;
-     }
--    .col-sm-offset-0 {
-+    .col-md-offset-0 {
-       margin-left: 0%;
-     }
--    .visible-xs {
--      display: none !important;
--    }
--    .hidden-xs {
--      display: block !important;
--    }
--    table.hidden-xs {
--      display: table;
--    }
--    tr.hidden-xs {
--      display: table-row !important;
--    }
--    th.hidden-xs,
--    td.hidden-xs {
--      display: table-cell !important;
--    }
--    .hidden-xs.hidden-print {
-+    .visible-sm {
-       display: none !important;
-     }
-     .hidden-sm {
-+      display: block !important;
-+    }
-+    table.hidden-sm {
-+      display: table;
-+    }
-+    tr.hidden-sm {
-+      display: table-row !important;
-+    }
-+    th.hidden-sm,
-+    td.hidden-sm {
-+      display: table-cell !important;
-+    }
-+    .hidden-sm.hidden-print {
-       display: none !important;
-     }
--    .visible-sm {
-+    .hidden-md {
-+      display: none !important;
-+    }
-+    .visible-md {
-       display: block !important;
-     }
--    table.visible-sm {
-+    table.visible-md {
-       display: table;
-     }
--    tr.visible-sm {
-+    tr.visible-md {
-       display: table-row !important;
-     }
--    th.visible-sm,
--    td.visible-sm {
-+    th.visible-md,
-+    td.visible-md {
-       display: table-cell !important;
-     }
--  }+  }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
deleted file mode 100644
index 78f48449c2f1..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_query.formplayer-webapp_query.style.diff.txt
+++ /dev/null
@@ -1,83 +0,0 @@
---- 
-+++ 
-@@ -1,20 +1,23 @@
- .full-width {
-   width: 100%;
-+  margin-left: 0;
-+  margin-right: 0;
-+  max-width: none;  // clear any max-widths set by bootstrap, such as in .container
- }
- 
- .sidebar-push {
--  @media (min-width: @screen-md-min) {
-+  @include media-breakpoint-up(lg) {
-     margin-left: 310px;
-   }
- }
- 
- #sidebar-region {
-   background: transparent;
--  @media (min-width: @screen-md-min) {
-+  @include media-breakpoint-up(lg) {
-     width: 300px;
-     position: absolute;
-   }
--  @media (max-width: @screen-sm-max) {
-+  @include media-breakpoint-down(lg) {
-     max-width: 600px;
-     margin: auto;
-   }
-@@ -66,35 +69,39 @@
- 
- .query-description {
-   a {
--    color: @cc-brand-mid;
-+    color: $cc-brand-mid;
-   }
-   a:hover {
--    color: @cc-brand-low;
-+    color: $cc-brand-low;
-   }
--}
--
--.query-caption.required .control-label::before, .search-query-group-header.required .search-query-group-header-label::before {
--  content: '*';
--  font-weight: bold;
--  color: #c0392b;
--  margin: 0 3px;
--  float: left;
- }
- 
- .search-query-group-header-label {
-   font-size: larger;
- }
- 
--.search-query-group {
--  background-color: @cc-bg;
-+.table .search-query-group {   // .table needed for specificity, to override .table stylings
-+  background-color: $cc-bg;
-+  border: none;
- }
- 
- #query-group-content > tr {
-   background-color: white;
-+
-+  td {
-+    border: none;
-+  }
- }
- 
--#query-properties td {
--  border-top: 0px;
-+#query-properties {
-+  > tr:nth-of-type(odd) > :not(.search-query-group) {
-+    background-color: $light;
-+  }
-+
-+  td {
-+    --bstable-bg-type: none;
-+    border-top: 0px;
-+  }
- }
- 
- .search-query-group .table {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_version.formplayer-webapp_version.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/formplayer-webapp_version.formplayer-webapp_version.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt
index 28c2fe3ae57c..920cf155f13e 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/forms._forms.style.diff.txt
@@ -360,7 +360,7 @@
  }
  
  .form-hide-actions .form-actions {
-@@ -361,15 +12,34 @@
+@@ -361,21 +12,34 @@
    .validationMessage {
      display: block;
      padding-top: 8px;
@@ -376,19 +376,23 @@
 -  float: none;
 -  position: initial;
 -  width: 13px;
--}+.help-block,
++.help-block,
 +p.help-block {
 +  display: block;
 +  margin-top: 5px;
 +  margin-bottom: 10px;
 +  color: lighten($cc-text, 25%);
-+}
-+
+ }
+ 
+-#id_bulk_upload_file.form-control {     // override .form-control styles
+-  border: none;
+-  box-shadow: none;
+-  padding: 0;
 +legend {
 +  border-bottom: 1px solid $border-color;
 +  padding-bottom: $spacer * .25;
 +  margin-bottom: $spacer * 1.25;
-+}
+ }
 +
 +.form-actions {
 +  border-top: 1px solid $border-color;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
index d1632245f476..8059aeaf4122 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/imports/includes_variables._variables.style.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,124 +1,230 @@
+@@ -1,124 +1,232 @@
 -@import "@{b3-import-variables}";
 -
 -// Nunito Sans is used on dimagi.com and embedded in hqwebapp/base.html
@@ -20,6 +20,8 @@
 +  xxl: 1160px
 +);
 +
++// Spacing override
++$enable-negative-margins: true;
 +
 +// Typography Overrides
 +$font-family-sans-serif: "Nunito Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
deleted file mode 100644
index 6dbc92555c3e..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app-main.preview_app-main.style.diff.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- 
-+++ 
-@@ -1,25 +1,19 @@
--@import '../../hqwebapp/less/_hq/includes/variables.less';
--@import '../../hqwebapp/less/_hq/includes/mixins.less';
--
- /* this is included in cloudcare/preview_app.html */
- 
--@import "../../cloudcare/less/formplayer-common/mixins.less";
-+@import "../../cloudcare/scss/formplayer-common/mixins";
- 
--@transition-speed: .5s;
-+$transition-speed: .5s;
- 
--@import "preview_app/base";
- @import "preview_app/variables";
-+@import "preview_app/datepicker";
- @import "preview_app/notifications";
- @import "preview_app/scrollable";
- @import "preview_app/navigation";
- @import "preview_app/grid";
- @import "preview_app/appicon";
--@import "preview_app/menu";
- @import "preview_app/breadcrumb";
- @import "preview_app/module";
- @import "preview_app/form";
- @import "preview_app/formnav";
--@import "preview_app/case";
--@import "preview_app/datepicker";
--@import "preview_app/panels";
- @import "preview_app/debugger";
-+@import "preview_app/case-tile";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app.preview_app.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app.preview_app.style.diff.txt
deleted file mode 100644
index 3a195d4c9b42..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app.preview_app.style.diff.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,3 @@
--@b3-import-variables: '../../../../../../../../node_modules/bootstrap/less/variables';
--@b3-import-mixins: '../../../../../../../../node_modules/bootstrap/less/mixins';
-+@import "../../hqwebapp/scss/commcarehq/variables";
- 
- @import "preview_app-main";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_appicon.preview_app_appicon.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_appicon.preview_app_appicon.style.diff.txt
deleted file mode 100644
index 7062780e0183..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_appicon.preview_app_appicon.style.diff.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- 
-+++ 
-@@ -1,12 +1,12 @@
--@appicon-height-preview: 130px;
--@appicon-icon-height-preview: @appicon-height-preview - 40px;
-+$appicon-height-preview: 130px;
-+$appicon-icon-height-preview: $appicon-height-preview - 40px;
- 
- .appicon {
--  min-height: @appicon-height-preview;
-+  min-height: $appicon-height-preview;
-   margin-bottom: 10px;
- 
-   .appicon-title {
--    .transition(height @transition-speed);
-+    transition: height $transition-speed;
-     height: 30px;
-     bottom: 7px;
-     h3 {
-@@ -16,11 +16,11 @@
-   }
- 
-   .appicon-icon {
--    margin-left: -@appicon-icon-height-preview/2;
--    width: @appicon-icon-height-preview;
--    height: @appicon-icon-height-preview;
--    line-height: @appicon-icon-height-preview;
--    font-size: @appicon-icon-height-preview;
-+    margin-left: -$appicon-icon-height-preview / 2;
-+    width: $appicon-icon-height-preview;
-+    height: $appicon-icon-height-preview;
-+    line-height: $appicon-icon-height-preview;
-+    font-size: $appicon-icon-height-preview;
-     &[class*='fa-'] {
-       font-size: 70px;
-     }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_base.preview_app_base.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_base.preview_app_base.style.diff.txt
deleted file mode 100644
index 29b149d07c1b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_base.preview_app_base.style.diff.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- 
-+++ 
-@@ -1,8 +0,0 @@
--body {
--  background-color: @cc-bg;
--}
--
--#version-info {
--  margin-top: 10px;
--  margin-bottom: 10px;
--}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_breadcrumb.preview_app_breadcrumb.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_breadcrumb.preview_app_breadcrumb.style.diff.txt
deleted file mode 100644
index 2fd893813d27..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_breadcrumb.preview_app_breadcrumb.style.diff.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- 
-+++ 
-@@ -35,7 +35,7 @@
- 
- .breadcrumb-form {
-   width: 100%;
--  .box-shadow(none);
-+  box-shadow: none;
- 
-   li {
-     padding-top: 1px;
-@@ -46,10 +46,10 @@
-   position: fixed;
-   z-index: 10;
-   width: 100%;
--  height: @webforms-breadcrumb-height;
--  .box-shadow(0 0 5px 2px rgba(0,0,0,.3));
-+  height: $webforms-breadcrumb-height;
-+  box-shadow: 0 0 5px 2px rgba(0,0,0,.3);
- }
- 
- .webforms-nav-single-question {
--  height: @webforms-nav-height;
-+  height: $webforms-nav-height;
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_case.preview_app_case.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_case.preview_app_case.style.diff.txt
deleted file mode 100644
index c46880dd500f..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_case.preview_app_case.style.diff.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- 
-+++ 
-@@ -1,9 +0,0 @@
--.case-list-action-button {
--  width: 100%;
--  .btn {
--    width: 100%;
--    font-size: 1.2rem;
--    .border-top-radius(0);
--    .border-bottom-radius(0);
--  }
--}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt
deleted file mode 100644
index 1ffc5bbf63a3..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_datepicker.preview_app_datepicker.style.diff.txt
+++ /dev/null
@@ -1,39 +0,0 @@
---- 
-+++ 
-@@ -1,17 +1,18 @@
--@datepicker-width: 247px;
--@datepicker-width-tablet: 447px;
--@datepicker-height: 410px;
--@datepicker-height-tablet: 565px;
-+$datepicker-width: 247px;
-+$datepicker-width-tablet: 447px;
-+$datepicker-height: 410px;
-+$datepicker-height-tablet: 565px;
- 
--.bootstrap-datetimepicker-widget.dropdown-menu {
-+.tempus-dominus-widget {
-+  transform: none !important;
-   position: fixed;
-   top: 30px !important;
-   left: 0px !important;
-   padding-bottom: 15px !important;
--  min-height: @datepicker-height !important;
-+  min-height: $datepicker-height !important;
- 
-   padding: 5px !important;
--  width: @datepicker-width !important;
-+  width: $datepicker-width !important;
-   margin-left: 2px !important;
-   margin-right: 2px !important;
- 
-@@ -20,7 +21,7 @@
-   }
- }
- 
--.preview-tablet-mode .bootstrap-datetimepicker-widget.dropdown-menu {
--  width: @datepicker-width-tablet !important;
--  min-height: @datepicker-height-tablet !important;
-+.preview-tablet-mode .tempus-dominus-widget {
-+  width: $datepicker-width-tablet !important;
-+  min-height: $datepicker-height-tablet !important;
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_debugger.preview_app_debugger.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_debugger.preview_app_debugger.style.diff.txt
deleted file mode 100644
index 7120a49fa2d7..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_debugger.preview_app_debugger.style.diff.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- 
-+++ 
-@@ -4,7 +4,7 @@
- }
- 
- .debugger.debugger-maximized {
--  height: @preview-phone-height;
-+  height: $preview-phone-height;
-   max-height: 100vh;
- }
- 
-@@ -20,7 +20,7 @@
-   right: 3px;
-   left: initial;
- 
--  .box-shadow(0 0 5px 0 rgba(0, 0, 0, 0.45));
-+  box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.45);
- 
-   .debugger-tab-title {
-     text-align: center;
-@@ -37,6 +37,6 @@
- 
- .preview-tablet-mode {
-   .debugger.debugger-maximized {
--    height: @preview-tablet-height;
-+    height: $preview-tablet-height;
-   }
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
deleted file mode 100644
index f9b73116de0c..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_form.preview_app_form.style.diff.txt
+++ /dev/null
@@ -1,108 +0,0 @@
---- 
-+++ 
-@@ -1,8 +1,6 @@
- .form-container {
-   background-color: white;
--  min-height: -webkit-calc(~"100vh - " (@webforms-nav-height + @webforms-breadcrumb-height));
--  min-height: -moz-calc(~"100vh - " (@webforms-nav-height + @webforms-breadcrumb-height));
--  min-height: calc(~"100vh - " (@webforms-nav-height + @webforms-breadcrumb-height));
-+  min-height: calc(100vh - $webforms-nav-height + $webforms-breadcrumb-height);
-   box-sizing: border-box;
-   padding: 0 10px;
- 
-@@ -17,19 +15,19 @@
-     font-size: 10px;
-     font-weight: 600;
-     text-transform: uppercase;
--    color: @cc-neutral-mid;
-+    color: $cc-neutral-mid;
-     margin-top: 0;
-   }
- }
- 
- .form-container .gr {
--  background-color: desaturate(lighten(@cc-brand-hi, 8), 40);
-+  background-color: desaturate(lighten($cc-brand-hi, 8), 40);
-   margin-left: -10px;
-   margin-right: -10px;
-   padding: 10px;
-   margin-bottom: 10px;
--  border-bottom: 3px solid desaturate(@cc-brand-hi, 30);
--  border-top: 3px solid desaturate(@cc-brand-hi, 30);
-+  border-bottom: 3px solid desaturate($cc-brand-hi, 30);
-+  border-top: 3px solid desaturate($cc-brand-hi, 30);
- }
- 
- .form-container .gr-has-no-nested-questions {
-@@ -58,13 +56,12 @@
- .form-container .form-actions {
-   background-color: transparent;
-   border-top: none;
--  margin-top: 0;
-   padding-top: 0;
- 
-   .btn {
-     width: 100%;
-     font-size: 16px;
--    .transition(all .5s);
-+    transition: all .5s;
-   }
- }
- 
-@@ -76,7 +73,7 @@
-   }
- }
- 
--.form-group {
-+.q {
-   padding: 10px 0;
-   label {
-     margin-right: 10px;
-@@ -84,17 +81,14 @@
-   }
- }
- 
--.form-group.required {
--  .transition(all .5s);
-+.q.required {
-+  transition: all .5s;
-   margin-bottom: 0;
--  label:before {
--    display: none;
--  }
- }
- 
--.form-group.required.on {
--  background-color: @cc-att-neg-hi;
--  border: 10px solid @cc-att-neg-mid;
-+.q.required.on {
-+  background-color: $cc-att-neg-hi;
-+  border: 10px solid $cc-att-neg-mid;
-   border-bottom: none;
-   label {
-     margin-left: 0;
-@@ -104,13 +98,13 @@
- 
- .form-group-required-label {
-   opacity: 0;
--  .transition(all .5s);
-+  transition: all .5s;
- }
- 
- .form-group-required-label.on {
-   opacity: 100;
-   font-size: 10px;
--  background-color: @cc-att-neg-mid;
-+  background-color: $cc-att-neg-mid;
-   color: white;
-   width: auto;
-   line-height: 14px;
-@@ -122,7 +116,7 @@
-   border: none;
- }
- 
--.form-group .help-block {
-+.q .help-block {
-   font-size: 11px;
-   &:before {
-     content: "\f05a";
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_formnav.preview_app_formnav.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_formnav.preview_app_formnav.style.diff.txt
deleted file mode 100644
index 42deb90b9405..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_formnav.preview_app_formnav.style.diff.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- 
-+++ 
-@@ -1,20 +1,19 @@
- .btn-formnav-submit {
--  transition: width @transition-speed;
--  width: @preview-phone-width - 46px;
-+  transition: width $transition-speed;
-+  width: $preview-phone-width - 46px;
-   text-transform: uppercase;
-   padding: 8px 10px;
-   border: none;
--  .transition(all @transition-speed);
-+  transition: all $transition-speed;
- 
--  .border-top-radius(0);
--  .border-bottom-radius(0);
-+  border-radius: 0;
- }
- 
- .preview-tablet-mode {
-   .formnav-container {
--    width: @preview-tablet-width;
-+    width: $preview-tablet-width;
-   }
-   .btn-formnav-submit {
--    width: @preview-tablet-width - 46px;
-+    width: $preview-tablet-width - 46px;
-   }
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_grid.preview_app_grid.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_grid.preview_app_grid.style.diff.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_menu.preview_app_menu.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_menu.preview_app_menu.style.diff.txt
deleted file mode 100644
index 2ca0ea2a5805..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_menu.preview_app_menu.style.diff.txt
+++ /dev/null
@@ -1,6 +0,0 @@
---- 
-+++ 
-@@ -1,3 +0,0 @@
--.menu-header {
--  display: none;
--}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt
deleted file mode 100644
index 6d5fc688ca2b..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_module.preview_app_module.style.diff.txt
+++ /dev/null
@@ -1,87 +0,0 @@
---- 
-+++ 
-@@ -1,4 +1,4 @@
--.make-module-size(30px);
-+@include make-module-size(30px);
- 
- .module-column-name h3 {
-   font-size: 12px;
-@@ -33,7 +33,7 @@
-   background-color: white;
- }
- 
--.module-search-container, .module-go-container{
-+.module-search-container {
-   .input-group-lg .form-control,
-   .input-group-lg .btn{
-     font-size: 11px;
-@@ -45,19 +45,17 @@
-   }
- }
- 
--.module-go-container {
--  width: 140px;
--}
--
--.module-per-page-container {
-+.pagination-container {
-+  .form-select,
-+  .pagination-lg .page-link,
-   .input-group-lg .form-control,
--  .input-group-lg .btn{
-+  .input-group-lg .btn {
-     font-size: 11px;
-     height: 30px;
-     padding: 5px 10px;
-   }
--  .input-group-lg .btn [class*='fa-'] {
--    font-size: 11px;
-+  .form-select {
-+    padding: 5px 20px;  // extra padding for the sake of the arrow
-   }
- }
- 
-@@ -73,13 +71,6 @@
- 
-   .module-icon {
-     max-height: 30px;
--  }
--}
--
--.module-pagination-container .pagination {
--  font-size: 10px;
--  [class*='fa-'] {
--    font-size: 14px;
-   }
- }
- 
-@@ -99,8 +90,7 @@
-   .modal-content {
-     height: 442px;
-     overflow-x: hidden;
--    .border-top-radius(0);
--    .border-bottom-radius(0);
-+    border-radius: 0;
-   }
- }
- 
-@@ -110,8 +100,7 @@
-   }
- 
-   .modal-content {
--    .border-top-radius(0);
--    .border-bottom-radius(0);
-+    border-radius: 0;
-   }
- 
-   .btn-lg {
-@@ -142,8 +131,7 @@
- 
- .module-banner {
-   font-size: 11px;
--  padding-left: 6px;
--  padding-right: 6px;
-+  padding: 6px;
- }
- 
- .module-menu-bar-offset {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_navigation.preview_app_navigation.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_navigation.preview_app_navigation.style.diff.txt
deleted file mode 100644
index bfc71757a0e6..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_navigation.preview_app_navigation.style.diff.txt
+++ /dev/null
@@ -1,35 +0,0 @@
---- 
-+++ 
-@@ -1,8 +1,8 @@
--@preview-navbar-height: 40px;
-+$preview-navbar-height: 40px;
- 
- .navbar-formplayer {
--  background-color: @cc-brand-mid;
--  min-height: @preview-navbar-height;
-+  background-color: $cc-brand-mid;
-+  min-height: $preview-navbar-height;
-   color: white;
-   margin-bottom: 0;
- 
-@@ -20,9 +20,9 @@
-   }
-   .navbar-nav > li > a {
-     color: white;
--    line-height: @preview-navbar-height;
-+    line-height: $preview-navbar-height;
-     padding-right: 19px;
--    .transition(background @transition-speed);
-+    transition: background $transition-speed;
- 
-     &:link, &:focus, &:visited, &:hover {
-       color: white;
-@@ -30,7 +30,7 @@
-     }
- 
-     &:hover {
--      background-color: @cc-brand-low;
-+      background-color: $cc-brand-low;
-     }
-   }
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_notifications.preview_app_notifications.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_notifications.preview_app_notifications.style.diff.txt
deleted file mode 100644
index 250590af345a..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_notifications.preview_app_notifications.style.diff.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- 
-+++ 
-@@ -1,13 +1,12 @@
- .notifications-container {
-   .alert  {
--    .box-shadow(none);
-+    box-shadow: none;
-     margin-bottom: 0;
--    .border-top-radius(0);
--    .border-bottom-radius(0);
-+    border-radius: 0;
-     padding: 9px;
--    .close {
--      vertical-align: top;
--      margin-top: -4px;
-+
-+    .btn-close {
-+      margin-top: -10px;
-     }
-   }
- }
-@@ -17,6 +16,6 @@
-     font-size: 11px;
-     margin-bottom: 5px;
-     padding-bottom: 3px;
--    border-bottom: 1px solid fade(@cc-dark-warm-accent-low, 20);
-+    border-bottom: 1px solid fade($cc-dark-warm-accent-low, 20);
-   }
- }
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_panels.preview_app_panels.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_panels.preview_app_panels.style.diff.txt
deleted file mode 100644
index e7867d361be4..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_panels.preview_app_panels.style.diff.txt
+++ /dev/null
@@ -1,6 +0,0 @@
---- 
-+++ 
-@@ -1,3 +0,0 @@
--.question-container .panel {
--  margin-top: 15px;
--}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_scrollable.preview_app_scrollable.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_scrollable.preview_app_scrollable.style.diff.txt
deleted file mode 100644
index 233451b70496..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_scrollable.preview_app_scrollable.style.diff.txt
+++ /dev/null
@@ -1,28 +0,0 @@
---- 
-+++ 
-@@ -1,11 +1,11 @@
- .scrollable-container {
--  transition: width @transition-speed;
-+  transition: width $transition-speed;
-   overflow-x: hidden;
-   overflow-y: scroll;
-   // 15px is the approximate width of the scrollbar in OSX.
-   // javascript is the most reliable way to hide it when pure css options fail
--  width: @preview-phone-width;
--  &.has-scrollbar-15 { width: @preview-phone-width + 15px; }
-+  width: $preview-phone-width;
-+  &.has-scrollbar-15 { width: $preview-phone-width + 15px; }
-   box-sizing: content-box;
- 
-   &:hover {
-@@ -17,8 +17,8 @@
- 
- .preview-tablet-mode {
-   .scrollable-container {
--    width: @preview-tablet-width;
--    &.has-scrollbar-15 { width: @preview-tablet-width + 15px; }
-+    width: $preview-tablet-width;
-+    &.has-scrollbar-15 { width: $preview-tablet-width + 15px; }
-   }
- }
- 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_variables.preview_app_variables.style.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_variables.preview_app_variables.style.diff.txt
deleted file mode 100644
index de101f9a5d24..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/stylesheets/preview_app_variables.preview_app_variables.style.diff.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- 
-+++ 
-@@ -1,7 +1,7 @@
--@preview-phone-width: 250px;
--@preview-tablet-width: 450px;
--@preview-tablet-height: 644px;
--@preview-phone-height: 444px;
-+$preview-phone-width: 250px;
-+$preview-tablet-width: 450px;
-+$preview-tablet-height: 644px;
-+$preview-phone-height: 444px;
- 
--@webforms-nav-height: 33px;
--@webforms-breadcrumb-height: 30px;
-+$webforms-nav-height: 33px;
-+$webforms-breadcrumb-height: 30px;
diff --git a/corehq/apps/hqwebapp/tests/test_compress_command.py b/corehq/apps/hqwebapp/tests/test_compress_command.py
index 486ce0799a0c..0d92c98f6600 100644
--- a/corehq/apps/hqwebapp/tests/test_compress_command.py
+++ b/corehq/apps/hqwebapp/tests/test_compress_command.py
@@ -1,11 +1,10 @@
 import os
 
+import pytest
 from django.conf import settings
 from django.template.utils import get_app_template_dirs
 from django.test import SimpleTestCase
 
-from nose.plugins.attrib import attr
-
 B3_BASE = 'hqwebapp/bootstrap3/base_navigation.html'
 
 COMPRESS_JS = ' compress js '
@@ -31,7 +30,7 @@ def _assert_valid_import(self, line, filename):
         for tag in DISALLOWED_REGEXES:
             self.assertNotRegex(line.strip(), tag[0], '{}: {}'.format(tag[1], filename))
 
-    @attr("slow")
+    @pytest.mark.slow
     def test_compress_offline(self):
         template_dir_list = []
         for template_dir in get_app_template_dirs('templates'):
diff --git a/corehq/apps/hqwebapp/tests/test_proptable_tags.py b/corehq/apps/hqwebapp/tests/test_proptable_tags.py
index 60e0cbe3db62..4548d295c2f0 100644
--- a/corehq/apps/hqwebapp/tests/test_proptable_tags.py
+++ b/corehq/apps/hqwebapp/tests/test_proptable_tags.py
@@ -38,8 +38,9 @@ def test_get_display_data_no_name(self):
         })
 
     def test_get_display_data_function(self):
-        get_color = lambda x: x['color']
-        column = DisplayConfig(name='favorite color', expr=get_color)
+        def _get_color(x):
+            return x['color']
+        column = DisplayConfig(name='favorite color', expr=_get_color)
         data = {
             'color': 'red'
         }
@@ -119,22 +120,6 @@ def test_get_display_process_date(self):
             'has_history': False,
         })
 
-    def test_get_display_process_timeago(self):
-        column = DisplayConfig(expr='date', process="date", timeago=True)
-        data = {'date': "2021-03-16T14:37:22Z"}
-        expected_value = (
-            "<time class='timeago' title='2021-03-16T14:37:22+00:00' datetime='2021-03-16T14:37:22+00:00'>"
-            "Mar 16, 2021 14:37 UTC"
-            "</time>"
-        )
-        self.assertEqual(get_display_data(data, column), {
-            'expr': 'date',
-            'name': 'date',
-            'description': None,
-            'value': expected_value,
-            'has_history': False,
-        })
-
     @override_settings(PHONE_TIMEZONES_HAVE_BEEN_PROCESSED=True)
     def test_get_display_process_phonetime(self):
         column = DisplayConfig(expr='date', process="date", is_phone_time=True)
diff --git a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
index fd3692fc1fc0..0d1b84ced6cc 100644
--- a/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
+++ b/corehq/apps/hqwebapp/tests/utils/test_bootstrap_changes.py
@@ -3,6 +3,7 @@
     get_spec,
     make_direct_css_renames,
     make_numbered_css_renames,
+    make_select_form_control_renames,
     make_template_tag_renames,
     make_data_attribute_renames,
     make_javascript_dependency_renames,
@@ -13,7 +14,9 @@
     replace_path_references,
     check_bootstrap3_references_in_template,
     flag_crispy_forms_in_template,
+    flag_selects_without_form_control,
     check_bootstrap3_references_in_javascript,
+    flag_file_inputs,
     flag_inline_styles,
     make_template_dependency_renames,
     add_todo_comments_for_flags,
@@ -49,6 +52,15 @@ def test_make_numbered_css_renames_bootstrap5():
     eq(renames, ['renamed col-xs-<num> to col-sm-<num>'])
 
 
+def test_make_select_form_control_renames_bootstrap5():
+    line = """        <select data-bind:"visible: showMe" class="form-control">\n"""
+    final_line, renames = make_select_form_control_renames(
+        line, get_spec('bootstrap_3_to_5')
+    )
+    eq(final_line, """        <select data-bind:"visible: showMe" class="form-select">\n""")
+    eq(renames, ['renamed form-control to form-select'])
+
+
 def test_make_template_tag_renames_bootstrap5():
     line = """        {% requirejs_main "data_dictionary/js/data_dictionary" %}\n"""
     final_line, renames = make_template_tag_renames(
@@ -67,6 +79,15 @@ def test_make_data_attribute_renames_bootstrap5():
     eq(renames, ['renamed data-toggle to data-bs-toggle'])
 
 
+def test_ko_make_data_attribute_renames_bootstrap5():
+    line = """        data-bind="attr: {'data-target': '#modalGroup-' + id()}"\n"""
+    final_line, renames = make_data_attribute_renames(
+        line, get_spec('bootstrap_3_to_5')
+    )
+    eq(final_line, """        data-bind="attr: {'data-bs-target': '#modalGroup-' + id()}"\n""")
+    eq(renames, ['renamed data-target to data-bs-target'])
+
+
 def test_make_javascript_dependency_renames():
     line = """        "hqwebapp/js/bootstrap3/widgets",\n"""
     final_line, renames = make_javascript_dependency_renames(
@@ -91,7 +112,7 @@ def test_flag_changed_css_classes_bootstrap5():
         line, get_spec('bootstrap_3_to_5')
     )
     eq(flags, [[
-        'css:dl-horizontal',
+        'css-dl-horizontal',
         '`dl-horizontal` has been dropped.\nInstead, use `.row` on `<dl>` and use grid column classes '
         '(or mixins) on its `<dt>` and `<dd>` children.\n\nAn EXAMPLE for how to apply this change is '
         'provided below.\nPlease see docs for further details.\n\nPreviously:\n```\n<dl class='
@@ -210,18 +231,26 @@ def test_check_bootstrap3_references_in_javascript():
     eq(issues, ['This javascript file references a bootstrap 3 file.'])
 
 
+def test_flag_file_inputs():
+    line = """<input type="file" id="xform_file_input" name="xform" />"""
+    flags = flag_file_inputs(line)
+    eq(len(flags), 1)
+    eq(flags[0][0], "css-file-inputs")
+    eq(flags[0][1].startswith('Please add the form-control class'), True)
+
+
 def test_flag_inline_styles():
     line = """method="post" style="float: left; margin-right: 5px;">"""
     flags = flag_inline_styles(line)
     eq(len(flags), 1)
-    eq(flags[0][0], "inline style")
+    eq(flags[0][0], "inline-style")
     eq(flags[0][1].startswith('This template uses inline styles.'), True)
 
 
 def test_flag_crispy_forms_in_template():
     line = """    {% crispy form %}\n"""
     flags = flag_crispy_forms_in_template(line)
-    eq(flags[0][0], "check crispy")
+    eq(flags[0][0], "crispy")
     eq(flags[0][1].startswith("This template uses crispy forms."), True)
 
 
@@ -230,7 +259,7 @@ def test_flag_changed_javascript_plugins_bootstrap5():
     flags = flag_changed_javascript_plugins(
         line, get_spec('bootstrap_3_to_5')
     )
-    eq(flags, [["plugin:modal",
+    eq(flags, [["js-modal",
                 "The `modal` plugin has been restructured since the removal of jQuery.\n\nThere is now a new way "
                 "of triggering modal events and interacting with modals in javascript.\nFor instance, if we "
                 "wanted to hide a modal with id `#bugReport` before, we would now do the\nfollowing..."
@@ -247,7 +276,7 @@ def test_flag_extended_changed_javascript_plugins_bootstrap5():
     flags = flag_changed_javascript_plugins(
         line, get_spec('bootstrap_3_to_5')
     )
-    eq(flags, [['plugin:popover',
+    eq(flags, [['js-popover',
                 'The `popover` plugin has been restructured since the removal of jQuery.\n'
                 '\nThere is now a new way of triggering popover events and interacting '
                 'with popovers in javascript.\n\nPlease feel free to update this help text'
@@ -257,10 +286,17 @@ def test_flag_extended_changed_javascript_plugins_bootstrap5():
                 'components/popovers/\n']])
 
 
+def test_flag_selects_without_form_control_bootstrap5():
+    line = """    <select\n"""
+    flags = flag_selects_without_form_control(line)
+    eq(flags[0][0], "css-select-form-control")
+    eq(flags[0][1].startswith("Please replace `form-control` with `form-select`."), True)
+
+
 def test_file_contains_reference_to_path():
     filedata = """
     {# Our Libraries #}
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'foobarapp/js/bugz.js' %}"></script>
         <script src="{% static 'foobarapp/js/privileges.js' %}"></script>
@@ -274,7 +310,7 @@ def test_file_contains_reference_to_path():
 def test_file_does_not_contain_reference_to_path():
     filedata = """
     {# Our Libraries #}
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'foobarapp/js/bugz_two.js' %}"></script>
         <script src="{% static 'foobarapp/js/privileges.js' %}"></script>
@@ -309,7 +345,7 @@ def test_javascript_file_does_not_contain_reference_to_path():
 def test_replace_path_references():
     filedata = """
     {# Our Libraries #}
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'foobarapp/js/bugz.js' %}"></script>
         <script src="{% static 'foobarapp/js/privileges.js' %}"></script>
@@ -321,7 +357,7 @@ def test_replace_path_references():
     result = replace_path_references(filedata, "foobarapp/js/bugz.js", "foobarapp/js/bootstrap3/bugz.js")
     expected_result = """
     {# Our Libraries #}
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'foobarapp/js/bootstrap3/bugz.js' %}"></script>
         <script src="{% static 'foobarapp/js/privileges.js' %}"></script>
@@ -356,14 +392,14 @@ def test_add_todo_comments_for_flags_template():
         line, get_spec('bootstrap_3_to_5')
     )
     line = add_todo_comments_for_flags(flags, line, is_template=True)
-    eq(line, """          <div class="form-inline nav"  {# todo B5: css:form-inline, css:nav #}\n""")
+    eq(line, """          <div class="form-inline nav"  {# todo B5: css-form-inline, css-nav #}\n""")
 
 
 def test_add_todo_comments_for_flags_template_replace():
-    line = """          {% crispy form %}  {# todo B5: css:form-inline, css:nav #}\n"""
+    line = """          {% crispy form %}  {# todo B5: css-form-inline, css-nav #}\n"""
     flags = flag_crispy_forms_in_template(line)
     line = add_todo_comments_for_flags(flags, line, is_template=True)
-    eq(line, """          {% crispy form %}  {# todo B5: check crispy #}\n""")
+    eq(line, """          {% crispy form %}  {# todo B5: crispy #}\n""")
 
 
 def test_add_todo_comments_for_flags_template_noop():
@@ -381,16 +417,16 @@ def test_add_todo_comments_for_flags_javascript():
         line, get_spec('bootstrap_3_to_5')
     )
     line = add_todo_comments_for_flags(flags, line, is_template=False)
-    eq(line, """            $modal.modal({  /* todo B5: plugin:modal */\n""")
+    eq(line, """            $modal.modal({  /* todo B5: js-modal */\n""")
 
 
 def test_add_todo_comments_for_flags_javascript_replace():
-    line = """            $popover.popover({  /* todo B5: plugin:modal */\n"""
+    line = """            $popover.popover({  /* todo B5: js-modal */\n"""
     flags = flag_changed_javascript_plugins(
         line, get_spec('bootstrap_3_to_5')
     )
     line = add_todo_comments_for_flags(flags, line, is_template=False)
-    eq(line, """            $popover.popover({  /* todo B5: plugin:popover */\n""")
+    eq(line, """            $popover.popover({  /* todo B5: js-popover */\n""")
 
 
 def test_add_todo_comments_for_flags_javascript_noop():
diff --git a/corehq/apps/hqwebapp/urls.py b/corehq/apps/hqwebapp/urls.py
index 9e002518a660..01741dc6966b 100644
--- a/corehq/apps/hqwebapp/urls.py
+++ b/corehq/apps/hqwebapp/urls.py
@@ -121,12 +121,12 @@
         name='public_home'),
     url(r'^impact/$', redirect_to_dimagi('commcare/'),
         name='public_impact'),
-    url(r'^pricing/$', redirect_to_dimagi('commcare/pricing/'),
+    url(r'^pricing/$', redirect_to_dimagi('commcare-pricing/'),
         name='public_software_services'),
-    url(r'^software_services/$', redirect_to_dimagi('commcare/pricing/')),
+    url(r'^software_services/$', redirect_to_dimagi('commcare-pricing/')),
     url(r'^services/$', redirect_to_dimagi('services/'),
         name='public_services'),
-    url(r'^software/$', redirect_to_dimagi('commcare/pricing/'),
+    url(r'^software/$', redirect_to_dimagi('commcare-pricing/'),
         name='public_pricing'),
     url(r'^solutions/$', redirect_to_dimagi('services/'),
         name='public_services'),
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes.py b/corehq/apps/hqwebapp/utils/bootstrap/changes.py
index 6cf904b296dd..1d3be701b196 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes.py
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes.py
@@ -102,6 +102,18 @@ def make_numbered_css_renames(line, spec):
     )
 
 
+def make_select_form_control_renames(line, spec):
+    if "<select" in line:
+        if re.search(_get_direct_css_regex("form-control"), line):
+            return _do_rename(
+                line,
+                {"form-control": "form-select"},
+                _get_direct_css_regex,
+                lambda x: r"\1form-select\3"
+            )
+    return line, []
+
+
 def make_template_tag_renames(line, spec):
     return _do_rename(
         line,
@@ -115,7 +127,7 @@ def make_data_attribute_renames(line, spec):
     return _do_rename(
         line,
         spec['data_attribute_renames'],
-        lambda x: r"([\n }])(" + x + r")(=[\"\'])",
+        lambda x: r"([\n }\"\'])(" + x + r")([\"\']?[=:]\s*[\"\'])",
         lambda x: r"\1" + spec['data_attribute_renames'][x] + r"\3"
     )
 
@@ -168,8 +180,8 @@ def flag_changed_css_classes(line, spec):
         regex = _get_direct_css_regex(css_class)
         if re.search(regex, line):
             flags.append([
-                f'css:{css_class}',
-                _get_change_guide(css_class)
+                f'css-{css_class}',
+                _get_change_guide(f'css-{css_class}')
             ])
     return flags
 
@@ -181,7 +193,7 @@ def flag_changed_javascript_plugins(line, spec):
         extension_regex = _get_extension_regex(plugin)
         if re.search(plugin_regex, line) or re.search(extension_regex, line):
             flags.append([
-                f'plugin:{plugin}',
+                f'js-{plugin}',
                 _get_change_guide(f"js-{plugin}")
             ])
     return flags
@@ -233,15 +245,24 @@ def check_bootstrap3_references_in_javascript(line):
     return issues
 
 
+def flag_file_inputs(line):
+    flags = []
+    regex = r"\btype\s*=\s*.file"
+    if re.search(regex, line):
+        flags.append([
+            "css-file-inputs",
+            _get_change_guide("css-file-inputs")
+        ])
+    return flags
+
+
 def flag_inline_styles(line):
     flags = []
     regex = r"\bstyle\s*=\s*"
     if re.search(regex, line):
         flags.append([
-            "inline style",
-            "This template uses inline styles. Please revisit this usage.\n\n"
-            "Inline styles can often be replaced with Bootstrap 5's utility classes, "
-            "particularly the spacing utilities: https://getbootstrap.com/docs/5.0/utilities/spacing/"
+            "inline-style",
+            _get_change_guide("inline-style")
         ])
     return flags
 
@@ -251,12 +272,23 @@ def flag_crispy_forms_in_template(line):
     regex = r"\{% crispy"
     if re.search(regex, line):
         flags.append([
-            "check crispy",
+            "crispy",
             _get_change_guide("crispy")
         ])
     return flags
 
 
+def flag_selects_without_form_control(line):
+    flags = []
+    if "<select" in line:
+        if "form-select" not in line and "form-control" not in line:
+            flags.append([
+                "css-select-form-control",
+                _get_change_guide("css-select-form-control")
+            ])
+    return flags
+
+
 def file_contains_reference_to_path(filedata, path_reference):
     regex = _get_path_reference_regex(path_reference)
     return re.search(regex, filedata) is not None
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/breadcrumb.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-breadcrumb.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/breadcrumb.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-breadcrumb.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/checkbox.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-checkbox.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/checkbox.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-checkbox.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/close.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-close.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/close.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-close.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/dl-horizontal.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-dl-horizontal.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/dl-horizontal.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-dl-horizontal.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/dropdown.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-dropdown.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/dropdown.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-dropdown.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-file-inputs.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-file-inputs.md
new file mode 100644
index 000000000000..f21492e7b3e1
--- /dev/null
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-file-inputs.md
@@ -0,0 +1,4 @@
+Please add the form-control class to this input.
+
+In Bootstrap 3, `form-control` added a border and shadow that looked weird with file inputs.
+In Bootstrap5, `form-control` is appropriate for file inputs.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md
new file mode 100644
index 000000000000..7b6ac9575df2
--- /dev/null
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-group.md
@@ -0,0 +1,10 @@
+`form-group` has been dropped. Use grid utilities instead.
+
+Since we are opting for vertical forms (where the label is directly above the field), take the following actions:
+* Remove the `div` wrapper from the `form-group`'s first child, which contains the field's label.
+* Remove the column classes (`col-lg-2`, etc.) from the `form-group`'s first child, usually a `<label>`,
+which contains the field's label. Most often, this will leave the label with just the `form-label` class.
+* Remove the column classes (`col-lg-2`, etc.) from the `form-group`'s second child, which contains the field
+control (the actual input, which will often use the `form-control` class).  Frequently, this will leave the `<div>`
+without any other classes. If so, and if it has no other attributes, it can be removed.
+* Replace `form-group` with `mb-3`.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/form-inline.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-inline.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/form-inline.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-form-inline.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/glyphicon.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-glyphicon.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/glyphicon.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-glyphicon.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/has-error.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md
similarity index 85%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/has-error.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md
index 01fd78028d76..2863565f0e6b 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/has-error.md
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-error.md
@@ -1,5 +1,7 @@
 Form validation markup has been reworked, which includes dropping `has-error`.
 In general, replace `has-error` and `help-block` with `is-invalid` and `invalid-feedback`.
+Note that `invalid-feedback` must be a **sibling** of an input with `is_invalid`, or it will be hidden.
+This is a change from `has-error`, which was used on containers and would apply to all descendants.
 
 An EXAMPLE for how to apply this change is provided below.
 Please see docs for further details.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/has-success.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md
similarity index 85%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/has-success.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md
index 2f0c9debec38..2750b719c6ea 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/has-success.md
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-has-success.md
@@ -1,5 +1,7 @@
 Form validation markup has been reworked, which includes dropping `has-success`.
 In general, replace `has-success` and `help-block` with `is-valid` and `valid-feedback`.
+Note that `valid-feedback` must be a **sibling** of an input with `is_valid`, or it will be hidden.
+This is a change from `has-success`, which was used on containers and would apply to all descendants.
 
 An EXAMPLE for how to apply this change is provided below.
 Please see docs for further details.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/input-group-addon.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-input-group-addon.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/input-group-addon.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-input-group-addon.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/input-group-btn.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-input-group-btn.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/input-group-btn.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-input-group-btn.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/modal-header.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-modal-header.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/modal-header.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-modal-header.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/nav.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-nav.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/nav.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-nav.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/navbar-dark.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-navbar-dark.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/navbar-dark.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-navbar-dark.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/navbar-light.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-navbar-light.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/navbar-light.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-navbar-light.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/navbar.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-navbar.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/navbar.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-navbar.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/page-header.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-page-header.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/page-header.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-page-header.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/pagination.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-pagination.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/pagination.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-pagination.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/panel.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-panel.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/panel.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-panel.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/progress.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-progress.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/progress.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-progress.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-select-form-control.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-select-form-control.md
new file mode 100644
index 000000000000..b20b2ad245a5
--- /dev/null
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-select-form-control.md
@@ -0,0 +1,4 @@
+Please replace `form-control` with `form-select`.
+
+In Bootstrap 3, selects used the `form-control` class.
+In Bootstrap5, selects use `form-select` instead.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/well.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-well.md
similarity index 100%
rename from corehq/apps/hqwebapp/utils/bootstrap/changes_guide/well.md
rename to corehq/apps/hqwebapp/utils/bootstrap/changes_guide/css-well.md
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/form-group.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/form-group.md
deleted file mode 100644
index 200051e7506f..000000000000
--- a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/form-group.md
+++ /dev/null
@@ -1,7 +0,0 @@
-`form-group` has been dropped. Use grid utilities instead.
-
-Since we are opting for vertical forms (where the label is directly above the field),
-the replacement for `form-group` is most likely just `mb-3` and the child `div` with a column
-class surrounding the `form-control` element can be removed, along with the column class that
-appears with the `<label>` `class` attribute. Most often, the `<label>` `class` only needs to
-contain the `form-label` class now.
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/inline-style.md b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/inline-style.md
new file mode 100644
index 000000000000..117eeba75891
--- /dev/null
+++ b/corehq/apps/hqwebapp/utils/bootstrap/changes_guide/inline-style.md
@@ -0,0 +1,13 @@
+This template uses inline styles. Please revisit this usage.
+
+Inline styles are not best practice. While replacing them is not strictly necessary for this migration,
+Bootstrap 5 includes a host of utility classes that can replace a lot of the imline style usage in HQ.
+
+Some common replacements:
+* Display styles like `display: none` can be replaced with classes like `d-none`. See https://getbootstrap.com/docs/5.0/utilities/display/
+* Spacing styles like `margin-bottom: 10px` can be replaced with classes like `mb-3`. See https://getbootstrap.com/docs/5.0/utilities/spacing/
+* Text alignment styles like `text-align: right` can be replaced with classes like `text-end`. See https://getbootstrap.com/docs/5.0/utilities/text/
+* Usages of the `em` unit should be updated to use the `rem` unit
+* Layouts achieved using inline styling can sometimes be replaced with usage of flex. See https://getbootstrap.com/docs/5.0/utilities/flex/
+
+See all of Bootstrap 5's utility classes: https://getbootstrap.com/docs/5.0/utilities/
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/paths.py b/corehq/apps/hqwebapp/utils/bootstrap/paths.py
index c852f5dc0c99..8225b48c8c3c 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/paths.py
+++ b/corehq/apps/hqwebapp/utils/bootstrap/paths.py
@@ -8,6 +8,7 @@
 PARENT_PATHS = {
     "corehq": COREHQ_BASE_DIR,
     "custom": CUSTOM_BASE_DIR,
+    "messaging": COREHQ_BASE_DIR / "messaging",
     "motech": COREHQ_BASE_DIR / "motech",
     "casexml": COREHQ_BASE_DIR / "ex-submodules/casexml/apps",
     "ex-submodules": COREHQ_BASE_DIR / "ex-submodules",
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 5ec3f13e4321..6e1dd5a57825 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -131,5 +131,11 @@
   },
   "motech.dhis2": {
     "is_complete": true
+  },
+  "export": {
+    "is_complete": true
+  },
+  "integration": {
+    "is_complete": true
   }
 }
diff --git a/corehq/apps/hqwebapp/utils/webpack.py b/corehq/apps/hqwebapp/utils/webpack.py
new file mode 100644
index 000000000000..8f06ccf14bb7
--- /dev/null
+++ b/corehq/apps/hqwebapp/utils/webpack.py
@@ -0,0 +1,32 @@
+import json
+from pathlib import Path
+
+from django.conf import settings
+from memoized import memoized
+
+import corehq
+
+WEBPACK_BUILD_DIR = Path(corehq.__file__).resolve().parent.parent / "webpack" / "_build"
+
+
+def cache_unless_debug(func):
+    return func if settings.DEBUG else memoized(func)
+
+
+class WebpackManifestNotFoundError(Exception):
+    pass
+
+
+@cache_unless_debug
+def get_webpack_manifest(filename=None):
+    if not filename:
+        path = WEBPACK_BUILD_DIR / "manifest.json"
+    else:
+        path = WEBPACK_BUILD_DIR / filename
+    if not path.is_file():
+        raise WebpackManifestNotFoundError
+
+    with open(path, 'r', encoding='utf-8') as f:
+        manifest = json.load(f)
+
+    return manifest
diff --git a/corehq/apps/hqwebapp/views.py b/corehq/apps/hqwebapp/views.py
index 1c35044181b1..3c52ea92a022 100644
--- a/corehq/apps/hqwebapp/views.py
+++ b/corehq/apps/hqwebapp/views.py
@@ -1111,7 +1111,7 @@ def paginate_crud_response(self):
         Return this in the post method of your view class.
         """
         response = getattr(self, '%s_response' % self.action)
-        return HttpResponse(json.dumps(response, cls=LazyEncoder))
+        return HttpResponse(json.dumps(response, cls=LazyEncoder), content_type='application/json')
 
     @property
     def create_response(self):
diff --git a/corehq/apps/hqwebapp/widgets.py b/corehq/apps/hqwebapp/widgets.py
index 44e62860a384..22afed38e9ff 100644
--- a/corehq/apps/hqwebapp/widgets.py
+++ b/corehq/apps/hqwebapp/widgets.py
@@ -137,12 +137,27 @@ def render(self, name, value, attrs=None, renderer=None):
 
         attrs.update({
             'data-separator': self.separator,
-            'data-labels': json.dumps(self.range_labels),
             'data-start-date': startdate,
             'data-end-date': enddate,
         })
 
+        from corehq.apps.hqwebapp.utils.bootstrap import get_bootstrap_version, BOOTSTRAP_5
+        use_bootstrap5 = get_bootstrap_version() == BOOTSTRAP_5
+        if use_bootstrap5:
+            attrs.update({
+                'data-labels': json.dumps(self.range_labels),
+            })
+
         output = super(DateRangePickerWidget, self).render(name, value, attrs, renderer)
+        if use_bootstrap5:
+            return format_html(
+                '<div class="input-group hqwebapp-datespan">'
+                '   <span class="input-group-text"><i class="fa-solid fa-calendar-days"></i></span>'
+                '   {}'
+                '</div>',
+                output
+            )
+
         return format_html(
             '<div class="input-group hqwebapp-datespan">'
             '   <span class="input-group-addon"><i class="fa-solid fa-calendar-days"></i></span>'
diff --git a/corehq/apps/integration/forms.py b/corehq/apps/integration/forms.py
index 9c1a8720dc24..49f4358244db 100644
--- a/corehq/apps/integration/forms.py
+++ b/corehq/apps/integration/forms.py
@@ -2,11 +2,13 @@
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy, gettext_noop
 
+from crispy_forms.bootstrap import PrependedText
 from crispy_forms import layout as crispy
 from crispy_forms.layout import Submit
 from memoized import memoized
 
 from corehq.apps.hqwebapp import crispy as hqcrispy
+from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.apps.integration.models import (
     DialerSettings,
     HmacCalloutSettings,
@@ -17,8 +19,11 @@
 
 class DialerSettingsForm(forms.ModelForm):
     is_enabled = forms.BooleanField(
-        label=_("Enable AWS Connect Dialer"),
-        required=False
+        label="",
+        required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=_("Enable AWS Connect Dialer"),
+        ),
     )
     aws_instance_id = forms.CharField(
         label=_('AWS Instance ID'),
@@ -51,10 +56,7 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            hqcrispy.B3MultiField(
-                _("Telephony Services"),
-                hqcrispy.InlineField('is_enabled'),
-            ),
+            PrependedText('is_enabled', ""),
             crispy.Div(
                 crispy.Field('aws_instance_id'),
             ),
@@ -64,10 +66,8 @@ def __init__(self, data, *args, **kwargs):
             crispy.Div(
                 crispy.Field('dialer_page_subheader'),
             ),
-            hqcrispy.FormActions(
-                crispy.ButtonHolder(
-                    Submit('submit', _("Update"))
-                )
+            crispy.ButtonHolder(
+                Submit('submit', _("Update"))
             )
         )
 
@@ -98,8 +98,11 @@ def save(self):
 
 class GaenOtpServerSettingsForm(forms.ModelForm):
     is_enabled = forms.BooleanField(
-        label=_("Enable GAEN OTP server integration"),
-        required=False
+        label="",
+        required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_lazy("Enable GAEN OTP server integration"),
+        ),
     )
 
     server_type = forms.CharField(
@@ -136,10 +139,7 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            hqcrispy.B3MultiField(
-                _("OTP Callouts"),
-                hqcrispy.InlineField('is_enabled'),
-            ),
+            PrependedText('is_enabled', ""),
             crispy.Div(
                 crispy.Field('server_type'),
             ),
@@ -149,10 +149,8 @@ def __init__(self, data, *args, **kwargs):
             crispy.Div(
                 crispy.Field('auth_token'),
             ),
-            hqcrispy.FormActions(
-                crispy.ButtonHolder(
-                    Submit('submit', _("Update"))
-                )
+            crispy.ButtonHolder(
+                Submit('submit', _("Update"))
             )
         )
 
@@ -183,8 +181,11 @@ def save(self):
 
 class HmacCalloutSettingsForm(forms.ModelForm):
     is_enabled = forms.BooleanField(
-        label=_("Enable Signed Callout in Web Apps"),
-        required=False
+        label="",
+        required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=_("Enable in Web Apps"),
+        ),
     )
     destination_url = forms.CharField(
         label=_('External Callout URL'),
@@ -193,11 +194,11 @@ class HmacCalloutSettingsForm(forms.ModelForm):
 
     api_key = forms.CharField(
         label=_('API Key'),
-        help_text=_("API Key for CommCare in the external System")
+        help_text=_("API Key for CommCare in the external system")
     )
     api_secret = forms.CharField(
         label=_('API Secret'),
-        help_text=_("API Secret for message Signing"),
+        help_text=_("API secret for message signing"),
         widget=forms.PasswordInput
     )
 
@@ -217,10 +218,7 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            hqcrispy.B3MultiField(
-                _("Signed Callout Config"),
-                hqcrispy.InlineField('is_enabled'),
-            ),
+            PrependedText('is_enabled', ""),
             crispy.Div(
                 crispy.Field('destination_url'),
             ),
@@ -230,10 +228,8 @@ def __init__(self, data, *args, **kwargs):
             crispy.Div(
                 crispy.Field('api_secret'),
             ),
-            hqcrispy.FormActions(
-                crispy.ButtonHolder(
-                    Submit('submit', _("Update"))
-                )
+            crispy.ButtonHolder(
+                Submit('submit', _("Update"))
             )
         )
 
@@ -264,8 +260,11 @@ def save(self):
 
 class SimprintsIntegrationForm(forms.Form):
     is_enabled = forms.BooleanField(
-        label=gettext_noop("Enable Simprints Integration"),
-        required=False
+        label="",
+        required=False,
+        widget=BootstrapCheckboxInput(
+            inline_label=gettext_noop("Enable Simprints Integration"),
+        ),
     )
     project_id = forms.CharField(
         label=gettext_noop("Project ID"),
@@ -287,22 +286,15 @@ def __init__(self, data, *args, **kwargs):
         self.helper = hqcrispy.HQFormHelper()
         self.helper.form_method = 'POST'
         self.helper.layout = crispy.Layout(
-            hqcrispy.B3MultiField(
-                _("Simprints Integration"),
-                hqcrispy.InlineField(
-                    'is_enabled', data_bind="checked: isEnabled"
-                ),
-            ),
+            PrependedText('is_enabled', "", data_bind="checked: isEnabled"),
             crispy.Div(
                 crispy.Field('project_id', data_bind="value: projectId"),
                 crispy.Field('user_id', data_bind="value: userId"),
                 crispy.Field('module_id', data_bind="value: moduleId"),
                 data_bind="visible: isEnabled"
             ),
-            hqcrispy.FormActions(
-                crispy.ButtonHolder(
-                    Submit('submit', gettext_lazy("Update"))
-                )
+            crispy.ButtonHolder(
+                Submit('submit', gettext_lazy("Update"))
             )
         )
 
diff --git a/corehq/apps/integration/static/integration/css/pseudo-webapps.css b/corehq/apps/integration/static/integration/css/pseudo-webapps.css
new file mode 100644
index 000000000000..b2e6b1ce9530
--- /dev/null
+++ b/corehq/apps/integration/static/integration/css/pseudo-webapps.css
@@ -0,0 +1,20 @@
+/* These pages need a handful of styles to make them look like webapps */
+
+.widget-container {
+    margin-top: 2rem;
+    background-color: white;
+    box-shadow: 0 0 10px 2px rgba(0, 0, 0, 0.1);
+    padding: 0;
+}
+
+.integration-navbar {
+    min-height: 30px;
+    background-color: #002c5f;
+}
+
+.integration-navbar .navbar-brand,
+.integration-navbar li a {
+    height: 30px;
+    padding: 6.5px 15px;
+    color: white;
+}
diff --git a/corehq/apps/integration/templates/integration/base_cloudcare_template.html b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
index 5e2ebec55445..20f7e5ea991c 100644
--- a/corehq/apps/integration/templates/integration/base_cloudcare_template.html
+++ b/corehq/apps/integration/templates/integration/base_cloudcare_template.html
@@ -1,11 +1,11 @@
-{% extends "hqwebapp/bootstrap3/base_navigation.html" %}
+{% extends "hqwebapp/bootstrap5/base_navigation.html" %}
 {% load i18n %}
 {% load static %}
 {% load hq_shared_tags %}
 {% load compress %}
 
 {% block navigation %}
-  <div class="navbar navbar-inverse navbar-cloudcare navbar-static-top">
+  <div class="navbar integration-navbar navbar-static-top">
     <div class="container-fluid">
       <a class="navbar-brand" href="{{ home_url }}"><i class="fcc fcc-flower"></i> Web Apps</a>
       <ul class="nav navbar-nav navbar-right" >
@@ -17,36 +17,17 @@
 
 {% block stylesheets %}
   {% compress css %}
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/font-formplayer.less' %}" />
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/formplayer-common.less' %}"/>
-    <link type="text/less"
-          rel="stylesheet"
-          media="all"
-          href="{% static 'cloudcare/less/formplayer-webapp.less' %}"/>
+    <link type="text/css" rel="stylesheet" media="all"
+          href="{% static 'integration/css/pseudo-webapps.css' %}"/>
   {% endcompress %}
 {% endblock %}
 
-
 {% block content %}
-  <div id="cloudcare-main" class="cloudcare-home-content">
-    <div id="menu-container">
-      <div class="container case-tile-container">
-        <div id="persistent-case-tile"></div>
-      </div>
-
-      <section id="cloudcare-notifications" class="container notifications-container"></section>
-      <div id="menu-region" class="container">
-        <div class="module-menu-container">
-           {% block widget_content %}
-           {% endblock %}
-        </div>
-      </div>
-    </div>
+  <div class="container widget-container">
+    {% block widget_content %}
+    {% endblock %}
   </div>
 {% endblock %}
+
+{% block footer %}
+{% endblock %}
diff --git a/corehq/apps/integration/templates/integration/biometric.html b/corehq/apps/integration/templates/integration/biometric.html
index e2c0621c93f2..20a047183963 100644
--- a/corehq/apps/integration/templates/integration/biometric.html
+++ b/corehq/apps/integration/templates/integration/biometric.html
@@ -1,22 +1,15 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main 'integration/js/biometric' %}
+{% requirejs_main_b5 'integration/js/biometric' %}
 
 {% block page_content %}
   {% initial_page_data 'simprintsFormData' simprints_form.initial_data %}
 
-  <div class="panel panel-modern-gray">
-    <div class="panel-heading">
-      <h4 class="panel-title panel-title-nolink">
-        {% trans 'Simprints Integration' %}
-      </h4>
-    </div>
-    <div class="panel-body" id="simprints-form">
-      {% crispy simprints_form %}
-    </div>
+  <div id="simprints-form">
+    {% crispy simprints_form %}
   </div>
 
 {% endblock %}
diff --git a/corehq/apps/integration/templates/integration/dialer_settings.html b/corehq/apps/integration/templates/integration/dialer_settings.html
index 403c589d9a6d..85502d82caab 100644
--- a/corehq/apps/integration/templates/integration/dialer_settings.html
+++ b/corehq/apps/integration/templates/integration/dialer_settings.html
@@ -1,4 +1,4 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
diff --git a/corehq/apps/integration/templates/integration/gaen_otp_server_settings.html b/corehq/apps/integration/templates/integration/gaen_otp_server_settings.html
index 403c589d9a6d..85502d82caab 100644
--- a/corehq/apps/integration/templates/integration/gaen_otp_server_settings.html
+++ b/corehq/apps/integration/templates/integration/gaen_otp_server_settings.html
@@ -1,4 +1,4 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
diff --git a/corehq/apps/integration/templates/integration/hmac_callout_settings.html b/corehq/apps/integration/templates/integration/hmac_callout_settings.html
index 403c589d9a6d..85502d82caab 100644
--- a/corehq/apps/integration/templates/integration/hmac_callout_settings.html
+++ b/corehq/apps/integration/templates/integration/hmac_callout_settings.html
@@ -1,4 +1,4 @@
-{% extends "hqwebapp/bootstrap3/base_section.html" %}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
diff --git a/corehq/apps/integration/templates/integration/web_app_dialer.html b/corehq/apps/integration/templates/integration/web_app_dialer.html
index bd087a91bfbe..33e98824aefb 100644
--- a/corehq/apps/integration/templates/integration/web_app_dialer.html
+++ b/corehq/apps/integration/templates/integration/web_app_dialer.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load static %}
 {% load compress %}
-{% requirejs_main "integration/js/dialer/domain_dialer_main" %}
+{% requirejs_main_b5 "integration/js/dialer/domain_dialer_main" %}
 
 {% block stylesheets %}
   {{ block.super }}
diff --git a/corehq/apps/integration/templates/integration/web_app_integration_err.html b/corehq/apps/integration/templates/integration/web_app_integration_err.html
index 036880d72ddf..799f0f79c7c5 100644
--- a/corehq/apps/integration/templates/integration/web_app_integration_err.html
+++ b/corehq/apps/integration/templates/integration/web_app_integration_err.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load static %}
 {% load compress %}
-{% requirejs_main "integration/js/dialer/domain_dialer_main" %}
+{% requirejs_main_b5 "integration/js/dialer/domain_dialer_main" %}
 
 {% block stylesheets %}
   {{ block.super }}
diff --git a/corehq/apps/integration/views.py b/corehq/apps/integration/views.py
index 9e34bab1c6cc..bbc622bbaa90 100644
--- a/corehq/apps/integration/views.py
+++ b/corehq/apps/integration/views.py
@@ -18,6 +18,7 @@
 from corehq.apps.domain.decorators import login_and_domain_required
 from corehq.apps.domain.views import BaseAdminProjectSettingsView
 from corehq.apps.domain.views.settings import BaseProjectSettingsView
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
 from corehq.apps.integration.forms import (
     DialerSettingsForm,
     HmacCalloutSettingsForm,
@@ -37,6 +38,7 @@ class BiometricIntegrationView(BaseAdminProjectSettingsView):
     page_title = gettext_lazy("Biometric Integration")
     template_name = 'integration/biometric.html'
 
+    @method_decorator(use_bootstrap5)
     @method_decorator(require_permission(HqPermissions.edit_motech))
     @method_decorator(toggles.BIOMETRIC_INTEGRATION.required_decorator())
     def dispatch(self, request, *args, **kwargs):
@@ -70,6 +72,7 @@ def post(self, request, *args, **kwargs):
 
 
 @toggles.WIDGET_DIALER.required_decorator()
+@use_bootstrap5
 @login_and_domain_required
 @require_GET
 def dialer_view(request, domain):
@@ -81,6 +84,7 @@ def dialer_view(request, domain):
 
 
 @toggles.GAEN_OTP_SERVER.required_decorator()
+@use_bootstrap5
 @login_and_domain_required
 @require_POST
 def gaen_otp_view(request, domain):
@@ -158,6 +162,7 @@ def get_post_data_for_otp(request, domain):
     return post_params
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 class DialerSettingsView(BaseProjectSettingsView):
     urlname = 'dialer_settings_view'
     page_title = gettext_lazy('Dialer Settings')
@@ -200,6 +205,7 @@ def post(self, request, *args, **kwargs):
         return self.get(request, *args, **kwargs)
 
 
+@method_decorator(use_bootstrap5, name='dispatch')
 @method_decorator(toggles.GAEN_OTP_SERVER.required_decorator(), name='dispatch')
 class GaenOtpServerSettingsView(BaseProjectSettingsView):
     urlname = 'gaen_otp_server_settings_view'
@@ -240,6 +246,7 @@ def post(self, request, *args, **kwargs):
 
 
 @method_decorator(toggles.HMAC_CALLOUT.required_decorator(), name='dispatch')
+@method_decorator(use_bootstrap5, name='dispatch')
 class HmacCalloutSettingsView(BaseProjectSettingsView):
     urlname = 'hmac_callout_settings_view'
     page_title = gettext_lazy('Signed Callout Settings')
diff --git a/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js b/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js
index 4063946cf1c0..ba2062349308 100644
--- a/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js
+++ b/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js
@@ -6,7 +6,8 @@ hqDefine("linked_domain/js/domain_links", [
     'hqwebapp/js/bootstrap3/alert_user',
     'hqwebapp/js/multiselect_utils',
     'analytix/js/kissmetrix',
-    'hqwebapp/js/bootstrap3/components.ko', // for pagination and search box
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
     'hqwebapp/js/select2_knockout_bindings.ko',     // selects2 for fields
 ], function (
     RMI,
@@ -551,11 +552,11 @@ hqDefine("linked_domain/js/domain_links", [
     };
 
     $(function () {
-        var view_data = initialPageData.get('view_data');
+        var viewData = initialPageData.get('view_data');
         var csrfToken = $("#csrfTokenContainer").val();
         setRMI(initialPageData.reverse('linked_domain:domain_link_rmi'), csrfToken);
 
-        var model = DomainLinksViewModel(view_data);
+        var model = DomainLinksViewModel(viewData);
         $("#ko-linked-projects").koApplyBindings(model);
 
         if ($("#new-downstream-domain-modal").length) {
diff --git a/corehq/apps/linked_domain/tests/test_linked_apps.py b/corehq/apps/linked_domain/tests/test_linked_apps.py
index d7c5bf9a8061..b73cd356280d 100644
--- a/corehq/apps/linked_domain/tests/test_linked_apps.py
+++ b/corehq/apps/linked_domain/tests/test_linked_apps.py
@@ -47,6 +47,7 @@
     convert_app_for_remote_linking,
 )
 from corehq.apps.userreports.tests.utils import (
+    cleanup_ucr,
     get_sample_data_source,
     get_sample_report_config,
 )
@@ -159,6 +160,7 @@ def test_linked_reports_updated(self):
 
         # link report on master app to linked domain
         link_info = create_linked_ucr(self.domain_link, master_report.get_id)
+        self.addCleanup(cleanup_ucr, link_info.datasource)
 
         updated_app = update_linked_app(self.linked_app, self.master1, 'a-user-id')
 
@@ -169,6 +171,7 @@ def _create_report_and_datasource(self):
         master_data_source = get_sample_data_source()
         master_data_source.domain = self.domain
         master_data_source.save()
+        self.addCleanup(cleanup_ucr, master_data_source)
 
         master_report = get_sample_report_config()
         master_report.config_id = master_data_source.get_id
@@ -199,6 +202,7 @@ def test_linked_reports_updated_for_remote(self, fake_ucr_getter):
             "datasource": master_data_source,
         }
         link_info = create_linked_ucr(self.domain_link, master_report.get_id)
+        self.addCleanup(cleanup_ucr, link_info.datasource)
         updated_app = update_linked_app(self.linked_app, self.master1, 'a-user-id')
 
         # report config added with the linked report id updated in report config
diff --git a/corehq/apps/linked_domain/tests/test_release_manager.py b/corehq/apps/linked_domain/tests/test_release_manager.py
index 664c65a22774..f85651dd41a6 100644
--- a/corehq/apps/linked_domain/tests/test_release_manager.py
+++ b/corehq/apps/linked_domain/tests/test_release_manager.py
@@ -31,6 +31,7 @@
 )
 from corehq.apps.sms.models import Keyword
 from corehq.apps.userreports.tests.utils import (
+    cleanup_ucr,
     get_sample_data_source,
     get_sample_report_config,
 )
@@ -233,19 +234,21 @@ def _create_new_report(self):
         self.data_source = get_sample_data_source()
         self.data_source.domain = self.domain
         self.data_source.save()
+        self.addCleanup(cleanup_ucr, self.data_source)
 
         self.report = get_sample_report_config()
         self.report.config_id = self.data_source.get_id
         self.report.domain = self.domain
         self.report.save()
+        self.addCleanup(self.report.delete)
         return self.report
 
     def test_already_linked_report_is_pushed(self):
         new_report = self._create_new_report()
         new_report.title = "Title"
         new_report.save()
-        self.addCleanup(new_report.delete)
         linked_report_info = create_linked_ucr(self.domain_link, new_report.get_id)
+        self.addCleanup(cleanup_ucr, linked_report_info.datasource)
         self.addCleanup(linked_report_info.report.delete)
         # after creating the link, update the upstream report
         new_report.title = "Updated Title"
@@ -264,7 +267,6 @@ def test_already_linked_report_is_pushed(self):
 
     def test_report_pushed_if_not_found(self):
         unpushed_report = self._create_new_report()
-        self.addCleanup(unpushed_report.delete)
         model = self._linked_data_view_model(
             MODEL_REPORT,
             detail=ReportLinkDetail(report_id=unpushed_report.get_id).to_json()
@@ -275,6 +277,7 @@ def test_report_pushed_if_not_found(self):
         self.assertIsNone(errors)
 
         downstream_report = get_downstream_report(self.linked_domain, unpushed_report.get_id)
+        self.addCleanup(cleanup_ucr, downstream_report.config)
         self.addCleanup(downstream_report.delete)
         self.assertIsNotNone(downstream_report)
 
diff --git a/corehq/apps/locations/forms.py b/corehq/apps/locations/forms.py
index 2cc4466a6c5a..625e394cf1e5 100644
--- a/corehq/apps/locations/forms.py
+++ b/corehq/apps/locations/forms.py
@@ -14,6 +14,7 @@
 from dimagi.utils.couch.database import iter_docs
 
 from corehq import toggles
+from corehq.feature_previews import USE_LOCATION_DISPLAY_NAME
 from corehq.apps.custom_data_fields.edit_entity import (
     CUSTOM_DATA_FIELD_PREFIX,
     CustomDataEditor,
@@ -32,6 +33,7 @@
 from corehq.apps.users.models import CommCareUser
 from corehq.apps.users.util import user_display_string
 from corehq.util.quickcache import quickcache
+from corehq.util.global_request import get_request_domain
 
 from .models import (
     LocationFixtureConfiguration,
@@ -45,14 +47,15 @@
 
 class LocationSelectWidget(forms.Widget):
     def __init__(self, domain, attrs=None, id='supply-point', multiselect=False, placeholder=None,
-                 include_locations_with_no_users_allowed=True):
+                 for_user_location_selection=False):
         super(LocationSelectWidget, self).__init__(attrs)
         self.domain = domain
         self.id = id
         self.multiselect = multiselect
         self.placeholder = placeholder
         url_name = 'location_search'
-        if not include_locations_with_no_users_allowed and toggles.LOCATION_HAS_USERS.enabled(self.domain):
+        if (for_user_location_selection
+                and toggles.USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION.enabled(self.domain)):
             url_name = 'location_search_has_users_only'
         self.query_url = reverse(url_name, args=[self.domain])
         self.template = 'locations/manage/partials/autocomplete_select_widget.html'
@@ -61,10 +64,11 @@ def render(self, name, value, attrs=None, renderer=None):
         location_ids = to_list(value) if value else []
         locations = list(SQLLocation.active_objects
                          .filter(domain=self.domain, location_id__in=location_ids))
-
+        use_location_display_name = USE_LOCATION_DISPLAY_NAME.enabled(get_request_domain())
         initial_data = [{
             'id': loc.location_id,
-            'text': loc.get_path_display(),
+            'text': loc.display_name if use_location_display_name else loc.get_path_display(),
+            'title': loc.get_path_display() if use_location_display_name else loc.display_name,
         } for loc in locations]
 
         return get_template(self.template).render({
diff --git a/corehq/apps/locations/static/locations/js/filtered_download.js b/corehq/apps/locations/static/locations/js/filtered_download.js
index 05df9092e2e4..757c89955466 100644
--- a/corehq/apps/locations/static/locations/js/filtered_download.js
+++ b/corehq/apps/locations/static/locations/js/filtered_download.js
@@ -4,7 +4,7 @@ hqDefine('locations/js/filtered_download', [
     'underscore',
     'hqwebapp/js/initial_page_data',
     'locations/js/widgets',     // location search
-    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // slideVisible binding
 ], function (
     $,
diff --git a/corehq/apps/locations/static/locations/js/widgets.js b/corehq/apps/locations/static/locations/js/widgets.js
index cc3d5441ea98..24aaab66214f 100644
--- a/corehq/apps/locations/static/locations/js/widgets.js
+++ b/corehq/apps/locations/static/locations/js/widgets.js
@@ -1,20 +1,84 @@
+'use strict';
 hqDefine("locations/js/widgets", [
     'jquery',
     'underscore',
+    'hqwebapp/js/toggles',
     'select2/dist/js/select2.full.min',
 ], function (
     $,
-    _
+    _,
+    toggles
 ) {
     // Update the options available to one select2 to be
     // the selected values from another (multiselect) select2
     function updateSelect2($source, $select) {
         $select.find("option").remove();
         _.each($source.select2('data'), function (result) {
-            $select.append(new Option(result.text || result.name, result.id));
+            const fullLengthName = result.text || result.name;
+            let $option;
+            if (toggles.toggleEnabled('LOCATION_FIELD_USER_PROVISIONING')) {
+                const truncatedName = truncateLocationName(fullLengthName, $select);
+                $option = new Option(truncatedName, result.id);
+            } else {
+                $option = new Option(fullLengthName, result.id);
+            }
+            $option.setAttribute('title', result.title);
+            $select.append($option);
         });
     }
 
+    function truncateLocationName(name, select) {
+        const nameWidthPixels = getSelectTextWidth(name, select);
+        const basicInfoTabActive = $('#basic-info').hasClass('active');
+        let containerWidthPixels = select.parent().width();
+
+        // Select is hidden on locations tab. Calculate width from visible select.
+        if (basicInfoTabActive) {
+            const visibleSelect = $('#basic-info').find('.controls > .select')[0];
+            if (!visibleSelect) {
+                return name;
+            }
+            containerWidthPixels = $(visibleSelect).parent().width();
+        // Default to select2 setting for overflow
+        } else if (containerWidthPixels < 0) {
+            return name;
+        }
+        let truncatedName;
+        if (nameWidthPixels > containerWidthPixels) {
+            // Conservative calc of the number of chars that will fit the container
+            const averagePixelWidthPerChar = Math.ceil(nameWidthPixels / name.length);
+            const maxCharCount = Math.floor(containerWidthPixels / averagePixelWidthPerChar);
+            const charLengthDiff = name.length - maxCharCount;
+
+            truncatedName = `${name.substring(0, 5)}...${name.substring(charLengthDiff + 16, name.length)}`;
+
+            return truncatedName;
+        }
+
+        return name;
+    }
+
+    function getSelectTextWidth(text, select) {
+        const fontSize = select.css('font-size');
+        const fontFamily = select.css('font-family');
+        const fontWeight = select.css('font-weight');
+        // Create an invisible div to get accurate measure of text width
+        const textDiv = $('<div id="select-text-div"></div>').text(text).css({'position': 'absolute',
+            'float': 'left',
+            'white-space': 'nowrap',
+            'visibility': 'hidden',
+            'font-size': fontSize,
+            'font-weight': fontWeight,
+            'font-family': fontFamily,
+        });
+
+        textDiv.appendTo('body');
+        const textWidth = textDiv.width();
+        textDiv.remove();
+
+        return textWidth;
+    }
+
     function initAutocomplete($select) {
         var options = $select.data();
         $select.select2({
@@ -34,14 +98,35 @@ hqDefine("locations/js/widgets", [
                 },
                 processResults: function (data, params) {
                     var more = (params.page || 1) * 10 < data.total;
+                    if (toggles.toggleEnabled('LOCATION_FIELD_USER_PROVISIONING')) {
+                        let selectedLocations = Array.from($select[0].selectedOptions);
+                        if (selectedLocations.length > 0) {
+                            let locIds = selectedLocations.map(option => option.value);
+                            data.results.forEach(result => {
+                                if (locIds.includes(result.id)) {
+                                    result.disabled = true;
+                                }
+                            });
+                        }
+                    }
                     return {
                         results: data.results,
                         pagination: { more: more },
                     };
                 },
             },
-            templateResult: function (result) { return result.text || result.name; },
-            templateSelection: function (result) { return result.text || result.name; },
+            templateResult: function (result) {
+                return result.text || result.name;
+            },
+            templateSelection: function (result) {
+                const fullLengthName = result.text || result.name;
+                if (toggles.toggleEnabled('LOCATION_FIELD_USER_PROVISIONING')) {
+                    const truncatedName = truncateLocationName(fullLengthName, $select);
+                    return truncatedName;
+                } else {
+                    return fullLengthName;
+                }
+            },
         });
 
         var initial = options.initial;
@@ -50,7 +135,9 @@ hqDefine("locations/js/widgets", [
                 initial = [initial];
             }
             _.each(initial, function (result) {
-                $select.append(new Option(result.text, result.id));
+                var $option = new Option(result.text, result.id);
+                $option.setAttribute('title', result.title);
+                $select.append($option);
             });
             $select.val(_.pluck(initial, 'id')).trigger('change');
         }
@@ -77,7 +164,9 @@ hqDefine("locations/js/widgets", [
             // This custom event is fired in autocomplete_select_widget.html
             if ($source.hasClass("select2-hidden-accessible")) {
                 updateSelect2($source, $select);
-                $select.append(new Option(value.text, value.id));
+                var $option = new Option(value.text, value.id);
+                $option.setAttribute('title', value.title);
+                $select.append($option);
                 $select.val(value.id).trigger("change");
             } else {
                 $source.on('select-ready', function () {
diff --git a/corehq/apps/locations/templates/locations/location_types.html b/corehq/apps/locations/templates/locations/location_types.html
index 1a2fb794cea5..4d069ed7c7f7 100644
--- a/corehq/apps/locations/templates/locations/location_types.html
+++ b/corehq/apps/locations/templates/locations/location_types.html
@@ -167,8 +167,6 @@ <h2>{% trans "Organization Levels" %}</h2>
                         {% endblocktrans %}">
                   </span>
                 </th>
-              {% endif %}
-              {% if request|toggle_enabled:"LOCATION_HAS_USERS" %}
                 <th data-bind="visible: advanced_mode">
                   {% trans "Has Users" %}
                   <span class="hq-help-template"
@@ -268,8 +266,6 @@ <h2>{% trans "Organization Levels" %}</h2>
                                     enable: view_descendants">
                   </select>
                 </td>
-              {% endif %}
-              {% if request|toggle_enabled:"LOCATION_HAS_USERS" %}
                 <td data-bind="visible: $parent.advanced_mode">
                   <input data-bind="checked: has_users_setting, disable: has_users_setting() && actually_has_users()" type="checkbox" />
                 </td>
diff --git a/corehq/apps/locations/tests/test_location_safety.py b/corehq/apps/locations/tests/test_location_safety.py
index ac5c4c52c26c..f231ed876aaf 100644
--- a/corehq/apps/locations/tests/test_location_safety.py
+++ b/corehq/apps/locations/tests/test_location_safety.py
@@ -1,5 +1,6 @@
 from django.views.generic.base import View
 
+import pytest
 from unittest.mock import MagicMock
 
 from corehq.apps.reports.dispatcher import ReportDispatcher
@@ -35,20 +36,17 @@ class SafeChildofUnsafeClsView(UnsafeClsView):
     """This shouldn't hoist its safety up to the parent class"""
 
 
-def test_django_view_safety():
-    def _assert(view_fn, is_safe):
-        assert is_location_safe(view_fn, MagicMock(), (), {}) == is_safe, \
-            f"{view_fn} {'IS NOT' if is_safe else 'IS'} marked as location-safe"
-
-    for view, is_safe in [
-            (safe_fn_view, True),
-            (unsafe_fn_view, False),
-            (SafeClsView.as_view(), True),
-            (UnsafeClsView.as_view(), False),
-            (ImplicitlySafeChildOfSafeClsView.as_view(), True),
-            (SafeChildofUnsafeClsView.as_view(), True),
-    ]:
-        yield _assert, view, is_safe
+@pytest.mark.parametrize("view_fn, is_safe", [
+    (safe_fn_view, True),
+    (unsafe_fn_view, False),
+    (SafeClsView.as_view(), True),
+    (UnsafeClsView.as_view(), False),
+    (ImplicitlySafeChildOfSafeClsView.as_view(), True),
+    (SafeChildofUnsafeClsView.as_view(), True),
+])
+def test_django_view_safety(view_fn, is_safe):
+    assert is_location_safe(view_fn, MagicMock(), (), {}) == is_safe, \
+        f"{view_fn} {'IS NOT' if is_safe else 'IS'} marked as location-safe"
 
 
 def _sometimes_safe(view_fn, request, *args, **kwargs):
@@ -69,21 +67,18 @@ class ImplicitlySafeChildOfConditionallySafeClsView(ConditionallySafeClsView):
     pass
 
 
-def test_conditionally_safe_django_views():
-    safe_request = MagicMock(this_is_safe=True)
-    unsafe_request = MagicMock(this_is_safe=False)
-
-    def _assert(view_fn, request, is_safe):
-        assert is_location_safe(view_fn, request, (), {}) == is_safe, \
-            f"{view_fn} {'IS NOT' if is_safe else 'IS'} marked as location-safe"
-
-    for view in [
-            conditionally_safe_fn_view,
-            ConditionallySafeClsView.as_view(),
-            ImplicitlySafeChildOfConditionallySafeClsView.as_view(),
-    ]:
-        yield _assert, view, safe_request, True
-        yield _assert, view, unsafe_request, False
+@pytest.mark.parametrize("view_fn, is_safe", [
+    (conditionally_safe_fn_view, True),
+    (ConditionallySafeClsView.as_view(), True),
+    (ImplicitlySafeChildOfConditionallySafeClsView.as_view(), True),
+    (conditionally_safe_fn_view, False),
+    (ConditionallySafeClsView.as_view(), False),
+    (ImplicitlySafeChildOfConditionallySafeClsView.as_view(), False),
+])
+def test_conditionally_safe_django_views(view_fn, is_safe):
+    request = MagicMock(this_is_safe=is_safe)
+    assert is_location_safe(view_fn, request, (), {}) == is_safe, \
+        f"{view_fn} {'IS NOT' if is_safe else 'IS'} marked as location-safe"
 
 
 class ExampleReportDispatcher(ReportDispatcher):
@@ -126,19 +121,16 @@ class ConditionallySafeHQReport(BaseReport):
     slug = 'conditionally_safe_hq_report'
 
 
-def test_hq_report_safety():
-    def _assert(report, request, is_safe):
-        view_fn = report.dispatcher.as_view()
-        view_kwargs = {'domain': 'foo', 'report_slug': report.slug}
-        assert is_location_safe(view_fn, request, (), view_kwargs) == is_safe, \
-            f"{report} {'IS NOT' if is_safe else 'IS'} marked as location-safe"
-
-    for report, request, is_safe in [
-            (SafeHQReport, MagicMock(), True),
-            (UnsafeHQReport, MagicMock(), False),
-            (ImplicitlySafeChildOfSafeHQReport, MagicMock(), True),
-            (SafeChildOfUnsafeHQReport, MagicMock(), True),
-            (ConditionallySafeHQReport, MagicMock(this_is_safe=True), True),
-            (ConditionallySafeHQReport, MagicMock(this_is_safe=False), False),
-    ]:
-        yield _assert, report, request, is_safe
+@pytest.mark.parametrize("report, request_, is_safe", [
+    (SafeHQReport, MagicMock(), True),
+    (UnsafeHQReport, MagicMock(), False),
+    (ImplicitlySafeChildOfSafeHQReport, MagicMock(), True),
+    (SafeChildOfUnsafeHQReport, MagicMock(), True),
+    (ConditionallySafeHQReport, MagicMock(this_is_safe=True), True),
+    (ConditionallySafeHQReport, MagicMock(this_is_safe=False), False),
+])
+def test_hq_report_safety(report, request_, is_safe):
+    view_fn = report.dispatcher.as_view()
+    view_kwargs = {'domain': 'foo', 'report_slug': report.slug}
+    assert is_location_safe(view_fn, request_, (), view_kwargs) == is_safe, \
+        f"{report} {'IS NOT' if is_safe else 'IS'} marked as location-safe"
diff --git a/corehq/apps/locations/tests/test_views.py b/corehq/apps/locations/tests/test_views.py
index 516bf9128d75..0a2d1fbfbbe8 100644
--- a/corehq/apps/locations/tests/test_views.py
+++ b/corehq/apps/locations/tests/test_views.py
@@ -146,7 +146,7 @@ def test_invalid_child_data(self):
         with self.assertRaises(LocationConsistencyError):
             self.send_request(data)
 
-    @flag_enabled('LOCATION_HAS_USERS')
+    @flag_enabled('USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION')
     @mock.patch('corehq.apps.locations.views.does_location_type_have_users', return_value=True)
     def test_invalid_remove_has_users(self, _):
         loc_type1 = OTHER_DETAILS.copy()
@@ -200,10 +200,10 @@ def test_search_view_basic(self):
         response = self.send_request(url, data)
         self.assertEqual(response.status_code, 200)
         results = json.loads(response.content)['results']
-        self.assertEqual(results[0]['id'], self.loc1.location_id)
-        self.assertEqual(results[1]['id'], self.loc2.location_id)
+        expected = {self.loc1.location_id, self.loc2.location_id}
+        self.assertEqual({r['id'] for r in results}, expected)
 
-    @flag_enabled('LOCATION_HAS_USERS')
+    @flag_enabled('USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION')
     def test_search_view_has_users_only(self):
         loc_type2 = LocationType(domain=self.domain, name='type2', code='code2')
         loc_type2.has_users = False
@@ -219,9 +219,8 @@ def test_search_view_has_users_only(self):
         response = self.send_request(url, data)
         self.assertEqual(response.status_code, 200)
         results = json.loads(response.content)['results']
-        self.assertEqual(len(results), 2)
-        self.assertEqual(results[0]['id'], self.loc1.location_id)
-        self.assertEqual(results[1]['id'], self.loc2.location_id)
+        expected = {self.loc1.location_id, self.loc2.location_id}
+        self.assertEqual({r['id'] for r in results}, expected)
 
 
 class BulkLocationUploadAPITest(TestCase):
diff --git a/corehq/apps/locations/urls.py b/corehq/apps/locations/urls.py
index d4c76a0fbbba..fc7abf6241d2 100644
--- a/corehq/apps/locations/urls.py
+++ b/corehq/apps/locations/urls.py
@@ -33,7 +33,7 @@
     url(r'^list/$', LocationsListView.as_view(), name=LocationsListView.urlname),
     url(r'^location_search/$', LocationsSearchView.as_view(), name='location_search'),
     url(r'^location_search_has_users_only/$', LocationsSearchView.as_view(
-        include_locations_with_no_users_allowed=False), name='location_search_has_users_only'),
+        include_locations_with_no_users=False), name='location_search_has_users_only'),
     url(r'^location_types/$', LocationTypesView.as_view(), name=LocationTypesView.urlname),
     url(r'^import/$', waf_allow('XSS_BODY')(LocationImportView.as_view()), name=LocationImportView.urlname),
     url(r'^import/bulk_location_upload_api/$', bulk_location_upload_api, name='bulk_location_upload_api'),
diff --git a/corehq/apps/locations/views.py b/corehq/apps/locations/views.py
index 11088b6e3d6f..639ce95f7f9b 100644
--- a/corehq/apps/locations/views.py
+++ b/corehq/apps/locations/views.py
@@ -264,11 +264,10 @@ def page_context(self):
 
 class LocationOptionsController(EmwfOptionsController):
     namespace_locations = False
-    case_sharing_only = False
 
-    def __init__(self, *args, include_locations_with_no_users_allowed=True):
-        self.include_locations_with_no_users_allowed = include_locations_with_no_users_allowed
-        super().__init__(*args)
+    def __init__(self, *args, include_locations_with_no_users=True, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.include_locations_with_no_users = include_locations_with_no_users
 
     @property
     def data_sources(self):
@@ -280,13 +279,13 @@ def data_sources(self):
 @method_decorator(locations_access_required, name='dispatch')
 @location_safe
 class LocationsSearchView(EmwfOptionsView):
-    include_locations_with_no_users_allowed = True
+    include_locations_with_no_users = True
 
     @property
     @memoized
     def options_controller(self):
         return LocationOptionsController(self.request, self.domain, self.search,
-            include_locations_with_no_users_allowed=self.include_locations_with_no_users_allowed)
+            include_locations_with_no_users=self.include_locations_with_no_users)
 
 
 @method_decorator(use_bootstrap5, name='dispatch')
@@ -434,7 +433,7 @@ def _validate_has_users_config(loc_type_payload, pk):
             payload_loc_type_name_by_pk[loc_type['pk']] = loc_type['name']
             if loc_type.get('code'):
                 payload_loc_type_code_by_pk[loc_type['pk']] = loc_type['code']
-            if toggles.LOCATION_HAS_USERS.enabled(self.domain):
+            if toggles.USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION.enabled(self.domain):
                 _validate_has_users_config(loc_type, pk)
         names = list(payload_loc_type_name_by_pk.values())
         names_are_unique = len(names) == len(set(names))
@@ -720,6 +719,7 @@ def delete_location(request, domain, loc_id):
     })
 
 
+@can_edit_or_view_location
 @location_safe
 def location_lineage(request, domain, loc_id):
     lineage = SQLLocation.objects.get_locations([loc_id])[0].lineage
@@ -819,7 +819,7 @@ def products_form(self):
     def users_form(self):
         if not (self.can_edit_commcare_users or self.can_access_all_locations):
             return None
-        if toggles.LOCATION_HAS_USERS.enabled(self.domain) and not self.location.location_type.has_users:
+        if not self.location.location_type.has_users:
             return None
         form = UsersAtLocationForm(
             request=self.request,
diff --git a/corehq/apps/mocha/templates/mocha/base.html b/corehq/apps/mocha/templates/mocha/base.html
index 0eb30eff18d3..12ed3550b598 100644
--- a/corehq/apps/mocha/templates/mocha/base.html
+++ b/corehq/apps/mocha/templates/mocha/base.html
@@ -1,7 +1,7 @@
 {% load compress %}
 {% load hq_shared_tags %}
 {% load statici18n %}
-{% requirejs_main %}
+{% requirejs_main %} {# todo, figure out webpack hooks for js tests #}
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
@@ -21,14 +21,14 @@
 
     <script src="{% statici18n LANGUAGE_CODE %}"></script> {# DO NOT COMPRESS #}
 
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       <script src="{% static 'mocha/mocha.js' %}"></script>
       <script src="{% static 'chai/chai.js' %}"></script>
       <script src="{% static 'sinon/pkg/sinon.js' %}"></script>
     {% endif %}
 
     <!-- Core Libraries -->
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       {% block core_libraries %}
         {% javascript_libraries underscore=True ko=True hq=True analytics=True %}
       {% endblock %}
@@ -51,7 +51,7 @@
     <div id="mocha-sandbox"></div>
     {% block mocha_tests %}{% endblock %}
 
-    {% if not requirejs_main %}
+    {% if not use_js_bundler %}
       <script charset="utf-8">
         hqImport("mocha/js/main").run();
       </script>
diff --git a/corehq/apps/ota/tests/test_app_aware_restore.py b/corehq/apps/ota/tests/test_app_aware_restore.py
index e3c17529c01b..5a61854d1948 100644
--- a/corehq/apps/ota/tests/test_app_aware_restore.py
+++ b/corehq/apps/ota/tests/test_app_aware_restore.py
@@ -1,18 +1,21 @@
-from django.test import TestCase
-
 from datetime import datetime, timedelta
-from unittest.mock import patch
+from unittest.mock import Mock, patch
 
+from django.test import TestCase
+
+from casexml.apps.case.xml import V3
 from casexml.apps.phone.models import SimplifiedSyncLog
 from casexml.apps.phone.tests.utils import (
     call_fixture_generator,
     create_restore_user,
 )
+from casexml.apps.phone.utils import MockDevice
 
 from corehq import toggles
 from corehq.apps.app_manager.fixtures.mobile_ucr import (
+    ReportFixturesProviderV2,
     report_fixture_generator,
-    ReportFixturesProviderV1)
+)
 from corehq.apps.app_manager.models import (
     Application,
     ReportAppConfig,
@@ -20,6 +23,9 @@
 )
 from corehq.apps.domain.models import Domain
 from corehq.apps.domain.shortcuts import create_domain
+from corehq.apps.userreports.reports.data_source import (
+    ConfigurableReportDataSource,
+)
 from corehq.apps.userreports.tests.utils import (
     get_sample_report_config,
     mock_datasource_config,
@@ -82,45 +88,52 @@ def tearDownClass(cls):
         domain.delete()
         super(AppAwareSyncTests, cls).tearDownClass()
 
-    def _get_fixture(self, fixtures, fixture_id):
-        matches = [f for f in fixtures if f.attrib.get('id') == fixture_id]
-        if matches:
-            return matches[0]
+    def _get_fixtures_by_prefix(self, fixtures, fixture_id_prefix):
+        return [f for f in fixtures if f.attrib.get('id').startswith(fixture_id_prefix)]
+
+    def _expected_v2_report_fixtures_for_id(self, report_id):
+        return {
+            f'{ReportFixturesProviderV2.id}:index',
+            f'{ReportFixturesProviderV2.id}:{report_id}',
+            f'{ReportFixturesProviderV2.id}-filters:{report_id}',
+        }
 
     def test_report_fixtures_provider_without_app(self):
         """
         ReportFixturesProvider should iterate all apps if app not given
         """
-        from corehq.apps.userreports.reports.data_source import ConfigurableReportDataSource
         with patch.object(ConfigurableReportDataSource, 'get_data') as get_data_mock:
             get_data_mock.return_value = self.rows
             with mock_datasource_config():
                 fixtures = call_fixture_generator(report_fixture_generator, self.user)
-                reports = self._get_fixture(fixtures, ReportFixturesProviderV1.id).findall('.//report')
-        self.assertEqual(len(reports), 2)
-        report_ids = {r.attrib.get('id') for r in reports}
-        self.assertEqual(report_ids, {'123456', 'abcdef'})
+                v2_report_fixtures = self._get_fixtures_by_prefix(fixtures, ReportFixturesProviderV2.id)
+        self.assertEqual(len(v2_report_fixtures), 5)
+        report_ids = {r.attrib.get('id') for r in v2_report_fixtures}
+        self.assertEqual(
+            report_ids,
+            self._expected_v2_report_fixtures_for_id('123456') | self._expected_v2_report_fixtures_for_id('abcdef')
+        )
 
     def test_report_fixtures_provider_with_app(self):
         """
         ReportFixturesProvider should not iterate all apps if app given
         """
-        from corehq.apps.userreports.reports.data_source import ConfigurableReportDataSource
+
         with patch.object(ConfigurableReportDataSource, 'get_data') as get_data_mock:
             get_data_mock.return_value = self.rows
             with mock_datasource_config():
                 fixtures = call_fixture_generator(report_fixture_generator, self.user, app=self.app1)
-                reports = self._get_fixture(fixtures, ReportFixturesProviderV1.id).findall('.//report')
+                v2_report_fixtures = self._get_fixtures_by_prefix(fixtures, ReportFixturesProviderV2.id)
 
-        self.assertEqual(len(reports), 1)
-        self.assertEqual(reports[0].attrib.get('id'), '123456')
+        self.assertEqual(len(v2_report_fixtures), 3)
+        report_ids = {r.attrib.get('id') for r in v2_report_fixtures}
+        self.assertEqual(report_ids, self._expected_v2_report_fixtures_for_id('123456'))
 
     def test_default_mobile_ucr_sync_interval(self):
         """
         When sync interval is set, ReportFixturesProvider should provide reports only if
         the interval has passed since the last sync or a new build is being requested.
         """
-        from corehq.apps.userreports.reports.data_source import ConfigurableReportDataSource
         with patch.object(ConfigurableReportDataSource, 'get_data') as get_data_mock:
             get_data_mock.return_value = self.rows
             with mock_datasource_config():
@@ -134,9 +147,10 @@ def test_default_mobile_ucr_sync_interval(self):
                 )
                 recent_sync.save()
                 fixtures = call_fixture_generator(report_fixture_generator, self.user, app=self.app1,
-                                                  last_sync=recent_sync, project=self.domain_obj)
-                reports = self._get_fixture(fixtures, ReportFixturesProviderV1.id)
-                self.assertIsNone(reports)
+                                                  last_sync=recent_sync, project=self.domain_obj,
+                                                  current_sync_log=Mock())
+                v2_report_fixtures = self._get_fixtures_by_prefix(fixtures, ReportFixturesProviderV2.id)
+                self.assertEqual(len(v2_report_fixtures), 0)
 
                 recent_sync_new_build = SimplifiedSyncLog(
                     domain=self.domain_obj.name,
@@ -146,24 +160,21 @@ def test_default_mobile_ucr_sync_interval(self):
                 )
                 recent_sync_new_build.save()
                 fixtures = call_fixture_generator(report_fixture_generator, self.user, app=self.app1,
-                                                  last_sync=recent_sync_new_build, project=self.domain_obj)
-                reports = self._get_fixture(fixtures, ReportFixturesProviderV1.id).findall('.//report')
-                self.assertEqual(len(reports), 1)
-                self.assertEqual(reports[0].attrib.get('id'), '123456')
+                                                  last_sync=recent_sync_new_build, project=self.domain_obj,
+                                                  current_sync_log=Mock())
+                v2_report_fixtures = self._get_fixtures_by_prefix(fixtures, ReportFixturesProviderV2.id)
+                self.assertEqual(len(v2_report_fixtures), 3)
+                report_ids = {r.attrib.get('id') for r in v2_report_fixtures}
+                self.assertEqual(report_ids, self._expected_v2_report_fixtures_for_id('123456'))
                 self.domain_obj.default_mobile_ucr_sync_interval = None
 
     def test_report_fixtures_provider_with_app_that_doesnt_have_reports(self):
-        from corehq.apps.userreports.reports.data_source import ConfigurableReportDataSource
         with patch.object(ConfigurableReportDataSource, 'get_data') as get_data_mock:
             get_data_mock.return_value = self.rows
             fixtures = call_fixture_generator(report_fixture_generator, self.user, app=self.app3)
         self.assertEqual(len(list(fixtures)), 0)
 
     def test_user_restore(self):
-        from casexml.apps.phone.utils import MockDevice
-        from casexml.apps.case.xml import V3
-        from corehq.apps.userreports.reports.data_source import ConfigurableReportDataSource
-
         with patch.object(ConfigurableReportDataSource, 'get_data') as get_data_mock:
             get_data_mock.return_value = self.rows
             with mock_datasource_config():
diff --git a/corehq/apps/products/views.py b/corehq/apps/products/views.py
index bfabacfeac8c..447ea021a10f 100644
--- a/corehq/apps/products/views.py
+++ b/corehq/apps/products/views.py
@@ -2,7 +2,12 @@
 from io import BytesIO
 
 from django.contrib import messages
-from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.http import (
+    Http404,
+    HttpResponse,
+    HttpResponseRedirect,
+    JsonResponse,
+)
 from django.http.response import HttpResponseServerError
 from django.shortcuts import render
 from django.urls import reverse
@@ -207,11 +212,11 @@ def get_archive_config(self):
             }
 
     def get(self, request, *args, **kwargs):
-        return HttpResponse(json.dumps({
+        return JsonResponse({
             'success': True,
             'current_page': int(self.page),
             'data_list': self.product_data,
-        }), 'text/json')
+        })
 
 
 @method_decorator(use_bootstrap5, name='dispatch')
diff --git a/corehq/apps/programs/views.py b/corehq/apps/programs/views.py
index 4c1e3e029684..ac535357c466 100644
--- a/corehq/apps/programs/views.py
+++ b/corehq/apps/programs/views.py
@@ -1,7 +1,9 @@
-import json
-
 from django.contrib import messages
-from django.http import Http404, HttpResponse, HttpResponseRedirect
+from django.http import (
+    Http404,
+    HttpResponseRedirect,
+    JsonResponse,
+)
 from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
@@ -68,10 +70,10 @@ def program_data(self):
         return data
 
     def get(self, request, *args, **kwargs):
-        return HttpResponse(json.dumps({
+        return JsonResponse({
             'success': True,
             'data_list': self.program_data,
-        }), 'text/json')
+        })
 
 
 @method_decorator(use_bootstrap5, name='dispatch')
@@ -186,8 +188,8 @@ def get_product_data(self):
             }
 
     def get(self, request, *args, **kwargs):
-        return HttpResponse(json.dumps({
+        return JsonResponse({
             'success': True,
             'current_page': self.page,
             'data_list': list(self.get_product_data()),
-        }), 'text/json')
+        })
diff --git a/corehq/apps/prototype/models/__init__.py b/corehq/apps/prototype/models/__init__.py
new file mode 100644
index 000000000000..66cd67b4c4fa
--- /dev/null
+++ b/corehq/apps/prototype/models/__init__.py
@@ -0,0 +1,4 @@
+"""
+Leaving this as a module so that prototypes can organize their models here.
+e.g. "my_new_prototype" in `prototypes/models/my_new_prototype/...`
+"""
diff --git a/corehq/apps/prototype/models/cache_store.py b/corehq/apps/prototype/models/cache_store.py
new file mode 100644
index 000000000000..ed134cace6a0
--- /dev/null
+++ b/corehq/apps/prototype/models/cache_store.py
@@ -0,0 +1,48 @@
+from abc import ABC, abstractmethod
+import copy
+
+from django.core.cache import cache
+
+
+class CacheStore(ABC):
+    """
+    Use this to store and retrieve data in memory for prototyped features,
+    especially for prototypes using HTMX.
+
+    DO NOT USE with released features! Prototypes only.
+    """
+    timeout = 2 * 60 * 60  # equivalent to 2 hours (in seconds)
+
+    def __init__(self, request):
+        self.username = request.user.username
+
+    @property
+    @abstractmethod
+    def slug(self):
+        raise NotImplementedError("please specify a 'slug'")
+
+    @property
+    @abstractmethod
+    def initial_value(self):
+        """
+        Please make sure the initial value can be properly pickled and stored
+        in cached memory. Safe options are strings, booleans, integers, dicts,
+        and lists of strings, booleans, and integers.
+
+        If you want to store more complicated objects, perhaps it's time to start
+        using a database. Please remember this is only for prototyping and examples!
+        """
+        raise NotImplementedError("please specify an 'initial_value'")
+
+    @property
+    def cache_key(self):
+        return f"{self.username}:prototype:{self.slug}"
+
+    def set(self, data):
+        cache.set(self.cache_key, data, self.timeout)
+
+    def get(self):
+        return cache.get(self.cache_key, copy.deepcopy(self.initial_value))
+
+    def delete(self):
+        cache.delete(self.cache_key)
diff --git a/corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js b/corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
index cb3c408ec9a6..c650dbce52d5 100644
--- a/corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+++ b/corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
@@ -5,7 +5,7 @@ hqDefine("prototype/js/example/knockout_pagination",[
     'knockout',
     'underscore',
     'hqwebapp/js/initial_page_data',
-    "hqwebapp/js/bootstrap5/components.ko", // for pagination
+    "hqwebapp/js/components/pagination",
 ], function ($, ko, _, initialPageData) {
     $(function () {
         let rowData = function (data) {
diff --git a/corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js b/corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
new file mode 100644
index 000000000000..9e7a26d5414c
--- /dev/null
+++ b/corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
@@ -0,0 +1,44 @@
+'use strict';
+
+hqDefine("prototype/js/webpack/bootstrap3_amd",[
+    'jquery',
+    'knockout',
+    'underscore',
+    'hqwebapp/js/initial_page_data',
+    "commcarehq_b3",  // IMPORTANT :: this has to be included with any Bootstrap 3 entry point
+], function ($, ko, _, initialPageData) {
+    /**
+     * This is an (HQ)AMD-formatted module, intended to be used with js_entry as follows:
+     * {% js_entry_b3 "prototype/js/webpack/bootstrap3_amd" %}
+     *
+     * It serves as a test to see that Webpack is working fine with this type of module
+     * and is an example of what a quick migration of an existing requirejs module might
+     * look like.
+     *
+     * The most important difference between a requirejs module and a webpack module of this type
+     * is that the webpack module requires that the "commcarehq_b3" dependency is included
+     * in the list of dependencies above. Otherwise, everything else should function
+     * identically to the requirejs module, provided the appropriate shims are in place
+     * in the Webpack config for special dependencies.
+     *
+     * For details on creating new shims, see: https://webpack.js.org/loaders/exports-loader/
+     *
+     * This file can be used to test such shims, webpack optimizations, or to carry out
+     * preliminary Webpack-related tests in production environments.
+     *
+     */
+    console.log("\n\nBelow are some basic tests to see that this Webpack module is working as expected:\n\n");
+    console.log("\nDid jQuery load?");
+    console.log($);
+    console.log("\nDid knockout load?");
+    console.log(ko);
+    console.log("\nDid underscore load?");
+    console.log(_);
+    console.log("\nIs initialPageData retrievable?");
+    console.log(initialPageData.get('test_initial'));
+    console.log("\nAre translations working?");
+    console.log(gettext("yes"));
+    console.log("\nIs bootstrap 5 working?");
+    console.log("click around the page and see that dropdowns work...");
+    console.log("\n\n");
+});
diff --git a/corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js b/corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
new file mode 100644
index 000000000000..322a07a880a1
--- /dev/null
+++ b/corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
@@ -0,0 +1,44 @@
+'use strict';
+
+hqDefine("prototype/js/webpack/bootstrap5_amd",[
+    'jquery',
+    'knockout',
+    'underscore',
+    'hqwebapp/js/initial_page_data',
+    "commcarehq",  // IMPORTANT :: this has to be included with any Bootstrap 5 entry point
+], function ($, ko, _, initialPageData) {
+    /**
+     * This is an (HQ)AMD-formatted module, intended to be used with js_entry as follows:
+     * {% js_entry "prototype/js/webpack/bootstrap5_amd" %}
+     *
+     * It serves as a test to see that Webpack is working fine with this type of module
+     * and is an example of what a quick migration of an existing requirejs module might
+     * look like.
+     *
+     * The most important difference between a requirejs module and a webpack module of this type
+     * is that the webpack module requires that the "commcarehq" dependency is included
+     * in the list of dependencies above. Otherwise, everything else should function
+     * identically to the requirejs module, provided the appropriate shims are in place
+     * in the Webpack config for special dependencies.
+     *
+     * For details on creating new shims, see: https://webpack.js.org/loaders/exports-loader/
+     *
+     * This file can be used to test such shims, webpack optimizations, or to carry out
+     * preliminary Webpack-related tests in production environments.
+     *
+     */
+    console.log("\n\nBelow are some basic tests to see that this Webpack module is working as expected:\n\n");
+    console.log("\nDid jQuery load?");
+    console.log($);
+    console.log("\nDid knockout load?");
+    console.log(ko);
+    console.log("\nDid underscore load?");
+    console.log(_);
+    console.log("\nIs initialPageData retrievable?");
+    console.log(initialPageData.get('test_initial'));
+    console.log("\nAre translations working?");
+    console.log(gettext("yes"));
+    console.log("\nIs bootstrap 5 working?");
+    console.log("click around the page and see that dropdowns work...");
+    console.log("\n\n");
+});
diff --git a/corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js b/corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
new file mode 100644
index 000000000000..bee9fd3dd276
--- /dev/null
+++ b/corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
@@ -0,0 +1,65 @@
+import 'commcarehq';  // IMPORTANT :: always include at beginning of any entry module
+
+import ko from 'knockout';
+import $ from 'jquery';
+import _ from 'underscore';
+import initialPageData from 'hqwebapp/js/initial_page_data';
+
+import 'hqwebapp/js/components/pagination';
+
+// The rest of the code below is otherwise the same as the core content of
+// prototype/js/knockout_pagination
+// ...only the imports have changed
+
+$(function () {
+    let rowData = function (data) {
+        let self = {};
+        self.columns = ko.observableArray(data);
+        return self;
+    };
+
+    let exampleModel = function () {
+        let self = {};
+        self.rows = ko.observableArray();
+
+        self.perPage = ko.observable();
+        self.totalItems = ko.observable();
+        self.itemsPerPage = ko.observable();
+
+        self.error = ko.observable();
+
+        self.goToPage = function (page) {
+            $.ajax({
+                method: 'POST',
+                url: initialPageData.reverse("prototype_example_paginated_data"),
+                data: {
+                    page: page,
+                    limit: self.itemsPerPage(),
+                },
+                success: function (data) {
+                    self.totalItems(data.total);
+                    self.rows.removeAll();
+                    _.each(data.rows, function (row) {
+                        self.rows.push(new rowData(row));
+                    });
+                    self.error(null);
+                },
+                error: function () {
+                    self.error(gettext("Could not load data. " +
+                        "Please try again later or report an issue if " +
+                        "this problem persists."));
+                },
+            });
+        };
+
+
+        // Initialize with first page of data
+        self.onPaginationLoad = function () {
+            self.goToPage(1);
+        };
+
+        return self;
+    };
+
+    $('#prototype-example-knockout-pagination').koApplyBindings(new exampleModel());
+});
diff --git a/corehq/apps/prototype/templates/prototype/webpack/bootstrap3_amd.html b/corehq/apps/prototype/templates/prototype/webpack/bootstrap3_amd.html
new file mode 100644
index 000000000000..4a2fdcd30764
--- /dev/null
+++ b/corehq/apps/prototype/templates/prototype/webpack/bootstrap3_amd.html
@@ -0,0 +1,21 @@
+{% extends 'hqwebapp/bootstrap3/base_navigation.html' %}
+{% load i18n %}
+{% load hq_shared_tags %}
+
+{% js_entry_b3 "prototype/js/webpack/bootstrap3_amd" %}
+
+{% block content %}
+  {% initial_page_data 'test_initial' 'successfully retrieved initial page data' %}
+  <div class="container my-5">
+    <h2>
+      Testing an (HQ)AMD-formatted module loaded with Webpack
+    </h2>
+    <div class="alert alert-info">
+      FYI: This page uses Bootstrap 3.
+    </div>
+    <p>
+      Please open the js console for troubleshooting and see
+      "prototype/js/webpack/bootstrap3_amd.js" for additional information.
+    </p>
+  </div>
+{% endblock content %}
diff --git a/corehq/apps/prototype/templates/prototype/webpack/bootstrap5_amd.html b/corehq/apps/prototype/templates/prototype/webpack/bootstrap5_amd.html
new file mode 100644
index 000000000000..015eb1d876b5
--- /dev/null
+++ b/corehq/apps/prototype/templates/prototype/webpack/bootstrap5_amd.html
@@ -0,0 +1,21 @@
+{% extends 'hqwebapp/bootstrap5/base_navigation.html' %}
+{% load i18n %}
+{% load hq_shared_tags %}
+
+{% js_entry "prototype/js/webpack/bootstrap5_amd" %}
+
+{% block content %}
+  {% initial_page_data 'test_initial' 'successfully retrieved initial page data' %}
+  <div class="container my-5">
+    <h2>
+      Testing an (HQ)AMD-formatted module loaded with Webpack
+    </h2>
+    <div class="alert alert-info">
+      FYI: This page uses Bootstrap 5.
+    </div>
+    <p>
+      Please open the js console for troubleshooting and see
+      "prototype/js/webpack/bootstrap5_amd.js" for additional information.
+    </p>
+  </div>
+{% endblock content %}
diff --git a/corehq/apps/prototype/templates/prototype/webpack/knockout_pagination.html b/corehq/apps/prototype/templates/prototype/webpack/knockout_pagination.html
new file mode 100644
index 000000000000..53aa4a641b62
--- /dev/null
+++ b/corehq/apps/prototype/templates/prototype/webpack/knockout_pagination.html
@@ -0,0 +1,49 @@
+{% extends 'hqwebapp/bootstrap5/base_navigation.html' %}
+{% load i18n %}
+{% load hq_shared_tags %}
+
+{% js_entry "prototype/js/webpack/knockout_pagination" %}
+
+{% block content %}
+{% registerurl "prototype_example_paginated_data" %}
+  <h1>
+    Prototype Example (Webpack)
+  </h1>
+  <p class="lead">
+    This is an example endpoint for a rapid prototype working with tabular data and knockout.
+  </p>
+  <div class="alert alert-info">
+    This also serves as a more concrete example of migrating an AMD module to webpack and
+    updating the module  to use es6 module syntax.
+  </div>
+
+  <div id="prototype-example-knockout-pagination">
+    <table class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th>Name</th>
+          <th>Color</th>
+          <th>Big Cats</th>
+          <th>Date of Birth</th>
+          <th>Application</th>
+          <th>Opened On</th>
+        </tr>
+      </thead>
+      <tbody>
+        <!-- ko foreach: rows -->
+        <tr>
+          <!-- ko foreach: $data.columns -->
+          <td data-bind="text: $data"></td>
+          <!-- /ko -->
+        </tr>
+        <!-- /ko -->
+      </tbody>
+    </table>
+    <pagination data-apply-bindings="false"
+                params="goToPage: goToPage,
+                        slug: 'style-guide',
+                        perPage: itemsPerPage,
+                        onLoad: onPaginationLoad,
+                        totalItems: totalItems"></pagination>
+  </div>
+{% endblock content %}
diff --git a/corehq/apps/prototype/urls.py b/corehq/apps/prototype/urls.py
index bd71d3f6710e..cead084a85c4 100644
--- a/corehq/apps/prototype/urls.py
+++ b/corehq/apps/prototype/urls.py
@@ -1,7 +1,14 @@
 from django.urls import re_path as url
 from corehq.apps.prototype.views import example
+from corehq.apps.prototype.views import webpack
 
 urlpatterns = [
+    url(r'^webpack/b5_amd/$', webpack.bootstrap5_amd_example,
+        name='webpack_bootstrap5_amd_example'),
+    url(r'^webpack/b3_amd/$', webpack.bootstrap3_amd_example,
+        name='webpack_bootstrap3_amd_example'),
+    url(r'^webpack/pagination/$', webpack.knockout_pagination,
+        name='webpack_knockout_pagination'),
     url(r'^example/$', example.knockout_pagination,
         name='prototype_example_knockout_pagination'),
     url(r'^example/data/$', example.example_paginated_data,
diff --git a/corehq/apps/prototype/views/webpack.py b/corehq/apps/prototype/views/webpack.py
new file mode 100644
index 000000000000..86d25e4c71ef
--- /dev/null
+++ b/corehq/apps/prototype/views/webpack.py
@@ -0,0 +1,25 @@
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render
+
+from corehq import toggles
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
+
+
+@login_required
+@use_bootstrap5
+@toggles.SAAS_PROTOTYPE.required_decorator()
+def bootstrap5_amd_example(request):
+    return render(request, 'prototype/webpack/bootstrap5_amd.html', {})
+
+
+@login_required
+@toggles.SAAS_PROTOTYPE.required_decorator()
+def bootstrap3_amd_example(request):
+    return render(request, 'prototype/webpack/bootstrap3_amd.html', {})
+
+
+@login_required
+@use_bootstrap5
+@toggles.SAAS_PROTOTYPE.required_decorator()
+def knockout_pagination(request):
+    return render(request, 'prototype/webpack/knockout_pagination.html', {})
diff --git a/corehq/apps/registration/forms.py b/corehq/apps/registration/forms.py
index e52bc1543bb5..a03ce421e5eb 100644
--- a/corehq/apps/registration/forms.py
+++ b/corehq/apps/registration/forms.py
@@ -15,15 +15,16 @@
 from crispy_forms import layout as crispy
 from crispy_forms.helper import FormHelper
 
-from corehq import privileges
-from corehq.apps.accounting.utils import domain_has_privilege
 from corehq.apps.analytics.tasks import track_workflow
+from corehq.apps.custom_data_fields.models import PROFILE_SLUG
+from corehq.apps.custom_data_fields.edit_entity import add_prefix, get_prefixed, with_prefix
 from corehq.apps.domain.forms import NoAutocompleteMixin, clean_password
 from corehq.apps.domain.models import Domain
 from corehq.apps.hqwebapp import crispy as hqcrispy
 from corehq.apps.programs.models import Program
+from corehq.toggles import WEB_USER_INVITE_ADDITIONAL_FIELDS
 from corehq.apps.users.forms import SelectUserLocationForm, BaseTableauUserForm
-from corehq.apps.users.models import CouchUser
+from corehq.apps.users.models import CouchUser, WebUser
 
 
 class RegisterWebUserForm(forms.Form):
@@ -490,30 +491,33 @@ class AdminInvitesUserForm(SelectUserLocationForm):
 
     def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                  role_choices=(), should_show_location=False, can_edit_tableau_config=False,
-                 *, domain, **kwargs):
+                 custom_data=None, *, domain, **kwargs):
+        self.custom_data = custom_data
+        if data and self.custom_data:
+            data = data.copy()
+            custom_data_post_dict = self.custom_data.form.data
+            data.update({k: v for k, v in custom_data_post_dict.items() if k not in data})
         self.request = kwargs.get('request')
         super(AdminInvitesUserForm, self).__init__(domain=domain, data=data, **kwargs)
         self.can_edit_tableau_config = can_edit_tableau_config
         domain_obj = Domain.get_by_name(domain)
         self.fields['role'].choices = [('', _("Select a role"))] + role_choices
         if domain_obj:
-            if domain_has_privilege(domain_obj.name, privileges.APP_USER_PROFILES):
-                self.fields['profile'] = forms.ChoiceField(choices=(), label="Profile", required=False)
-                from corehq.apps.users.views.mobile import UserFieldsView
-                self.valid_profiles = UserFieldsView.get_user_accessible_profiles(
-                    self.domain, self.request.couch_user
-                )
-                if len(self.valid_profiles) > 0:
-                    self.fields['profile'].choices = [('', '')] + [
-                        (profile.id, profile.name) for profile in self.valid_profiles
-                    ]
+            if self.custom_data:
+                prefixed_fields = {}
+                if WEB_USER_INVITE_ADDITIONAL_FIELDS.enabled(domain):
+                    prefixed_fields = add_prefix(self.custom_data.form.fields, self.custom_data.prefix)
+                elif PROFILE_SLUG in self.custom_data.form.fields:
+                    prefixed_profile_key = with_prefix(PROFILE_SLUG, self.custom_data.prefix)
+                    prefixed_fields[prefixed_profile_key] = self.custom_data.form.fields[PROFILE_SLUG]
+                self.fields.update(prefixed_fields)
             if domain_obj.commtrack_enabled:
                 self.fields['program'] = forms.ChoiceField(label="Program", choices=(), required=False)
                 programs = Program.by_domain(domain_obj.name)
                 choices = [('', '')] + list((prog.get_id, prog.name) for prog in programs)
                 self.fields['program'].choices = choices
 
-        self.excluded_emails = excluded_emails or []
+        self.excluded_emails = [x.lower() for x in excluded_emails] if excluded_emails else []
 
         if self.can_edit_tableau_config:
             self._initialize_tableau_fields(data, domain)
@@ -533,9 +537,12 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
                     data_bind="textInput: email",
                 ),
                 'role',
-                'profile' if ('profile' in self.fields and len(self.fields['profile'].choices) > 0) else None,
             )
         ]
+        if self.custom_data:
+            custom_data_fieldset = self.custom_data.make_fieldsets(prefixed_fields, data is not None,
+                                                                   field_name_includes_prefix=True)
+            fields.extend(custom_data_fieldset)
         if should_show_location:
             fields.append(
                 crispy.Fieldset(
@@ -579,19 +586,21 @@ def __init__(self, data=None, excluded_emails=None, is_add_user=None,
             ),
         )
 
-    def clean_profile(self):
-        profile_id = self.cleaned_data['profile']
-        if profile_id and profile_id not in {str(p.id) for p in self.valid_profiles}:
+    def _validate_profile(self, profile_id):
+        valid_profile_ids = {choice[0] for choice in self.custom_data.form.fields[PROFILE_SLUG].widget.choices}
+        if profile_id and profile_id not in valid_profile_ids:
             raise forms.ValidationError(
                 _('Invalid profile selected. Please select a valid profile.'),
             )
-        return profile_id
 
     def clean_email(self):
         email = self.cleaned_data['email'].strip()
-        if email in self.excluded_emails:
+        if email.lower() in self.excluded_emails:
             raise forms.ValidationError(_("A user with this email address is already in "
                                           "this project or has a pending invitation."))
+        web_user = WebUser.get_by_username(email)
+        if web_user and not web_user.is_active:
+            raise forms.ValidationError(_("A user with this email address is deactivated. "))
         return email
 
     def clean(self):
@@ -611,6 +620,18 @@ def clean(self):
         for field in cleaned_data:
             if isinstance(cleaned_data[field], str):
                 cleaned_data[field] = cleaned_data[field].strip()
+
+        if self.custom_data:
+            prefixed_profile_key = with_prefix(PROFILE_SLUG, self.custom_data.prefix)
+            prefixed_field_names = add_prefix(self.custom_data.form.fields, self.custom_data.prefix).keys()
+            custom_user_data = {key: cleaned_data.pop(key) for key in prefixed_field_names if key in cleaned_data}
+
+            if prefixed_profile_key in custom_user_data:
+                profile_id = custom_user_data.pop(prefixed_profile_key)
+                self._validate_profile(profile_id)
+                cleaned_data['profile'] = profile_id
+            cleaned_data['custom_user_data'] = get_prefixed(custom_user_data, self.custom_data.prefix)
+
         return cleaned_data
 
     def _initialize_tableau_fields(self, data, domain):
diff --git a/corehq/apps/registration/migrations/0006_selfsignupworkflow.py b/corehq/apps/registration/migrations/0006_selfsignupworkflow.py
new file mode 100644
index 000000000000..b90cb53451c1
--- /dev/null
+++ b/corehq/apps/registration/migrations/0006_selfsignupworkflow.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.2.11 on 2024-10-09 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('registration', '0005_asyncsignuprequest'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SelfSignupWorkflow',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('domain', models.CharField(db_index=True, max_length=255)),
+                ('initiating_user', models.CharField(max_length=80)),
+                ('created_on', models.DateTimeField(auto_now_add=True)),
+                ('completed_on', models.DateTimeField(null=True)),
+                ('subscribed_edition', models.CharField(choices=[('Community', 'Community'), ('Standard', 'Standard'), ('Pro', 'Pro'), ('Advanced', 'Advanced'),
+                    ('Enterprise', 'Enterprise'), ('Paused', 'Paused'), ('Reseller', 'Reseller'), ('Managed Hosting', 'Managed Hosting')], max_length=25, null=True)),
+            ],
+        ),
+    ]
diff --git a/corehq/apps/registration/models.py b/corehq/apps/registration/models.py
index 018f4f769a36..ea2d746b8c19 100644
--- a/corehq/apps/registration/models.py
+++ b/corehq/apps/registration/models.py
@@ -2,10 +2,11 @@
 import logging
 
 from django.conf import settings
-from memoized import memoized
-
 from django.db import models
 
+from memoized import memoized
+
+from corehq.apps.accounting.models import SoftwarePlanEdition
 from corehq.apps.domain.models import Domain
 
 log = logging.getLogger(__name__)
@@ -155,3 +156,31 @@ def clear_data_for_username(cls, username):
         :param username: string
         """
         cls.objects.filter(username=username).delete()
+
+
+class SelfSignupWorkflow(models.Model):
+    domain = models.CharField(max_length=255, db_index=True)
+    initiating_user = models.CharField(max_length=80)
+    created_on = models.DateTimeField(auto_now_add=True)
+    completed_on = models.DateTimeField(null=True)
+    subscribed_edition = models.CharField(
+        choices=SoftwarePlanEdition.CHOICES,
+        max_length=25,
+        null=True
+    )
+
+    @classmethod
+    def get_in_progress_for_domain(cls, domain):
+        try:
+            workflow = cls.objects.get(
+                domain=domain,
+                completed_on__isnull=True
+            )
+            return workflow
+        except cls.DoesNotExist:
+            return None
+
+    def complete_workflow(self, edition):
+        self.completed_on = datetime.datetime.now()
+        self.subscribed_edition = edition
+        self.save()
diff --git a/corehq/apps/registration/templates/registration/base.html b/corehq/apps/registration/templates/registration/base.html
index 61b72bc8311d..b97f55381640 100644
--- a/corehq/apps/registration/templates/registration/base.html
+++ b/corehq/apps/registration/templates/registration/base.html
@@ -3,10 +3,6 @@
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% block head %}{{ block.super }}
-  {% include 'analytics/fullstory.html' %}
-{% endblock %}
-
 {% block login-content %}
   <div class="container-fluid">
     <div class="row">
diff --git a/corehq/apps/registration/tests/test_forms.py b/corehq/apps/registration/tests/test_forms.py
new file mode 100644
index 000000000000..11c2e0025640
--- /dev/null
+++ b/corehq/apps/registration/tests/test_forms.py
@@ -0,0 +1,66 @@
+from unittest.mock import patch
+
+from django.test import RequestFactory
+from testil import Regex
+
+from ..forms import AdminInvitesUserForm
+from corehq.apps.users.models import WebUser
+
+
+patch_query = patch.object(
+    AdminInvitesUserForm,
+    "_user_has_permission_to_access_locations",
+    lambda *ignore: True,
+)
+
+mock_couch_user = WebUser(
+    username="testuser",
+    _id="user123",
+    domain="test-domain",
+)
+
+
+@patch_query
+@patch("corehq.apps.users.models.WebUser.get_by_username", return_value=None)
+def test_minimal_valid_form(mock_web_user):
+    form = create_form()
+
+    assert form.is_valid(), form.errors
+
+
+@patch_query
+@patch("corehq.apps.users.models.WebUser.get_by_username", return_value=None)
+def test_form_is_invalid_when_invite_existing_email_with_case_mismatch(mock_web_user):
+    form = create_form(
+        {"email": "test@TEST.com"},
+        excluded_emails=["TEST@test.com"],
+    )
+
+    msg = "this email address is already in this project"
+    assert not form.is_valid()
+    assert form.errors["email"] == [Regex(msg)], form.errors
+
+
+@patch_query
+@patch("corehq.apps.users.models.WebUser.get_by_username", return_value=mock_couch_user)
+def test_form_is_invalid_when_invite_deactivated_user(mock_web_user):
+    mock_web_user.is_active = False
+    form = create_form(
+        {"email": "test@TEST.com"},
+    )
+
+    msg = "A user with this email address is deactivated."
+    assert not form.is_valid()
+    assert form.errors["email"] == [Regex(msg)], form.errors
+
+
+def create_form(data=None, **kw):
+    form_defaults = {"email": "test@test.com", "role": "admin"}
+    request = RequestFactory().post("/", form_defaults | (data or {}))
+    defaults = {
+        "domain": "test",
+        "request": request,
+        "excluded_emails": [],
+        "role_choices": [("admin", "admin")],
+    }
+    return AdminInvitesUserForm(request.POST, **(defaults | kw))
diff --git a/corehq/apps/registration/tests/test_utils.py b/corehq/apps/registration/tests/test_utils.py
index 80bc2d55770f..58227a802504 100644
--- a/corehq/apps/registration/tests/test_utils.py
+++ b/corehq/apps/registration/tests/test_utils.py
@@ -2,16 +2,23 @@
 from unittest import mock
 
 from django.contrib.auth.models import User
-from django.test import TestCase, RequestFactory
+from django.test import RequestFactory, TestCase
 
 from corehq.apps.accounting.models import Subscription
 from corehq.apps.domain.exceptions import ErrorInitializingDomain
 from corehq.apps.domain.models import Domain
-from corehq.apps.hqmedia.models import CommCareImage, LogoForSystemEmailsReference
+from corehq.apps.hqmedia.models import (
+    CommCareImage,
+    LogoForSystemEmailsReference,
+)
 from corehq.apps.hqmedia.views import ViewMultimediaFile
-from corehq.apps.registration.utils import request_new_domain, project_logo_emails_context
-from corehq.util.test_utils import flag_enabled
+from corehq.apps.registration.models import SelfSignupWorkflow
+from corehq.apps.registration.utils import (
+    project_logo_emails_context,
+    request_new_domain,
+)
 from corehq.apps.users.models import WebUser
+from corehq.util.test_utils import flag_enabled
 from corehq.util.view_utils import absolute_reverse
 
 
@@ -38,13 +45,16 @@ def setUpClass(cls):
         cls.domain_test = 'test-1'
 
     def tearDown(self):
-        for domain in [self.domain_sso_test, self.domain_test]:
+        subscribed_domains = [self.domain_sso_test, self.domain_test]
+        for domain in subscribed_domains:
             Subscription._get_active_subscription_by_domain.clear(
                 Subscription,
                 domain
             )
+        SelfSignupWorkflow.objects.filter(domain__in=subscribed_domains).delete()
 
-        for test_domain in ['subscription-failed', 'init-default-roles-failed']:
+        failed_subscribed_domains = ['subscription-failed', 'init-default-roles-failed']
+        for test_domain in failed_subscribed_domains:
             domain = Domain.get_by_name(test_domain)
             if domain is not None:
                 domain.delete()
@@ -102,6 +112,19 @@ def test_subscription_exception_raises_error_and_domain_is_deleted(self):
         domain = Domain.get_by_name('subscription-failed')
         self.assertIsNone(domain)
 
+    @mock.patch('corehq.apps.registration.utils._setup_subscription', _noop)
+    @mock.patch('corehq.apps.registration.utils.notify_exception', _noop)
+    def test_using_self_signup_creates_self_signup_workflow(self):
+        request_new_domain(
+            self.request,
+            self.domain_test,
+            is_new_user=True,
+            is_self_signup=True
+        )
+        workflow = SelfSignupWorkflow.get_in_progress_for_domain(self.domain_test)
+        self.assertIsInstance(workflow, SelfSignupWorkflow)
+        self.assertEqual(workflow.initiating_user, self.new_user.username)
+
 
 class TestUsingProjectLogoInEmails(TestCase):
 
diff --git a/corehq/apps/registration/tests/test_views.py b/corehq/apps/registration/tests/test_views.py
new file mode 100644
index 000000000000..bcd26d710dbf
--- /dev/null
+++ b/corehq/apps/registration/tests/test_views.py
@@ -0,0 +1,95 @@
+from datetime import datetime
+
+from django.contrib.messages import get_messages
+from django.test import TestCase
+from django.test.client import Client
+from django.urls import reverse
+from django.utils.html import escape
+
+from corehq.apps.accounting.models import DefaultProductPlan
+from corehq.apps.domain.models import Domain
+from corehq.apps.registration.models import (
+    RegistrationRequest,
+    SelfSignupWorkflow,
+)
+from corehq.apps.users.models import WebUser
+
+
+class TestConfirmDomainView(TestCase):
+
+    def setUp(self):
+        super().setUp()
+        self.domain = Domain(name='the-name-of-a-domain', is_active=False)
+        self.domain.save()
+        self.addCleanup(self.domain.delete)
+
+        self.user = WebUser.create(self.domain.name, 'test-user', 'password', None, None, 'testy@example.com')
+        self.addCleanup(self.user.delete, self.domain.name, deleted_by=None)
+
+        self.client = Client()
+        self.client.force_login(self.user.get_django_user())
+        self.client.defaults.update({'plan': DefaultProductPlan.get_default_plan_version()})
+
+    def create_registration_request(self, guid):
+        reg_request = RegistrationRequest.objects.create(
+            request_time=datetime.now(),
+            activation_guid=guid,
+            domain=self.domain.name,
+            new_user_username=self.user.username
+        )
+        self.addCleanup(reg_request.delete)
+
+    @staticmethod
+    def url(guid=None):
+        url = reverse('registration_confirm_domain')
+        if guid:
+            url += f'{guid}/'
+        return url
+
+    def test_confirm_domain(self):
+        guid = 'abc123'
+        self.create_registration_request(guid)
+
+        response = self.client.get(self.url(guid))
+        self.assertRedirects(response, reverse('dashboard_domain', args=[self.domain.name]))
+
+        domain = Domain.get_by_name(self.domain.name)
+        self.assertTrue(domain.is_active)
+
+    def test_no_guid(self):
+        response = self.client.get(self.url())
+        self.assertTemplateUsed(response, 'registration/confirmation_error.html')
+
+        expected_message = 'An account activation key was not provided.'
+        self.assertIn(expected_message, response.content.decode())
+
+    def test_bad_guid(self):
+        bad_guid = 'bad456'
+        response = self.client.get(self.url(bad_guid))
+        self.assertTemplateUsed(response, 'registration/confirmation_error.html')
+
+        expected_message = escape(f'The account activation key "{bad_guid}" provided is invalid.')
+        self.assertIn(expected_message, response.content.decode())
+
+    def test_domain_already_confirmed(self):
+        guid = 'abc123'
+        self.create_registration_request(guid)
+        self.client.get(self.url(guid))
+
+        response = self.client.get(self.url(guid))
+        self.assertRedirects(response, reverse('dashboard_domain', args=[self.domain.name]))
+
+        messages = list(get_messages(response.wsgi_request))
+        self.assertIn(
+            f'Your account {self.user.username} has already been activated',
+            messages[1].message
+        )
+
+    def test_self_signup_redirect(self):
+        guid = 'abc123'
+        self.create_registration_request(guid)
+        SelfSignupWorkflow.objects.create(domain=self.domain.name, initiating_user=self.user.username)
+
+        response = self.client.get(self.url(guid))
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response.get('Location'), reverse('domain_select_plan', args=[self.domain.name]))
diff --git a/corehq/apps/registration/utils.py b/corehq/apps/registration/utils.py
index 5abff442eae0..d6223e2d65a3 100644
--- a/corehq/apps/registration/utils.py
+++ b/corehq/apps/registration/utils.py
@@ -9,20 +9,20 @@
 
 from celery import chord
 
-from corehq.apps.users.role_utils import initialize_domain_with_default_roles
-from corehq.util.soft_assert import soft_assert
 from dimagi.utils.couch import CriticalSection
 from dimagi.utils.couch.database import get_safe_write_kwargs
 from dimagi.utils.logging import notify_exception
 from dimagi.utils.name_to_url import name_to_url
-from dimagi.utils.web import get_ip, get_url_base, get_static_url_prefix
+from dimagi.utils.web import get_ip, get_static_url_prefix, get_url_base
 
 from corehq.apps.accounting.models import (
     BillingAccount,
     BillingContactInfo,
     SubscriptionAdjustmentMethod,
 )
-from corehq.apps.accounting.utils.subscription import ensure_community_or_paused_subscription
+from corehq.apps.accounting.utils.subscription import (
+    ensure_community_or_paused_subscription,
+)
 from corehq.apps.analytics.tasks import (
     HUBSPOT_CREATED_NEW_PROJECT_SPACE_FORM_ID,
     send_hubspot_form,
@@ -31,11 +31,16 @@
 from corehq.apps.domain.models import Domain
 from corehq.apps.hqmedia.models import LogoForSystemEmailsReference
 from corehq.apps.hqwebapp.tasks import send_html_email_async, send_mail_async
-from corehq.apps.registration.models import RegistrationRequest
+from corehq.apps.registration.models import (
+    RegistrationRequest,
+    SelfSignupWorkflow,
+)
 from corehq.apps.registration.tasks import send_domain_registration_email
 from corehq.apps.users.models import CouchUser, WebUser
-from corehq.util.view_utils import absolute_reverse
+from corehq.apps.users.role_utils import initialize_domain_with_default_roles
 from corehq.toggles import USE_LOGO_IN_SYSTEM_EMAILS
+from corehq.util.soft_assert import soft_assert
+from corehq.util.view_utils import absolute_reverse
 
 APPCUES_APP_SLUGS = ['health', 'agriculture', 'wash']
 
@@ -106,7 +111,7 @@ def activate_new_user(
     return new_user
 
 
-def request_new_domain(request, project_name, is_new_user=True, is_new_sso_user=False):
+def request_new_domain(request, project_name, is_new_user=True, is_new_sso_user=False, is_self_signup=False):
     now = datetime.utcnow()
     current_user = CouchUser.from_django_user(request.user, strict=True)
 
@@ -161,6 +166,9 @@ def request_new_domain(request, project_name, is_new_user=True, is_new_sso_user=
             new_domain.delete()
             raise ErrorInitializingDomain(f"Subscription setup failed for '{name}'")
 
+        if is_self_signup:
+            SelfSignupWorkflow.objects.create(domain=new_domain.name, initiating_user=current_user.username)
+
     initialize_domain_with_default_roles(new_domain.name)
 
     if request.user.is_authenticated:
diff --git a/corehq/apps/registration/views.py b/corehq/apps/registration/views.py
index 5f7f9878f3a4..40de9c2e87ff 100644
--- a/corehq/apps/registration/views.py
+++ b/corehq/apps/registration/views.py
@@ -1,6 +1,5 @@
 import logging
 import re
-
 from datetime import datetime
 
 from django.conf import settings
@@ -18,12 +17,11 @@
 
 from memoized import memoized
 
-from corehq.apps.sso.models import IdentityProvider
 from dimagi.utils.couch import CriticalSection
 from dimagi.utils.couch.resource_conflict import retry_resource
 from dimagi.utils.web import get_ip
 
-from corehq.apps.accounting.models import BillingAccount
+from corehq.apps.accounting.models import BillingAccount, SoftwarePlanEdition
 from corehq.apps.analytics import ab_tests
 from corehq.apps.analytics.tasks import (
     HUBSPOT_COOKIE,
@@ -34,7 +32,10 @@
 )
 from corehq.apps.analytics.utils import get_meta
 from corehq.apps.domain.decorators import login_required
-from corehq.apps.domain.exceptions import NameUnavailableException, ErrorInitializingDomain
+from corehq.apps.domain.exceptions import (
+    ErrorInitializingDomain,
+    NameUnavailableException,
+)
 from corehq.apps.domain.extension_points import has_custom_clean_password
 from corehq.apps.domain.models import Domain, LicenseAgreement
 from corehq.apps.hqwebapp.decorators import use_jquery_ui, use_ko_validation
@@ -44,8 +45,9 @@
     RegisterWebUserForm,
 )
 from corehq.apps.registration.models import (
-    RegistrationRequest,
     AsyncSignupRequest,
+    RegistrationRequest,
+    SelfSignupWorkflow,
 )
 from corehq.apps.registration.utils import (
     activate_new_user_via_reg_form,
@@ -55,7 +57,13 @@
     send_mobile_experience_reminder,
     send_new_request_update_email,
 )
-from corehq.apps.users.models import CouchUser, WebUser, Invitation, EULA_CURRENT_VERSION
+from corehq.apps.sso.models import IdentityProvider
+from corehq.apps.users.models import (
+    EULA_CURRENT_VERSION,
+    CouchUser,
+    Invitation,
+    WebUser,
+)
 from corehq.const import USER_CHANGE_VIA_WEB
 from corehq.util.context_processors import get_per_domain_context
 from corehq.util.jqueryrmi import JSONResponseMixin, allow_remote_invocation
@@ -172,7 +180,8 @@ def register_new_user(self, data):
                 request_new_domain(
                     self.request,
                     reg_form.cleaned_data['project_name'],
-                    is_new_user=True
+                    is_new_user=True,
+                    is_self_signup=False  # TODO: connect this to RegisterWebUserForm
                 )
             except NameUnavailableException:
                 # technically, the form should never reach this as names are
@@ -517,7 +526,7 @@ def confirm_domain(request, guid=''):
             return render(request, 'registration/confirmation_error.html', context)
 
         requested_domain = Domain.get_by_name(req.domain)
-        view_name = "dashboard_default"
+        view_name = _confirm_domain_redirect(request.plan.plan.edition, req.domain)
         view_args = [requested_domain.name]
 
         # Has guid already been confirmed?
@@ -548,6 +557,14 @@ def confirm_domain(request, guid=''):
         return HttpResponseRedirect(reverse(view_name, args=view_args))
 
 
+def _confirm_domain_redirect(edition, domain):
+    from corehq.apps.dashboard.views import DomainDashboardView
+    from corehq.apps.domain.views import SelectPlanView
+    should_select_plan = bool(edition == SoftwarePlanEdition.COMMUNITY
+                              and SelfSignupWorkflow.get_in_progress_for_domain(domain))
+    return SelectPlanView.urlname if should_select_plan else DomainDashboardView.urlname
+
+
 @retry_resource(3)
 def eula_agreement(request):
     if request.method == 'POST':
diff --git a/corehq/apps/registry/static/registry/js/registry_edit.js b/corehq/apps/registry/static/registry/js/registry_edit.js
index f19c5e22a054..37af56af7c9e 100644
--- a/corehq/apps/registry/static/registry/js/registry_edit.js
+++ b/corehq/apps/registry/static/registry/js/registry_edit.js
@@ -8,11 +8,11 @@ hqDefine("registry/js/registry_edit", [
     'registry/js/registry_actions',
     'registry/js/registry_logs',
     'es6!hqwebapp/js/bootstrap5_loader',
-    'hqwebapp/js/components/inline_edit',
     'hqwebapp/js/select2_knockout_bindings.ko',
     'hqwebapp/js/bootstrap5/knockout_bindings.ko', // openModal
     'hqwebapp/js/bootstrap5/main', // makeHqHelp
     'hqwebapp/js/multiselect_utils',
+    'hqwebapp/js/components/inline_edit',
 ], function (
     moment,
     ko,
@@ -21,11 +21,8 @@ hqDefine("registry/js/registry_edit", [
     text,
     actions,
     auditLogs,
-    bootstrap,
-    inlineEdit
+    bootstrap
 ) {
-    ko.components.register('inline-edit', inlineEdit);
-
     let InvitationModel = function (data) {
         let self = data;
         self.statusText = text.getStatusText(self.status);
diff --git a/corehq/apps/registry/static/registry/js/registry_logs.js b/corehq/apps/registry/static/registry/js/registry_logs.js
index c3c70281c48c..313b9029ff6c 100644
--- a/corehq/apps/registry/static/registry/js/registry_logs.js
+++ b/corehq/apps/registry/static/registry/js/registry_logs.js
@@ -4,18 +4,15 @@ hqDefine("registry/js/registry_logs", [
     'knockout',
     'hqwebapp/js/initial_page_data',
     'registry/js/registry_actions',
-    'hqwebapp/js/components/pagination',
     'hqwebapp/js/tempus_dominus',
+    'hqwebapp/js/components/pagination',
 ], function (
     moment,
     ko,
     initialPageData,
     actions,
-    pagination,
     hqTempusDominus
 ) {
-    ko.components.register('pagination', pagination);
-
     const allDatesText = gettext("Show All Dates"),
         allDomainsText = gettext("All Project Spaces"),
         allActionsText = gettext("All Actions");
diff --git a/corehq/apps/registry/templates/registry/partials/audit_logs.html b/corehq/apps/registry/templates/registry/partials/audit_logs.html
index b8d04dce5a6a..c532a7b83cb7 100644
--- a/corehq/apps/registry/templates/registry/partials/audit_logs.html
+++ b/corehq/apps/registry/templates/registry/partials/audit_logs.html
@@ -60,7 +60,7 @@ <h6>{% trans "Loading ..." %}</h6>
         </tr>
       </tbody>
     </table>
-    <pagination
+    <pagination data-apply-bindings="false"
                 params="goToPage: goToPage,
                         slug: 'registry-audit-logs',
                         perPage: perPage,
diff --git a/corehq/apps/registry/templates/registry/registry_edit.html b/corehq/apps/registry/templates/registry/registry_edit.html
index d6b15b583b03..2a858383c662 100644
--- a/corehq/apps/registry/templates/registry/registry_edit.html
+++ b/corehq/apps/registry/templates/registry/registry_edit.html
@@ -33,7 +33,7 @@
 <div id="edit-registry" class="registry-inlines">
   <div class="row">
     <div class="col-md-6 col-lg-4">
-      <inline-edit params="
+      <inline-edit data-apply-bindings="false" params="
           value: name,
           containerClass: 'h3',
           url: '{% url "edit_registry_attr" registry.domain registry.slug 'name' %}',
@@ -84,7 +84,7 @@
   <div class="row">
     <div class="col-md-8 col-lg-6">
       {% if is_owner %}
-      <inline-edit params="
+      <inline-edit data-apply-bindings="false" params="
             value: '{{ registry.description|escapejs }}',
             url: '{% url "edit_registry_attr" registry.domain registry.slug 'description' %}',
             placeholder: '{% trans "Enter data registry description here"|escapejs %}',
diff --git a/corehq/apps/reports/analytics/esaccessors.py b/corehq/apps/reports/analytics/esaccessors.py
index 21393da80b6c..026d3c9371f0 100644
--- a/corehq/apps/reports/analytics/esaccessors.py
+++ b/corehq/apps/reports/analytics/esaccessors.py
@@ -417,7 +417,13 @@ def _chunked_get_form_counts_by_user_xmlns(domain, startdate, enddate, user_ids=
 
 
 def _duration_script():
-    return "doc['form.meta.timeEnd'].value - doc['form.meta.timeStart'].value"
+    # ES 5 returns long where as ES 6 returns a JodaCompatibleZonedDateTime
+    # This class can't use - operator directly
+    from corehq.apps.es.client import manager
+    script = "doc['form.meta.timeEnd'].value - doc['form.meta.timeStart'].value"
+    if manager.elastic_major_version >= 6:
+        script = "doc['form.meta.timeEnd'].value.getMillis() - doc['form.meta.timeStart'].value.getMillis()"
+    return script
 
 
 def get_form_duration_stats_by_user(
diff --git a/corehq/apps/reports/commtrack/__init__.py b/corehq/apps/reports/commtrack/__init__.py
index 5ded265c0ac1..fff66747827f 100644
--- a/corehq/apps/reports/commtrack/__init__.py
+++ b/corehq/apps/reports/commtrack/__init__.py
@@ -1,4 +1,3 @@
-from .maps import StockStatusMapReport  # noqa: F401
 from .standard import (  # noqa: F401
     CurrentStockStatusReport,
     InventoryReport,
diff --git a/corehq/apps/reports/commtrack/data_sources.py b/corehq/apps/reports/commtrack/data_sources.py
index 0caf982d9555..666995d8a8b7 100644
--- a/corehq/apps/reports/commtrack/data_sources.py
+++ b/corehq/apps/reports/commtrack/data_sources.py
@@ -6,7 +6,6 @@
 
 from casexml.apps.stock.const import SECTION_TYPE_STOCK
 from casexml.apps.stock.utils import months_of_stock_remaining, stock_category
-from dimagi.utils.couch.loosechange import map_reduce
 
 from corehq.apps.locations.models import SQLLocation
 from corehq.apps.products.models import Product
@@ -36,22 +35,6 @@ def format_decimal(d):
         return d.quantize(Decimal(1)) if d == d.to_integral() else d.normalize()
 
 
-def _location_map(location_ids):
-    return {
-        loc.location_id: loc
-        for loc in (SQLLocation.objects
-                    .filter(is_archived=False,
-                            location_id__in=location_ids)
-                    .prefetch_related('location_type'))
-    }
-
-
-def geopoint(location):
-    if None in (location.latitude, location.longitude):
-        return None
-    return '{} {}'.format(location.latitude, location.longitude)
-
-
 class CommtrackDataSourceMixin(object):
 
     @property
@@ -378,31 +361,3 @@ def _get_dict_for_ledger_value(self, ledger_value):
             })
 
         return values
-
-
-class StockStatusBySupplyPointDataSource(StockStatusDataSource):
-
-    def get_data(self):
-        data = list(super(StockStatusBySupplyPointDataSource, self).get_data())
-
-        products = dict((r['product_id'], r['product_name']) for r in data)
-        product_ids = sorted(products, key=lambda e: products[e])
-
-        by_supply_point = map_reduce(lambda e: [(e['location_id'],)], data=data, include_docs=True)
-        locs = _location_map(list(by_supply_point))
-
-        for loc_id, subcases in by_supply_point.items():
-            if loc_id not in locs:
-                continue  # it's archived, skip
-            loc = locs[loc_id]
-            by_product = dict((c['product_id'], c) for c in subcases)
-
-            rec = {
-                'name': loc.name,
-                'type': loc.location_type.name,
-                'geo': geopoint(loc),
-            }
-            for prod in product_ids:
-                rec.update(dict(('%s-%s' % (prod, key), by_product.get(prod, {}).get(key)) for key in
-                                ('current_stock', 'consumption', 'months_remaining', 'category')))
-            yield rec
diff --git a/corehq/apps/reports/commtrack/maps.py b/corehq/apps/reports/commtrack/maps.py
deleted file mode 100644
index aa9b11d08192..000000000000
--- a/corehq/apps/reports/commtrack/maps.py
+++ /dev/null
@@ -1,141 +0,0 @@
-from django.template.loader import render_to_string
-from django.utils.translation import gettext_noop
-
-from corehq.apps.hqwebapp.decorators import use_maps
-from corehq.apps.products.models import Product
-from corehq.apps.reports.commtrack.standard import CommtrackReportMixin
-from corehq.apps.reports.standard.maps import GenericMapReport
-
-
-class StockStatusMapReport(GenericMapReport, CommtrackReportMixin):
-    name = gettext_noop("Stock Status (map)")
-    slug = "stockstatus_map"
-
-    fields = [
-        'corehq.apps.reports.filters.fixtures.AsyncLocationFilter',
-        'corehq.apps.reports.filters.commtrack.ProgramFilter',
-    ]
-
-    data_source = {
-        'report': 'corehq.apps.reports.commtrack.data_sources.StockStatusBySupplyPointDataSource',
-    }
-
-    @use_maps
-    def decorator_dispatcher(self, request, *args, **kwargs):
-        super(StockStatusMapReport, self).decorator_dispatcher(request, *args, **kwargs)
-
-    @property
-    def display_config(self):
-        conf = {
-            'name_column': 'name',
-            'detail_columns': ['type'],
-            'table_columns': ['type'],
-            'column_titles': {
-                'type': 'Supply Point Type',
-            },
-            'enum_captions': {},
-            'numeric_format': {},
-            'metrics': [
-                {
-                    'color': {
-                        'column': 'type',
-                    },
-                },
-            ],
-        }
-
-        titles = {
-            'current_stock': 'Stock on Hand',
-            'consumption': 'Monthly Consumption',
-            'months_remaining': 'Months of Stock Remaining',
-            'category': 'Current Stock Status',
-        }
-
-        products = sorted(
-            Product.by_domain(self.domain),
-            key=lambda p: p.name
-        )
-
-        if self.program_id:
-            products = [c for c in products if c.program_id == self.program_id]
-        for p in products:
-
-            def col_id(c):
-                return "%s-%s" % (p._id, c)
-
-            product_cols = []
-            for c in ('category', 'current_stock', 'months_remaining', 'consumption'):
-                conf['column_titles'][col_id(c)] = titles[c]
-                product_cols.append(col_id(c))
-            conf['detail_columns'].extend(product_cols)
-
-            product_metrics = [
-                {
-                    'icon': {
-                        'column': col_id('category'),
-                        'categories': {
-                            'stockout': '/static/commtrack/images/stockout.png',
-                            'understock': '/static/commtrack/images/warning.png',
-                            'adequate': '/static/commtrack/images/goodstock.png',
-                            'overstock': '/static/commtrack/images/overstock.png',
-                            '_null': '/static/commtrack/images/no_data.png',
-                        },
-                    }
-                }
-            ]
-            conf['enum_captions'][col_id('category')] = {
-                'stockout': 'Stocked out',
-                'understock': 'Under-stock',
-                'adequate': 'Adequate Stock',
-                'overstock': 'Over-stock',
-                '_null': 'No Data',
-            }
-
-            for c in ('current_stock', 'months_remaining', 'consumption'):
-                metric = {
-                    'title': conf['column_titles'][col_id(c)],
-                    'size': {
-                        'column': col_id(c),
-                    },
-                }
-                if c not in ('consumption',):
-                    metric['color'] = {
-                        'column': col_id('category'),
-                        'categories': {
-                            'stockout': 'rgba(255, 0, 0, .8)',
-                            'understock': 'rgba(255, 120, 0, .8)',
-                            'adequate': 'rgba(50, 200, 50, .8)',
-                            'overstock': 'rgba(120, 0, 255, .8)',
-                            '_null': 'rgba(128, 128, 128, .8)',
-                        },
-                    }
-                else:
-                    metric['color'] = 'rgba(120, 120, 255, .8)'
-                product_metrics.append(metric)
-
-                conf['numeric_format'][col_id(c)] = {
-                    'current_stock': "return x + ' %s'" % (p.unit or 'unit'),
-                    'months_remaining': "return (Math.round(10 * x) / 10) + (x == 1 ? ' month' : ' months')",
-                    'consumption': "return (Math.round(10 * x) / 10) + ' %s / month'" % (p.unit or 'unit'),
-                }[c]
-
-            conf['metrics'].append({
-                'title': p.name,
-                'group': True,
-                'children': product_metrics,
-            })
-            conf['table_columns'].append({
-                'title': p.name,
-                'subcolumns': product_cols,
-            })
-
-        conf['detail_template'] = render_to_string('reports/partials/commtrack/stockstatus_mapdetail.html', {
-            'products': products,
-            'columns': [{'id': c, 'title': titles[c]} for c in
-                        ('category', 'current_stock', 'consumption', 'months_remaining')],
-        })
-
-        conf['display'] = {
-            'table': False,
-        }
-        return conf
diff --git a/corehq/apps/reports/filters/controllers.py b/corehq/apps/reports/filters/controllers.py
index 3596d4d713f9..e1138fc62f54 100644
--- a/corehq/apps/reports/filters/controllers.py
+++ b/corehq/apps/reports/filters/controllers.py
@@ -1,6 +1,5 @@
 from memoized import memoized
 
-from corehq import toggles
 from corehq.apps.enterprise.models import EnterprisePermissions
 from corehq.apps.es import GroupES, UserES, groups
 from corehq.apps.locations.models import SQLLocation
@@ -46,6 +45,7 @@ def __init__(self, request, domain, search, case_sharing_only=False):
         self.domain = domain
         self.search = search
         self.case_sharing_only = case_sharing_only
+        self.include_locations_with_no_users = True
 
     @property
     @memoized
@@ -97,8 +97,7 @@ def get_locations_query(self, query):
 
         if self.case_sharing_only:
             locations = locations.filter(location_type__shares_cases=True)
-        if (toggles.LOCATION_HAS_USERS.enabled(self.domain)
-                and not self.include_locations_with_no_users_allowed):
+        if not self.include_locations_with_no_users:
             locations = locations.filter(location_type__has_users=True)
         return locations.accessible_to_user(self.domain, self.request.couch_user)
 
@@ -199,7 +198,8 @@ def get_options(self, show_more=False):
         )
         results = [
             {'id': entry[0], 'text': entry[1]} if len(entry) == 2 else
-            {'id': entry[0], 'text': entry[1], 'is_active': entry[2]} for entry
+            {'id': entry[0], 'text': entry[1], 'is_active': entry[2]} if len(entry) == 3 else
+            {'id': entry[0], 'text': entry[1], 'is_active': entry[2], 'title': entry[3]} for entry
             in options
         ]
 
diff --git a/corehq/apps/reports/filters/select.py b/corehq/apps/reports/filters/select.py
index 1c9d9afb70cb..30f0da20c599 100644
--- a/corehq/apps/reports/filters/select.py
+++ b/corehq/apps/reports/filters/select.py
@@ -144,6 +144,7 @@ def options(self):
             State.Pending,
             State.Cancelled,
             State.Fail,
+            State.InvalidPayload,
         ]]
 
 
diff --git a/corehq/apps/reports/filters/users.py b/corehq/apps/reports/filters/users.py
index 179881308ac8..3015dbab9739 100644
--- a/corehq/apps/reports/filters/users.py
+++ b/corehq/apps/reports/filters/users.py
@@ -7,6 +7,7 @@
 from memoized import memoized
 
 from corehq import toggles
+from corehq.feature_previews import USE_LOCATION_DISPLAY_NAME
 from corehq.apps.domain.models import Domain
 from corehq.apps.enterprise.models import EnterprisePermissions
 from corehq.apps.es import filters
@@ -20,6 +21,7 @@
 from corehq.apps.users.models import CommCareUser, UserHistory, WebUser
 from corehq.apps.users.util import cached_user_id_to_user_display
 from corehq.const import USER_DATETIME_FORMAT
+from corehq.util.global_request import get_request_domain
 from corehq.util.timezones.conversions import ServerTime
 from corehq.util.timezones.utils import get_timezone_for_user
 
@@ -138,11 +140,13 @@ def user_type_tuple(self, t):
 
     def location_tuple(self, location):
         location_id = location.location_id
-        text = location.get_path_display()
+        use_location_display_name = USE_LOCATION_DISPLAY_NAME.enabled(get_request_domain())
+        text = location.display_name if use_location_display_name else location.get_path_display()
+        tooltip = location.get_path_display() if use_location_display_name else location.display_name
         if self.namespace_locations:
             location_id = f'l__{location_id}'
             text = f'{text} [location]'
-        return (location_id, text)
+        return (location_id, text, None, tooltip)
 
     @property
     @memoized
@@ -280,8 +284,8 @@ def get_default_selections(self):
     def selected(self):
         selected_ids = self.request.GET.getlist(self.slug)
         if not selected_ids:
-            return [{'id': url_id, 'text': text}
-                    for url_id, text in self.get_default_selections()]
+            return [{'id': selection_tuple[0], 'text': selection_tuple[1]}
+                    for selection_tuple in self.get_default_selections()]
 
         selected = (self.selected_static_options(selected_ids)
                     + self._selected_user_entries(selected_ids)
diff --git a/corehq/apps/reports/forms.py b/corehq/apps/reports/forms.py
index b84da0c4bcbb..d136062344b6 100644
--- a/corehq/apps/reports/forms.py
+++ b/corehq/apps/reports/forms.py
@@ -317,6 +317,14 @@ class TableauServerForm(forms.Form):
         label=_('Target Site'),
     )
 
+    get_reports_using_role = forms.BooleanField(
+        label=_("Get Tableau reports using role name"),
+        required=False,
+        help_text=_("If checked, CommCareHQ will request embedded reports from Tableau Server using the user's "
+                    "role name instead of the user's username (e.g. \"HQ/Field Implementer\" instead of "
+                    "\"HQ/Leandra@dimagi.com\")")
+    )
+
     tableau_groups_allowed = forms.MultipleChoiceField(
         label=_("Allowed Tableau Groups"),
         choices=[],
@@ -331,6 +339,7 @@ class Meta:
             'server_name',
             'validate_hostname',
             'target_site',
+            'get_reports_using_role'
             'tableau_groups_allowed'
         ]
 
@@ -355,6 +364,9 @@ def __init__(self, data, user_syncing_config={}, *args, **kwargs):
             crispy.Div(
                 crispy.Field('target_site'),
             ),
+            crispy.Div(
+                crispy.Field('get_reports_using_role'),
+            ),
             FormActions(
                 crispy.Submit('submit_btn', 'Submit')
             )
@@ -395,6 +407,7 @@ def initial_data(self):
             'server_name': self._existing_config.server_name,
             'validate_hostname': self._existing_config.validate_hostname,
             'target_site': self._existing_config.target_site,
+            'get_reports_using_role': self._existing_config.get_reports_using_role,
             'allowed_tableau_groups': self._existing_config.allowed_tableau_groups,
         }
 
@@ -402,6 +415,7 @@ def save(self):
         self._existing_config.server_type = self.cleaned_data['server_type']
         self._existing_config.server_name = self.cleaned_data['server_name']
         self._existing_config.validate_hostname = self.cleaned_data['validate_hostname']
+        self._existing_config.get_reports_using_role = self.cleaned_data['get_reports_using_role']
         self._existing_config.target_site = self.cleaned_data['target_site']
         if self.add_allowed_tableau_groups_field:
             self._existing_config.allowed_tableau_groups = [
diff --git a/corehq/apps/reports/generic.py b/corehq/apps/reports/generic.py
index b19688baaeb5..bdaa7777ab1f 100644
--- a/corehq/apps/reports/generic.py
+++ b/corehq/apps/reports/generic.py
@@ -1,6 +1,5 @@
 import datetime
 import io
-import json
 import re
 from itertools import chain
 
@@ -37,6 +36,7 @@
 )
 from corehq.apps.reports.cache import request_cache
 from corehq.apps.reports.datatables import DataTablesHeader
+from corehq.apps.reports.exceptions import BadRequestError
 from corehq.apps.reports.filters.dates import DatespanFilter
 from corehq.apps.reports.tasks import export_all_rows_task
 from corehq.apps.reports.util import DatatablesParams
@@ -658,11 +658,11 @@ def filters_response(self):
         rendered_filters = render_to_string(
             self.template_filters, self.context, request=self.request
         )
-        return HttpResponse(json.dumps(dict(
+        return JsonResponse(dict(
             filters=rendered_filters,
             slug=self.slug,
             url_root=self.url_root
-        )))
+        ))
 
     @property
     @request_cache()
@@ -830,6 +830,7 @@ class GenericTabularReport(GenericReportView):
     statistics_rows = None
     force_page_size = False  # force page size to be as the default rows
     default_rows = 10
+    max_rows = 1000
     start_at_row = 0
     show_all_rows = False
     fix_left_col = False
@@ -922,6 +923,8 @@ def pagination(self):
             self._pagination = DatatablesParams.from_request_dict(
                 self.request.POST if self.request.method == 'POST' else self.request.GET
             )
+            if self._pagination.count > self.max_rows:
+                raise BadRequestError(gettext("Row count is too large"))
         return self._pagination
 
     @property
diff --git a/corehq/apps/reports/migrations/0020_tableauserver_get_reports_using_role.py b/corehq/apps/reports/migrations/0020_tableauserver_get_reports_using_role.py
new file mode 100644
index 000000000000..df877a11c8dc
--- /dev/null
+++ b/corehq/apps/reports/migrations/0020_tableauserver_get_reports_using_role.py
@@ -0,0 +1,43 @@
+# Generated by Django 4.2.14 on 2024-08-13 19:14
+
+from django.db import migrations, models
+from corehq.util.django_migrations import skip_on_fresh_install
+
+
+@skip_on_fresh_install
+def _move_ff_to_setting(apps, schema_editor):
+    try:
+        from corehq.toggles import EMBED_TABLEAU_REPORT_BY_USER
+        from corehq.toggles import EMBEDDED_TABLEAU
+    except ImportError:
+        return
+    TableauServer = apps.get_model('reports', 'TableauServer')
+    for domain in EMBEDDED_TABLEAU.get_enabled_domains():
+        if not EMBED_TABLEAU_REPORT_BY_USER.enabled(domain):
+            try:
+                server = TableauServer.objects.get(domain=domain)
+            except TableauServer.DoesNotExist:
+                pass
+            else:
+                server.get_reports_using_role = True
+                server.save()
+
+
+def noop(*args, **kwargs):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reports', '0019_tableauvisualization_location_safe'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='tableauserver',
+            name='get_reports_using_role',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.RunPython(_move_ff_to_setting, reverse_code=noop),
+    ]
diff --git a/corehq/apps/reports/models.py b/corehq/apps/reports/models.py
index 24948bbe6f93..fba9dc838b50 100644
--- a/corehq/apps/reports/models.py
+++ b/corehq/apps/reports/models.py
@@ -156,6 +156,7 @@ class TableauServer(models.Model):
     validate_hostname = models.CharField(max_length=128, default='', blank=True)
     target_site = models.CharField(max_length=64, default='Default')
     allowed_tableau_groups = ArrayField(models.CharField(max_length=255), null=True, blank=True, default=list)
+    get_reports_using_role = models.BooleanField(default=False)
 
     def __str__(self):
         return '{domain} {server} {server_type} {site}'.format(domain=self.domain,
diff --git a/corehq/apps/reports/standard/cases/case_data.py b/corehq/apps/reports/standard/cases/case_data.py
index 3637a4d61b7c..9939b22d97de 100644
--- a/corehq/apps/reports/standard/cases/case_data.py
+++ b/corehq/apps/reports/standard/cases/case_data.py
@@ -450,7 +450,8 @@ def case_property_names(request, domain, case_id):
     # We need to look at the export schema in order to remove any case properties that
     # have been deleted from the app. When the data dictionary is fully public, we can use that
     # so that users may deprecate those properties manually
-    export_schema = CaseExportDataSchema.generate_schema_from_builds(domain, None, case.type)
+    export_schema = CaseExportDataSchema.generate_schema_from_builds(domain, None, case.type,
+                                                                     is_identifier_case_type=True)
     property_schema = export_schema.group_schemas[0]
     last_app_ids = get_latest_app_ids_and_versions(domain)
     all_property_names = {
diff --git a/corehq/apps/reports/standard/maps.py b/corehq/apps/reports/standard/maps.py
deleted file mode 100644
index 8be0f07cc668..000000000000
--- a/corehq/apps/reports/standard/maps.py
+++ /dev/null
@@ -1,147 +0,0 @@
-import re
-
-from django.conf import settings
-
-from dimagi.utils.modules import to_function
-
-from corehq.apps.reports.api import ReportDataSource
-from corehq.apps.reports.standard import (
-    ProjectReport,
-    ProjectReportParametersMixin,
-)
-
-
-class GenericMapReport(ProjectReport, ProjectReportParametersMixin):
-    """instances must set:
-    data_source -- config about backend data source
-    display_config -- configure the front-end display of data
-
-    consult docs/maps.html for instructions
-    """
-
-    report_partial_path = "reports/partials/bootstrap3/maps.html"
-    flush_layout = True
-
-    # override on subclass. It must be a dict with keys:
-    # * report: fully qualified path to a ReportDataSource class
-    # * report_params (optional): params to pass to the data source. This get's
-    #     augmented with the `domain` and `request` params.
-    data_source = None
-
-    def _get_data(self):
-        data = self._get_data_report(self.data_source, dict(self.request.GET.items()))
-        return self._to_geojson(data, "geo")
-
-    def _to_geojson(self, data, geo_col):
-        def _parse_geopoint(raw):
-            try:
-                latlon = [float(k) for k in re.split(' *,? *', raw)[:2]]
-                return [latlon[1], latlon[0]] # geojson is lon, lat
-            except ValueError:
-                return None
-
-        metadata = {}
-
-        def points():
-            for row in data:
-                if '_meta' in row:
-                    # not a real data row
-                    metadata.update(row['_meta'])
-                    continue
-
-                geo = row[geo_col]
-                if geo is None:
-                    continue
-
-                e = geo
-                depth = 0
-                while hasattr(e, '__iter__'):
-                    e = e[0]
-                    depth += 1
-
-                if depth < 2:
-                    if depth == 0:
-                        geo = _parse_geopoint(geo)
-                        if geo is None:
-                            continue
-                    feature_type = 'Point'
-                else:
-                    if depth == 2:
-                        geo = [geo]
-                        depth += 1
-                    feature_type = 'MultiPolygon' if depth == 4 else 'Polygon'
-
-                properties = dict((k, v) for k, v in row.items() if k != geo_col)
-                # handle 'display value / raw value' fields (for backwards compatibility with
-                # existing data sources)
-                # note: this is not ideal for the maps report, as we have no idea how to properly
-                # format legends; it's better to use a formatter function in the maps report config
-                display_props = {}
-                for k, v in properties.items():
-                    if isinstance(v, dict) and set(v.keys()) == set(('html', 'sort_key')):
-                        properties[k] = v['sort_key']
-                        display_props['__disp_%s' % k] = v['html']
-                properties.update(display_props)
-
-                yield {
-                    'type': 'Feature',
-                    'geometry': {
-                        'type': feature_type,
-                        'coordinates': geo,
-                    },
-                    'properties': properties,
-                }
-
-        features = list(points())
-        return {
-            'type': 'FeatureCollection',
-            'features': features,
-            'metadata': metadata,
-        }
-
-    def _get_data_report(self, params, filters):
-        # this ordering is important!
-        # in the reverse order you could view a different domain's data just by setting the url param!
-        config = dict(filters)
-        config.update(params.get('report_params', {}))
-        config['domain'] = self.domain
-        config['request'] = self.request
-
-        DataSource = to_function(params['report'])
-
-        assert issubclass(DataSource, ReportDataSource), \
-            f"[{params['report']}] does not implement the ReportDataSource API!"
-
-        return DataSource(config).get_data()
-
-    @property
-    def report_context(self):
-        layers = getattr(settings, 'MAPS_LAYERS', None)
-        if not layers:
-            layers = {'Default': {'family': 'fallback'}}
-
-        data = self._get_data()
-        display = self.dynamic_config(self.display_config, data['features'])
-
-        context = {
-            'data': data,
-            'config': display,
-            'layers': layers,
-        }
-
-        return dict(
-            context=context,
-        )
-
-    def dynamic_config(self, static_config, data):
-        """override to customize the display configuration based on the
-        resultant data
-
-        static_config -- contents of 'display_config' property
-        data -- report data as a list of geojson Feature records
-        """
-        return static_config
-
-    @classmethod
-    def show_in_navigation(cls, domain=None, project=None, user=None):
-        return True
diff --git a/corehq/apps/reports/standard/tableau.py b/corehq/apps/reports/standard/tableau.py
index 8e3af51d5ea1..3c31772d8dd1 100644
--- a/corehq/apps/reports/standard/tableau.py
+++ b/corehq/apps/reports/standard/tableau.py
@@ -9,12 +9,16 @@
 import requests
 
 from corehq import toggles
-from corehq.apps.reports.models import TableauVisualization
+from corehq.apps.reports.models import TableauServer, TableauVisualization
 from corehq.apps.domain.decorators import login_and_domain_required
 from corehq.apps.domain.views.base import BaseDomainView
 from corehq.apps.locations.permissions import location_safe
 
 
+def _get_hostname(server):
+    return server.server_name if server.validate_hostname == '' else server.validate_hostname
+
+
 @location_safe
 class TableauView(BaseDomainView):
     urlname = 'tableau'
@@ -41,6 +45,7 @@ def visualization(self):
     def page_url(self):
         return reverse(self.urlname, args=(self.domain, self.visualization.id,))
 
+    @method_decorator(login_and_domain_required)
     @method_decorator(toggles.EMBEDDED_TABLEAU.required_decorator())
     def dispatch(self, request, *args, **kwargs):
         if not self._authenticate_request(request):
@@ -54,16 +59,10 @@ def _authenticate_request(self, request):
 
     @property
     def page_context(self):
-        if self.visualization.server.validate_hostname == '':
-            hostname = self.visualization.server.server_name
-        else:
-            hostname = self.visualization.server.validate_hostname
         return {
             "domain": self.visualization.server.domain,
             "server_type": self.visualization.server.server_type,
-            "server_address": self.visualization.server.server_name,
-            "validate_hostname": hostname,
-            "target_site": self.visualization.server.target_site,
+            "validate_hostname": _get_hostname(self.visualization.server),
             "view_url": self.visualization.view_url,
             "viz_id": self.visualization.id,
         }
@@ -77,38 +76,36 @@ def get(self, request, *args, **kwargs):
 @login_and_domain_required
 @require_POST
 @location_safe
-def tableau_visualization_ajax(request, domain):
+def get_tableau_server_ticket(request, domain):
     from requests_toolbelt.adapters import host_header_ssl
     visualization_data = {data: value[0] for data, value in dict(request.POST).items()}
-    server_name = visualization_data.pop('server_name')
-    validate_hostname = visualization_data.pop('validate_hostname')
-    target_site = visualization_data.pop('target_site')
+
+    server = TableauServer.objects.get(domain=domain)
+    server_name = server.server_name
+    validate_hostname = _get_hostname(server)
+    target_site = server.target_site
 
     # Authenticate
     if not request.couch_user.can_view_tableau_viz(domain, TableauVisualization.objects.get(
             id=visualization_data.pop('viz_id'))):
         raise Http403
 
-    if toggles.EMBED_TABLEAU_REPORT_BY_USER.enabled(domain):
+    if server.get_reports_using_role:
+        tableau_username = f"HQ/{request.couch_user.get_role(domain).name}"
+    else:
         # An equivalent Tableau user with the username "HQ/{username}" must exist.
         tableau_username = f"HQ/{request.couch_user.username}"
-    else:
-        # An equivalent Tableau user with the username "HQ/{role name}" must exist.
-        tableau_username = f"HQ/{request.couch_user.get_role(domain).name}"
+
     tabserver_url = 'https://{}/trusted/'.format(server_name)
     post_arguments = {'username': tableau_username}
 
     if target_site != 'Default':
         post_arguments.update({'target_site': target_site})
 
-    if validate_hostname != '':
-        request = requests.Session()
-        request.mount('https://', host_header_ssl.HostHeaderSSLAdapter())
-        tabserver_response = request.post(tabserver_url,
-                                          post_arguments,
-                                          headers={'Host': validate_hostname})
-    else:
-        tabserver_response = requests.post(tabserver_url, post_arguments)
+    request = requests.Session()
+    request.mount('https://', host_header_ssl.HostHeaderSSLAdapter())
+    tabserver_response = request.post(tabserver_url, post_arguments,
+                                      headers={'Host': validate_hostname})
 
     if tabserver_response.status_code == 200:
         if tabserver_response.content != b'-1':
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/base_maps.js b/corehq/apps/reports/static/reports/js/bootstrap3/base_maps.js
deleted file mode 100644
index 8dcd4c56f2ac..000000000000
--- a/corehq/apps/reports/static/reports/js/bootstrap3/base_maps.js
+++ /dev/null
@@ -1,15 +0,0 @@
-hqDefine("reports/js/bootstrap3/base_maps", function () {
-    var done = false;
-
-    $(document).ajaxComplete(function () {
-        var $data = $(".base-maps-data");
-        if ($data.length && !done) {
-            var context = $data.data("context"),
-                iconPath = $data.data("icon_path");
-            if (iconPath && context) {
-                hqImport("reports/js/bootstrap3/maps_utils").load(context, iconPath);
-                done = true;
-            }
-        }
-    });
-});
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 04db8f40a77e..30b4b1fb225b 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/case_details.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/case_details.js
@@ -72,20 +72,13 @@ hqDefine("reports/js/bootstrap3/case_details", [
 
         self.data_loading = ko.observable(false);
 
-        self.getParameterByName = function (name, url) {
-            if (!url) {
-                url = window.location.href;
+        self.getFormIdFromUrl = function () {
+            var regex = new RegExp("[?&]form_id(=([^&#]*)|&|#|$)"),
+                results = regex.exec(window.location.hash);
+            if (results && results[2]) {
+                return decodeURIComponent(results[2]);
             }
-            name = name.replace(/[[\]]/g, "\\$&");
-            var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
-                results = regex.exec(url);
-            if (!results) {
-                return null;
-            }
-            if (!results[2]) {
-                return '';
-            }
-            return decodeURIComponent(results[2].replace(/\+/g, " "));
+            return null;
         };
 
         self.get_xform_data = function (xformId) {
@@ -124,7 +117,7 @@ hqDefine("reports/js/bootstrap3/case_details", [
         var loadForm = function () {
             var hash = window.location.hash.split('?');
             if (hash[0] === '#history') {
-                var formId = self.getParameterByName('form_id', window.location.hash);
+                var formId = self.getFormIdFromUrl();
                 if (formId) {
                     self.get_xform_data(formId);
                     self.selected_xform_doc_id(formId);
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js b/corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js
index 925210a83210..bb2151e12e42 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/config.dataTables.bootstrap.js
@@ -153,12 +153,6 @@ hqDefine("reports/js/bootstrap3/config.dataTables.bootstrap", [
                                 }
                             }
                             applyBootstrapMagic();
-                            if ('context' in data) {
-                                var iconPath = data['icon_path'] || $(".base-maps-data").data("icon_path");
-                                hqRequire(["reports/js/bootstrap3/maps_utils"], function (mapsUtils) {
-                                    mapsUtils.load(data['context'], iconPath);
-                                });
-                            }
                             if (self.successCallbacks) {
                                 for (i = 0; i < self.successCallbacks.length; i++) {
                                     self.successCallbacks[i](data);
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/data_corrections.js b/corehq/apps/reports/static/reports/js/bootstrap3/data_corrections.js
index 99f93a922c1e..41c7ef2f079e 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/data_corrections.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/data_corrections.js
@@ -34,9 +34,9 @@ hqDefine("reports/js/bootstrap3/data_corrections", [
     "underscore",
     "hqwebapp/js/assert_properties",
     "analytix/js/kissmetrix",
-    "hqwebapp/js/bootstrap3/components.ko",     // pagination
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
     "select2/dist/js/select2.full.min",
-    "hqwebapp/js/bootstrap3/components.ko",    // search box
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js b/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
index 7b758d5009ea..f47613c55c81 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
@@ -7,7 +7,7 @@ hqDefine("reports/js/bootstrap3/edit_scheduled_report", [
     "hqwebapp/js/multiselect_utils",
     "hqwebapp/js/bootstrap3/widgets",  // autocomplete widget for email recipient list
     "jquery-ui/ui/widgets/datepicker",
-    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
 ], function (
     $,
     _,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js b/corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js
index a04fb033fe74..75b9ce35c90e 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/reports.async.js
@@ -165,9 +165,6 @@ hqDefine("reports/js/bootstrap3/reports.async", function () {
 
                     // Assorted UI cleanup/initialization
                     $('.hq-report-time-notice').removeClass('hide');
-                    if ($.timeago) {
-                        $(".timeago").timeago();
-                    }
 
                     $('.loading-backdrop').fadeOut();
                     self.hqLoading.fadeOut();
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/saved_reports_main.js b/corehq/apps/reports/static/reports/js/bootstrap3/saved_reports_main.js
index 28433dcfe0db..0911f933141f 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/saved_reports_main.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/saved_reports_main.js
@@ -3,8 +3,9 @@ hqDefine("reports/js/bootstrap3/saved_reports_main", [
     'knockout',
     'hqwebapp/js/initial_page_data',
     'reports/js/bootstrap3/report_config_models',
-    'reports/js/bootstrap3/scheduled_reports_list',
+    'reports/js/scheduled_reports_list',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // modal binding
+    'hqwebapp/js/components/pagination',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/base_maps.js b/corehq/apps/reports/static/reports/js/bootstrap5/base_maps.js
deleted file mode 100644
index 56789be49500..000000000000
--- a/corehq/apps/reports/static/reports/js/bootstrap5/base_maps.js
+++ /dev/null
@@ -1,15 +0,0 @@
-hqDefine("reports/js/bootstrap5/base_maps", function () {
-    var done = false;
-
-    $(document).ajaxComplete(function () {
-        var $data = $(".base-maps-data");
-        if ($data.length && !done) {
-            var context = $data.data("context"),
-                iconPath = $data.data("icon_path");
-            if (iconPath && context) {
-                hqImport("reports/js/bootstrap5/maps_utils").load(context, iconPath);
-                done = true;
-            }
-        }
-    });
-});
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 e46366ea6f24..0bb585df2e1c 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/case_details.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/case_details.js
@@ -72,20 +72,13 @@ hqDefine("reports/js/bootstrap5/case_details", [
 
         self.data_loading = ko.observable(false);
 
-        self.getParameterByName = function (name, url) {
-            if (!url) {
-                url = window.location.href;
+        self.getFormIdFromUrl = function () {
+            var regex = new RegExp("[?&]form_id(=([^&#]*)|&|#|$)"),
+                results = regex.exec(window.location.hash);
+            if (results && results[2]) {
+                return decodeURIComponent(results[2]);
             }
-            name = name.replace(/[[\]]/g, "\\$&");
-            var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
-                results = regex.exec(url);
-            if (!results) {
-                return null;
-            }
-            if (!results[2]) {
-                return '';
-            }
-            return decodeURIComponent(results[2].replace(/\+/g, " "));
+            return null;
         };
 
         self.get_xform_data = function (xformId) {
@@ -124,7 +117,7 @@ hqDefine("reports/js/bootstrap5/case_details", [
         var loadForm = function () {
             var hash = window.location.hash.split('?');
             if (hash[0] === '#history') {
-                var formId = self.getParameterByName('form_id', window.location.hash);
+                var formId = self.getFormIdFromUrl();
                 if (formId) {
                     self.get_xform_data(formId);
                     self.selected_xform_doc_id(formId);
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js b/corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js
index d093ce2cd91d..67982d789f69 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/config.dataTables.bootstrap.js
@@ -153,12 +153,6 @@ hqDefine("reports/js/bootstrap5/config.dataTables.bootstrap", [
                                 }
                             }
                             applyBootstrapMagic();
-                            if ('context' in data) {
-                                var iconPath = data['icon_path'] || $(".base-maps-data").data("icon_path");
-                                hqRequire(["reports/js/bootstrap5/maps_utils"], function (mapsUtils) {
-                                    mapsUtils.load(data['context'], iconPath);
-                                });
-                            }
                             if (self.successCallbacks) {
                                 for (i = 0; i < self.successCallbacks.length; i++) {
                                     self.successCallbacks[i](data);
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/data_corrections.js b/corehq/apps/reports/static/reports/js/bootstrap5/data_corrections.js
index eac65533680e..0724373e9396 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/data_corrections.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/data_corrections.js
@@ -34,9 +34,9 @@ hqDefine("reports/js/bootstrap5/data_corrections", [
     "underscore",
     "hqwebapp/js/assert_properties",
     "analytix/js/kissmetrix",
-    "hqwebapp/js/bootstrap5/components.ko",     // pagination
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
     "select2/dist/js/select2.full.min",
-    "hqwebapp/js/bootstrap5/components.ko",    // search box
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js b/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
index 5bb7134b3a7c..3cbcf63fde93 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
@@ -7,7 +7,7 @@ hqDefine("reports/js/bootstrap5/edit_scheduled_report", [
     "hqwebapp/js/multiselect_utils",
     "hqwebapp/js/bootstrap5/widgets",  // autocomplete widget for email recipient list
     "jquery-ui/ui/widgets/datepicker",
-    'hqwebapp/js/bootstrap5/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
 ], function (
     $,
     _,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js b/corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js
index 274c0b0e5cf9..d966d0d81bb1 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/reports.async.js
@@ -165,9 +165,6 @@ hqDefine("reports/js/bootstrap5/reports.async", function () {
 
                     // Assorted UI cleanup/initialization
                     $('.hq-report-time-notice').removeClass('hide');
-                    if ($.timeago) {
-                        $(".timeago").timeago();
-                    }
 
                     $('.loading-backdrop').fadeOut();
                     self.hqLoading.fadeOut();
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/saved_reports_main.js b/corehq/apps/reports/static/reports/js/bootstrap5/saved_reports_main.js
index 21661d8d5d44..a6b96286ba7e 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/saved_reports_main.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/saved_reports_main.js
@@ -3,8 +3,9 @@ hqDefine("reports/js/bootstrap5/saved_reports_main", [
     'knockout',
     'hqwebapp/js/initial_page_data',
     'reports/js/bootstrap5/report_config_models',
-    'reports/js/bootstrap5/scheduled_reports_list',
+    'reports/js/scheduled_reports_list',
     'hqwebapp/js/bootstrap5/knockout_bindings.ko', // modal binding
+    'hqwebapp/js/components/pagination',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js b/corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
deleted file mode 100644
index fdad29c77d50..000000000000
--- a/corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-
-    ScheduledReportModel - model representing a single row on the list / a single report filter file
-    ScheduleReportPanelModel - model representing a whole table ('My Scheduled Reports' and 'Other Scheduled Reports')
-    ScheduledReportListModel - model representing the whole page (list of reports, actions)
-
-*/
-
-hqDefine("reports/js/bootstrap5/scheduled_reports_list", [
-    'jquery',
-    'knockout',
-    'underscore',
-    'hqwebapp/js/assert_properties',
-    'hqwebapp/js/bootstrap5/components.ko', // pagination & feedback widget
-], function (
-    $,
-    ko,
-    _,
-    assertProperties
-) {
-    "use strict";
-    var scheduledReportModel = function (report, isOwner, isAdmin) {
-        assertProperties.assert(report, [
-            'id',
-            'addedToBulk',
-            'domain',
-            'owner_id',
-            'recipient_emails',
-            'config_ids',
-            'send_to_owner',
-            'hour',
-            'minute',
-            'day',
-            'uuid',
-            'start_date',
-            'configs',
-            'is_editable',
-            'owner_email',
-            'day_name',
-            'editUrl',
-            'viewUrl',
-            'sendUrl',
-            'deleteUrl',
-            'unsubscribeUrl',
-        ]);
-
-        var self = ko.mapping.fromJS(report);
-
-        self.configMany = true;
-        if (report.configs.length === 1) {
-            self.configMany = false;
-        }
-
-        self.recipient_email_count = self.recipient_emails().length;
-
-        self.deleteScheduledReport = function (observable, event) {
-            $(event.currentTarget).closest('form').submit();
-        };
-
-        self.is_owner = isOwner;
-        self.is_admin = isAdmin;
-        self.firstConfig = ko.observable(report.configs[0]);
-
-        return self;
-    };
-
-    var scheduledReportsPanelModel = function (options) {
-        assertProperties.assert(options, ['reports', 'is_owner', 'is_admin', 'header']);
-
-        var self = _.extend({}, options);
-
-        self.scheduledReports = ko.observableArray();
-        self.items = ko.observableArray();
-        self.isLoadingPanel = ko.observable(true);
-        self.perPage = ko.observable();
-
-        self.scheduledReports(ko.utils.arrayMap(options.reports, function (report) {
-            return scheduledReportModel(report, self.is_owner, self.is_admin);
-        }));
-
-        self.goToPage = function (page) {
-            self.isLoadingPanel(true);
-            self.items(self.scheduledReports.slice(self.perPage() * (page - 1), self.perPage() * page));
-            self.isLoadingPanel(false);
-        };
-
-        self.selectAll = function () {
-            _.each(self.items(), function (e) { e.addedToBulk(true); });
-        };
-
-        self.selectNone = function () {
-            _.each(self.items(), function (e) { e.addedToBulk(false); });
-        };
-
-        self.totalItems = ko.observable(self.scheduledReports().length);
-
-        self.onPaginationLoad = function () {
-            self.goToPage(1);
-        };
-
-        return self;
-    };
-
-    var scheduledReportListModel = function (options) {
-        assertProperties.assert(options, ['scheduled_reports', 'other_scheduled_reports', 'is_admin']);
-
-        var self = {};
-        window.scrollTo(0, 0);
-
-        self.bulkAction = ko.observable(false);
-        self.isBulkDeleting = ko.observable(false);
-        self.isBulkSending = ko.observable(false);
-        self.action = ko.observable();
-
-        self.panels = ko.observableArray([]);
-        self.panels.push(scheduledReportsPanelModel({
-            reports: options.scheduled_reports,
-            is_owner: true,
-            is_admin: options.is_admin,
-            header: gettext("My Scheduled Reports"),
-        }));
-        self.panels.push(scheduledReportsPanelModel({
-            reports: options.other_scheduled_reports,
-            is_owner: false,
-            is_admin: options.is_admin,
-            header: gettext("Other Scheduled Reports"),
-        }));
-
-        self.reports = ko.computed(function () {
-            return _.flatten(_.map(self.panels(), function (panel) { return panel.scheduledReports(); }));
-        });
-
-        self.selectedReports = ko.computed(function () {
-            return _.filter(self.reports(), function (e) { return e.addedToBulk(); });
-        });
-
-        self.selectedReportsCount = ko.computed(function () {
-            return self.selectedReports().length;
-        });
-
-        self.isMultiple = ko.computed(function () {
-            if (self.selectedReportsCount() > 1) {
-                return true;
-            }
-            return false;
-        });
-
-        self.sendModal = function () {
-            self.action('send');
-        };
-
-        self.deleteModal = function () {
-            self.action('delete');
-        };
-
-        self.bulkSend = function () {
-            self.bulkAction(true);
-            self.isBulkSending(true);
-            var sendList = _.filter(self.reports(), function (e) {return e.addedToBulk();});
-            var ids = [];
-            for (let i = 0; i < sendList.length; i++) {
-                ids.push(sendList[i].id());
-            }
-            ids = JSON.stringify(ids);
-            $.ajax({
-                method: 'POST',
-                url: sendList[0].sendUrl(),
-                data: {
-                    "sendList": ids,
-                    "bulkSendCount": sendList.length,
-                },
-                success: function () {
-                    location.reload();
-                },
-            });
-        };
-
-        self.bulkDelete = function () {
-            self.bulkAction(true);
-            self.isBulkDeleting(true);
-            var deleteList = _.filter(self.reports(), function (e) {return e.addedToBulk();});
-            var ids = [];
-            for (let i = 0; i < deleteList.length; i++) {
-                ids.push(deleteList[i].id());
-            }
-            ids = JSON.stringify(ids);
-            $.ajax({
-                method: 'POST',
-                url: deleteList[0].deleteUrl(),
-                data: {
-                    "deleteList": ids,
-                    "bulkDeleteCount": deleteList.length,
-                },
-                success: function () {
-                    location.reload();
-                },
-            });
-        };
-
-        return self;
-    };
-
-    return {
-        scheduledReportListModel: scheduledReportListModel,
-    };
-
-});
-
-
diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js b/corehq/apps/reports/static/reports/js/scheduled_reports_list.js
similarity index 97%
rename from corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
rename to corehq/apps/reports/static/reports/js/scheduled_reports_list.js
index dbafb7cba0f0..1dcdd48b1af3 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
+++ b/corehq/apps/reports/static/reports/js/scheduled_reports_list.js
@@ -6,12 +6,12 @@
 
 */
 
-hqDefine("reports/js/bootstrap3/scheduled_reports_list", [
+hqDefine("reports/js/scheduled_reports_list", [
     'jquery',
     'knockout',
     'underscore',
     'hqwebapp/js/assert_properties',
-    'hqwebapp/js/bootstrap3/components.ko', // pagination & feedback widget
+    'hqwebapp/js/components/pagination',
 ], function (
     $,
     ko,
@@ -205,5 +205,3 @@ hqDefine("reports/js/bootstrap3/scheduled_reports_list", [
     };
 
 });
-
-
diff --git a/corehq/apps/reports/static/reports/js/tableau.js b/corehq/apps/reports/static/reports/js/tableau.js
index 7d482ec5d78a..76b832c9f044 100644
--- a/corehq/apps/reports/static/reports/js/tableau.js
+++ b/corehq/apps/reports/static/reports/js/tableau.js
@@ -6,11 +6,8 @@ hqDefine("reports/js/tableau", function () {
     self.requestViz = function () {
         $.ajax({
             method: 'post',
-            url: initialPageData.reverse('tableau_visualization_ajax'),
+            url: initialPageData.reverse('get_tableau_server_ticket'),
             data: {
-                validate_hostname: initialPageData.get("validate_hostname"),
-                server_name: initialPageData.get("server_address"),
-                target_site: initialPageData.get("target_site"),
                 viz_id: initialPageData.get("viz_id"),
             },
             dataType: 'json',
diff --git a/corehq/apps/reports/static/reports/v2/js/bootstrap3/datagrid.js b/corehq/apps/reports/static/reports/v2/js/bootstrap3/datagrid.js
index 840845c3fe3c..e3eb80633aee 100644
--- a/corehq/apps/reports/static/reports/v2/js/bootstrap3/datagrid.js
+++ b/corehq/apps/reports/static/reports/v2/js/bootstrap3/datagrid.js
@@ -7,7 +7,7 @@ hqDefine('reports/v2/js/bootstrap3/datagrid', [
     'knockout',
     'underscore',
     'hqwebapp/js/assert_properties',
-    'reports/v2/js/datagrid/bootstrap3/data_models',
+    'reports/v2/js/datagrid/data_models',
     'reports/v2/js/datagrid/columns',
     'reports/v2/js/datagrid/report_filters',
     'analytix/js/kissmetrix',
diff --git a/corehq/apps/reports/static/reports/v2/js/bootstrap5/datagrid.js b/corehq/apps/reports/static/reports/v2/js/bootstrap5/datagrid.js
index 3c44610c0bde..589bbf10656d 100644
--- a/corehq/apps/reports/static/reports/v2/js/bootstrap5/datagrid.js
+++ b/corehq/apps/reports/static/reports/v2/js/bootstrap5/datagrid.js
@@ -7,7 +7,7 @@ hqDefine('reports/v2/js/bootstrap5/datagrid', [
     'knockout',
     'underscore',
     'hqwebapp/js/assert_properties',
-    'reports/v2/js/datagrid/bootstrap5/data_models',
+    'reports/v2/js/datagrid/data_models',
     'reports/v2/js/datagrid/columns',
     'reports/v2/js/datagrid/report_filters',
     'analytix/js/kissmetrix',
diff --git a/corehq/apps/reports/static/reports/v2/js/datagrid/bootstrap5/data_models.js b/corehq/apps/reports/static/reports/v2/js/datagrid/bootstrap5/data_models.js
deleted file mode 100644
index 69164d21192a..000000000000
--- a/corehq/apps/reports/static/reports/v2/js/datagrid/bootstrap5/data_models.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- * todo add docstring
- */
-
-hqDefine('reports/v2/js/datagrid/bootstrap5/data_models', [
-    'jquery',
-    'knockout',
-    'underscore',
-    'analytix/js/kissmetrix',
-    'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/bootstrap5/components.ko',  // pagination widget
-], function (
-    $,
-    ko,
-    _,
-    kissmetrics,
-    initialPageData
-) {
-    'use strict';
-
-    var scrollingDataModel = function (endpoint) {
-        var self = {};
-
-        self.endpoint = endpoint;
-
-        self.hasInitialLoadFinished = ko.observable(false);
-
-        self.isDataLoading = ko.observable(false);
-        self.isLoadingError = ko.observable(false);
-        self.ajaxPromise = undefined;
-
-        self.numTimeouts = 0;
-        self.showTimeoutError = ko.observable(false);
-
-        self.isDataLoading.subscribe(function (isLoading) {
-            if (!isLoading) {
-                return;
-            }
-
-            // vertically center the loading text within the table body rows,
-            // and make sure the width and height of the element wrapping the
-            // loading text is the same as the width and height of the rows in
-            // table body
-            var $rows = $('#js-datagrid-rows'),
-                $loading = $('#js-datagrid-loading'),
-                position = $rows.position(),
-                marginTop = Math.max(0, $rows.height() / 2 - 50); // 50 is half the line height of the loading text
-
-            if (position.top === 0) {
-                return;
-            }
-
-            $loading
-                .height(Math.max(100, $rows.height()))
-                .width($rows.width())
-                .css('left', position.left + 'px')
-                .css('top', position.top + "px");
-            
-            $loading.find('.loading-text')
-                .css('margin-top', marginTop + 'px');
-        });
-
-        self.rows = ko.observableArray([]);
-
-        self.limit = ko.observable(undefined);
-        self.hasLimitBeenModified = ko.observable(false);
-
-        self.currentPage = ko.observable(undefined);
-        self.totalRecords = ko.observable(1);
-
-        self.resetPagination = ko.observable(false);
-
-        self.limit.subscribe(function (newLimit) {
-            // needed to stay in sync with pagination widget
-            // to prevent unnecessary reloads of data
-            self.hasLimitBeenModified(true);
-
-            if (self.hasInitialLoadFinished()) {
-                kissmetrics.track.event("Changed page size", {
-                    "Domain": initialPageData.get('domain'),
-                    "Page Size Selected": newLimit,
-                });
-            }
-        });
-
-        self.hasNoData = ko.computed(function () {
-            return self.totalRecords() < 1;
-        });
-
-        self.goToPage = function (page) {
-            if (page !== self.currentPage() || self.hasLimitBeenModified()) {
-                self.currentPage(page);
-                if (!self.resetPagination() || self.hasLimitBeenModified()) {
-                    self.loadRecords();
-                }
-                self.hasLimitBeenModified(false);
-                self.resetPagination(false);
-            }
-        };
-
-        self.thresholds = {
-            10000: "10 sec",
-            20000: "20 sec",
-            30000: "30 sec",
-            40000: "40 sec",
-            50000: "50 sec",
-            60000: "1 min",
-            90000: "1.5 min",
-            120000: "2 min",
-            300000: "5 min",
-            600000: "10 min",
-        };
-
-        self.thresholdTimer = 0;
-        self.thresholdInterval = 10000;
-
-        self.sendThresholdAnalytics = setInterval(function () {
-            self.thresholdTimer += self.thresholdInterval;
-            if (_.has(self.thresholds, self.thresholdTimer)) {
-                var eventTitle = "ECD Initial Load Threshold - " + self.thresholds[self.thresholdTimer];
-                kissmetrics.track.event(eventTitle, {
-                    "Domain": initialPageData.get('domain'),
-                });
-            }
-        }, self.thresholdInterval);
-
-        self.loadRecords = function () {
-            if (!self.reportContext) {
-                throw new Error("Please call init() before calling loadRecords().");
-            }
-
-            if (self.ajaxPromise) {
-                self.ajaxPromise.abort();
-            }
-
-            if (self.isDataLoading()) {
-                return;
-            }
-
-            // wait for pagination widget to kick in
-            if (self.currentPage() === undefined) {
-                return;
-            }
-            if (self.limit() === undefined) {
-                return;
-            }
-
-            self.isLoadingError(false);
-            self.isDataLoading(true);
-
-            self.ajaxPromise = $.ajax({
-                url: self.endpoint.getUrl(),
-                method: 'post',
-                dataType: 'json',
-                data: {
-                    limit: self.limit(),
-                    page: self.currentPage(),
-                    totalRecords: self.totalRecords(),
-                    reportContext: JSON.stringify(self.reportContext()),
-                },
-            })
-                .done(function (data) {
-                    if (data.isTimeout && self.numTimeouts < 6) {
-                        self.numTimeouts ++;
-                        self.isDataLoading(false);
-                        self.ajaxPromise = undefined;
-                        self.refresh();
-                        return;
-                    }
-
-                    if (data.isTimeout) {
-                        self.showTimeoutError(true);
-                        kissmetrics.track.event("ECD Timeout Error After 5 Attempts", {
-                            "Domain": initialPageData.get('domain'),
-                        });
-                    } else {
-                        self.showTimeoutError(false);
-                        self.numTimeouts = 0;
-                        var timeEventTitle = "ECD Load Time";
-                        if (!self.hasInitialLoadFinished()) {
-                            timeEventTitle = timeEventTitle + " - Initial";
-                        }
-                        kissmetrics.track.event(timeEventTitle, {
-                            "Domain": initialPageData.get('domain'),
-                            "Time": data.took,
-                        });
-
-                    }
-
-                    self.rows(data.rows);
-                    if (self.hasInitialLoadFinished()) {
-                        self.resetPagination(data.resetPagination);
-                    }
-                    self.totalRecords(data.totalRecords);
-
-                    if (!self.hasInitialLoadFinished()) {
-                        self.hasInitialLoadFinished(true);
-                        clearInterval(self.sendThresholdAnalytics);
-                        $('#js-datagrid-initial-loading').fadeOut();
-                        _.each(self.reportFilters(), function (reportFilter) {
-                            reportFilter.value.subscribe(function () {
-                                self.refresh();
-                            });
-                            reportFilter.isLoadingComplete(true);
-                        });
-                    }
-                })
-                .fail(function (e) {
-                    if (e.statusText !== 'abort') {
-                        self.rows([]);
-                        self.isLoadingError(true);
-                    }
-                })
-                .always(function () {
-                    self.isDataLoading(false);
-                    self.ajaxPromise = undefined;
-                });
-        };
-
-        self.init = function (reportContextObservable, reportFiltersObservable) {
-            self.reportContext = reportContextObservable;
-            self.reportFilters = reportFiltersObservable;
-            self.pageTitle = $(document).find("title").text();
-
-            var _url = new URL(window.location.href);
-            self.currentPage(_url.searchParams.get('p') || self.currentPage());
-            self.limit(_url.searchParams.get('l') || self.limit());
-
-        };
-
-        self.refresh = function () {
-            self.loadRecords();
-        };
-
-        return self;
-    };
-
-    return {
-        scrollingDataModel: scrollingDataModel,
-    };
-});
diff --git a/corehq/apps/reports/static/reports/v2/js/datagrid/bootstrap3/data_models.js b/corehq/apps/reports/static/reports/v2/js/datagrid/data_models.js
similarity index 98%
rename from corehq/apps/reports/static/reports/v2/js/datagrid/bootstrap3/data_models.js
rename to corehq/apps/reports/static/reports/v2/js/datagrid/data_models.js
index f8132e52ee7c..5b70c1ccf055 100644
--- a/corehq/apps/reports/static/reports/v2/js/datagrid/bootstrap3/data_models.js
+++ b/corehq/apps/reports/static/reports/v2/js/datagrid/data_models.js
@@ -2,13 +2,13 @@
  * todo add docstring
  */
 
-hqDefine('reports/v2/js/datagrid/bootstrap3/data_models', [
+hqDefine('reports/v2/js/datagrid/data_models', [
     'jquery',
     'knockout',
     'underscore',
     'analytix/js/kissmetrix',
     'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/bootstrap3/components.ko',  // pagination widget
+    'hqwebapp/js/components/pagination',
 ], function (
     $,
     ko,
@@ -55,7 +55,7 @@ hqDefine('reports/v2/js/datagrid/bootstrap3/data_models', [
                 .width($rows.width())
                 .css('left', position.left + 'px')
                 .css('top', position.top + "px");
-            
+
             $loading.find('.loading-text')
                 .css('margin-top', marginTop + 'px');
         });
diff --git a/corehq/apps/reports/static/reports/v2/js/views/bootstrap3/explore_case_data.js b/corehq/apps/reports/static/reports/v2/js/views/bootstrap3/explore_case_data.js
index 57558acd8337..9c4a5742e8bc 100644
--- a/corehq/apps/reports/static/reports/v2/js/views/bootstrap3/explore_case_data.js
+++ b/corehq/apps/reports/static/reports/v2/js/views/bootstrap3/explore_case_data.js
@@ -4,6 +4,7 @@ hqDefine('reports/v2/js/views/bootstrap3/explore_case_data', [
     'underscore',
     'reports/v2/js/context',
     'reports/v2/js/bootstrap3/datagrid',
+    'hqwebapp/js/components/bootstrap3/feedback',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/static/reports/v2/js/views/bootstrap5/explore_case_data.js b/corehq/apps/reports/static/reports/v2/js/views/bootstrap5/explore_case_data.js
index 900e36724c02..92a76e2e53f3 100644
--- a/corehq/apps/reports/static/reports/v2/js/views/bootstrap5/explore_case_data.js
+++ b/corehq/apps/reports/static/reports/v2/js/views/bootstrap5/explore_case_data.js
@@ -4,6 +4,7 @@ hqDefine('reports/v2/js/views/bootstrap5/explore_case_data', [
     'underscore',
     'reports/v2/js/context',
     'reports/v2/js/bootstrap5/datagrid',
+    'hqwebapp/js/components/bootstrap5/feedback',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/reports/templates/reports/bootstrap3/base_template.html b/corehq/apps/reports/templates/reports/bootstrap3/base_template.html
index 71b61dfde011..4729769cc341 100644
--- a/corehq/apps/reports/templates/reports/bootstrap3/base_template.html
+++ b/corehq/apps/reports/templates/reports/bootstrap3/base_template.html
@@ -6,7 +6,6 @@
   {% compress js %}
     <script src="{% static 'reports/js/bootstrap3/report_config_models.js' %}"></script>
     <script src="{% static "reports/js/bootstrap3/base.js" %}"></script>
-    <script src="{% static "reports/js/bootstrap3/base_maps.js" %}"></script>
   {% endcompress %}
 {% endblock %}
 
diff --git a/corehq/apps/reports/templates/reports/bootstrap3/tableau_template.html b/corehq/apps/reports/templates/reports/bootstrap3/tableau_template.html
index bcfef4183782..64fceae77ee1 100644
--- a/corehq/apps/reports/templates/reports/bootstrap3/tableau_template.html
+++ b/corehq/apps/reports/templates/reports/bootstrap3/tableau_template.html
@@ -9,11 +9,9 @@
 {% initial_page_data "server_type" server_type %}
 {% initial_page_data "ticket" ticket %}
 {% initial_page_data "validate_hostname" validate_hostname %}
-{% initial_page_data "server_address" server_address %}
-{% initial_page_data "target_site" target_site %}
 {% initial_page_data "view_url" view_url %}
 {% initial_page_data "viz_id" viz_id %}
-{% registerurl 'tableau_visualization_ajax' request.domain %}
+{% registerurl 'get_tableau_server_ticket' request.domain %}
 
 <script src="https://{{ validate_hostname }}/javascripts/api/tableau-2.5.0.min.js"></script>
 <script src="{% static 'reports/js/tableau.js' %}"></script>
diff --git a/corehq/apps/reports/templates/reports/bootstrap5/base_template.html b/corehq/apps/reports/templates/reports/bootstrap5/base_template.html
index e0b3135a22b4..6a7e4d3d2eef 100644
--- a/corehq/apps/reports/templates/reports/bootstrap5/base_template.html
+++ b/corehq/apps/reports/templates/reports/bootstrap5/base_template.html
@@ -6,7 +6,6 @@
   {% compress js %}
     <script src="{% static 'reports/js/bootstrap5/report_config_models.js' %}"></script>
     <script src="{% static "reports/js/bootstrap5/base.js" %}"></script>
-    <script src="{% static "reports/js/bootstrap5/base_maps.js" %}"></script>
   {% endcompress %}
 {% endblock %}
 
diff --git a/corehq/apps/reports/templates/reports/bootstrap5/tableau_template.html b/corehq/apps/reports/templates/reports/bootstrap5/tableau_template.html
index ce5fddc52011..db61d8e1b523 100644
--- a/corehq/apps/reports/templates/reports/bootstrap5/tableau_template.html
+++ b/corehq/apps/reports/templates/reports/bootstrap5/tableau_template.html
@@ -9,11 +9,9 @@
 {% initial_page_data "server_type" server_type %}
 {% initial_page_data "ticket" ticket %}
 {% initial_page_data "validate_hostname" validate_hostname %}
-{% initial_page_data "server_address" server_address %}
-{% initial_page_data "target_site" target_site %}
 {% initial_page_data "view_url" view_url %}
 {% initial_page_data "viz_id" viz_id %}
-{% registerurl 'tableau_visualization_ajax' request.domain %}
+{% registerurl 'get_tableau_server_ticket' request.domain %}
 
 <script src="https://{{ validate_hostname }}/javascripts/api/tableau-2.5.0.min.js"></script>
 <script src="{% static 'reports/js/tableau.js' %}"></script>
diff --git a/corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html b/corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
index 825423852d38..49017dfb2cc5 100644
--- a/corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
+++ b/corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
@@ -38,8 +38,8 @@ <h4 class="card-title">
               <td>
                 <div class="has-feedback">
                   <input type="text" class="form-control" data-bind="
-                                                     value: name,
-                                                     explorerColumnsAutocomplete: $parent.suggestedProperties()"
+                    value: name,
+                    explorerColumnsAutocomplete: $parent.suggestedProperties()"
                   />
                   <span class="form-control-feedback" data-bind="visible: meta_type">
                     <span class="badge text-bg-primary" data-bind="text: meta_type"></span>
@@ -48,12 +48,12 @@ <h4 class="card-title">
               </td>
               <td>
                 <div class="has-feedback">
-                  <select class="form-control" data-bind="
-                                                options: {{ property_label_options }},
-                                                optionsText: 'name',
-                                                optionsValue: 'type',
-                                                value: label,
-                                                "/>
+                  <select class="form-select" data-bind="
+                    options: {{ property_label_options }},
+                    optionsText: 'name',
+                    optionsValue: 'type',
+                    value: label,
+                  "></select>
                 </div>
               </td>
               <td>
diff --git a/corehq/apps/reports/templates/reports/partials/bootstrap3/base_maps.html b/corehq/apps/reports/templates/reports/partials/bootstrap3/base_maps.html
deleted file mode 100644
index 59ef37aa88dc..000000000000
--- a/corehq/apps/reports/templates/reports/partials/bootstrap3/base_maps.html
+++ /dev/null
@@ -1,123 +0,0 @@
-{% load hq_shared_tags %}
-
-<!-- Data container, similar to initial page data -->
-<div class="base-maps-data"
-     data-icon_path="{{ 'leaflet/dist/images'|static }}"
-     data-context="{% html_attr context %}"></div>
-
-<div class="panel panel-default">
-  <div class="panel-heading">
-    <h2 class="panel-title">
-      {{ report.title }}
-    </h2>
-  </div>
-  <div class="panel-body">
-    <div class="hq-graphic-report">
-      <script type="text/template" id="default_detail_popup">
-        <div class="default-popup">
-          <h3><%- name %></h3>
-          <hr>
-          <table>
-            <% _.each(info, function(field) { %>
-            <tr class="data data-<%- field.slug %>">
-              <td><%- field.label %></td>
-              <td class="detail_data">
-                <%- field.value %>
-              </td>
-            </tr>
-            <% }); %>
-          </table>
-        </div>
-      </script>
-
-      <script type="text/template" id="info_popup">
-        <% if (name) { %><h4><%- name %></h4><% } %>
-        <% _.each(info, function(field) { %>
-        <div><%- field.label %></div>
-        <div class="detail_data"><%- field.value %></div>
-        <% }); %>
-      </script>
-
-      <script type="text/template" id="legend_size">
-        <table class="sizelegend">
-          <% _.each(entries, function(e, i) { %>
-          <tr id="sizerow-<%- i %>">
-            <td class="circle-container">
-              <div class="circle"></div>
-            </td>
-            <td class="vallabel"><%- e.valfmt %></td>
-          </tr>
-          <% }); %>
-        </table>
-      </script>
-
-      <script type="text/template" id="legend_enum">
-        <table class="enumlegend">
-          <% _.each(enums, function(e, i) { %>
-          <tr id="enumrow-<%- i %>"><td class="enum"></td><td class="vallabel"><%- e.label %></td></tr>
-          <% }); %>
-        </table>
-      </script>
-
-      <script type="text/template" id="legend_colorscale">
-        <table class="colorscalelegend">
-          <tr>
-            <td id="scalebar"></td>
-            <td class="tickmarks">
-              <div class="tickmarks-inner">
-                <% _.each(ticks, function(e) { %>
-                <div class="width-spacer"><%- e.label %></div>
-                <div class="ticklabel" style="top: <%- e.coord %>px;">
-                  <div class="ticklabel-inner"><%- e.label %></div>
-                </div>
-                <% }); %>
-              </div>
-            </td>
-          </tr>
-        </table>
-      </script>
-
-      <script type="text/template" id="metrics-group">
-        <div class="choice" data-bind="if: name() != '_root', click: onclick">
-          <i class="fa" data-bind="visible: group, css: { 'fa-caret-right': !expanded(), 'fa-caret-down': expanded }"></i>
-          <span data-bind="text: name, css: { selected: selected }"></span>
-        </div>
-
-        <div data-bind="visible: expanded, foreach: children" class="metric-group">
-          <div data-bind="template: { name: 'metrics-group' }"></div>
-        </div>
-      </script>
-
-      <div id="results-capped" class="alert alert-info" style="display: none;">
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
-        There are <strong id="rows-total"></strong> results for the chosen report filters.
-        However, map display has been capped at the first <strong id="rows-capped"></strong> results.
-      </div>
-
-      <div>
-        <div id="map" style="width: 100%;"></div>
-
-        <div id="metrics" class="control-pane" style="display: none;">
-          <div data-bind="template: { name: 'metrics-group', if: root, data: root }" class="metrics-container"></div>
-        </div>
-
-        <div id="legend" class="control-pane" style="display: none;">
-        </div>
-
-        <div id="info" class="control-pane" style="display: none;">
-        </div>
-
-        <div id="zoomtofit" class="leaflet-control-layers" style="display: none;">
-          <div id="zoomtofit-target" class="zoomtofit leaflet-control-layers-toggle" title="Fit all data into view"></div>
-        </div>
-
-        <div id="toggletable" class="leaflet-control-layers" style="display: none;">
-          <div id="toggletable-target" class="toggletable leaflet-control-layers-toggle" title="Show/hide data table">
-            <i class="fa fa-table"></i>
-          </div>
-        </div>
-      </div>
-    </div>
-    {% block content %}{% endblock content %}
-  </div>
-</div>
diff --git a/corehq/apps/reports/templates/reports/partials/bootstrap3/maps.html b/corehq/apps/reports/templates/reports/partials/bootstrap3/maps.html
deleted file mode 100644
index a4415c263710..000000000000
--- a/corehq/apps/reports/templates/reports/partials/bootstrap3/maps.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'reports/partials/bootstrap3/base_maps.html' %}
-{% load hq_shared_tags %}
-
-{% block content %}
-  <table class="table table-striped datatable dataTable" id="tabular"></table>
-  <div class="row dataTables_control" style="height: 20px"></div>
-{% endblock content %}
-
diff --git a/corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html b/corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
deleted file mode 100644
index ed97bdf56ef4..000000000000
--- a/corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-<table class="export_data table table-striped">
-  <thead>
-  <tr>
-    <th>{% trans "Name" %}</th>
-    <th>{% trans "Export" %}</th>
-    <th>{% trans "Edit" %}</th>
-    <th>
-      {% trans "Add to Bulk Export" %} <i class="icon-white icon-info-sign bulk-export-info"></i>
-      <small style="display: block;">
-        {% trans "Select" %}:
-        <a href="#" class="btn btn-mini" data-all="true" data-bind="click: toggleSelectAllExports">{% trans "all" %}</a>
-        <a href="#" class="btn btn-mini btn-inverse" data-bind="click: toggleSelectAllExports">{% trans "none" %}</a>
-      </small>
-    </th>
-  </tr>
-  </thead>
-  <tbody>
-  {% for export in saved_exports %}
-    <tr class="{% cycle "odd" "even" %}">
-      <td class="control-group form-inline">
-        {{ export.name|default:"[blank]" }}
-        {% if not deid and export.is_safe %}<span class="label label-default">{% trans "de-identified" %}</span>{% endif %}
-        <div><p class="help-inline">{{ export.formname }}</p></div>
-      </td>
-      <td class="cell-vertical-centered">
-        <a class="btn btn-primary" href='{{ export.download_url }}'>
-          {% trans "Export" %}
-        </a>
-      </td>
-      <td class="cell-vertical-centered">
-        <a class="btn btn-default" href='{% url edit_export_view_name domain export.get_id %}'>
-          <i class="icon-pencil icon-white"></i> {% trans "Edit" %}
-        </a>
-      </td>
-      <td class="form-inline">
-        {% if export.default_format == bulk_export_format %}
-          <label>
-            <input type="checkbox" class="select-export" data-bind="event: {change: updateSelectedExports}" value="{{ export.get_id }}"/>
-            <span class="label label-info">+ {% trans "Bulk Export" %}</span>
-          </label>
-        {% else %}
-          <span class="label custom-bulk-format-na">{{ export.default_format }} {% trans "Not Available" %}</span>
-        {% endif %}
-      </td>
-    </tr>
-  {% endfor %}
-  </tbody>
-</table>
diff --git a/corehq/apps/reports/templates/reports/partials/bootstrap5/base_maps.html b/corehq/apps/reports/templates/reports/partials/bootstrap5/base_maps.html
deleted file mode 100644
index 77a19fef0136..000000000000
--- a/corehq/apps/reports/templates/reports/partials/bootstrap5/base_maps.html
+++ /dev/null
@@ -1,123 +0,0 @@
-{% load hq_shared_tags %}
-
-<!-- Data container, similar to initial page data -->
-<div class="base-maps-data"
-     data-icon_path="{{ 'leaflet/dist/images'|static }}"
-     data-context="{% html_attr context %}"></div>
-
-<div class="card card-default">  {# todo B5: css:panel #}
-  <div class="card-header">
-    <h2 class="card-title">
-      {{ report.title }}
-    </h2>
-  </div>
-  <div class="card-body">
-    <div class="hq-graphic-report">
-      <script type="text/template" id="default_detail_popup">
-        <div class="default-popup">
-          <h3><%- name %></h3>
-          <hr>
-          <table>
-            <% _.each(info, function(field) { %>
-            <tr class="data data-<%- field.slug %>">
-              <td><%- field.label %></td>
-              <td class="detail_data">
-                <%- field.value %>
-              </td>
-            </tr>
-            <% }); %>
-          </table>
-        </div>
-      </script>
-
-      <script type="text/template" id="info_popup">
-        <% if (name) { %><h4><%- name %></h4><% } %>
-        <% _.each(info, function(field) { %>
-        <div><%- field.label %></div>
-        <div class="detail_data"><%- field.value %></div>
-        <% }); %>
-      </script>
-
-      <script type="text/template" id="legend_size">
-        <table class="sizelegend">
-          <% _.each(entries, function(e, i) { %>
-          <tr id="sizerow-<%- i %>">
-            <td class="circle-container">
-              <div class="circle"></div>
-            </td>
-            <td class="vallabel"><%- e.valfmt %></td>
-          </tr>
-          <% }); %>
-        </table>
-      </script>
-
-      <script type="text/template" id="legend_enum">
-        <table class="enumlegend">
-          <% _.each(enums, function(e, i) { %>
-          <tr id="enumrow-<%- i %>"><td class="enum"></td><td class="vallabel"><%- e.label %></td></tr>
-          <% }); %>
-        </table>
-      </script>
-
-      <script type="text/template" id="legend_colorscale">
-        <table class="colorscalelegend">
-          <tr>
-            <td id="scalebar"></td>
-            <td class="tickmarks">
-              <div class="tickmarks-inner">
-                <% _.each(ticks, function(e) { %>
-                <div class="width-spacer"><%- e.label %></div>
-                <div class="ticklabel" style="top: <%- e.coord %>px;">  {# todo B5: inline style #}
-                  <div class="ticklabel-inner"><%- e.label %></div>
-                </div>
-                <% }); %>
-              </div>
-            </td>
-          </tr>
-        </table>
-      </script>
-
-      <script type="text/template" id="metrics-group">
-        <div class="choice" data-bind="if: name() != '_root', click: onclick">
-          <i class="fa" data-bind="visible: group, css: { 'fa-caret-right': !expanded(), 'fa-caret-down': expanded }"></i>
-          <span data-bind="text: name, css: { selected: selected }"></span>
-        </div>
-
-        <div data-bind="visible: expanded, foreach: children" class="metric-group">
-          <div data-bind="template: { name: 'metrics-group' }"></div>
-        </div>
-      </script>
-
-      <div id="results-capped" class="alert alert-info" style="display: none;">  {# todo B5: inline style #}
-        <button type="button" class="btn-close" data-bs-dismiss="alert">&times;</button>  {# todo B5: css:close #}
-        There are <strong id="rows-total"></strong> results for the chosen report filters.
-        However, map display has been capped at the first <strong id="rows-capped"></strong> results.
-      </div>
-
-      <div>
-        <div id="map" style="width: 100%;"></div>  {# todo B5: inline style #}
-
-        <div id="metrics" class="control-pane" style="display: none;">  {# todo B5: inline style #}
-          <div data-bind="template: { name: 'metrics-group', if: root, data: root }" class="metrics-container"></div>
-        </div>
-
-        <div id="legend" class="control-pane" style="display: none;">  {# todo B5: inline style #}
-        </div>
-
-        <div id="info" class="control-pane" style="display: none;">  {# todo B5: inline style #}
-        </div>
-
-        <div id="zoomtofit" class="leaflet-control-layers" style="display: none;">  {# todo B5: inline style #}
-          <div id="zoomtofit-target" class="zoomtofit leaflet-control-layers-toggle" title="Fit all data into view"></div>
-        </div>
-
-        <div id="toggletable" class="leaflet-control-layers" style="display: none;">  {# todo B5: inline style #}
-          <div id="toggletable-target" class="toggletable leaflet-control-layers-toggle" title="Show/hide data table">
-            <i class="fa fa-table"></i>
-          </div>
-        </div>
-      </div>
-    </div>
-    {% block content %}{% endblock content %}
-  </div>
-</div>
diff --git a/corehq/apps/reports/templates/reports/partials/bootstrap5/maps.html b/corehq/apps/reports/templates/reports/partials/bootstrap5/maps.html
deleted file mode 100644
index c2c11f5e6cfe..000000000000
--- a/corehq/apps/reports/templates/reports/partials/bootstrap5/maps.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'reports/partials/bootstrap5/base_maps.html' %}
-{% load hq_shared_tags %}
-
-{% block content %}
-  <table class="table table-striped datatable dataTable" id="tabular"></table>
-  <div class="row dataTables_control" style="height: 20px"></div>  {# todo B5: inline style #}
-{% endblock content %}
-
diff --git a/corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html b/corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
deleted file mode 100644
index 257a058b29e1..000000000000
--- a/corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% load hq_shared_tags %}
-{% load i18n %}
-<table class="export_data table table-striped">
-  <thead>
-  <tr>
-    <th>{% trans "Name" %}</th>
-    <th>{% trans "Export" %}</th>
-    <th>{% trans "Edit" %}</th>
-    <th>
-      {% trans "Add to Bulk Export" %} <i class="icon-white icon-info-sign bulk-export-info"></i>
-      <small style="display: block;">  {# todo B5: inline style #}
-        {% trans "Select" %}:
-        <a href="#" class="btn btn-mini" data-all="true" data-bind="click: toggleSelectAllExports">{% trans "all" %}</a>
-        <a href="#" class="btn btn-mini btn-inverse" data-bind="click: toggleSelectAllExports">{% trans "none" %}</a>
-      </small>
-    </th>
-  </tr>
-  </thead>
-  <tbody>
-  {% for export in saved_exports %}
-    <tr class="{% cycle "odd" "even" %}">
-      <td class="control-group form-inline">  {# todo B5: css:form-inline #}
-        {{ export.name|default:"[blank]" }}
-        {% if not deid and export.is_safe %}<span class="badge text-bg-secondary">{% trans "de-identified" %}</span>{% endif %}
-        <div><p class="help-inline">{{ export.formname }}</p></div>
-      </td>
-      <td class="cell-vertical-centered">
-        <a class="btn btn-primary" href='{{ export.download_url }}'>
-          {% trans "Export" %}
-        </a>
-      </td>
-      <td class="cell-vertical-centered">
-        <a class="btn btn-outline-primary" href='{% url edit_export_view_name domain export.get_id %}'>
-          <i class="icon-pencil icon-white"></i> {% trans "Edit" %}
-        </a>
-      </td>
-      <td class="form-inline">  {# todo B5: css:form-inline #}
-        {% if export.default_format == bulk_export_format %}
-          <label>
-            <input type="checkbox" class="select-export" data-bind="event: {change: updateSelectedExports}" value="{{ export.get_id }}"/>  {# todo B5: css:checkbox #}
-            <span class="badge text-bg-info">+ {% trans "Bulk Export" %}</span>
-          </label>
-        {% else %}
-          <span class="badge custom-bulk-format-na">{{ export.default_format }} {% trans "Not Available" %}</span>
-        {% endif %}
-      </td>
-    </tr>
-  {% endfor %}
-  </tbody>
-</table>
diff --git a/corehq/apps/reports/templates/reports/partials/commtrack/stockstatus_mapdetail.html b/corehq/apps/reports/templates/reports/partials/commtrack/stockstatus_mapdetail.html
deleted file mode 100644
index 5e6bee243a74..000000000000
--- a/corehq/apps/reports/templates/reports/partials/commtrack/stockstatus_mapdetail.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% comment %}
-this template generates an underscore.js template used by the maps report
-{% endcomment %}
-<style>
-  .stock-status-detail td,
-  .stock-status-detail th {
-    padding: 0.25em 0.5em;
-  }
-  .stock-status-detail .loctype {
-    color: #666;
-    font-size: 75%;
-    text-transform: uppercase;
-  }
-  .stock-status-detail .data {
-    font-weight: bold;
-    max-width: 6em;
-    vertical-align: top;
-  }
-  .stock-status-detail th {
-    font-weight: normal;
-    vertical-align: bottom;
-  }
-  .stock-status-detail th.header {
-    max-width: 6em;
-  }
-</style>
-
-<div class="stock-status-detail">
-  <h3><%= name %> <span class="loctype">(<%= props.type %>)</span></h3>
-  <hr />
-  <table>
-    <tr><th></th>
-      {% for c in columns %}
-        <th class="header">{{ c.title }}</th>
-      {% endfor %}
-    </tr>
-    {% for p in products %}
-      <tr><td>{{ p.name }}</td>
-        {% for c in columns %}
-          <td class="data data-{{ p.get_id }}-{{ c.id }}">
-            <%= props['{{ p.get_id }}-{{ c.id }}'] %>
-          </td>
-        {% endfor %}
-      </tr>
-    {% endfor %}
-  </table>
-</div>
diff --git a/corehq/apps/reports/templates/reports/reportdata/bootstrap3/view_form_attachment.html b/corehq/apps/reports/templates/reports/reportdata/bootstrap3/view_form_attachment.html
index 4d9cbd2021ed..597b3c7d9034 100644
--- a/corehq/apps/reports/templates/reports/reportdata/bootstrap3/view_form_attachment.html
+++ b/corehq/apps/reports/templates/reports/reportdata/bootstrap3/view_form_attachment.html
@@ -7,9 +7,15 @@
     {% if is_image %}
       <img src="{{ download_url }}">
     {% else %}
-      <video controls {% if disable_download %} controlsList="nodownload" {% endif %} autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">
-        <source src="{{ download_url }}">
-      </video>
+      {% if disable_download %}
+        <audio controls oncontextmenu="return false;" controlsList="nodownload" autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">
+          <source src="{{ download_url }}">
+        </audio>
+      {% else %}
+        <video controls autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">
+          <source src="{{ download_url }}">
+        </video>
+      {% endif %}
     {% endif %}
   </body>
 </html>
diff --git a/corehq/apps/reports/templates/reports/reportdata/bootstrap5/view_form_attachment.html b/corehq/apps/reports/templates/reports/reportdata/bootstrap5/view_form_attachment.html
index 3f33db60aa47..79ce673c023d 100644
--- a/corehq/apps/reports/templates/reports/reportdata/bootstrap5/view_form_attachment.html
+++ b/corehq/apps/reports/templates/reports/reportdata/bootstrap5/view_form_attachment.html
@@ -7,9 +7,15 @@
     {% if is_image %}
       <img src="{{ download_url }}">
     {% else %}
-      <video controls {% if disable_download %} controlsList="nodownload" {% endif %} autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">  {# todo B5: inline style #}
-        <source src="{{ download_url }}">
-      </video>
+      {% if disable_download %}
+        <audio controls oncontextmenu="return false;" controlsList="nodownload" autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">
+          <source src="{{ download_url }}">
+        </audio>
+      {% else %}
+        <video controls autoplay name="{{ content_name }}" style="top: 10%; left: 10%; position: absolute;">  {# todo B5: inline style #}
+          <source src="{{ download_url }}">
+        </video>
+      {% endif %}
     {% endif %}
   </body>
 </html>
diff --git a/corehq/apps/reports/tests/test_filters.py b/corehq/apps/reports/tests/test_filters.py
index c13044541d56..1ced4a32e6bb 100644
--- a/corehq/apps/reports/tests/test_filters.py
+++ b/corehq/apps/reports/tests/test_filters.py
@@ -7,7 +7,7 @@
 from corehq.apps.domain.utils import clear_domain_names
 from corehq.apps.es.tests.utils import es_test
 from corehq.apps.es.users import user_adapter
-from corehq.apps.locations.models import LocationType
+from corehq.apps.locations.models import LocationType, SQLLocation
 from corehq.apps.locations.tests.util import make_loc
 from corehq.apps.reports.filters.case_list import CaseListFilter
 from corehq.apps.reports.filters.controllers import paginate_options
@@ -165,7 +165,7 @@ def setUp(self):
         self.user_assigned_locations = [
             make_loc('root', domain=self.domain.name, type=self.location_type.code).sql_location
         ]
-        self.request = RequestFactory()
+        self.request = RequestFactory().get('/a/{self.domain}/')
         self.request.couch_user = WebUser()
         self.request.domain = self.domain
 
@@ -189,6 +189,36 @@ def test_default_selections_for_restricted_access(self, assigned_locations_patch
         emwf.get_default_selections()
         assert assigned_locations_patch.called
 
+    @patch('corehq.apps.users.models.WebUser.get_sql_locations')
+    def test_selections_for_restricted_access(self, assigned_locations_patch):
+        self.request.can_access_all_locations = False
+        self.request.project = self.domain
+        emwf = ExpandedMobileWorkerFilter(self.request)
+        usa = SQLLocation(
+            domain=self.domain.name,
+            name='The United States of America',
+            site_code='usa',
+            location_type=self.location_type,
+            location_id='1',
+        )
+        usa.save()
+        india = SQLLocation(
+            domain=self.domain.name,
+            name='India',
+            site_code='in',
+            location_type=self.location_type,
+            location_id='2',
+        )
+        india.save()
+        assigned_locations_patch.return_value = [usa, india]
+        self.assertEqual(
+            emwf.selected,
+            [
+                {'id': 'l__1', 'text': 'The United States of America [location]'},
+                {'id': 'l__2', 'text': 'India [location]'}
+            ]
+        )
+
 
 class TestCaseListFilter(TestCase):
     def setUp(self):
diff --git a/corehq/apps/reports/tests/test_generic.py b/corehq/apps/reports/tests/test_generic.py
index 0b6588bfaf45..19ed8c75c09d 100644
--- a/corehq/apps/reports/tests/test_generic.py
+++ b/corehq/apps/reports/tests/test_generic.py
@@ -1,8 +1,9 @@
 from unittest import expectedFailure
 
 from django.utils.safestring import mark_safe
-from django.test import SimpleTestCase
+from django.test import RequestFactory, SimpleTestCase
 
+from corehq.apps.reports.exceptions import BadRequestError
 from corehq.apps.reports.generic import GenericTabularReport
 
 from ..generic import _sanitize_rows
@@ -43,6 +44,21 @@ def test_strip_tags_expected_fail(self):
         value = GenericTabularReport._strip_tags(value)
         self.assertEqual(value, '1 < 8 > 2')
 
+    def test_pagination_exceeds_max_rows(self):
+        class Report(GenericTabularReport):
+            name = slug = "report"
+            section_name = "reports"
+            dispatcher = "fake"
+
+            def _update_initial_context(self):
+                """override to avoid database hit in test"""
+
+        request = RequestFactory().get("/report", {"iDisplayLength": 1001})
+        report = Report(request)
+        with self.assertRaises(BadRequestError) as res:
+            report.pagination
+        self.assertEqual(str(res.exception), "Row count is too large")
+
 
 class SanitizeRowTests(SimpleTestCase):
     def test_normal_output(self):
diff --git a/corehq/apps/reports/tests/test_views.py b/corehq/apps/reports/tests/test_views.py
index 0a3440bedc28..f93516f1d26b 100644
--- a/corehq/apps/reports/tests/test_views.py
+++ b/corehq/apps/reports/tests/test_views.py
@@ -14,7 +14,7 @@
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.locations.models import LocationType, make_location
 from corehq.apps.reports.models import TableauServer, TableauVisualization
-from corehq.apps.reports.standard.tableau import tableau_visualization_ajax, TableauView
+from corehq.apps.reports.standard.tableau import get_tableau_server_ticket, TableauView
 from corehq.apps.reports.views import (
     MySavedReportsView,
     AddSavedReportConfigView,
@@ -998,6 +998,7 @@ def setUpClass(cls):
             server_type='server',
             server_name='a_server',
             target_site='a_site',
+            validate_hostname='',
         )
         cls.viz_1 = TableauVisualization.objects.create(
             domain=cls.DOMAIN,
@@ -1046,34 +1047,32 @@ def test_location_restricted_user_can_access_location_safe_report(self):
         response = self._get_tableau_view_response(self.viz_2)
         self.assertEqual(response.status_code, 200)
 
-    def _get_ajax_view_response(self, viz):
+    def _get_ticket_view_response(self, viz):
         self.log_user_in(self.non_admin_user.username)
         request_data = {
-            'validate_hostname': '',
-            'server_name': ['dimagi-tableau-test.us'],
-            'target_site': ['Test1234'],
             'viz_id': [viz.id]
         }
-        response = self.client.post(reverse(tableau_visualization_ajax, args=[self.DOMAIN]), request_data)
+        response = self.client.post(reverse(get_tableau_server_ticket, args=[self.DOMAIN]), request_data)
         return response
 
-    def test_ajax_view_location_restricted_user_cant_access_location_unsafe_report(self):
+    def test_ticket_view_location_restricted_user_cant_access_location_unsafe_report(self):
         self.role.set_permissions(HqPermissions(
             access_all_locations=False, view_tableau=True).to_list())
-        response = self._get_ajax_view_response(self.viz_1)
+        response = self._get_ticket_view_response(self.viz_1)
         self.assertEqual(response.status_code, 403)
 
-    def test_ajax_view_no_permission_to_tableau_report(self):
+    def test_ticket_view_no_permission_to_tableau_report(self):
         self.role.set_permissions(HqPermissions(
             access_all_locations=False, view_tableau=False, view_tableau_list=[str(self.viz_1.id)]).to_list())
-        response = self._get_ajax_view_response(self.viz_2)
+        response = self._get_ticket_view_response(self.viz_2)
         self.assertEqual(response.status_code, 403)
 
-    @patch('corehq.apps.reports.standard.tableau.requests.post')
-    def test_ajax_view_location_restricted_user_can_access_location_safe_report(self, mock_request):
+    @patch('corehq.apps.reports.standard.tableau.requests.Session')
+    def test_ticket_view_location_restricted_user_can_access_location_safe_report(self, mock_session):
+        mock_request = mock_session.return_value
         MockResponse = namedtuple('MockResponse', ['status_code', 'content'])
-        mock_request.return_value = MockResponse(status_code=200, content='1234'.encode('utf-8'))
+        mock_request.post.return_value = MockResponse(status_code=200, content='1234'.encode('utf-8'))
         self.role.set_permissions(HqPermissions(
             access_all_locations=False, view_tableau=False, view_tableau_list=[str(self.viz_2.id)]).to_list())
-        response = self._get_ajax_view_response(self.viz_2)
+        response = self._get_ticket_view_response(self.viz_2)
         self.assertEqual(response.status_code, 200)
diff --git a/corehq/apps/reports/urls.py b/corehq/apps/reports/urls.py
index 62ac17a33f67..7ec3d5113b86 100644
--- a/corehq/apps/reports/urls.py
+++ b/corehq/apps/reports/urls.py
@@ -17,7 +17,7 @@
     resave_case_view,
     undo_close_case_view,
 )
-from corehq.apps.reports.standard.tableau import TableauView, tableau_visualization_ajax
+from corehq.apps.reports.standard.tableau import TableauView, get_tableau_server_ticket
 from corehq.apps.userreports.reports.view import (
     ConfigurableReportView,
     CustomConfigurableReportDispatcher,
@@ -157,7 +157,7 @@
     url(r'^v2/', include('corehq.apps.reports.v2.urls')),
 
     url(r'^tableau/(?P<viz_id>[\d]+)/$', TableauView.as_view(), name=TableauView.urlname),
-    url(r'^tableau/visualization/$', tableau_visualization_ajax, name='tableau_visualization_ajax'),
+    url(r'^tableau/ticket/$', get_tableau_server_ticket, name='get_tableau_server_ticket'),
 
     # Internal Use
     url(r'^reprocess_error_form/$', ReprocessXFormErrorView.as_view(),
diff --git a/corehq/apps/saved_reports/models.py b/corehq/apps/saved_reports/models.py
index 67612b002d92..1f1aff6e759e 100644
--- a/corehq/apps/saved_reports/models.py
+++ b/corehq/apps/saved_reports/models.py
@@ -48,6 +48,7 @@
 )
 from corehq.apps.reports.dispatcher import (
     CustomProjectReportDispatcher,
+    DomainReportDispatcher,
     ProjectReportDispatcher,
     ReleaseManagementReportDispatcher,
 )
@@ -203,7 +204,8 @@ def _dispatcher(self):
             CustomProjectReportDispatcher,
             EnterpriseReportDispatcher,
             ReleaseManagementReportDispatcher,
-            CaseManagementMapDispatcher
+            CaseManagementMapDispatcher,
+            DomainReportDispatcher,
         ]
 
         for dispatcher in dispatchers:
diff --git a/corehq/apps/saved_reports/tests/test_models.py b/corehq/apps/saved_reports/tests/test_models.py
index 1f6f101e98d5..7714781610e2 100644
--- a/corehq/apps/saved_reports/tests/test_models.py
+++ b/corehq/apps/saved_reports/tests/test_models.py
@@ -81,6 +81,15 @@ def test_report_config_does_not_have_datespan_if_not_in_params(self):
         self.assertEqual(self.config.filters.get('startdate'), None)
         self.assertEqual(self.config.filters.get('enddate'), None)
 
+    def test_report_config_for_type_domain_report_is_not_deleted_when_access_dispatcher(self):
+        # The dispatcher property surprisingly deletes the report config when the report type
+        # doesn't match any of the list of dispatcher's prefix
+        config = ReportConfig(report_type='domain_report')
+        config.save()
+        self.addCleanup(config.delete)
+        config._dispatcher
+        self.assertEqual(config.doc_type, 'ReportConfig')
+
 
 class TestReportNotification(TestCase):
     def test_unauthorized_user_cannot_view_report(self):
diff --git a/corehq/apps/sms/static/sms/js/settings.js b/corehq/apps/sms/static/sms/js/settings.js
index be3cd72e7646..51bcf5f30a79 100644
--- a/corehq/apps/sms/static/sms/js/settings.js
+++ b/corehq/apps/sms/static/sms/js/settings.js
@@ -3,10 +3,10 @@ hqDefine("sms/js/settings", [
     'knockout',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/select2_handler',
-    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
     'bootstrap-timepicker/js/bootstrap-timepicker',
     'hqwebapp/js/bootstrap3/widgets', //multi-emails
-], function(
+], function (
     $,
     ko,
     initialPageData,
@@ -23,7 +23,7 @@ hqDefine("sms/js/settings", [
             self.time_input_relationship_initial = function () {
                 if (self.start_time() === null) {
                     return "BEFORE";
-                } else if(self.end_time() === null) {
+                } else if (self.end_time() === null) {
                     return "AFTER";
                 } else {
                     return "BETWEEN";
@@ -62,23 +62,23 @@ hqDefine("sms/js/settings", [
             self.sms_case_registration_user_id.init();
             self.override_daily_outbound_sms_limit = ko.observable();
 
-            self.showDefaultSMSResponse = ko.computed(function() {
+            self.showDefaultSMSResponse = ko.computed(function () {
                 return self.use_default_sms_response() === "ENABLED";
             });
 
-            self.showCustomCaseUsername = ko.computed(function() {
+            self.showCustomCaseUsername = ko.computed(function () {
                 return self.use_custom_case_username() === "CUSTOM";
             });
 
-            self.showCustomMessageCountThreshold = ko.computed(function() {
+            self.showCustomMessageCountThreshold = ko.computed(function () {
                 return self.use_custom_message_count_threshold() === "CUSTOM";
             });
 
-            self.showRestrictedSMSTimes = ko.computed(function() {
+            self.showRestrictedSMSTimes = ko.computed(function () {
                 return self.use_restricted_sms_times() === "ENABLED";
             });
 
-            self.showRegistrationOptions = ko.computed(function() {
+            self.showRegistrationOptions = ko.computed(function () {
                 return self.sms_case_registration_enabled() === "ENABLED";
             });
 
@@ -86,41 +86,41 @@ hqDefine("sms/js/settings", [
                 return self.sms_mobile_worker_registration_enabled() === "ENABLED";
             });
 
-            self.addRestrictedSMSTime = function() {
+            self.addRestrictedSMSTime = function () {
                 self.restricted_sms_times.push(dayTimeWindow(-1, null, null, null));
                 self.refreshTimePickers();
             };
 
-            self.removeRestrictedSMSTime = function() {
+            self.removeRestrictedSMSTime = function () {
                 self.restricted_sms_times.remove(this);
             };
 
-            self.showSMSConversationTimes = ko.computed(function() {
+            self.showSMSConversationTimes = ko.computed(function () {
                 return self.use_sms_conversation_times() === "ENABLED";
             });
 
-            self.addSMSConversationTime = function() {
+            self.addSMSConversationTime = function () {
                 self.sms_conversation_times.push(dayTimeWindow(-1, null, null, null));
                 self.refreshTimePickers();
             };
 
-            self.removeSMSConversationTime = function() {
+            self.removeSMSConversationTime = function () {
                 self.sms_conversation_times.remove(this);
             };
 
-            self.showCustomChatTemplate = ko.computed(function() {
+            self.showCustomChatTemplate = ko.computed(function () {
                 return self.use_custom_chat_template() === "CUSTOM";
             });
 
-            self.restricted_sms_times_json = ko.computed(function() {
+            self.restricted_sms_times_json = ko.computed(function () {
                 return ko.toJSON(self.restricted_sms_times());
             });
 
-            self.sms_conversation_times_json = ko.computed(function() {
+            self.sms_conversation_times_json = ko.computed(function () {
                 return ko.toJSON(self.sms_conversation_times());
             });
 
-            self.refreshTimePickers = function() {
+            self.refreshTimePickers = function () {
                 $('[data-timeset="true"]').each(function () {
                     $(this).timepicker({
                         showMeridian: false,
@@ -130,7 +130,7 @@ hqDefine("sms/js/settings", [
                 });
             };
 
-            self.init = function() {
+            self.init = function () {
                 self.use_default_sms_response(initial.use_default_sms_response);
                 self.use_restricted_sms_times(initial.use_restricted_sms_times);
                 self.use_custom_case_username(initial.use_custom_case_username);
diff --git a/corehq/apps/sms/views.py b/corehq/apps/sms/views.py
index 11a419123af2..f516c7d9f4c8 100644
--- a/corehq/apps/sms/views.py
+++ b/corehq/apps/sms/views.py
@@ -14,6 +14,7 @@
     HttpResponse,
     HttpResponseBadRequest,
     HttpResponseRedirect,
+    JsonResponse,
 )
 from django.shortcuts import render
 from django.urls import reverse
@@ -751,8 +752,7 @@ def chat_contact_list(request, domain):
     total_records = len(data)
 
     if sSearch:
-        regex = re.compile('^.*%s.*$' % sSearch)
-        data = [row for row in data if regex.match(row[0]) or regex.match(row[2])]
+        data = [row for row in data if sSearch in row[0] or sSearch in row[2]]
     filtered_records = len(data)
 
     data.sort(key=lambda row: row[0])
@@ -765,7 +765,7 @@ def chat_contact_list(request, domain):
         'iTotalDisplayRecords': filtered_records,
     }
 
-    return HttpResponse(json.dumps(result))
+    return JsonResponse(result)
 
 
 def get_contact_name_for_chat(contact, domain_obj):
@@ -954,7 +954,7 @@ def update_last_read_message(self, requesting_user_id, sms):
 
     def get(self, request, *args, **kwargs):
         if not self.contact:
-            return HttpResponse('[]')
+            return JsonResponse([], safe=False)
 
         data, last_sms = self.get_response_data(request.couch_user.get_id)
         if last_sms:
@@ -963,7 +963,7 @@ def get(self, request, *args, **kwargs):
             except Exception:
                 notify_exception(request, "Error updating last read message for %s" % last_sms.pk)
 
-        return HttpResponse(json.dumps(data))
+        return JsonResponse(data, safe=False)
 
 
 class ChatLastReadMessage(View, DomainViewMixin):
@@ -989,9 +989,9 @@ def get(self, request, *args, **kwargs):
 
             if lrm:
                 lrm_timestamp = json_format_datetime(lrm.message_timestamp)
-        return HttpResponse(json.dumps({
+        return JsonResponse({
             'message_timestamp': lrm_timestamp,
-        }))
+        })
 
 
 class DomainSmsGatewayListView(CRUDPaginatedViewMixin, BaseMessagingSectionView):
diff --git a/corehq/apps/smsforms/tests/test_app.py b/corehq/apps/smsforms/tests/test_app.py
index 6d68dea8716c..465c03a0cb1c 100644
--- a/corehq/apps/smsforms/tests/test_app.py
+++ b/corehq/apps/smsforms/tests/test_app.py
@@ -25,15 +25,16 @@
 from corehq.apps.users.tests.util import patch_user_data_db_layer
 from corehq.form_processor.models import CommCareCase
 from corehq.messaging.scheduling.util import utcnow
+from corehq.tests.util.context import add_context
 
 
-@patch_user_data_db_layer()
 @patch('corehq.apps.smsforms.app.tfsms.start_session')
 class TestStartSession(TestCase):
     domain = "test-domain"
 
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         cls.factory = AppFactory(domain=cls.domain)
         cls.app = cls.factory.app
         cls.module, cls.basic_form = cls.factory.new_basic_module('basic', 'patient')
@@ -49,10 +50,10 @@ def setUpClass(cls):
 
         cls.case = CommCareCase(domain=cls.domain, case_id=cls.case_id, case_json={'language_code': 'fr'})
         cls.web_user = WebUser(username='web-user@example.com', _id=uuid.uuid4().hex, language='hin')
+        cls.addClassCleanup(SQLXFormsSession.objects.all().delete)
 
-    @classmethod
-    def tearDownClass(cls):
-        SQLXFormsSession.objects.all().delete()
+    def setUp(self):
+        add_context(patch_user_data_db_layer(), self)
 
     def _start_session(self, yield_responses=False):
         if not self.recipient:
@@ -125,14 +126,7 @@ def test_start_session_as_user(self, xform_config_mock, tfsms_start_session_mock
         expected_session_data = {
             'device_id': 'commconnect', 'app_version': self.app.version, 'domain': self.domain,
             'username': self.recipient.raw_username, 'user_id': self.recipient.get_id,
-            'user_data': {
-                'commcare_first_name': None,
-                'commcare_last_name': None,
-                'commcare_phone_number': None,
-                'commcare_profile': '',
-                'commcare_project': self.domain,
-                'commcare_user_type': 'web',
-            },
+            'user_data': self.web_user.get_user_session_data(self.domain),
             'app_id': None
         }
         xform_config_mock.assert_called_once_with(
diff --git a/corehq/apps/sso/backends.py b/corehq/apps/sso/backends.py
index 1ea63a7b1fec..8e9389067979 100644
--- a/corehq/apps/sso/backends.py
+++ b/corehq/apps/sso/backends.py
@@ -84,6 +84,7 @@ def authenticate(self, request, username, idp_slug, is_handshake_successful):
         if not is_new_user and not web_user.is_active:
             web_user.is_active = True
             web_user.save()
+            user.refresh_from_db()
             request.sso_new_user_messages['success'].append(
                 _("User account for {} has been re-activated.").format(web_user.username)
             )
diff --git a/corehq/apps/sso/forms.py b/corehq/apps/sso/forms.py
index 2c117a703710..c64fce80e238 100644
--- a/corehq/apps/sso/forms.py
+++ b/corehq/apps/sso/forms.py
@@ -66,7 +66,7 @@ def _check_required_when_active(is_active, value):
 
 def _ensure_entity_id_matches_expected_provider(entity_id, identity_provider):
     if (identity_provider.idp_type == IdentityProviderType.ONE_LOGIN
-            and not re.match(r'^https:\/\/[A-za-z\d-]*.onelogin.com\/', entity_id)):
+            and not re.match(r'^https:\/\/[A-za-z\d-]*\.onelogin\.com\/', entity_id)):
         raise forms.ValidationError(
             _("This is not a valid One Login URL.")
         )
diff --git a/corehq/apps/sso/tests/test_tasks.py b/corehq/apps/sso/tests/test_tasks.py
index 62b0d47eb78d..1f7b2629fe6a 100644
--- a/corehq/apps/sso/tests/test_tasks.py
+++ b/corehq/apps/sso/tests/test_tasks.py
@@ -253,8 +253,8 @@ def test_updates_non_compliant_expiry_to_max(self):
         with freeze_time(current_time):
             num_updates = enforce_key_expiration_for_idp(idp)
 
-        updated_key = HQApiKey.objects.get(id=key.id)
-        self.assertEqual(updated_key.expiration_date, current_time + datetime.timedelta(days=30))
+        key.refresh_from_db()
+        self.assertEqual(key.expiration_date, current_time + datetime.timedelta(days=30))
         self.assertEqual(num_updates, 1)
 
     def test_exits_when_no_maximum_date_exists(self):
@@ -288,8 +288,8 @@ def test_integration_test(self):
         with freeze_time(current_time):
             update_sso_user_api_key_expiration_dates(idp.id)
 
-        updated_key = HQApiKey.objects.get(id=key.id)
-        self.assertEqual(updated_key.expiration_date, current_time + datetime.timedelta(days=30))
+        key.refresh_from_db()
+        self.assertEqual(key.expiration_date, current_time + datetime.timedelta(days=30))
 
     def _create_idp_for_domains(self, domains, max_days_until_user_api_key_expiration=30):
         idp = generator.create_idp('test-idp', account=self.account)
diff --git a/corehq/apps/styleguide/context.py b/corehq/apps/styleguide/context.py
index 6a17848def24..7c1b1e3714f7 100644
--- a/corehq/apps/styleguide/context.py
+++ b/corehq/apps/styleguide/context.py
@@ -22,6 +22,7 @@ def get_navigation_context(current_page):
                     Page("Code Guidelines", 'styleguide_code_guidelines_b5'),
                     Page("Bootstrap Migration Guide", 'styleguide_migration_guide_b5'),
                     Page("Javascript Guide", 'styleguide_javascript_guide_b5'),
+                    Page("HTMX + Alpine.JS", 'styleguide_htmx_and_alpine_b5'),
                 ],
             ),
             NavigationGroup(
diff --git a/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py b/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
new file mode 100644
index 000000000000..cb30cc10d03e
--- /dev/null
+++ b/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
@@ -0,0 +1,101 @@
+import json
+
+from crispy_forms import bootstrap as twbscrispy, layout as crispy
+from crispy_forms.helper import FormHelper
+
+from django import forms
+from django.utils.translation import gettext_lazy, gettext as _
+
+
+class MatchType:
+    EXACT = "exact"
+    IS_NOT = "is_not"
+    CONTAINS = "contains"
+    IS_EMPTY = "is_empty"
+
+    OPTIONS = (
+        (EXACT, gettext_lazy("is exactly")),
+        (IS_NOT, gettext_lazy("is not")),
+        (CONTAINS, gettext_lazy("contains")),
+        (IS_EMPTY, gettext_lazy("is empty")),
+    )
+
+    MATCHES_WITH_VALUES = (
+        EXACT, IS_NOT, CONTAINS,
+    )
+
+
+class FilterDemoForm(forms.Form):
+    slug = forms.ChoiceField(
+        label=gettext_lazy("Column"),
+        choices=(
+            ('name', gettext_lazy("Name")),
+            ('color', gettext_lazy("Color")),
+            ('desc', gettext_lazy("Description")),
+        ),
+        required=False
+    )
+    match = forms.ChoiceField(
+        label=gettext_lazy("Match Type"),
+        choices=MatchType.OPTIONS,
+        required=False,
+        help_text=gettext_lazy(
+            "Hint: select 'is empty' to watch the Value field below disappear"
+        )
+    )
+    value = forms.CharField(
+        label=gettext_lazy("Value"),
+        strip=False,
+        required=False
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.helper = FormHelper()
+
+        # We defer to defining the <form> tag in the template as we will
+        # use HTMX to load and submit the form. Keeping the HTMX attributes
+        # local to the template is preferred to maintain context.
+        self.helper.form_tag = False
+
+        # This form layout uses Alpine to toggle the visibility of
+        # the "value" field:
+        self.helper.layout = crispy.Layout(
+            crispy.Div(
+                'slug',
+                crispy.Field(
+                    'match',
+                    # We initialize the match value in the alpine
+                    # model defined below:
+                    x_init="match = $el.value",
+                    # and then two-way bind the alpine match
+                    # model variable to this input:
+                    x_model="match",
+                ),
+                crispy.Div(
+                    'value',
+                    # This uses alpine to determine whether to
+                    # show the value field, based on the valueMatches
+                    # list defined in the alpine model below:
+                    x_show="valueMatches.includes(match)",
+                ),
+                twbscrispy.StrictButton(
+                    _("Add Filter"),
+                    type="submit",
+                    css_class="btn-primary htmx-loading",
+                ),
+                # The Alpine data model is easily bound to the form
+                # to control hiding/showing the value field:
+                x_data=json.dumps({
+                    "match": self.fields['match'].initial,
+                    "valueMatches": MatchType.MATCHES_WITH_VALUES,
+                }),
+            ),
+        )
+
+    def clean(self):
+        match = self.cleaned_data['match']
+        value = self.cleaned_data['value']
+        if match in MatchType.MATCHES_WITH_VALUES and not value:
+            self.add_error('value', _("Please specify a value."))
diff --git a/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_views.py b/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_views.py
new file mode 100644
index 000000000000..04c0d73f182a
--- /dev/null
+++ b/corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_views.py
@@ -0,0 +1,68 @@
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views.generic import TemplateView
+
+from corehq.apps.domain.decorators import login_required
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
+from corehq.apps.hqwebapp.views import BasePageView
+from corehq.apps.styleguide.examples.bootstrap5.htmx_alpine_form_demo import FilterDemoForm
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(use_bootstrap5, name='dispatch')
+class HtmxAlpineFormDemoView(BasePageView):
+    """
+    This view is just a basic page view which acts as the "container" for a separate
+    "FilterDemoFormView" that handles the interaction with the "FilterDemoForm".
+
+    This establishes the page as a `js_entry` point for HTMX + Alpine and loads the
+    form view below asynchronously in the page content.
+    """
+    urlname = "sg_htmx_alpine_form_demo"
+    template_name = "styleguide/htmx_alpine_crispy/main.html"
+
+    @property
+    def page_url(self):
+        return reverse(self.urlname)
+
+    @property
+    def page_context(self):
+        return {
+            "filter_form_url": reverse(FilterDemoFormView.urlname),
+        }
+
+
+# don't forget to add the same security decorators as the "host" view above!
+@method_decorator(login_required, name='dispatch')
+# the use_bootstrap5 decorator is needed here for crispy forms to work properly
+@method_decorator(use_bootstrap5, name='dispatch')
+class FilterDemoFormView(TemplateView):
+    """
+    This view inherits from a simple `TemplateView` because the `template_name` is a
+    partial HTML template, so we don't need to extend any of the base HQ templates.
+    """
+    urlname = "sg_htmx_alpine_filter_form"
+    template_name = "styleguide/htmx_alpine_crispy/partial_form.html"
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        filter_form = kwargs.pop('filter_form') if 'filter_form' in kwargs else None
+        context.update({
+            "filter_form": filter_form or FilterDemoForm(),
+        })
+        return context
+
+    def post(self, request, *args, **kwargs):
+        filter_form = FilterDemoForm(request.POST)
+        show_success = False
+        if filter_form.is_valid():
+            # do something with filter form data
+            show_success = True
+            filter_form = None
+        return super().get(
+            request,
+            filter_form=filter_form,
+            show_success=show_success,
+            *args,
+            **kwargs
+        )
diff --git a/corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py b/corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
new file mode 100644
index 000000000000..235133f9b23b
--- /dev/null
+++ b/corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
@@ -0,0 +1,110 @@
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
+
+from corehq.apps.domain.decorators import login_required
+from corehq.apps.hqwebapp.decorators import use_bootstrap5
+from corehq.apps.hqwebapp.views import BasePageView
+from corehq.apps.prototype.models.cache_store import CacheStore
+from corehq.util.htmx_action import HqHtmxActionMixin, hq_hx_action
+
+
+@method_decorator(login_required, name='dispatch')
+@method_decorator(use_bootstrap5, name='dispatch')
+class TodoListDemoView(HqHtmxActionMixin, BasePageView):
+    """
+    This view demonstrates how we use HqHtmxActionMixin with a view to provide
+    HTMX responses when HTMX interacts with this view using the `hq-hx-action` attribute.
+    """
+    urlname = "sg_htmx_todo_list_example"
+    template_name = 'styleguide/htmx_todo/main.html'
+
+    @property
+    def page_url(self):
+        return reverse(self.urlname)
+
+    @property
+    def page_context(self):
+        return {
+            "items": self.get_items(),
+        }
+
+    def get_items(self):
+        return TodoListStore(self.request).get()
+
+    def save_items(self, items):
+        TodoListStore(self.request).set(items)
+
+    def update_item(self, item_id, name=None, is_done=None):
+        items = self.get_items()
+        for item in items:
+            if item["id"] == item_id:
+                item["name"] = name if name is not None else item["name"]
+                item["is_done"] = is_done if is_done is not None else item["is_done"]
+                TodoListStore(self.request).set(items)
+                return item
+
+    def render_item_response(self, request, item):
+        template = ("styleguide/htmx_todo/item_done_oob_swap.html" if item["is_done"]
+                    else "styleguide/htmx_todo/item.html")
+        context = {
+            'item': item,
+        }
+        return self.render_htmx_partial_response(request, template, context)
+
+    # we can now reference `hq-hx-action="create_new_item"`
+    # alongside a `hx-post` to this view URL
+    @hq_hx_action('post')
+    def create_new_item(self, request, *args, **kwargs):
+        items = self.get_items()
+        new_item = {
+            "id": len(items) + 1,
+            "name": _("New Item"),
+            "is_done": False,
+        }
+        items.insert(0, new_item)
+        self.save_items(items)
+        return self.render_item_response(request, new_item)
+
+    @hq_hx_action('post')
+    def edit_item(self, request, *args, **kwargs):
+        item = self.update_item(
+            int(request.POST['itemId']),
+            name=request.POST['newValue'],
+        )
+        return self.render_item_response(request, item)
+
+    @hq_hx_action('post')
+    def mark_item_done(self, request, *args, **kwargs):
+        item = self.update_item(
+            int(request.POST['itemId']),
+            is_done=True,
+        )
+        return self.render_item_response(request, item)
+
+
+class TodoListStore(CacheStore):
+    """
+    CacheStore is a helpful prototyping tool when you need to store
+    data on the server side for prototyping HTMX views.
+
+    Caution: Please don't use this for real features.
+    """
+    slug = 'styleguide-todo-list'
+    initial_value = [
+        {
+            "id": 1,
+            "name": "get coat hangers",
+            "is_done": False,
+        },
+        {
+            "id": 2,
+            "name": "water plants",
+            "is_done": False,
+        },
+        {
+            "id": 3,
+            "name": "Review PRs",
+            "is_done": False,
+        },
+    ]
diff --git a/corehq/apps/styleguide/static/styleguide/main.js b/corehq/apps/styleguide/static/styleguide/main.js
index d87950f30269..131391408f82 100644
--- a/corehq/apps/styleguide/static/styleguide/main.js
+++ b/corehq/apps/styleguide/static/styleguide/main.js
@@ -2,7 +2,7 @@ $(function () {
     'use strict';
     let initialPageData = hqImport("hqwebapp/js/initial_page_data");
     ace.config.set('basePath', initialPageData.get('ace_base_path'));
-    _.each(["python", "html", "js"], function (lang) {
+    _.each(["python", "html", "js", "django"], function (lang) {
         $('pre[data-lang="' + lang + '"]').each(function () {
             let editor = ace.edit($(this).get(0), {
                     showPrintMargin: false,
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
index 33dfb39f746d..69e3c398331f 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
@@ -128,6 +128,7 @@ <h6>Quick Links</h6>
       <script src="{% static 'ace-builds/src-min-noconflict/mode-python.js' %}"></script>
       <script src="{% static 'ace-builds/src-min-noconflict/mode-javascript.js' %}"></script>
       <script src="{% static 'ace-builds/src-min-noconflict/mode-html.js' %}"></script>
+      <script src="{% static 'ace-builds/src-min-noconflict/mode-django.js' %}"></script>
       <script src="{% static 'styleguide/main.js' %}"></script>
       <script src="{% static 'knockout-validation/dist/knockout.validation.min.js' %}"></script>
       <script src="{% static 'hqwebapp/js/bootstrap5/validators.ko.js' %}"></script>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_get_started.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_get_started.html
new file mode 100644
index 000000000000..fe0829657686
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/examples/htmx_get_started.html
@@ -0,0 +1,13 @@
+{% extends "hqwebapp/bootstrap5/base_navigation.html" %}
+{% load hq_shared_tags %}
+
+{% js_entry "hqwebapp/js/htmx_and_alpine" %}
+
+{% block content %}
+  Do HTMX and Alpine things here!
+{% endblock %}
+
+{% block modals %}
+  {% include "hqwebapp/htmx/error_modal.html" %}
+  {{ block.super }}
+{% endblock modals %}
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html
new file mode 100644
index 000000000000..0c71948a417c
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/htmx_and_alpine.html
@@ -0,0 +1,244 @@
+{% extends 'styleguide/bootstrap5/base.html' %}
+
+{% block intro %}
+  <h1 class="sg-title mb-0" id="content">HTMX and Alpine</h1>
+  <p class="sg-lead">
+    Low JavaScript, high interactivity.
+  </p>
+{% endblock intro %}
+
+{% block toc %}
+  <h5 class="my-2 ms-3">On this page</h5>
+  <hr class="my-2 ms-3">
+  <nav id="TableOfContents">
+    <ul>
+      <li>
+        <a href="#overview">Overview</a>
+        <ul>
+          <a href="#getting-started">Getting Started</a></li>
+        </ul>
+      </li>
+      <li>
+        <a href="#usage-forms">Usage with Forms</a>
+        <ul>
+          <a href="#usage-forms-demo">Demo with Crispy Forms</a></li>
+        </ul>
+      </li>
+      <li>
+        <a href="#organization">Organization for Complex Pages</a>
+        <ul>
+          <a href="#using-hqhtmxactionmixin">Using <code>HqHtmxActionMixin</code></a></li>
+        </ul>
+      </li>
+      <li><a href="#debugging">Debugging During Development</a></li>
+    </ul>
+  </nav>
+{% endblock toc %}
+
+{% block content %}
+  <h2 id="overview" class="pt-4">
+    Overview
+  </h2>
+  <p>
+    <a href="https://htmx.org/" target="_blank">HTMX</a> and <a href="https://alpinejs.dev/" target="_blank">Alpine</a>
+    are two lightweight JavaScript libraries that work well together to add interactivity to a page without
+    needing to add a ton of custom javascript. They work through clever usage of HTML attributes.
+  </p>
+  <p>
+    HTMX is particularly suited for a Django environment like ours as it expects asynchronous responses to
+    be HTML (instead of JSON), meaning we can return partial templates as responses. This allows us to utilize
+    more of Django's backend power, rather than having to re-create a ton of logic in the front end.
+  </p>
+  <h3 id="getting-started" class="pt-3">
+    Getting Started
+  </h3>
+  <p>
+    If you want to quickly get started, you can use this <code>js_entry</code> point
+    <code>hqwebapp/js/htmx_and_alpine</code> (no additional configuration necessary) and
+    include <code>hqwebapp/htmx/error_modal.html</code> in the <code>modals</code> block of your page.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_get_started %}
+  <p>
+    Right now HTMX and Alpine are only available on pages using Webpack. If you don't know what this means,
+    please read the
+    <a href="https://commcare-hq.readthedocs.io/js-guide/static-files.html" target="_blank">Overview of Static Files
+    and JavaScript Bundlers</a>. If you don't know how to proceed after that, read further.
+  </p>
+  <div class="alert alert-primary">
+    <strong>Important:</strong> HTMX and Alpine can only be included on pages using Webpack as the JavaScript bundler
+    due to limitations with RequireJS. See the guide for
+    <a
+        href="https://commcare-hq.readthedocs.io/js-guide/requirejs-to-webpack.html"
+        target="_blank"
+    >Migrating RequireJS to Webpack</a> if you have an older page you would like
+    to use HTMX and Alpine on. If the page is even older (no bundler), we currently do not have a solution
+    for this.
+  </div>
+
+  <h2 id="usage-forms" class="pt-4">
+    Usage with Forms
+  </h2>
+  <p>
+    HTMX and Alpine are well suited for sprinkling bits of interactivity into an otherwise very static form.
+    For instance, we want to hide or show a field depending on the value of a select input.
+  </p>
+  <p>
+    The in-page interactivity is handled by Alpine. HTMX is useful because it allows us to submit (and load)
+    the form asynchronously.
+  </p>
+  <h3 id="usage-forms-demo" class="pt-3">
+    Demo with Crispy Forms
+  </h3>
+  <p>
+    <a href="{% url "sg_htmx_alpine_form_demo" %}" target="_blank">Take a look at this simple demo</a> of how
+    we might use HTMX and Alpine with Crispy Forms. Tip: Make sure you are logged in.
+  </p>
+  <p>
+    Below we have two template views, <code>HtmxAlpineFormDemoView</code> and <code>FilterDemoFormView</code>.
+    <code>HtmxAlpineFormDemoView</code> is the view that loads when visiting the URL above. It can be considered
+    the "host" view, and asynchronously loads the partial template content from the <code>FilterDemoFormView</code>
+    on page load. <code>FilterDemoFormView</code> then controls everything related to the <code>FilterDemoForm</code>.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_alpine_form_views %}
+  <p>
+    Take a look at the template for <code>HtmxAlpineFormDemoView</code>. You can see it uses a common
+    <code>js_entry</code> entry point <code>hqwebapp/js/htmx_and_alpine</code>, which is appropriate for
+    most common uses of HTMX and Alpine.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.form_main_template %}
+  <p>
+    The template for <code>FilterDemoFormView</code> then looks like this&mdash;a very simple form partial!
+    The magic of what happens after the form is submitted is in the <code>hx-</code> attributes within
+    the <code>&lt;form&gt;</code> tag that control the HTMX interactions.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.form_partial_template %}
+  <p>
+    The interaction within the form is then controlled by Alpine. Take a peek at <code>self.helper.layout</code>
+    in the code below. All the <code>x_</code> attributes define the Alpine model and interactions&mdash;no
+    external JavaScript file necessary!
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_alpine_form %}
+
+  <h2 id="organization" class="pt-4">
+    Organization for Complex Pages
+  </h2>
+  <p>
+    You can imagine that if a page needs to make a lot of different HTMX requests for multiple page interactions,
+    the view list needed to process each request might get pretty long. Additionally, it might be challenging to
+    properly identify these views as related to one main view.
+  </p>
+  <p>
+    That is where <code>HqHtmxActionMixin</code> comes in! You can use this mixin with any <code>TemplateView</code>
+    (and common HQ subclasses, like <code>BasePageView</code>). Once mixed-in, any method on that view can be
+    decorated with <code>@hq_hx_action()</code> to make that method name directly available as an "action"
+    with any <code>hx-get</code>, <code>hx-post</code>, or related <code>hx-</code> request to that View's URL.
+    This association can be made with the <code>hq-hx-action</code> attribute in the same element that has the
+    <code>hx-</code> request tag.
+  </p>
+  <p>
+    Not quite following? Yes, it's a bit complex. Let's check out a demo and hopefully that will clear up any
+    confusion...
+  </p>
+  <h3 id="using-hqhtmxactionmixin" class="pt-3">
+    Using <code>HqHtmxActionMixin</code>
+  </h3>
+  <p>
+    To illustrate the usage of <code>HqHtmxActionMixin</code>, here is a simple
+    <a href="{% url "sg_htmx_todo_list_example" %}" target="_blank">To-Do List</a> demo.
+  </p>
+  <p>
+    Let's first start with the <code>TodoListDemoView</code>, a subclass of <code>BasePageView</code> that mixes
+    in <code>HqHtmxActionMixin</code>. You can see that the <code>@hq_hx_action()</code> decorator is applied
+    to three methods in this view: <code>create_new_item</code>, <code>edit_item</code>, and
+    <code>mark_item_done</code>.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_hq_hx_action %}
+  <p>
+    Looking at the main template for this view, we can scan the page for the first <code>hx-post</code>
+    attribute, which posts to <code>request.path_info</code>. This is URL of the page serving this
+    template: <code>TodoListDemoView</code>.
+  </p>
+  <p>
+    Below <code>hx-post</code> is the <code>hq-hx-action</code> attribute referencing the
+    <code>create_new_item</code> method of the <code>TodoListDemoView</code>. Remember, this was one
+    of the methods decorated with <code>@hq_hx_action()</code>. The rest of the attributes are specific to
+    HTMX, and you can read more about them on <a href="https://htmx.org/" target="_blank">htmx.org</a>.
+  </p>
+  <p>
+    If you scan the rest of the template, you will notice another <code>hq-hx-action</code> attribute which
+    references the method <code>does_not_exist</code>. As it is aptly named, this method does not exist in
+    <code>TodoListDemoView</code>. However, that's the point, as this attribute is attached to a button which
+    triggers the HTMX error modal. :)
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_todo_main %}
+  <p>
+    What about the other two actions, <code>edit_item</code> and <code>mark_item_done</code>? To examine the usage
+    for these, we need to look at the <code>item.html</code> template.
+  </p>
+  <p>
+    In this template, we see <code>hq_hx_action="mark_item_done"</code> applied to the <code>checkbox</code>
+    input. Scrolling down, we see <code>hq_hx_action="edit_item"</code> applied to the <code>form</code>
+    that contains the <code>input</code> with the edited form value.
+  </p>
+  <p>
+    However, how is the quick inline-edit interaction happening? That all comes from Alpine! Looking at the
+    attributes in the <code>li</code> element on that template, we see the simple Alpine model being defined,
+    setting up variables to track the <code>isEditing</code> and <code>isSubmitting</code> states. Additionally,
+    the <code>itemValue</code> is defined and initialized from the template variable <code>item.name</code>. This
+    <code>itemValue</code> is bound to the text <code>input</code> in the <code>edit_item</code> form below, with
+    Alpine's <code>x-model</code> attribute.
+  </p>
+  <p>
+    The hide/show states of other elements are then controlled with Alpine's <code>x-show</code> attribute,
+    while other form elements are disabled using Alpine's <code>:disabled</code> shorthand attribute when the
+    <code>isEditing</code> or <code>isSubmitting</code> states change.
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_todo_item %}
+  <p>
+    From the code in <code>TodoListDemoView</code>, you can see that a request to the different
+    <code>@hq_hx_action()</code> methods returns <code>self.render_item_response</code>. This returns
+    <code>render_htmx_partial_response</code>, which is part of the <code>HqHtmxActionMixin</code>.
+    Looking at this <code>render_item_response</code> method, we see two partial templates being returned.
+  </p>
+  <p>
+    The <code>item.html</code> template we've already examined above. However, when the item is marked as
+    <code>is_done</code>, the method returns the <code>item_done_oob_swap.html</code> partial. Let's take a
+    look at this template:
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_todo_item_done_swap %}
+  <p>
+    As you can see, this template just adds a wrapper around the <code>item_done.html</code> template, but
+    it has a very interesting HTMX attribute in this wrapper, <code>hx-swap-oob</code>. This was included
+    to demonstrate a powerful feature of HTMX to do out-of-bounds swaps, which you can
+    <a href="https://htmx.org/attributes/hx-swap-oob/" target="_blank">read about here</a>.
+  </p>
+  <p>
+    Lastly, we have the <code>item_done.html</code> partial template. It's very simple:
+  </p>
+  {% include 'styleguide/bootstrap5/code_display.html' with content=examples.htmx_todo_item_done %}
+  <p>
+    That's it! Hopefully <code>HqHtmxActionMixin</code> seems less confusing now,
+    and you are inspired to use it. :)
+  </p>
+
+  <h2 id="debugging" class="pt-4">
+    Debugging During Development
+  </h2>
+  <p>
+    During development of a page using <code>HTMX</code>, you might be interested in seeing how the page
+    looks like when requests take a long time to load, or when the server is a little flaky. Unfortunately,
+    when you try to use the browser dev tools to simulate page slowness, you are only delaying sending the
+    request to your local server, rather than simulating a slow server response. The distinction is important
+    with HTMX, especially when debugging timeout issues.
+  </p>
+  <p>
+    To enable some advanced debugging features on a view using the <code>HqHtmxActionMixin</code>, you
+    can also mix-in the <code>HqHtmxDebugMixin</code>. The <code>HqHtmxDebugMixin</code> allows you to
+    simulate slow server responses by setting <code>simulate_slow_response = True</code> on your view.
+    You can also simulate intermittent bad gateway errors with <code>simulate_flaky_gateway = True</code>.
+  </p>
+  <p>
+    You can check out the <code>HqHtmxDebugMixin</code> directly for additional documentation and usage
+    guidance.
+  </p>
+{% endblock content %}
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/migration_guide.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/migration_guide.html
index a871cef678d3..4c883944ab88 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/migration_guide.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/migration_guide.html
@@ -104,7 +104,7 @@ <h2 id="overview">
     To support this approach, we have tooling that facilitates "splitting" and "unsplitting" files:
     copying files, moving them, and updating references to them. This tooling also performs the simpler migration
     updates, such as renaming CSS classes. For updates that it cannot handle automatically, it adds a TODO comment
-    to the relevant code and writes out a changelog.
+    to the relevant code.
   </p>
   <p>
     Once the entire platform is fully migrated to Bootstrap 5, any remaining Bootstrap 3 code can be removed:
@@ -121,10 +121,6 @@ <h2 id="prepare-local-environment" class="pt-4">
     <code>scss</code> files. The recommended method is with homebrew <code>brew install sass/sass/sass</code>,
     as described in <code>DEV_SETUP.md</code>.
   </p>
-  <p>
-    Next, you will need to specify <code>BOOTSTRAP_MIGRATION_LOGS_DIR</code> in <code>localsettings.py</code>. This
-    will be where the migration management command will leave longer notes for each migrated file.
-  </p>
 
   <h2 id="announce-migration" class="pt-3">
     Step 1: Announce Migration
@@ -282,10 +278,6 @@ <h3 id="large-apps" class="pt-3">
     <a href="https://github.com/dimagi/commcare-hq/tree/master/corehq/apps/hqwebapp/utils/bootstrap/changes_guide"
     target="_blank">changes_guide</a> directory.
   </p>
-  <p>
-    In addition, a changelog for each file will be saved to a markdown file in
-    <code>BOOTSTRAP_MIGRATION_LOGS_DIR</code> (ouside of repository).
-  </p>
   <div class="alert alert-primary">
     <p>
       If templates or javascript files have several nested dependencies, you may need to run this split files step
@@ -522,16 +514,20 @@ <h2 id="migrating-views" class="pt-4">
   </p>
   <p>
     The migration process begins by either applying <code>@use_bootstrap5</code> decorator the view function or
-    <code>@method_decorator(use_bootstrap5, name='dispatch')</code> to the view class.
+    <code>@method_decorator(use_bootstrap5, name='dispatch')</code> to the view class. Also update the template's
+    name in the view from <code>bootstrap3/foo.html</code> to <code>bootstrap5/foo.html</code>.
   </p>
   <p>
-    Next, you should go into the view template and ensure that this template inherits from <code>bootstrap5</code>
-    base templates.
+    The automation should have updated the view template so that it inherits from <code>bootstrap5</code>
+    base templates. It should also have updated any <code>bootstrap3</code> javascript dependencies to their
+    <code>bootstrap5</code> versions.
   </p>
   <p>
-    Finally, you should make sure any javascript files needed to render that view also inherit from <code>bootstrap5</code>
-    dependencies. The migration tool should have handled updating any <code>bootstrap3</code> dependencies to their
-    <code>bootstrap5</code> versions.
+    The automation will have added comments to the template and javascript files noting what changes need to be
+    made. Each comment will be marked with <code>todo B5</code> and the type of change that needs to be made.
+    Each type of change has a corresponding document in the
+    <a href="https://github.com/dimagi/commcare-hq/tree/master/corehq/apps/hqwebapp/utils/bootstrap/changes_guide"
+    target="_blank">changes_guide</a> directory explaining what needs to be done.
   </p>
   <p>
     Once a view's template and javascript files are updated, it is now time to load that view and test for
@@ -548,12 +544,6 @@ <h2 id="migrating-views" class="pt-4">
     The most important part of the migration is ensuring that the page is functionally similar to the user and that no
     errors are present on the page that were not previously present in the Bootstrap 3 version.
   </div>
-  <p>
-    There is a chance you might have to introduce changes to the stylesheet if you come across a custom component that
-    has not yet been migrated to Bootstrap 5. If this is the case, please flag this component with the lead developer
-    of the Bootstrap migration. They can assist with updating the stylesheet (if necessary) or updating guidance
-    for replacing this component with Bootstrap 5 best practices.
-  </p>
 
   <h3 id="un-split-view-files" class="pt-3">
     Un-Split View Files
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html b/corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
new file mode 100644
index 000000000000..2024e1996363
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
@@ -0,0 +1,25 @@
+{% extends "hqwebapp/bootstrap5/base_navigation.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{# use the `hqwebapp/js/htmx_and_alpine` entry point to get started with HTMX and Alpine without any extra javascript #}
+{% js_entry "hqwebapp/js/htmx_and_alpine" %}
+
+{% block content %}
+  <div
+      class="container p-5"
+      {# loads FilterDemoFormView on load with hx-get #}
+      hx-trigger="load"
+      hx-get="{{ filter_form_url }}"
+  >
+    <div class="htmx-indicator">
+      <i class="fa-solid fa-spinner fa-spin"></i> {% trans "Loading..." %}
+    </div>
+  </div>
+{% endblock %}
+
+{% block modals %}
+  {# you can either include this template or include an extension of this template to show HTMX errors to the user #}
+  {% include "hqwebapp/htmx/error_modal.html" %}
+  {{ block.super }}
+{% endblock modals %}
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html b/corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
new file mode 100644
index 000000000000..54c3c0e2bb4e
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
@@ -0,0 +1,30 @@
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+<div id="add-filter-form-container">
+  {% if show_success %}
+    <div
+        class="alert alert-success alert-dismissible fade show"
+        role="alert"
+    >
+      {% blocktrans %}
+        Added filter!
+      {% endblocktrans %}
+      <button
+          type="button"
+          class="btn-close"
+          data-bs-dismiss="alert"
+          aria-label="{% trans "Close" %}"
+      ></button>
+    </div>
+  {% endif %}
+
+  <form
+      hx-post="{{ request.path_info }}"
+      hx-target="#add-filter-form-container"
+      hx-swap="outerHTML"
+      hx-disabled-elt="find button"
+  >
+    {% crispy filter_form %}
+  </form>
+</div>
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
new file mode 100644
index 000000000000..6f9c094caf4f
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
@@ -0,0 +1,95 @@
+{% load i18n %}
+<li
+    id="item-{{ item.id }}"
+    class="list-group-item"
+    {# the x-data below is from Alpine, and sets up the model for inline editing #}
+    x-data='{
+      isEditing: false,
+      isSubmitting: false,
+      itemValue: "{{ item.name }}",
+    }'
+>
+  <div class="d-flex align-items-center fs-4 p-1">
+    <input
+        class="form-check-input me-3"
+        type="checkbox"
+        {# request.path_info is just the same URL for this view #}
+        {# an alternative would be {% url "sg_htmx_todo_list_example" %} #}
+        hx-post="{{ request.path_info }}"
+        {# hq-hx-action triggers the mark_item_done method in TodoListDemoView #}
+        hq-hx-action="mark_item_done"
+        {# hx-vals is a handy way to send extra JSON-formatted data with the request #}
+        hx-vals='{
+          "itemId": {{ item.id }}
+        }'
+        {# the next two lines say replace the entire content of the target in hx-target #}
+        hx-swap="outerHTML"
+        hx-target="#item-{{ item.id }}"
+        {# :disabled is shorthand for Alpine's x-bind:disabled #}
+        :disabled="isEditing || isSubmitting"
+    >
+
+    {# the element below defines what the text looks like when not in edit mode #}
+    <div
+        class="pt-1"
+        {# here we react to the value of isEditing from the alpine model set up in the parent <li> element #}
+        x-show="!isEditing"
+        {# @dblclick is shorthand for Alpine's x-on:dblclick #}
+        @dblclick="isEditing = !isSubmitting"
+    >
+      <span>{{ item.name }}</span>
+      <button
+          class="btn btn-link btn-sm inline-edit-action"
+          type="button"
+          @click="isEditing = true"
+          :disabled="isSubmitting"
+      >
+        <i class="fa fa-pencil"></i>
+        <span class="visually-hidden">
+          {% trans "Edit Value" %}
+        </span>
+      </button>
+    </div>
+
+    {# the element below defines what the inline edit looks like in edit mode #}
+    <div x-show="isEditing">
+      <form
+          hx-post="{{ request.path_info }}"
+          hq-hx-action="edit_item"
+          hx-vals='{
+            "itemId": {{ item.id }}
+          }'
+          {# hx-disabled-elt ensures that all buttons related to this form are disabled on post #}
+          hx-disabled-elt="find button"
+          hx-swap="outerHTML"
+          hx-target="#item-{{ item.id }}"
+      >
+        <div class="input-group">
+          <input
+              type="text"
+              class="form-control"
+              name="newValue"
+              {# x-model creates a two-way binding for the value of itemValue in the alpine model with the value of the input #}
+              x-model="itemValue"
+          >
+          <button
+              class="btn btn-primary htmx-loading"
+              type="submit"
+              @click="isSubmitting = true"
+          >
+            <i class="fa fa-check"></i>
+          </button>
+          <button
+              class="btn btn-outline-danger"
+              type="button"
+              :disabled="isSubmitting"
+              @click="isEditing = false"
+          >
+            <i class="fa fa-close"></i>
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+</li>
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_todo/item_done.html b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item_done.html
new file mode 100644
index 000000000000..8da854d9d71a
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item_done.html
@@ -0,0 +1,9 @@
+<li
+    id="item-{{ item.id }}"
+    class="list-group-item"
+>
+  <div class="p-2 fs-5">
+    <i class="fa-solid fa-circle-check text-success"></i>
+    <span class="ms-3">{{ item.name }}</span>
+  </div>
+</li>
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_todo/item_done_oob_swap.html b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item_done_oob_swap.html
new file mode 100644
index 000000000000..ddfc4ee98f9d
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_todo/item_done_oob_swap.html
@@ -0,0 +1,4 @@
+{# hx-swap-oob inserts the result of this element in the #done-items <ul> instead of the #todo-list <ul> #}
+<ul hx-swap-oob="afterbegin:#done-items">
+  {% include 'styleguide/htmx_todo/item_done.html' %}
+</ul>
diff --git a/corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html b/corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
new file mode 100644
index 000000000000..097f6b4ce639
--- /dev/null
+++ b/corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
@@ -0,0 +1,70 @@
+{% extends "hqwebapp/bootstrap5/base_navigation.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{# use this entry point if you don't need to add any extra javascript to an HTMX + Alpine page #}
+{% js_entry "hqwebapp/js/htmx_and_alpine" %}
+
+{% block content %}
+  <div class="container py-4">
+
+    <h1>
+      {% trans "To-Do" %}
+      <button
+          class="btn btn-primary btn-sm"
+          {# request.path_info is just the same URL for this view #}
+          {# an alternative would be {% url "sg_htmx_todo_list_example" %} #}
+          hx-post="{{ request.path_info }}"
+          {# hq-hx-action triggers the create_new_item method in TodoListDemoView #}
+          hq-hx-action="create_new_item"
+          {# the next two lines tell HTMX to insert the returned HTML from the post at the beginning of the #todo-list <ul> below #}
+          hx-target="#todo-list"
+          hx-swap="afterbegin"
+      >
+        <i class="fa-solid fa-plus"></i> {% trans "Add Item" %}
+      </button>
+    </h1>
+    <ul
+        class="list-group"
+        id="todo-list"
+    >
+      {% for item in items %}
+        {% if not item.is_done %}
+          {% include 'styleguide/htmx_todo/item.html' %}
+        {% endif %}
+      {% endfor %}
+    </ul>
+
+    <h2 class="pt-5">
+      {% trans "Done" %}
+    </h2>
+    <ul
+        class="list-group"
+        id="done-items"
+    >
+      {% for item in items %}
+        {% if item.is_done %}
+          {% include 'styleguide/htmx_todo/item_done.html' %}
+        {% endif %}
+      {% endfor %}
+    </ul>
+
+    <div class="py-5">
+      <button
+          class="btn btn-outline-danger"
+          type="button"
+          {# this button posts to a non existent @hq_hx_action method in the view, purposely triggering the error modal #}
+          hx-post="{{ request.path_info }}"
+          hq-hx-action="does_not_exist"
+      >
+        {% trans "Trigger Error" %}
+      </button>
+    </div>
+  </div>
+{% endblock %}
+
+{% block modals %}
+  {# you can either include this template or include an extension of this template to show HTMX errors to the user #}
+  {% include "hqwebapp/htmx/error_modal.html" %}
+  {{ block.super }}
+{% endblock modals %}
diff --git a/corehq/apps/styleguide/urls.py b/corehq/apps/styleguide/urls.py
index bc864308ad5a..c09538c2ca25 100644
--- a/corehq/apps/styleguide/urls.py
+++ b/corehq/apps/styleguide/urls.py
@@ -1,6 +1,11 @@
 from django.urls import include, re_path as url
 
 from corehq.apps.styleguide.examples.bootstrap5.example_urls import urlpatterns as example_urlpatterns
+from corehq.apps.styleguide.examples.bootstrap5.htmx_alpine_form_views import (
+    HtmxAlpineFormDemoView,
+    FilterDemoFormView,
+)
+from corehq.apps.styleguide.examples.bootstrap5.htmx_hq_hx_action import TodoListDemoView
 from corehq.apps.styleguide.views import (
     AtomsStyleGuideView,
     MainStyleGuideView,
@@ -19,6 +24,12 @@
         include('corehq.apps.styleguide.examples.simple_crispy_form.urls')),
 ]
 
+advanced_demo_urlpatterns = [
+    url(r'^htmx_todo/$', TodoListDemoView.as_view(), name=TodoListDemoView.urlname),
+    url(r'^htmx_alpine_form/$', HtmxAlpineFormDemoView.as_view(), name=HtmxAlpineFormDemoView.urlname),
+    url(r'^htmx_alpine_form/form/$', FilterDemoFormView.as_view(), name=FilterDemoFormView.urlname),
+]
+
 urlpatterns = [
     url(r'^$', MainStyleGuideView.as_view(), name=MainStyleGuideView.urlname),
     url(r'^atoms/$', AtomsStyleGuideView.as_view(),
@@ -30,6 +41,7 @@
     url(r'^pages/$', PagesStyleGuideView.as_view(),
         name=PagesStyleGuideView.urlname),
     url(r'^docs/', include(doc_urlpatterns)),
+    url(r'^demo/', include(advanced_demo_urlpatterns)),
     url(r'^b5/$', bootstrap5.styleguide_home, name="styleguide_home_b5"),
     url(r'^b5/data/select2_ajax_demo$', bootstrap5_data.select2_ajax_demo,
         name="styleguide_data_select2_ajax_demo"),
@@ -52,6 +64,8 @@
         name="styleguide_migration_guide_b5"),
     url(r'^b5/javascript/$', bootstrap5.styleguide_javascript_guide,
         name="styleguide_javascript_guide_b5"),
+    url(r'^b5/htmx_alpine/$', bootstrap5.styleguide_htmx_and_alpine,
+        name="styleguide_htmx_and_alpine_b5"),
     url(r'^b5/atoms/accessibility/$', bootstrap5.styleguide_atoms_accessibility,
         name="styleguide_atoms_accessibility_b5"),
     url(r'^b5/atoms/typography/$', bootstrap5.styleguide_atoms_typography,
diff --git a/corehq/apps/styleguide/views/bootstrap5.py b/corehq/apps/styleguide/views/bootstrap5.py
index 416fe9edc6d3..4563393c45ab 100644
--- a/corehq/apps/styleguide/views/bootstrap5.py
+++ b/corehq/apps/styleguide/views/bootstrap5.py
@@ -57,6 +57,56 @@ def styleguide_javascript_guide(request):
                   get_navigation_context("styleguide_javascript_guide_b5"))
 
 
+@use_bootstrap5
+def styleguide_htmx_and_alpine(request):
+    context = get_navigation_context("styleguide_htmx_and_alpine_b5")
+    context.update({
+        "examples": {
+            'htmx_get_started': CodeForDisplay(
+                code=get_example_context('styleguide/bootstrap5/examples/htmx_get_started.html'),
+                language="Django",
+            ),
+            'htmx_alpine_form_views': CodeForDisplay(
+                code=get_python_example_context('htmx_alpine_form_views.py'),
+                language="Python",
+            ),
+            'form_main_template': CodeForDisplay(
+                code=get_example_context('styleguide/htmx_alpine_crispy/main.html'),
+                language="Django",
+            ),
+            'form_partial_template': CodeForDisplay(
+                code=get_example_context('styleguide/htmx_alpine_crispy/partial_form.html'),
+                language="Django",
+            ),
+            'htmx_alpine_form': CodeForDisplay(
+                code=get_python_example_context('htmx_alpine_form_demo.py'),
+                language="Python",
+            ),
+            'htmx_hq_hx_action': CodeForDisplay(
+                code=get_python_example_context('htmx_hq_hx_action.py'),
+                language="Python",
+            ),
+            'htmx_todo_main': CodeForDisplay(
+                code=get_example_context('styleguide/htmx_todo/main.html'),
+                language="Django",
+            ),
+            'htmx_todo_item': CodeForDisplay(
+                code=get_example_context('styleguide/htmx_todo/item.html'),
+                language="Django",
+            ),
+            'htmx_todo_item_done_swap': CodeForDisplay(
+                code=get_example_context('styleguide/htmx_todo/item_done_oob_swap.html'),
+                language="Django",
+            ),
+            'htmx_todo_item_done': CodeForDisplay(
+                code=get_example_context('styleguide/htmx_todo/item_done.html'),
+                language="Django",
+            ),
+        }
+    })
+    return render(request, 'styleguide/bootstrap5/htmx_and_alpine.html', context)
+
+
 @use_bootstrap5
 def styleguide_atoms_accessibility(request):
     return render(request, 'styleguide/bootstrap5/atoms/accessibility.html',
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 71f8e43035b0..4916f1d1f409 100644
--- a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
+++ b/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
@@ -4,7 +4,7 @@ hqDefine('toggle_ui/js/flags', [
     'underscore',
     'hqwebapp/js/bootstrap3/alert_user',
     'reports/js/bootstrap3/config.dataTables.bootstrap',
-    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/toggle_ui/views.py b/corehq/apps/toggle_ui/views.py
index c2419cde7791..6b0011615a9a 100644
--- a/corehq/apps/toggle_ui/views.py
+++ b/corehq/apps/toggle_ui/views.py
@@ -5,7 +5,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.http import JsonResponse
-from django.http.response import Http404, HttpResponse
+from django.http.response import Http404
 from django.utils.decorators import method_decorator
 from django.utils.functional import cached_property
 from django.views.decorators.http import require_POST
@@ -212,7 +212,7 @@ def post(self, request, *args, **kwargs):
         if self.usage_info:
             data['last_used'] = _get_usage_info(toggle)
             data['service_type'], data['by_service'] = _get_service_type(toggle)
-        return HttpResponse(json.dumps(data), content_type="application/json")
+        return JsonResponse(data)
 
     def _save_randomness(self, toggle, randomness):
         if 0 <= randomness <= 1:
@@ -387,7 +387,7 @@ def set_toggle(request, toggle_slug):
     namespace = request.POST['namespace']
     _set_toggle(request.user.username, static_toggle, item, namespace, enabled)
 
-    return HttpResponse(json.dumps({'success': True}), content_type="application/json")
+    return JsonResponse({'success': True})
 
 
 @require_superuser_or_contractor
diff --git a/corehq/apps/translations/app_translations/upload_form.py b/corehq/apps/translations/app_translations/upload_form.py
index 4126b8de261c..f9a699bb0f8f 100644
--- a/corehq/apps/translations/app_translations/upload_form.py
+++ b/corehq/apps/translations/app_translations/upload_form.py
@@ -77,8 +77,7 @@ def update(self, rows):
 
         # Setup
         rows = get_unicode_dicts(rows)
-        template_translation_el = self._get_template_translation_el()
-        self._add_missing_translation_elements_to_itext(template_translation_el)
+        self._update_or_create_translation_elements()
         self._populate_markdown_stats(rows)
         self.msgs = []
 
@@ -87,8 +86,8 @@ def update(self, rows):
 
         # Update the translations
         for lang in self.langs:
-            translation_node = self.itext.find("./{f}translation[@lang='%s']" % lang)
-            assert translation_node.exists()
+            translation_element = self.itext.find("./{f}translation[@lang='%s']" % lang)
+            assert translation_element.exists()
 
             for row in rows:
                 if row['label'] in label_ids_to_skip:
@@ -117,37 +116,54 @@ def update(self, rows):
 
         return [(t, _('Error in {sheet}: {msg}').format(sheet=self.sheet_name, msg=m)) for (t, m) in self.msgs]
 
-    def _get_template_translation_el(self):
-        # Make language nodes for each language if they don't yet exist
-        #
+    def _update_or_create_translation_elements(self):
+        """
+        Create new elements if necessary and ensure existing elements are up to date with the current app config
+        """
+        template_element = self._get_template_translation_element()
+        for lang in self.langs:
+            translation_element = self.itext.find("./{f}translation[@lang='%s']" % lang)
+            if translation_element.exists():
+                self._update_default_attr_if_needed(translation_element, lang)
+            else:
+                self._create_translation_element(template_element, lang)
+
+    def _get_template_translation_element(self):
         # Currently operating under the assumption that every xForm has at least
-        # one translation element, that each translation element has a text node
-        # for each question and that each text node has a value node under it.
+        # one translation element, that each translation element has a text element
+        # for each question and that each text element has a value element under it.
         # Get a translation element to be used as a template for new elements, preferably of default lang
         default_lang = self.app.default_language
-        default_trans_el = self.itext.find("./{f}translation[@lang='%s']" % default_lang)
-        if default_trans_el.exists():
-            return default_trans_el
+        default_element = self.itext.find("./{f}translation[@lang='%s']" % default_lang)
+        if default_element.exists():
+            return default_element
+
+        # If no default element found, fallback to finding any translation element
         non_default_langs = copy.copy(self.app.langs)
         non_default_langs.remove(default_lang)
         for lang in non_default_langs:
-            trans_el = self.itext.find("./{f}translation[@lang='%s']" % lang)
-            if trans_el.exists():
-                return trans_el
-        raise Exception(_("Form has no translation node present to be used as a template."))
+            translation_element = self.itext.find("./{f}translation[@lang='%s']" % lang)
+            if translation_element.exists():
+                return translation_element
 
-    def _add_missing_translation_elements_to_itext(self, template_translation_el):
-        for lang in self.langs:
-            trans_el = self.itext.find("./{f}translation[@lang='%s']" % lang)
-            if not trans_el.exists():
-                new_trans_el = copy.deepcopy(template_translation_el.xml)
-                new_trans_el.set('lang', lang)
-                if lang != self.app.langs[0]:
-                    # If the language isn't the default language
-                    new_trans_el.attrib.pop('default', None)
-                else:
-                    new_trans_el.set('default', '')
-                self.itext.xml.append(new_trans_el)
+        raise XFormException(_("Form has no translation element present to be used as a template."))
+
+    def _create_translation_element(self, template, lang):
+        translation_element = copy.deepcopy(template.xml)
+        translation_element.set('lang', lang)
+        self._update_default_attr_if_needed(translation_element, lang)
+        self.itext.xml.append(translation_element)
+
+    def _update_default_attr_if_needed(self, element, element_lang):
+        """
+        A default language is set at both the app and form level (in translation elements), and it is
+        possible that they can get out of sync. This ensures the translation element in a form is up to date
+        with the app's default language.
+        """
+        if element_lang != self.app.default_language:
+            element.attrib.pop('default', None)
+        else:
+            element.set('default', '')
 
     def _populate_markdown_stats(self, rows):
         # Aggregate Markdown vetoes, and translations that currently have Markdown
diff --git a/corehq/apps/translations/integrations/transifex/views.py b/corehq/apps/translations/integrations/transifex/views.py
index 8c9e6a3c5762..e79104a2b087 100644
--- a/corehq/apps/translations/integrations/transifex/views.py
+++ b/corehq/apps/translations/integrations/transifex/views.py
@@ -13,6 +13,8 @@
 import polib
 from memoized import memoized
 
+from couchexport.models import Format
+
 from corehq import toggles
 from corehq.apps.app_manager.dbaccessors import get_current_app, get_version_build_id
 from corehq.apps.app_manager.exceptions import BuildNotFoundException
@@ -71,7 +73,7 @@ def transifex_integration_enabled(self, request):
 class ConvertTranslations(BaseTranslationsView):
     page_title = _('Convert Translations')
     urlname = 'convert_translations'
-    template_name = 'convert_translations.html'
+    template_name = 'translations/convert_translations.html'
 
     @property
     @memoized
@@ -150,14 +152,14 @@ def _po_file_response(self):
         uploaded_file = self.convert_translation_form.cleaned_data.get('upload_file')
         worksheet = openpyxl.load_workbook(uploaded_file).worksheets[0]
         content = self._generate_po_content(worksheet)
-        response = HttpResponse(content, content_type="text/html; charset=utf-8")
+        response = HttpResponse(content, content_type="text/plain; charset=utf-8")
         response['Content-Disposition'] = safe_filename_header(worksheet.title, 'po')
         return response
 
     def _excel_file_response(self):
         wb = self._generate_excel_file(self.convert_translation_form.cleaned_data.get('upload_file'))
         content = get_file_content_from_workbook(wb)
-        response = HttpResponse(content, content_type="text/html; charset=utf-8")
+        response = HttpResponse(content, content_type=Format.from_format('xlsx').mimetype)
         response['Content-Disposition'] = safe_filename_header(self._uploaded_file_name.split('.po')[0], 'xlsx')
         return response
 
@@ -181,7 +183,7 @@ def _zip_file_response(self):
                 else:
                     assert False, "unexpected filename: {}".format(filename)
         mem_file.seek(0)
-        response = HttpResponse(mem_file, content_type="text/html")
+        response = HttpResponse(mem_file, content_type='application/zip')
         zip_filename = 'Converted-' + uploaded_zipfile.filename.split('.zip')[0]
         response['Content-Disposition'] = safe_filename_header(zip_filename, "zip")
         return response
@@ -211,7 +213,7 @@ def page_context(self):
 class PullResource(BaseTranslationsView):
     page_title = _('Pull Resource')
     urlname = 'pull_resource'
-    template_name = 'pull_resource.html'
+    template_name = 'translations/pull_resource.html'
 
     def dispatch(self, request, *args, **kwargs):
         return super(PullResource, self).dispatch(request, *args, **kwargs)
@@ -290,10 +292,10 @@ def _pull_resource(self, request):
         file_response = self._generate_response_file(request.domain, project_slug, resource_slug)
         if isinstance(file_response, openpyxl.Workbook):
             content = get_file_content_from_workbook(file_response)
-            response = HttpResponse(content, content_type="text/html; charset=utf-8")
+            response = HttpResponse(content, content_type=Format.from_format('xlsx').mimetype)
             response['Content-Disposition'] = safe_filename_header(resource_slug, "xlsx")
         else:
-            response = HttpResponse(file_response, content_type="text/html; charset=utf-8")
+            response = HttpResponse(file_response, content_type='application/zip')
             response['Content-Disposition'] = safe_filename_header(project_slug, "zip")
         return response
 
@@ -311,7 +313,7 @@ def post(self, request, *args, **kwargs):
 class BlacklistTranslations(BaseTranslationsView):
     page_title = _('Blacklist Translations')
     urlname = 'blacklist_translations'
-    template_name = 'blacklist_translations.html'
+    template_name = 'translations/blacklist_translations.html'
 
     def section_url(self):
         return self.page_url
@@ -341,7 +343,7 @@ def post(self, request, *args, **kwargs):
 class AppTranslations(BaseTranslationsView):
     page_title = gettext_lazy('App Translations')
     urlname = 'app_translations'
-    template_name = 'app_translations.html'
+    template_name = 'translations/app_translations.html'
 
     def dispatch(self, request, *args, **kwargs):
         return super(AppTranslations, self).dispatch(request, *args, **kwargs)
@@ -528,7 +530,7 @@ def page_context(self):
 class DownloadTranslations(BaseTranslationsView):
     page_title = gettext_lazy('Download Translations')
     urlname = 'download_translations'
-    template_name = 'download_translations.html'
+    template_name = 'translations/download_translations.html'
 
     @property
     def page_context(self):
@@ -572,7 +574,7 @@ def post(self, request, *args, **kwargs):
 class MigrateTransifexProject(BaseTranslationsView):
     page_title = gettext_lazy('Migrate Project')
     urlname = 'migrate_transifex_project'
-    template_name = 'migrate_project.html'
+    template_name = 'translations/migrate_project.html'
 
     def section_url(self):
         return reverse(MigrateTransifexProject.urlname, args=self.args, kwargs=self.kwargs)
diff --git a/corehq/apps/translations/templates/app_translations.html b/corehq/apps/translations/templates/translations/app_translations.html
similarity index 100%
rename from corehq/apps/translations/templates/app_translations.html
rename to corehq/apps/translations/templates/translations/app_translations.html
diff --git a/corehq/apps/translations/templates/blacklist_translations.html b/corehq/apps/translations/templates/translations/blacklist_translations.html
similarity index 100%
rename from corehq/apps/translations/templates/blacklist_translations.html
rename to corehq/apps/translations/templates/translations/blacklist_translations.html
diff --git a/corehq/apps/translations/templates/convert_translations.html b/corehq/apps/translations/templates/translations/convert_translations.html
similarity index 100%
rename from corehq/apps/translations/templates/convert_translations.html
rename to corehq/apps/translations/templates/translations/convert_translations.html
diff --git a/corehq/apps/translations/templates/download_translations.html b/corehq/apps/translations/templates/translations/download_translations.html
similarity index 100%
rename from corehq/apps/translations/templates/download_translations.html
rename to corehq/apps/translations/templates/translations/download_translations.html
diff --git a/corehq/apps/translations/templates/migrate_project.html b/corehq/apps/translations/templates/translations/migrate_project.html
similarity index 100%
rename from corehq/apps/translations/templates/migrate_project.html
rename to corehq/apps/translations/templates/translations/migrate_project.html
diff --git a/corehq/apps/translations/templates/pull_resource.html b/corehq/apps/translations/templates/translations/pull_resource.html
similarity index 100%
rename from corehq/apps/translations/templates/pull_resource.html
rename to corehq/apps/translations/templates/translations/pull_resource.html
diff --git a/corehq/apps/translations/tests/test_bulk_app_translation.py b/corehq/apps/translations/tests/test_bulk_app_translation.py
index 6323b53d1104..260c035ca1b8 100644
--- a/corehq/apps/translations/tests/test_bulk_app_translation.py
+++ b/corehq/apps/translations/tests/test_bulk_app_translation.py
@@ -840,6 +840,20 @@ def test_case_search_labels_on_upload(self):
         self.assertEqual(module.search_config.description,
                          {'en': 'More information', 'fra': "Plus d'information"})
 
+    def test_translation_elements_are_up_to_date_with_app_langs(self):
+        self.assertEqual(self.app.langs, ["en", "fra"])
+        # upload translations to ensure all translation elements are created
+        self.upload_raw_excel_translations(self.multi_sheet_upload_headers, self.multi_sheet_upload_data)
+
+        # change default language and upload again
+        self.app.langs = ["fra", "en"]
+        self.upload_raw_excel_translations(self.multi_sheet_upload_headers, self.multi_sheet_upload_data)
+
+        xform = self.app.get_module(0).get_form(0).wrapped_xform()
+        itext_node = xform.model_node.find("{f}itext")
+        self.assertEqual(itext_node.find("./{f}translation[@lang='fra']").get("default"), "")
+        self.assertIsNone(itext_node.find("./{f}translation[@lang='en']").get('default'))
+
 
 class BulkAppTranslationPartialsTest(BulkAppTranslationTestBase):
 
diff --git a/corehq/apps/user_importer/tests/test_importer.py b/corehq/apps/user_importer/tests/test_importer.py
index 9f9213e7f426..4c6c2f5c35df 100644
--- a/corehq/apps/user_importer/tests/test_importer.py
+++ b/corehq/apps/user_importer/tests/test_importer.py
@@ -54,6 +54,7 @@
 from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
 from corehq.const import USER_CHANGE_VIA_BULK_IMPORTER
 from corehq.extensions.interface import disable_extensions
+from corehq.tests.util.context import add_context
 from corehq.util.test_utils import flag_enabled
 
 from dimagi.utils.dates import add_months_to_date
@@ -2210,7 +2211,6 @@ def test_tableau_users(self, mock_request):
             local_tableau_users.get(username='george@eliot.com')
 
 
-@patch_user_data_db_layer()
 class TestUserChangeLogger(SimpleTestCase):
     @classmethod
     def setUpClass(cls):
@@ -2222,6 +2222,9 @@ def setUpClass(cls):
             user_id=cls.uploading_user.get_id
         )
 
+    def setUp(self):
+        add_context(patch_user_data_db_layer(), self)
+
     def test_add_change_message_duplicate_slug_entry(self):
         user = CommCareUser()
         user_change_logger = UserChangeLogger(
diff --git a/corehq/apps/user_importer/tests/test_validators.py b/corehq/apps/user_importer/tests/test_validators.py
index de60e74d5083..355b75d14f34 100644
--- a/corehq/apps/user_importer/tests/test_validators.py
+++ b/corehq/apps/user_importer/tests/test_validators.py
@@ -1,7 +1,9 @@
 from datetime import datetime
+from unittest.mock import patch
+
+import pytest
 from django.test import TestCase
 from faker import Faker
-from unittest.mock import patch
 from testil import assert_raises
 
 from corehq.apps.domain.shortcuts import create_domain
@@ -31,6 +33,7 @@
 from corehq.apps.custom_data_fields.models import (CustomDataFieldsDefinition,
     CustomDataFieldsProfile)
 from corehq.apps.users.views.mobile.custom_data_fields import UserFieldsView
+from corehq.tests.tools import nottest
 from corehq.util.test_utils import flag_enabled
 
 factory = Faker()
@@ -147,61 +150,60 @@
 ]
 
 
-def test_validators():
-    def _test_spec(validator, specs, errors):
-        for i, spec in enumerate(specs):
-            if i in errors:
-                with assert_raises(UserUploadError, msg=errors[i]):
-                    validator(spec)
-            else:
+@pytest.mark.parametrize("specs, validator, errors", TEST_CASES)
+def test_validators(specs, validator, errors):
+    for i, spec in enumerate(specs):
+        if i in errors:
+            with assert_raises(UserUploadError, msg=errors[i]):
                 validator(spec)
+        else:
+            validator(spec)
+
 
-    for specs, validator, errors in TEST_CASES:
-        yield _test_spec, validator, specs, errors
+@nottest
+def _test_duplicates(specs, duplicates, check=None):
+    validator = DuplicateValidator('domain', 'name', specs, check_function=check)
+    for spec in specs:
+        yield validator, spec, duplicates
 
 
-def test_duplicates():
-    specs = [
+@pytest.mark.parametrize("validator, spec, duplicates", list(_test_duplicates(
+    [
         {'name': 1},
         {'name': 2},
         {'name': 3},
         {'name': 2},
         {'name': 3},
         {},
-    ]
-    duplicates = (2, 3)
-    yield from _test_duplicates(specs, duplicates)
+    ],
+    (2, 3),
+)))
+def test_duplicates(validator, spec, duplicates):
+    if spec.get('name') in duplicates:
+        with assert_raises(UserUploadError, msg=validator.error_message):
+            validator(spec)
+    else:
+        validator(spec)
 
 
-def test_duplicates_with_check():
-    specs = [
+@pytest.mark.parametrize("validator, spec, duplicates", list(_test_duplicates(
+    [
         {'name': 1},
         {'name': 2},
         {'name': 2},
         {'name': 3},
         {'name': 3},
         {},
-    ]
-    duplicates = (3,)
-
-    def check(item):
-        return item != 2
-
-    yield from _test_duplicates(specs, duplicates, check)
-
-
-def _test_duplicates(specs, duplicates, check=None):
-    validator = DuplicateValidator('domain', 'name', specs, check_function=check)
-
-    def _test(spec):
-        if spec.get('name') in duplicates:
-            with assert_raises(UserUploadError, msg=validator.error_message):
-                validator(spec)
-        else:
+    ],
+    (3,),
+    check=(lambda item: item != 2)
+)))
+def test_duplicates_with_check(validator, spec, duplicates):
+    if spec.get('name') in duplicates:
+        with assert_raises(UserUploadError, msg=validator.error_message):
             validator(spec)
-
-    for spec in specs:
-        yield _test, spec
+    else:
+        validator(spec)
 
 
 def test_existing_users():
@@ -386,7 +388,7 @@ def test_cant_remove_location(self):
         assert validation_result == self.validator.error_message_location_access.format(
             self.locations['Suffolk'].site_code)
 
-    @flag_enabled('LOCATION_HAS_USERS')
+    @flag_enabled('USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION')
     def test_location_not_has_users(self):
         self.editable_user.reset_locations(self.domain, [self.locations['Middlesex'].location_id])
         self.locations['Cambridge'].location_type.has_users = False
diff --git a/corehq/apps/user_importer/validation.py b/corehq/apps/user_importer/validation.py
index a732da845f30..86ee1be3e157 100644
--- a/corehq/apps/user_importer/validation.py
+++ b/corehq/apps/user_importer/validation.py
@@ -511,7 +511,7 @@ def _validate_location_has_users(self, spec):
     def validate_spec(self, spec):
         user_access_error = self._validate_uploading_user_access(spec)
         location_cannot_have_users_error = None
-        if toggles.LOCATION_HAS_USERS.enabled(self.domain):
+        if toggles.USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION.enabled(self.domain):
             location_cannot_have_users_error = self._validate_location_has_users(spec)
         return user_access_error or location_cannot_have_users_error
 
diff --git a/corehq/apps/userreports/const.py b/corehq/apps/userreports/const.py
index 8076ccc695da..016900227103 100644
--- a/corehq/apps/userreports/const.py
+++ b/corehq/apps/userreports/const.py
@@ -88,4 +88,4 @@
     (UCR_NAMED_FILTER, UCR_NAMED_FILTER),
 )
 
-DATA_SOURCE_REBUILD_RESTRICTED_AT = 1000000
+DATA_SOURCE_REBUILD_RESTRICTED_AT = 1_000_000
diff --git a/corehq/apps/userreports/expressions/factory.py b/corehq/apps/userreports/expressions/factory.py
index 75129ab0c599..c99d708fe610 100644
--- a/corehq/apps/userreports/expressions/factory.py
+++ b/corehq/apps/userreports/expressions/factory.py
@@ -6,21 +6,20 @@
 
 from jsonobject.exceptions import BadValueError
 
-from corehq.apps.userreports.specs import FactoryContext
 from dimagi.utils.parsing import json_format_date, json_format_datetime
 from dimagi.utils.web import json_handler
 
 from corehq.apps.userreports.exceptions import BadSpecError
 from corehq.apps.userreports.expressions.date_specs import (
     AddDaysExpressionSpec,
+    AddHoursExpressionSpec,
     AddMonthsExpressionSpec,
     DiffDaysExpressionSpec,
     EthiopianDateToGregorianDateSpec,
     GregorianDateToEthiopianDateSpec,
     MonthEndDateExpressionSpec,
     MonthStartDateExpressionSpec,
-    AddHoursExpressionSpec,
-    UTCNow
+    UTCNow,
 )
 from corehq.apps.userreports.expressions.list_specs import (
     FilterItemsExpressionSpec,
@@ -46,6 +45,7 @@
     NestedExpressionSpec,
     PropertyNameGetterSpec,
     PropertyPathGetterSpec,
+    RelatedCaseExpressionSpec,
     RelatedDocExpressionSpec,
     ReportingGroupsExpressionSpec,
     RootDocExpressionSpec,
@@ -53,6 +53,7 @@
     SubcasesExpressionSpec,
     SwitchExpressionSpec,
 )
+from corehq.apps.userreports.specs import FactoryContext
 
 
 def _make_filter(spec, factory_context):
@@ -68,7 +69,6 @@ def _simple_expression_generator(wrapper_class, spec, factory_context):
 
 _identity_expression = functools.partial(_simple_expression_generator, IdentityExpressionSpec)
 _constant_expression = functools.partial(_simple_expression_generator, ConstantGetterSpec)
-_property_name_expression = functools.partial(_simple_expression_generator, PropertyNameGetterSpec)
 _property_path_expression = functools.partial(_simple_expression_generator, PropertyPathGetterSpec)
 _iteration_number_expression = functools.partial(_simple_expression_generator, IterationNumberExpressionSpec)
 _jsonpath_expression = functools.partial(_simple_expression_generator, JsonpathExpressionSpec)
@@ -133,6 +133,26 @@ def _related_doc_expression(spec, factory_context):
     return wrapped
 
 
+def _related_case_expression(spec, factory_context):
+    wrapped = RelatedCaseExpressionSpec.wrap(spec)
+    kwargs = {'value_expression': ExpressionFactory.from_spec(
+        wrapped.value_expression,
+        factory_context
+    )}
+    if getattr(wrapped, 'case_id_expression', None):
+        kwargs['case_id_expression'] = ExpressionFactory.from_spec(
+            wrapped.case_id_expression,
+            factory_context
+        )
+    if getattr(wrapped, 'external_id_expression', None):
+        kwargs['external_id_expression'] = ExpressionFactory.from_spec(
+            wrapped.external_id_expression,
+            factory_context,
+        )
+    wrapped.configure(**kwargs)
+    return wrapped
+
+
 def _iterator_expression(spec, factory_context):
     wrapped = IteratorExpressionSpec.wrap(spec)
     wrapped.configure(
@@ -360,6 +380,7 @@ class ExpressionFactory(object):
         'property_name': _property_name_expression,
         'property_path': _property_path_expression,
         'reduce_items': _reduce_items_expression,
+        'related_case': _related_case_expression,
         'related_doc': _related_doc_expression,
         'root_doc': _root_doc_expression,
         'sort_items': _sort_items_expression,
diff --git a/corehq/apps/userreports/expressions/specs.py b/corehq/apps/userreports/expressions/specs.py
index 4567c748c6e5..ac424af2d0e9 100644
--- a/corehq/apps/userreports/expressions/specs.py
+++ b/corehq/apps/userreports/expressions/specs.py
@@ -692,7 +692,11 @@ def _get_user(domain, doc_id):
         # 'is_account_confirmed',
         # 'user_location_id',
     )
-    user = CommCareUser.get_by_user_id(doc_id, domain)
+    try:
+        user = CommCareUser.get_by_user_id(doc_id, domain)
+    except CouchUser.AccountTypeError:
+        # user is a WebUser not a CommCareUser
+        return None
     if not user:
         return None
 
@@ -731,6 +735,86 @@ def _device_to_dict(
     return {k: v for k, v in device.to_json().items() if k in whitelist}
 
 
+class RelatedCaseExpressionSpec(JsonObject):
+    """
+    Similar to ``RelatedDocExpressionSpec``, this can be used to look up
+    a property in a related case. Related cases can be identified either
+    by their case ID or by ``external_id``. This example looks up the
+    full name of a patient identified by their external ID:
+
+    .. code:: json
+
+       {
+           "type": "related_case",
+           "external_id_expression": {
+               "type": "property_name",
+               "property_name": "patient_external_id"
+           },
+           "value_expression": {
+               "type": "property_name",
+               "property_name": "full_name"
+           }
+       }
+    """
+    type = TypeProperty('related_case')
+    case_id_expression = DictProperty()
+    external_id_expression = DictProperty()
+    value_expression = DictProperty(required=True)
+
+    def configure(
+        self,
+        *,
+        value_expression,
+        case_id_expression=None,
+        external_id_expression=None,
+    ):
+        if bool(case_id_expression) == bool(external_id_expression):
+            # Both case_id_expression and external_id_expression are
+            # present or both are missing
+            raise BadSpecError(
+                'RelatedCaseExpression must have either case_id_expression '
+                'or external_id_expression'
+            )
+        self._case_id_expression = case_id_expression
+        self._external_id_expression = external_id_expression
+        self._value_expression = value_expression
+
+    def __call__(self, item, evaluation_context=None):
+        if self._case_id_expression:
+            case_id = self._case_id_expression(item, evaluation_context)
+            external_id = None
+        else:
+            case_id = None
+            external_id = self._external_id_expression(item, evaluation_context)
+        if case_id or external_id:
+            return self.get_value(case_id, external_id, evaluation_context)
+
+    def get_value(self, case_id, external_id, evaluation_context):
+        case = self._get_document(case_id, external_id, evaluation_context)
+        # Use a new evaluation context since this is a new document
+        return self._value_expression(case, EvaluationContext(case, 0))
+
+    @staticmethod
+    @ucr_context_cache(vary_on=('case_id', 'external_id',))
+    def _get_document(case_id, external_id, evaluation_context):
+        domain = evaluation_context.root_doc['domain']
+        assert domain
+
+        # Call get_document_store_for_doc_type() so that load counter tracks load.
+        case_document_store = get_document_store_for_doc_type(
+            domain,
+            'CommCareCase',
+            load_source='related_case_expression'
+        )
+        try:
+            doc = case_document_store.get_document(case_id, external_id=external_id)
+        except DocumentNotFoundError:
+            return None
+        if domain != doc.get('domain'):
+            return None
+        return doc
+
+
 class NestedExpressionSpec(JsonObject):
     """
     These can be used to nest expressions. This can be used, e.g. to pull a
diff --git a/corehq/apps/userreports/pillow_utils.py b/corehq/apps/userreports/pillow_utils.py
index 9f3999219c82..0339de257540 100644
--- a/corehq/apps/userreports/pillow_utils.py
+++ b/corehq/apps/userreports/pillow_utils.py
@@ -24,6 +24,11 @@ def _is_datasource_active(adapter):
 
 
 def rebuild_sql_tables(adapters):
+
+    def _notify_rebuild(msg, obj):
+        assert_ = soft_assert(notify_admins=True)
+        assert_(False, msg, obj)
+
     tables_by_engine = defaultdict(dict)
     all_adapters = []
     for adapter in adapters:
@@ -41,10 +46,6 @@ def rebuild_sql_tables(adapters):
                 Domain {adapter.config.domain}.
                 Skipping."""
             )
-
-    _assert = soft_assert(notify_admins=True)
-    _notify_rebuild = lambda msg, obj: _assert(False, msg, obj)
-
     for engine_id, table_map in tables_by_engine.items():
         table_names = list(table_map)
         engine = connection_manager.get_engine(engine_id)
@@ -102,5 +103,10 @@ def rebuild_table(adapter, diffs=None):
         adapter.log_table_rebuild_skipped(source='pillowtop', diffs=diff_dicts)
         return
 
-    rebuild_indicators.delay(adapter.config.get_id, source='pillowtop', engine_id=adapter.engine_id,
-                             diffs=diff_dicts, domain=config.domain)
+    rebuild_indicators.delay(
+        adapter.config.get_id,
+        source='pillowtop',
+        engine_id=adapter.engine_id,
+        diffs=diff_dicts,
+        domain=config.domain,
+    )
diff --git a/corehq/apps/userreports/reports/builder/forms.py b/corehq/apps/userreports/reports/builder/forms.py
index 8973f6aae5bd..d90a7f5dcc26 100644
--- a/corehq/apps/userreports/reports/builder/forms.py
+++ b/corehq/apps/userreports/reports/builder/forms.py
@@ -514,7 +514,11 @@ def data_source_name(self):
         raise NotImplementedError
 
     def construct_data_source(self, table_id, **kwargs):
-        return DataSourceConfiguration(domain=self.domain, table_id=table_id, **kwargs)
+        return DataSourceConfiguration(
+            domain=self.domain,
+            table_id=table_id,
+            **kwargs,
+        )
 
     def _ds_config_kwargs(self, indicators, is_multiselect_chart_report=False, multiselect_field=None):
         if is_multiselect_chart_report:
@@ -1197,10 +1201,12 @@ def _configured_columns(self):
     def _get_data_source_configuration_kwargs(self):
         filters = self.cleaned_data['user_filters'] + self.cleaned_data['default_filters']
         ms_field = self._report_aggregation_cols[0] if self._is_multiselect_chart_report else None
-        return self.ds_builder.get_datasource_constructor_kwargs(self._configured_columns,
-                                                                 filters,
-                                                                 self._is_multiselect_chart_report,
-                                                                 ms_field)
+        return self.ds_builder.get_datasource_constructor_kwargs(
+            self._configured_columns,
+            filters,
+            self._is_multiselect_chart_report,
+            ms_field,
+        )
 
     def _build_data_source(self):
         data_source_config = self.ds_builder.construct_data_source(
@@ -1210,8 +1216,11 @@ def _build_data_source(self):
         )
         data_source_config.validate()
         data_source_config.save()
-        tasks.rebuild_indicators.delay(data_source_config._id, source="report_builder",
-                                       domain=data_source_config.domain)
+        tasks.rebuild_indicators.delay(
+            data_source_config._id,
+            source="report_builder",
+            domain=data_source_config.domain,
+        )
         return data_source_config._id
 
     def update_report(self):
@@ -1249,8 +1258,10 @@ def _update_data_source_if_necessary(self):
                     data_source.save()
                     now = datetime.datetime.utcnow()
                     tasks.rebuild_indicators.delay(
-                        data_source._id, source='report_builder_update',
-                        trigger_time=now, domain=data_source.domain
+                        data_source._id,
+                        source='report_builder_update',
+                        trigger_time=now,
+                        domain=data_source.domain
                     )
 
     def create_report(self):
@@ -1341,9 +1352,11 @@ def create_temp_data_source_if_necessary(self, username):
         )
         settings.CELERY_TASK_ALWAYS_EAGER = always_eager
 
-        tasks.rebuild_indicators(data_source_config._id,
-                                 username,
-                                 limit=SAMPLE_DATA_MAX_ROWS)  # Do synchronously
+        tasks.rebuild_indicators(  # Do synchronously
+            data_source_config._id,
+            username,
+            limit=SAMPLE_DATA_MAX_ROWS
+        )
         self._filter_data_source_changes(data_source_config._id)
         return data_source_config._id
 
@@ -1388,9 +1401,11 @@ def _update_temp_datasource(self, data_source_config_id, username):
             data_source_config.base_item_expression = temp_config["base_item_expression"]
             data_source_config.validate()
             data_source_config.save()
-            tasks.rebuild_indicators(data_source_config._id,
-                                     username,
-                                     limit=SAMPLE_DATA_MAX_ROWS)  # Do synchronously
+            tasks.rebuild_indicators(  # Do synchronously
+                data_source_config._id,
+                username,
+                limit=SAMPLE_DATA_MAX_ROWS
+            )
             self._filter_data_source_changes(data_source_config._id)
 
     @property
diff --git a/corehq/apps/userreports/reports/view.py b/corehq/apps/userreports/reports/view.py
index 5ab858959191..a10eaf0d5589 100644
--- a/corehq/apps/userreports/reports/view.py
+++ b/corehq/apps/userreports/reports/view.py
@@ -1,4 +1,3 @@
-import json
 from contextlib import closing, contextmanager
 from io import BytesIO
 
@@ -6,9 +5,9 @@
 from django.contrib import messages
 from django.http import (
     Http404,
-    HttpResponse,
     HttpResponseBadRequest,
     HttpResponseRedirect,
+    JsonResponse,
 )
 from django.http.response import HttpResponseServerError
 from django.shortcuts import redirect, render
@@ -556,9 +555,9 @@ def email_response(self):
                 self.report_export.create_export(temp, Format.HTML)
             except UserReportsError as e:
                 return self.render_json_response({'error': str(e)})
-            return HttpResponse(json.dumps({
+            return JsonResponse({
                 'report': temp.getvalue().decode('utf-8'),
-            }), content_type='application/json')
+            })
 
     @property
     @memoized
diff --git a/corehq/apps/userreports/static/userreports/js/configurable_report.js b/corehq/apps/userreports/static/userreports/js/configurable_report.js
index 847365b6f6ec..d586f854816d 100644
--- a/corehq/apps/userreports/static/userreports/js/configurable_report.js
+++ b/corehq/apps/userreports/static/userreports/js/configurable_report.js
@@ -1,8 +1,9 @@
 hqDefine("userreports/js/configurable_report", function () {
     var initialPageData = hqImport("hqwebapp/js/initial_page_data");
 
-    if (typeof define === 'function' && define.amd || window.USE_REQUIREJS) {
-        throw new Error("This part of UCR is not yet migrated to RequireJS. Update the UCR logic in reports/js/standard_hq_report before removing this error.");
+    if (typeof define === 'function' && define.amd || (window.USE_REQUIREJS || window.USE_WEBPACK)) {
+        throw new Error("This part of UCR is not yet migrated to a Javascript Bundler (preferably Webpack). " +
+            "Update the UCR logic in reports/js/standard_hq_report before removing this error.");
     }
 
     var getStandardHQReport = function (isFirstLoad) {
diff --git a/corehq/apps/userreports/tasks.py b/corehq/apps/userreports/tasks.py
index 14d76f125a2d..8369290aed9b 100644
--- a/corehq/apps/userreports/tasks.py
+++ b/corehq/apps/userreports/tasks.py
@@ -80,8 +80,16 @@ def _build_indicators(config, document_store, relevant_ids):
 
 @serial_task('{indicator_config_id}', default_retry_delay=60 * 10, timeout=3 * 60 * 60, max_retries=20,
              queue=UCR_CELERY_QUEUE, ignore_result=True, serializer='pickle')
-def rebuild_indicators(indicator_config_id, initiated_by=None, limit=-1, source=None,
-                       engine_id=None, diffs=None, trigger_time=None, domain=None):
+def rebuild_indicators(
+    indicator_config_id,
+    initiated_by=None,
+    limit=-1,
+    source=None,
+    engine_id=None,
+    diffs=None,
+    trigger_time=None,
+    domain=None,
+):
     config = get_ucr_datasource_config_by_id(indicator_config_id)
     if trigger_time is not None and trigger_time < config.last_modified:
         return
@@ -254,7 +262,9 @@ def queue_async_indicators():
     cutoff = start + ASYNC_INDICATOR_QUEUE_TIME - timedelta(seconds=30)
     retry_threshold = start - timedelta(hours=4)
     # don't requeue anything that has been retried more than ASYNC_INDICATOR_MAX_RETRIES times
-    indicators = AsyncIndicator.objects.filter(unsuccessful_attempts__lt=ASYNC_INDICATOR_MAX_RETRIES)[:settings.ASYNC_INDICATORS_TO_QUEUE]
+    indicators = AsyncIndicator.objects.filter(
+        unsuccessful_attempts__lt=ASYNC_INDICATOR_MAX_RETRIES
+    )[:settings.ASYNC_INDICATORS_TO_QUEUE]
 
     indicators_by_domain_doc_type = defaultdict(list)
     # page so that envs can have arbitarily large settings.ASYNC_INDICATORS_TO_QUEUE
diff --git a/corehq/apps/userreports/templates/userreports/edit_data_source.html b/corehq/apps/userreports/templates/userreports/edit_data_source.html
index 18483e0cc176..924fa170f15f 100644
--- a/corehq/apps/userreports/templates/userreports/edit_data_source.html
+++ b/corehq/apps/userreports/templates/userreports/edit_data_source.html
@@ -32,7 +32,9 @@ <h4><i class="fa-solid fa-triangle-exclamation"></i>
         <div class="btn-group">
           {% if data_source.disable_destructive_rebuild %}
             <div style="margin-right: 15px;">
-              <button class="btn btn-default" disabled>
+              <button id="gtm-rebuild-ds-disabled"
+                      class="btn btn-default"
+                      disabled>
                 {% if use_updated_ucr_naming %}
                   {% trans 'Rebuild Custom Web Report Source'%}
                 {% else %}
@@ -47,7 +49,10 @@ <h4><i class="fa-solid fa-triangle-exclamation"></i>
             </div>
           {% else %}
             <div>
-              <a href="#confirm_rebuild" class="btn btn-default" data-toggle="modal">
+              <a id="gtm-rebuild-ds-btn"
+                 class="btn btn-default"
+                 href="#confirm_rebuild"
+                 data-toggle="modal">
                 {% if use_updated_ucr_naming %}
                   {% trans 'Rebuild Custom Web Report Source'%}
                 {% else %}
@@ -85,7 +90,8 @@ <h4><i class="fa-solid fa-triangle-exclamation"></i>
               </a>
             </li>
             <li>
-              <a class="submit-dropdown-form"
+              <a id="gtm-rebuild-in-place-btn"
+                 class="submit-dropdown-form"
                  href=""
                  data-action="{% url 'build_in_place' domain data_source.get_id %}">
                 {% trans 'Rebuild Table in Place' %}
@@ -226,7 +232,11 @@ <h4 class="modal-title">
               <button type="button" class="btn btn-default" data-dismiss="modal">
                 {% trans "Cancel" %}
               </button>
-              <button type="submit" value="{% trans 'Confirm'%}" class="disable-on-submit btn btn-danger">{% trans 'Confirm'%}</button>
+              <button id="gtm-rebuild-ds-confirm"
+                      class="disable-on-submit btn btn-danger"
+                      type="submit">
+                  {% trans 'Confirm'%}
+              </button>
             </div>
           </form>
         </div>
diff --git a/corehq/apps/userreports/templates/userreports/reportbuilder/configure_report.html b/corehq/apps/userreports/templates/userreports/reportbuilder/configure_report.html
index 0100d0c77672..8f1557f81331 100644
--- a/corehq/apps/userreports/templates/userreports/reportbuilder/configure_report.html
+++ b/corehq/apps/userreports/templates/userreports/reportbuilder/configure_report.html
@@ -9,7 +9,6 @@
       height: 350px;
     }
   </style>
-  {% include 'analytics/fullstory.html' %}
 {% endblock %}
 
 {% block js %}{{ block.super }}
diff --git a/corehq/apps/userreports/templates/userreports/reportbuilder/data_source_select.html b/corehq/apps/userreports/templates/userreports/reportbuilder/data_source_select.html
index 150603e3d69a..1956cf944347 100644
--- a/corehq/apps/userreports/templates/userreports/reportbuilder/data_source_select.html
+++ b/corehq/apps/userreports/templates/userreports/reportbuilder/data_source_select.html
@@ -4,10 +4,6 @@
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
 
-{% block head %}{{ block.super }}
-  {% include 'analytics/fullstory.html' %}
-{% endblock %}
-
 {% block js %}{{ block.super }}
   {% compress js %}
   <script src="{% static 'userreports/js/data_source_select_model.js' %}"></script>
diff --git a/corehq/apps/userreports/templates/userreports/ucr_expressions.html b/corehq/apps/userreports/templates/userreports/ucr_expressions.html
index f2c3b8fef483..d66ef472a830 100644
--- a/corehq/apps/userreports/templates/userreports/ucr_expressions.html
+++ b/corehq/apps/userreports/templates/userreports/ucr_expressions.html
@@ -33,11 +33,60 @@ <h3 data-bind="text: name"></h3>
                 data-bind="attr: {href: edit_url}">
             {% trans "Update Expression" %}
         </a>
+        <button type="button"
+                data-toggle="modal"
+                data-bind="attr: {'data-target': '#delete-expression-' + id}"
+                class="btn btn-danger">
+          <i class="fa fa-remove"></i> {% trans 'Remove' %}
+        </button>
         <a class="btn btn-primary"
                 href="{% url 'domain_links' domain %}"
                 data-bind="visible: upstream_id">
             {% trans "Linked Project Spaces" %}
         </a>
+
+        <div class="modal fade" data-bind="attr: {id: 'delete-expression-' + id}">
+          <div class="modal-dialog">
+            <div class="modal-content">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">
+                  {% blocktrans %}
+                    Delete expression <strong data-bind="text: name"></strong>?
+                  {% endblocktrans %}
+                </h4>
+              </div>
+              <div class="modal-body">
+                <p>
+                  {% blocktrans %}
+                    Yes, delete the <strong data-bind="text: name"></strong> expression.
+                  {% endblocktrans %}
+                </p>
+              </div>
+              <div class="modal-footer">
+                <button type="button"
+                        class="btn btn-default"
+                        data-dismiss="modal">
+                  {% trans 'Cancel' %}
+                </button>
+                <button type="button"
+                        class="btn btn-danger delete-item-confirm"
+                        data-loading-text="{% trans 'Deleting Expression...' %}">
+                  <i class="fa fa-remove"></i> {% trans 'Delete Expression' %}
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
     </td>
 </script>
+
+<script type="text/html" id="deleted-ucr-statement-template">
+  <td class="col-sm-8">
+    <a data-bind="text: name"></a>
+  </td>
+  <td class="col-sm-4">
+    <span class="label label-default">{% trans 'Deleted' %}</span>
+  </td>
+</script>
 {% endblock %}
diff --git a/corehq/apps/userreports/tests/test_adapters.py b/corehq/apps/userreports/tests/test_adapters.py
index dbb5160394ab..e4354d70420b 100644
--- a/corehq/apps/userreports/tests/test_adapters.py
+++ b/corehq/apps/userreports/tests/test_adapters.py
@@ -46,6 +46,7 @@ def test_bulk_delete_table_exists(self, register_data_source_row_change_mock):
 
         docs = [{'_id': '1'}]
         adapter.build_table()
+        self.addCleanup(adapter.drop_table)
         self.assertTrue(adapter.table_exists)
 
         adapter.bulk_delete(docs)
diff --git a/corehq/apps/userreports/tests/test_data_source_repeats.py b/corehq/apps/userreports/tests/test_data_source_repeats.py
index c9ed55d72b7f..ad6f2ee56303 100644
--- a/corehq/apps/userreports/tests/test_data_source_repeats.py
+++ b/corehq/apps/userreports/tests/test_data_source_repeats.py
@@ -1,11 +1,8 @@
 import datetime
-import json
-import os
 from unittest.mock import MagicMock, patch
 
 from django.test import SimpleTestCase, TestCase
 
-from corehq.apps.userreports.models import DataSourceConfiguration
 from corehq.apps.userreports.tests.utils import get_data_source_with_repeat
 from corehq.apps.userreports.util import get_indicator_adapter
 
@@ -19,7 +16,8 @@ def setUp(self):
         self.config = get_data_source_with_repeat()
 
 
-@patch('corehq.apps.userreports.models.AllowedUCRExpressionSettings.disallowed_ucr_expressions', MagicMock(return_value=[]))
+@patch('corehq.apps.userreports.models.AllowedUCRExpressionSettings.disallowed_ucr_expressions',
+       MagicMock(return_value=[]))
 class RepeatDataSourceConfigurationTest(RepeatDataSourceTestMixin, SimpleTestCase):
 
     def test_test_doc_matches(self):
@@ -76,6 +74,7 @@ class RepeatDataSourceBuildTest(RepeatDataSourceTestMixin, TestCase):
 
     def test_table_population(self):
         adapter = get_indicator_adapter(self.config)
+        self.addCleanup(adapter.drop_table)
         # Delete and create table
         adapter.rebuild_table()
 
diff --git a/corehq/apps/userreports/tests/test_expressions.py b/corehq/apps/userreports/tests/test_expressions.py
index c94a4e833d25..421d979d1531 100644
--- a/corehq/apps/userreports/tests/test_expressions.py
+++ b/corehq/apps/userreports/tests/test_expressions.py
@@ -11,6 +11,7 @@
 from casexml.apps.case.const import CASE_INDEX_EXTENSION
 from casexml.apps.case.mock import CaseFactory, CaseIndex, CaseStructure
 from casexml.apps.case.tests.util import delete_all_cases, delete_all_xforms
+from corehq.apps.domain.models import Domain
 
 from corehq.apps.groups.models import Group
 from corehq.apps.userreports.decorators import ucr_context_cache
@@ -1255,6 +1256,305 @@ def test_value_expressions(self):
             )
 
 
+class TestRelatedDocExpressionWebUser(TestCase):
+    domain = 'test-webuser-domain'
+
+    def setUp(self):
+        domain_obj = Domain(name=self.domain, is_active=True)
+        domain_obj.save()
+        self.addCleanup(domain_obj.delete)
+        self.user = WebUser.create(self.domain, 'user', '***', None, None)
+        self.addCleanup(self.user.delete, None, None)
+
+    def test_web_user(self):
+        doc = {
+            'related_user_id': self.user._id,
+            'domain': self.domain,
+        }
+        evaluation_context = EvaluationContext(doc, 0)
+
+        expression = ExpressionFactory.from_spec({
+            'type': 'related_doc',
+            'related_doc_type': 'CommCareUser',
+            'doc_id_expression': {
+                'type': 'property_name',
+                'property_name': 'related_user_id'
+            },
+            'value_expression': {
+                'type': 'property_name',
+                'property_name': 'username',
+            },
+        })
+        value = expression(doc, evaluation_context)
+        self.assertIsNone(value)
+
+
+class RelatedCaseExpressionTest(SimpleTestCase):
+
+    case_id_expr_spec = {
+        'type': 'related_case',
+        'case_id_expression': {
+            'type': 'property_name',
+            'property_name': 'parent_id'
+        },
+        'value_expression': {
+            'type': 'property_name',
+            'property_name': 'related_property'
+        }
+    }
+
+    ext_id_expr_spec = {
+        'type': 'related_case',
+        'external_id_expression': {
+            'type': 'property_name',
+            'property_name': 'parent_external_id'
+        },
+        'value_expression': {
+            'type': 'property_name',
+            'property_name': 'related_property'
+        }
+    }
+
+    nested_expr_spec = {
+        "type": "related_case",
+        "case_id_expression": {
+            "type": "property_name",
+            "property_name": "parent_id"
+        },
+        "value_expression": {
+            "type": "related_case",
+            "external_id_expression": {
+                "type": "property_name",
+                "property_name": "parent_external_id"
+            },
+            "value_expression": {
+                "type": "property_name",
+                "property_name": "related_property"
+            }
+        }
+    }
+
+    def setUp(self):
+
+        def get_case(case_id, domain):
+            doc = self.database.get(case_id)
+            if doc is None:
+                raise CaseNotFound
+            return Config(to_json=lambda: doc)
+
+        def get_case_by_external_id(domain, external_id, raise_multiple):
+            doc = self.database.get(external_id)
+            if doc is None:
+                raise CaseNotFound
+            return Config(to_json=lambda: doc)
+
+        get_case_patch = patch.object(CommCareCase.objects, 'get_case', get_case)
+        get_case_patch.start()
+        self.addCleanup(get_case_patch.stop)
+
+        get_case_by_external_id_patch = patch.object(
+            CommCareCase.objects,
+            'get_case_by_external_id',
+            get_case_by_external_id,
+        )
+        get_case_by_external_id_patch.start()
+        self.addCleanup(get_case_by_external_id_patch.stop)
+
+        self.database = {}
+
+    def test_lookup_by_case_id(self):
+        case_id_expression = ExpressionFactory.from_spec(self.case_id_expr_spec)
+        related_case_id = 'related-case-id'
+        related_case = {
+            'domain': 'test-domain',
+            'related_property': 'foo'
+        }
+        my_case = {
+            'domain': 'test-domain',
+            'parent_id': related_case_id,
+        }
+        self.database = {
+            'my-id': my_case,
+            related_case_id: related_case
+        }
+        my_context = EvaluationContext(my_case, 0)
+        self.assertEqual(case_id_expression(my_case, my_context), 'foo')
+
+    def test_lookup_by_external_id(self):
+        ext_id_expression = ExpressionFactory.from_spec(self.ext_id_expr_spec)
+        related_external_id = 'related-external-id'
+        related_case = {
+            'domain': 'test-domain',
+            'related_property': 'foo'
+        }
+        my_case = {
+            'domain': 'test-domain',
+            'parent_external_id': related_external_id,
+        }
+        self.database = {
+            'my-id': my_case,
+            related_external_id: related_case
+        }
+        my_context = EvaluationContext(my_case, 0)
+        self.assertEqual(ext_id_expression(my_case, my_context), 'foo')
+
+    def test_both_ids_spec(self):
+        both_ids_spec = {
+            'type': 'related_case',
+            'case_id_expression': {
+                'type': 'property_name',
+                'property_name': 'parent_id'
+            },
+            'external_id_expression': {
+                'type': 'property_name',
+                'property_name': 'parent_external_id'
+            },
+            'value_expression': {
+                'type': 'property_name',
+                'property_name': 'related_property'
+            }
+        }
+        with self.assertRaises(BadSpecError):
+            ExpressionFactory.from_spec(both_ids_spec)
+
+    def test_neither_ids_spec(self):
+        neither_ids_spec = {
+            'type': 'related_case',
+            'value_expression': {
+                'type': 'property_name',
+                'property_name': 'related_property'
+            }
+        }
+        with self.assertRaises(BadSpecError):
+            ExpressionFactory.from_spec(neither_ids_spec)
+
+    def test_related_case_id_not_found(self):
+        case_id_expression = ExpressionFactory.from_spec(self.case_id_expr_spec)
+        my_case = {
+            'domain': 'test-domain',
+            'parent_id': 'some-missing-id',
+        }
+        my_context = EvaluationContext(my_case, 0)
+        self.assertIsNone(case_id_expression(my_case, my_context))
+
+    def test_related_external_id_not_found(self):
+        ext_id_expression = ExpressionFactory.from_spec(self.ext_id_expr_spec)
+        my_case = {
+            'domain': 'test-domain',
+            'parent_external_id': 'some-missing-id',
+        }
+        my_context = EvaluationContext(my_case, 0)
+        self.assertIsNone(ext_id_expression(my_case, my_context))
+
+    def test_cross_domain_case_id_lookup(self):
+        case_id_expression = ExpressionFactory.from_spec(self.case_id_expr_spec)
+        related_id = 'cross-domain-id'
+        related_case = {
+            'domain': 'wrong-domain',
+            'related_property': 'foo'
+        }
+        my_case = {
+            'domain': 'test-domain',
+            'parent_id': related_id,
+        }
+        self.database = {
+            'my-id': my_case,
+            related_id: related_case
+        }
+        my_context = EvaluationContext(my_case, 0)
+        self.assertIsNone(case_id_expression(my_case, my_context))
+
+    def test_cross_domain_external_id_lookup(self):
+        ext_id_expression = ExpressionFactory.from_spec(self.ext_id_expr_spec)
+        related_id = 'cross-domain-id'
+        related_case = {
+            'domain': 'wrong-domain',
+            'related_property': 'foo'
+        }
+        my_case = {
+            'domain': 'test-domain',
+            'parent_external_id': related_id,
+        }
+        self.database = {
+            'my-id': my_case,
+            related_id: related_case
+        }
+        my_context = EvaluationContext(my_case, 0)
+        self.assertIsNone(ext_id_expression(my_case, my_context))
+
+    def test_nested_lookup(self):
+        nested_expression = ExpressionFactory.from_spec(self.nested_expr_spec)
+
+        related_external_id = 'nested-external-id'
+        related_case_2 = {
+            'domain': 'test-domain',
+            'related_property': 'bar',
+        }
+
+        related_case_id = 'nested-case-id'
+        related_case_1 = {
+            'domain': 'test-domain',
+            'parent_external_id': related_external_id,
+            'related_property': 'foo',
+        }
+
+        my_case = {
+            'domain': 'test-domain',
+            'parent_id': related_case_id,
+        }
+
+        self.database = {
+            'my-id': my_case,
+            related_case_id: related_case_1,
+            related_external_id: related_case_2
+        }
+
+        my_context = EvaluationContext(my_case, 0)
+        self.assertEqual('bar', nested_expression(my_case, my_context))
+
+    def test_nested_lookup_cross_domains(self):
+        nested_expression = ExpressionFactory.from_spec(self.nested_expr_spec)
+
+        related_external_id = 'nested-external-id'
+        related_case_2 = {
+            'domain': 'wrong-domain',
+            'related_property': 'bar',
+        }
+
+        related_case_id = 'nested-case-id'
+        related_case_1 = {
+            'domain': 'test-domain',
+            'parent_external_id': related_external_id,
+            'related_property': 'foo',
+        }
+
+        my_case = {
+            'domain': 'test-domain',
+            'parent_id': related_case_id,
+        }
+
+        self.database = {
+            'my-id': my_case,
+            related_case_id: related_case_1,
+            related_external_id: related_case_2
+        }
+
+        my_context = EvaluationContext(my_case, 0)
+        self.assertIsNone(nested_expression(my_case, my_context))
+
+    def test_caching(self):
+        case_id_expression = ExpressionFactory.from_spec(self.case_id_expr_spec)
+        self.test_lookup_by_case_id()
+
+        my_case = self.database.get('my-id')
+        my_context = EvaluationContext(my_case, 0)
+        self.assertEqual('foo', case_id_expression(my_case, my_context))
+
+        my_case = self.database.get('my-id')
+        self.database.clear()
+        self.assertEqual('foo', case_id_expression(my_case, my_context))
+
+
 class TestFormsExpressionSpec(TestCase):
 
     @classmethod
diff --git a/corehq/apps/userreports/tests/test_pillow.py b/corehq/apps/userreports/tests/test_pillow.py
index 61a4ff6c77ab..3b97074ae699 100644
--- a/corehq/apps/userreports/tests/test_pillow.py
+++ b/corehq/apps/userreports/tests/test_pillow.py
@@ -197,11 +197,9 @@ def test_bad_spec_error(self, _):
         }
         data_source_1.save()
         del ExpressionFactory.spec_map["missing_expression"]
-        ds_1_domain = data_source_1.domain
         table_manager = ConfigurableReportTableManager([DynamicDataSourceProvider()])
         table_manager.bootstrap()
-        self.assertEqual(0, len(table_manager.table_adapters_by_domain))
-        self.assertEqual(0, len(table_manager.table_adapters_by_domain[ds_1_domain]))
+        self.assertEqual(dict(table_manager.table_adapters_by_domain), {})
 
     def _copy_data_source(self, data_source):
         data_source_json = data_source.to_json()
diff --git a/corehq/apps/userreports/tests/test_registry_pillow.py b/corehq/apps/userreports/tests/test_registry_pillow.py
index 68ee5a539dad..c32903f51d49 100644
--- a/corehq/apps/userreports/tests/test_registry_pillow.py
+++ b/corehq/apps/userreports/tests/test_registry_pillow.py
@@ -6,13 +6,11 @@
 from casexml.apps.case.tests.util import delete_all_cases, delete_all_xforms
 from corehq.apps.domain.shortcuts import create_user
 from corehq.apps.registry.tests.utils import create_registry_for_test, Invitation, Grant
-from corehq.apps.userreports.models import (
-    RegistryDataSourceConfiguration
-)
 from corehq.apps.userreports.pillow import (
     RegistryDataSourceTableManager, get_kafka_ucr_registry_pillow,
 )
 from corehq.apps.userreports.tests.utils import (
+    cleanup_ucr,
     get_sample_registry_data_source,
 )
 from corehq.apps.userreports.util import get_indicator_adapter
@@ -37,10 +35,6 @@ def setUpTestData(cls):
             Invitation(cls.domain), Invitation("other-domain"),
         ], grants=[Grant("other-domain", to_domains=[cls.domain])], name='bazz')
 
-    def tearDown(self):
-        for config in RegistryDataSourceConfiguration.all():
-            config.get_db().delete_doc(config.get_id)
-
     def test_bootstrap(self, ignored_mock):
         self._bootstrap_manager_with_data_source()
 
@@ -50,6 +44,7 @@ def test_ignore_migrating_domains(self, mock_domains_with_migrations):
         data_source_1.save()
         table_manager = RegistryDataSourceTableManager()
         table_manager.bootstrap([data_source_1])
+        self.addCleanup(cleanup_ucr, data_source_1)
         # the "user-reports" domain is excluded because it has a migration in progress
         self.assertEqual({"granted-domain"}, table_manager.relevant_domains)
 
@@ -67,6 +62,7 @@ def test_update_modified_since_add_adapter_same_domain(self, ignored_mock):
         data_source_2 = get_sample_registry_data_source(domain=self.domain, registry_slug=self.registry_1.slug)
         data_source_2.save()
         table_manager._add_or_update_data_source(data_source_2)
+        self.addCleanup(cleanup_ucr, data_source_2)
         expected_domains = {self.domain, "granted-domain"}
         self.assertEqual(expected_domains, table_manager.relevant_domains)
         for domain in expected_domains:
@@ -81,6 +77,7 @@ def test_update_modified_since_add_adapter_different_domain(self, ignored_mock):
         data_source_2 = get_sample_registry_data_source(domain=self.domain, registry_slug=self.registry_2.slug)
         data_source_2.save()
         table_manager._add_or_update_data_source(data_source_2)
+        self.addCleanup(cleanup_ucr, data_source_2)
         expected_domains = {self.domain, "granted-domain", "other-domain"}
         self.assertEqual(expected_domains, table_manager.relevant_domains)
 
@@ -115,6 +112,7 @@ def test_update_modified_since_refresh_same_configs(self, ignored_mock):
     def _bootstrap_manager_with_data_source(self):
         data_source_1 = get_sample_registry_data_source(domain=self.domain, registry_slug=self.registry_1.slug)
         data_source_1.save()
+        self.addCleanup(cleanup_ucr, data_source_1)
         table_manager = RegistryDataSourceTableManager()
         table_manager.bootstrap([data_source_1])
 
@@ -161,16 +159,12 @@ def setUpClass(cls):
             domain=cls.participator_1, registry_slug=cls.registry_1.slug
         )
         cls.config.save()
+        cls.addClassCleanup(cls.config.delete)
         cls.adapter = get_indicator_adapter(cls.config)
         cls.adapter.build_table()
+        cls.addClassCleanup(cls.adapter.drop_table)
         cls.pillow = get_kafka_ucr_registry_pillow(ucr_configs=[cls.config], processor_chunk_size=100)
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.config.delete()
-        cls.adapter.drop_table()
-        super().tearDownClass()
-
     def tearDown(self):
         self.adapter.clear_table()
         delete_all_cases()
diff --git a/corehq/apps/userreports/tests/test_utils.py b/corehq/apps/userreports/tests/test_utils.py
index bb7fc89948fd..9bc859eb52ca 100644
--- a/corehq/apps/userreports/tests/test_utils.py
+++ b/corehq/apps/userreports/tests/test_utils.py
@@ -1,5 +1,6 @@
 from django.test import SimpleTestCase
 
+import pytest
 from testil import eq
 
 from dimagi.utils.couch.undo import remove_deleted_doc_type_suffix
@@ -90,15 +91,13 @@ def test_column_length_with_suffix(self):
         )
 
 
-def test_remove_deleted_doc_type_suffix():
-    def _check(doc_type, expected):
-        eq(expected, remove_deleted_doc_type_suffix(doc_type))
-
-    yield from [
-        (_check, 'DataSource', 'DataSource'),
-        (_check, 'DataSource-Deleted', 'DataSource'),
-        (_check, 'DataSource-Deleted-Deleted', 'DataSource'),
-    ]
+@pytest.mark.parametrize("doc_type, expected", [
+    ('DataSource', 'DataSource'),
+    ('DataSource-Deleted', 'DataSource'),
+    ('DataSource-Deleted-Deleted', 'DataSource'),
+])
+def test_remove_deleted_doc_type_suffix(doc_type, expected):
+    eq(expected, remove_deleted_doc_type_suffix(doc_type))
 
 
 class TestGetDomainForUCRTableName(SimpleTestCase):
diff --git a/corehq/apps/userreports/tests/utils.py b/corehq/apps/userreports/tests/utils.py
index b4f0de547b92..2faef24697ae 100644
--- a/corehq/apps/userreports/tests/utils.py
+++ b/corehq/apps/userreports/tests/utils.py
@@ -19,6 +19,7 @@
     DataSourceConfiguration,
     ReportConfiguration, RegistryDataSourceConfiguration,
 )
+from corehq.apps.userreports.util import get_indicator_adapter
 from corehq.sql_db.connections import connection_manager
 
 
@@ -36,6 +37,13 @@ def get_sample_registry_data_source(**kwargs):
     return _get_sample_doc('sample_registry_data_source.json', RegistryDataSourceConfiguration, **kwargs)
 
 
+def cleanup_ucr(data_source):
+    try:
+        get_indicator_adapter(data_source).drop_table()
+    finally:
+        data_source.delete()
+
+
 def get_data_source_with_related_doc_type():
     return _get_sample_doc('parent_child_data_source.json', DataSourceConfiguration)
 
diff --git a/corehq/apps/userreports/ui/fields.py b/corehq/apps/userreports/ui/fields.py
index 492ba88edcd5..f6d616133e10 100644
--- a/corehq/apps/userreports/ui/fields.py
+++ b/corehq/apps/userreports/ui/fields.py
@@ -52,14 +52,20 @@ def to_python(self, value):
             return value
 
         val = super(JsonField, self).to_python(value)
+        if val in self.null_values:
+            return val
+
         try:
             return json.loads(val)
-        except:
+        except Exception:
             raise forms.ValidationError(_('Please enter valid JSON. This is not valid: {}'.format(value)))
 
     def validate(self, value):
-        if value in self.null_values and self.required:
-            raise forms.ValidationError(self.error_messages['required'])
+        if value in self.null_values:
+            if self.required:
+                raise forms.ValidationError(self.error_messages['required'])
+            return
+
         if self.expected_type and not isinstance(value, self.expected_type):
             raise forms.ValidationError(
                 _('Expected {} but was {}').format(self.expected_type.__name__, type(value).__name__))
diff --git a/corehq/apps/userreports/ui/forms.py b/corehq/apps/userreports/ui/forms.py
index 405482337598..62779218f84f 100644
--- a/corehq/apps/userreports/ui/forms.py
+++ b/corehq/apps/userreports/ui/forms.py
@@ -231,6 +231,7 @@ def __init__(self, domain, data_source_config, read_only, *args, **kwargs):
                 twbscrispy.StrictButton(
                     _("Save"),
                     type="submit",
+                    css_id="gtm-save-ds-btn",
                     css_class="btn btn-primary",
                 ),
             ),
diff --git a/corehq/apps/userreports/views.py b/corehq/apps/userreports/views.py
index c6e3fb7c2853..897bbbecff4c 100644
--- a/corehq/apps/userreports/views.py
+++ b/corehq/apps/userreports/views.py
@@ -1208,6 +1208,10 @@ def post(self, request, *args, **kwargs):
                 messages.success(request, _('Data source "{}" saved!').format(
                     config.display_name
                 ))
+                messages.success(request, _(
+                    'This data source will be built/rebuilt automatically the '
+                    'next time a row is added.'
+                ))
                 if self.config_id is None:
                     return HttpResponseRedirect(reverse(
                         EditDataSourceView.urlname, args=[self.domain, config._id])
@@ -1319,7 +1323,7 @@ def rebuild_data_source(request, domain, config_id):
     config, is_static = get_datasource_config_or_404(config_id, domain)
 
     if toggles.RESTRICT_DATA_SOURCE_REBUILD.enabled(domain):
-        number_of_records = _number_of_records_to_be_iterated_for_rebuild(config=config)
+        number_of_records = _number_of_records_to_be_iterated_for_rebuild(datasource_configuration=config)
         if number_of_records and number_of_records > DATA_SOURCE_REBUILD_RESTRICTED_AT:
             messages.error(
                 request,
@@ -1346,23 +1350,31 @@ def rebuild_data_source(request, domain, config_id):
     ))
 
 
-def _number_of_records_to_be_iterated_for_rebuild(config):
-    count_of_records = None
-
-    case_types_or_xmlns = config.get_case_type_or_xmlns_filter()
-    # case_types_or_xmlns could also be [None]
-    case_types_or_xmlns = list(filter(None, case_types_or_xmlns))
-
-    if config.referenced_doc_type == 'CommCareCase':
-        if case_types_or_xmlns:
-            count_of_records = CaseSearchES().domain(config.domain).case_type(case_types_or_xmlns).count()
-        else:
-            count_of_records = CaseSearchES().domain(config.domain).count()
-    elif config.referenced_doc_type == 'XFormInstance':
-        if case_types_or_xmlns:
-            count_of_records = FormES().domain(config.domain).xmlns(case_types_or_xmlns).count()
-        else:
-            count_of_records = FormES().domain(config.domain).count()
+def _number_of_records_to_be_iterated_for_rebuild(datasource_configuration):
+    if datasource_configuration.referenced_doc_type == 'CommCareCase':
+        es_query = CaseSearchES().domain(datasource_configuration.domain)
+        case_types = [
+            case_type
+            for case_type in datasource_configuration.get_case_type_or_xmlns_filter()
+            if case_type is not None
+        ]
+        if case_types:
+            es_query = es_query.case_type(case_types)
+        count_of_records = es_query.count()
+    elif datasource_configuration.referenced_doc_type == 'XFormInstance':
+        es_query = FormES().domain(datasource_configuration.domain)
+        xmlnses = [
+            xmlns
+            for xmlns in datasource_configuration.get_case_type_or_xmlns_filter()
+            if xmlns is not None
+        ]
+        if xmlnses:
+            es_query = es_query.xmlns(xmlnses)
+        count_of_records = es_query.count()
+    else:
+        # DataSourceConfiguration.referenced_doc_type is neither
+        # 'CommCareCase' nor 'XFormInstance'
+        count_of_records = None
 
     return count_of_records
 
@@ -1424,9 +1436,12 @@ def build_data_source_in_place(request, domain, config_id):
             config.display_name
         )
     )
-    rebuild_indicators_in_place.delay(config_id, request.user.username,
-                                      source='edit_data_source_build_in_place',
-                                      domain=config.domain)
+    rebuild_indicators_in_place.delay(
+        config_id,
+        request.user.username,
+        source='edit_data_source_build_in_place',
+        domain=config.domain,
+    )
     return HttpResponseRedirect(reverse(
         EditDataSourceView.urlname, args=[domain, config._id]
     ))
@@ -1899,6 +1914,16 @@ def get_create_item_data(self, create_form):
             "template": "base-ucr-statement-template",
         }
 
+    def get_deleted_item_data(self, item_id):
+        deleted_expression = self.base_query.get(id=item_id)
+        deleted_expression.delete()
+        return {
+            'itemData': {
+                'name': deleted_expression.name,
+            },
+            'template': 'deleted-ucr-statement-template',
+        }
+
 
 @method_decorator(toggles.UCR_EXPRESSION_REGISTRY.required_decorator(), name='dispatch')
 class UCRExpressionEditView(BaseProjectDataView):
diff --git a/corehq/apps/users/forms.py b/corehq/apps/users/forms.py
index 33a1f686ddd5..b5c79e69f45e 100644
--- a/corehq/apps/users/forms.py
+++ b/corehq/apps/users/forms.py
@@ -57,12 +57,13 @@
 from corehq.apps.user_importer.helpers import UserChangeLogger
 from corehq.const import LOADTEST_HARD_LIMIT, USER_CHANGE_VIA_WEB
 from corehq.pillows.utils import MOBILE_USER_TYPE, WEB_USER_TYPE
+from corehq.feature_previews import USE_LOCATION_DISPLAY_NAME
 from corehq.toggles import (
     COMMCARE_CONNECT,
-    LOCATION_HAS_USERS,
     TWO_STAGE_USER_PROVISIONING,
     TWO_STAGE_USER_PROVISIONING_BY_SMS,
 )
+from corehq.util.global_request import get_request_domain
 
 from ..hqwebapp.signals import clear_login_attempts
 from .audit.change_messages import UserChangeMessage
@@ -793,7 +794,7 @@ def __init__(self, project, request_user, *args, **kwargs):
             location_field = crispy.Field(
                 'location_id',
                 data_bind='value: location_id',
-                data_query_url=reverse('location_search', args=[self.domain]),
+                data_query_url=reverse('location_search_has_users_only', args=[self.domain]),
             )
         else:
             location_field = crispy.Hidden(
@@ -1147,9 +1148,11 @@ def render(self, name, value, attrs=None, renderer=None):
         if value:
             try:
                 loc = SQLLocation.objects.get(location_id=value)
+                use_location_display_name = USE_LOCATION_DISPLAY_NAME.enabled(get_request_domain())
                 initial_data = {
                     'id': loc.location_id,
-                    'text': loc.get_path_display(),
+                    'text': loc.display_name if use_location_display_name else loc.get_path_display(),
+                    'title': loc.get_path_display() if use_location_display_name else loc.display_name,
                 }
             except SQLLocation.DoesNotExist:
                 pass
@@ -1183,7 +1186,7 @@ def __init__(self, domain: str, *args, **kwargs):
         self.domain = domain
         self.fields['assigned_locations'].widget = LocationSelectWidget(
             self.domain, multiselect=True, id='id_assigned_locations',
-            include_locations_with_no_users_allowed=False
+            for_user_location_selection=True
         )
         self.fields['assigned_locations'].help_text = ExpandedMobileWorkerFilter.location_search_help
         self.fields['primary_location'].widget = PrimaryLocationWidget(
@@ -1200,7 +1203,7 @@ def clean_assigned_locations(self):
             locations = get_locations_from_ids(location_ids, self.domain)
         except SQLLocation.DoesNotExist:
             raise forms.ValidationError(_('One or more of the locations was not found.'))
-        if LOCATION_HAS_USERS.enabled(self.domain) and locations.filter(location_type__has_users=False).exists():
+        if locations.filter(location_type__has_users=False).exists():
             raise forms.ValidationError(
                 _('One or more of the locations you specified cannot have users assigned.'))
         return [location.location_id for location in locations]
@@ -1657,7 +1660,7 @@ def __init__(self, *args, **kwargs):
             id='id_location_id',
             placeholder=_("All Locations"),
             attrs={'data-bind': 'value: location_id'},
-            include_locations_with_no_users_allowed=False
+            for_user_location_selection=True
         )
         self.fields['location_id'].widget.query_url = "{url}?show_all=true".format(
             url=self.fields['location_id'].widget.query_url
diff --git a/corehq/apps/users/management/commands/accept_invite.py b/corehq/apps/users/management/commands/accept_invite.py
index 3a44f191d5be..7141bfa7890a 100644
--- a/corehq/apps/users/management/commands/accept_invite.py
+++ b/corehq/apps/users/management/commands/accept_invite.py
@@ -30,6 +30,7 @@ def handle(self, username, domain, **options):
                                 invitation.assigned_locations.all().values_list('location_id', flat=True)),
                             program_id=invitation.program,
                             profile=invitation.profile,
+                            custom_user_data=invitation.custom_user_data,
                             tableau_role=invitation.tableau_role,
                             tableau_group_ids=invitation.tableau_group_ids)
         invitation.is_accepted = True
diff --git a/corehq/apps/users/migrations/0072_remove_invitation_supply_point.py b/corehq/apps/users/migrations/0072_remove_invitation_supply_point.py
new file mode 100644
index 000000000000..6001e27efebd
--- /dev/null
+++ b/corehq/apps/users/migrations/0072_remove_invitation_supply_point.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.15 on 2024-10-04 14:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0071_rm_user_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='invitation',
+            name='supply_point',
+        ),
+    ]
diff --git a/corehq/apps/users/migrations/0073_connectiduserlink_is_active.py b/corehq/apps/users/migrations/0073_connectiduserlink_is_active.py
new file mode 100644
index 000000000000..507db4fe21c8
--- /dev/null
+++ b/corehq/apps/users/migrations/0073_connectiduserlink_is_active.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.14 on 2024-08-12 09:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0072_remove_invitation_supply_point'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='connectiduserlink',
+            name='is_active',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/corehq/apps/users/models.py b/corehq/apps/users/models.py
index 6fcb8ff24f0f..23424ceb4d30 100644
--- a/corehq/apps/users/models.py
+++ b/corehq/apps/users/models.py
@@ -481,9 +481,9 @@ def _is_member_of(self, domain, allow_enterprise):
 
         if allow_enterprise:
             from corehq.apps.enterprise.models import EnterprisePermissions
-            config = EnterprisePermissions.get_by_domain(domain)
-            if config.is_enabled and domain in config.domains:
-                return self.is_member_of(config.source_domain, allow_enterprise=False)
+            source_domain = EnterprisePermissions.get_source_domain(domain)
+            if source_domain:
+                return self.is_member_of(source_domain, allow_enterprise=False)
 
         return False
 
@@ -520,9 +520,9 @@ def get_domain_membership(self, domain, allow_enterprise=True):
                 if domain in self.domains:
                     raise self.Inconsistent("Domain '%s' is in domain but not in domain_memberships" % domain)
                 from corehq.apps.enterprise.models import EnterprisePermissions
-                config = EnterprisePermissions.get_by_domain(domain)
-                if allow_enterprise and config.is_enabled and domain in config.domains:
-                    return self.get_domain_membership(config.source_domain, allow_enterprise=False)
+                source_domain = EnterprisePermissions.get_source_domain(domain)
+                if allow_enterprise and source_domain:
+                    return self.get_domain_membership(source_domain, allow_enterprise=False)
         except self.Inconsistent as e:
             logging.warning(e)
             self.domains = [d.domain for d in self.domain_memberships]
@@ -552,7 +552,7 @@ def add_domain_membership(self, domain, timezone=None, **kwargs):
 
     def add_as_web_user(self, domain, role, primary_location_id=None,
                         assigned_location_ids=None, program_id=None, profile=None,
-                        tableau_role=None, tableau_group_ids=None):
+                        tableau_role=None, tableau_group_ids=None, custom_user_data=None):
         if assigned_location_ids is None:
             assigned_location_ids = []
         domain_obj = Domain.get_by_name(domain)
@@ -564,9 +564,11 @@ def add_as_web_user(self, domain, role, primary_location_id=None,
             if primary_location_id:
                 self.set_location(domain, primary_location_id, commit=False)
             self.reset_locations(domain, assigned_location_ids, commit=False)
+        user_data = self.get_user_data(domain_obj.name)
         if domain_has_privilege(domain_obj.name, privileges.APP_USER_PROFILES) and profile:
-            user_data = self.get_user_data(domain_obj.name)
             user_data.update({}, profile_id=profile.id)
+        if custom_user_data:
+            user_data.update(custom_user_data)
         if TABLEAU_USER_SYNCING.enabled(domain) and (tableau_role or tableau_group_ids):
             if tableau_group_ids is None:
                 tableau_group_ids = []
@@ -1645,11 +1647,8 @@ def can_access_any_web_apps(self, domain=None):
         return False
 
     def can_view_some_tableau_viz(self, domain):
-        if not self.can_access_all_locations(domain):
-            return False
-
         from corehq.apps.reports.models import TableauVisualization
-        return self.can_view_tableau(domain) or bool(TableauVisualization.for_user(domain, self))
+        return bool(TableauVisualization.for_user(domain, self))
 
     def can_login_as(self, domain):
         return (
@@ -2063,7 +2062,11 @@ def set_groups(self, group_ids):
         touched = []
         faulty_groups = []
         for to_add in desired - current:
-            group = Group.get(to_add)
+            try:
+                group = Group.get(to_add)
+            except ResourceNotFound:
+                faulty_groups.append(to_add)
+                continue
             if group.domain != self.domain:
                 faulty_groups.append(to_add)
                 continue
@@ -2443,6 +2446,8 @@ def add_domain_membership(self, domain, timezone=None, **kwargs):
         super().add_domain_membership(domain, timezone, **kwargs)
 
     def delete_domain_membership(self, domain, create_record=False):
+        self._leaving_domains = getattr(self, '_leaving_domains', []) + [domain]
+
         if TABLEAU_USER_SYNCING.enabled(domain):
             from corehq.apps.reports.util import delete_tableau_user
             delete_tableau_user(domain, self.username)
@@ -2521,8 +2526,10 @@ def save(self, fire_signals=True, **params):
         super().save(fire_signals=fire_signals, **params)
         if fire_signals and not self.to_be_deleted():
             from corehq.apps.callcenter.tasks import sync_web_user_usercases_if_applicable
-            for domain in self.get_domains():
+            # We need to sync to all domains, even those the user is leaving
+            for domain in self.get_domains() + getattr(self, '_leaving_domains', []):
                 sync_web_user_usercases_if_applicable(self, domain)
+        self._leaving_domains = []
 
     def add_to_assigned_locations(self, domain, location):
         membership = self.get_domain_membership(domain)
@@ -2735,9 +2742,8 @@ class Invitation(models.Model):
     domain = models.CharField(max_length=255)
     role = models.CharField(max_length=100, null=True, blank=True)  # role qualified ID
     program = models.CharField(max_length=126, null=True, blank=True)   # couch id of a Program
-    supply_point = models.CharField(max_length=126, null=True, blank=True)  # couch id of a Location
     primary_location = models.ForeignKey("locations.SQLLocation", on_delete=models.SET_NULL,
-                                 to_field='location_id', null=True, blank=True)  # to replace supply_point
+                                 to_field='location_id', null=True, blank=True)
     assigned_locations = models.ManyToManyField("locations.SQLLocation", symmetrical=False,
                                                 related_name='invitations')
     profile = models.ForeignKey("custom_data_fields.CustomDataFieldsProfile",
@@ -2852,6 +2858,7 @@ def accept_invitation_and_join_domain(self, web_user):
             assigned_location_ids=list(self.assigned_locations.all().values_list('location_id', flat=True)),
             program_id=self.program,
             profile=self.profile,
+            custom_user_data=self.custom_user_data,
             tableau_role=self.tableau_role,
             tableau_group_ids=self.tableau_group_ids
         )
diff --git a/corehq/apps/users/static/users/js/enterprise_users.js b/corehq/apps/users/static/users/js/enterprise_users.js
index 69f56da94881..28b0617e4eb3 100644
--- a/corehq/apps/users/static/users/js/enterprise_users.js
+++ b/corehq/apps/users/static/users/js/enterprise_users.js
@@ -10,7 +10,8 @@ hqDefine("users/js/enterprise_users", [
     "underscore",
     "hqwebapp/js/initial_page_data",
     "users/js/web_users_list",
-    "hqwebapp/js/bootstrap3/components.ko",    // pagination and search box widgets
+    "hqwebapp/js/components/pagination",
+    "hqwebapp/js/components/search_box",
 ], function (
     $,
     ko,
diff --git a/corehq/apps/users/static/users/js/filtered_download.js b/corehq/apps/users/static/users/js/filtered_download.js
index 2201f395820a..4d8719fdd07b 100644
--- a/corehq/apps/users/static/users/js/filtered_download.js
+++ b/corehq/apps/users/static/users/js/filtered_download.js
@@ -5,7 +5,7 @@ hqDefine('users/js/filtered_download', [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/bootstrap3/widgets',      // role selection
     'locations/js/widgets',     // location search
-    'hqwebapp/js/bootstrap3/components.ko',    // select toggle widget
+    'hqwebapp/js/components/select_toggle',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // slideVisible binding
 ], function (
     $,
diff --git a/corehq/apps/users/static/users/js/invite_web_user.js b/corehq/apps/users/static/users/js/invite_web_user.js
index 4d60a353634a..6ebbf3773062 100644
--- a/corehq/apps/users/static/users/js/invite_web_user.js
+++ b/corehq/apps/users/static/users/js/invite_web_user.js
@@ -2,12 +2,16 @@ hqDefine('users/js/invite_web_user',[
     'jquery',
     'knockout',
     'hqwebapp/js/initial_page_data',
+    'users/js/custom_data_fields',
+    'hqwebapp/js/toggles',
     'hqwebapp/js/bootstrap3/validators.ko',
     'locations/js/widgets',
 ], function (
     $,
     ko,
-    initialPageData
+    initialPageData,
+    customDataFields,
+    toggles
 ) {
     'use strict';
 
@@ -68,6 +72,15 @@ hqDefine('users/js/invite_web_user',[
                 && self.emailDelayed.isValid()
                 && !self.emailDelayed.isValidating();
         });
+        var $customDataFieldsForm = $(".custom-data-fieldset");
+        if ($customDataFieldsForm.length) {
+            self.custom_fields = customDataFields.customDataFieldsEditor({
+                profiles: initialPageData.get('custom_fields_profiles'),
+                profile_slug: initialPageData.get('custom_fields_profile_slug'),
+                slugs: initialPageData.get('custom_fields_slugs'),
+                can_edit_original_profile: true,
+            });
+        }
 
         return self;
     };
diff --git a/corehq/apps/users/static/users/js/mobile_workers.js b/corehq/apps/users/static/users/js/mobile_workers.js
index 82eb1d1be8b4..97661472e580 100644
--- a/corehq/apps/users/static/users/js/mobile_workers.js
+++ b/corehq/apps/users/static/users/js/mobile_workers.js
@@ -28,7 +28,8 @@ hqDefine("users/js/mobile_workers",[
     'zxcvbn/dist/zxcvbn',
     'locations/js/widgets',
     'users/js/custom_data_fields',
-    'hqwebapp/js/bootstrap3/components.ko', // for pagination
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
     'hqwebapp/js/bootstrap3/validators.ko', // email address validation
     'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
 ], function (
diff --git a/corehq/apps/users/static/users/js/web_users.js b/corehq/apps/users/static/users/js/web_users.js
index 3305bc4b0352..6974b42e0947 100644
--- a/corehq/apps/users/static/users/js/web_users.js
+++ b/corehq/apps/users/static/users/js/web_users.js
@@ -9,7 +9,8 @@ hqDefine("users/js/web_users",[
     "hqwebapp/js/assert_properties",
     "hqwebapp/js/initial_page_data",
     "users/js/web_users_list",
-    'hqwebapp/js/bootstrap3/components.ko',    // pagination and search box widgets
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // for modals
 ], function ($, ko, _, moment, assertProperties, initialPageData, webUsersList) {
 
diff --git a/corehq/apps/users/static/users/js/web_users_list.js b/corehq/apps/users/static/users/js/web_users_list.js
index f7635a57deec..1c9077dabeb9 100644
--- a/corehq/apps/users/static/users/js/web_users_list.js
+++ b/corehq/apps/users/static/users/js/web_users_list.js
@@ -10,7 +10,8 @@ hqDefine("users/js/web_users_list", [
     "knockout",
     "underscore",
     "hqwebapp/js/assert_properties",
-    "hqwebapp/js/bootstrap3/components.ko",    // pagination and search box widgets
+    "hqwebapp/js/components/pagination",
+    "hqwebapp/js/components/search_box",
 ], function (
     $,
     ko,
diff --git a/corehq/apps/users/templates/users/invite_web_user.html b/corehq/apps/users/templates/users/invite_web_user.html
index 925cebe6a858..52efd230b922 100644
--- a/corehq/apps/users/templates/users/invite_web_user.html
+++ b/corehq/apps/users/templates/users/invite_web_user.html
@@ -6,6 +6,9 @@
 {% requirejs_main 'users/js/invite_web_user' %}
 
 {% block page_content %}
+  {% initial_page_data 'custom_fields_slugs' custom_fields_slugs %}
+  {% initial_page_data 'custom_fields_profiles' custom_fields_profiles %}
+  {% initial_page_data 'custom_fields_profile_slug' custom_fields_profile_slug %}
   {% registerurl "check_sso_trust" domain %}
 
   <div id="invite-web-user-form"
diff --git a/corehq/apps/users/templates/users/mobile_workers.html b/corehq/apps/users/templates/users/mobile_workers.html
index 72cd3e8f5e2d..25121816b146 100644
--- a/corehq/apps/users/templates/users/mobile_workers.html
+++ b/corehq/apps/users/templates/users/mobile_workers.html
@@ -76,11 +76,11 @@
             {% if request|request_has_privilege:"FILTERED_BULK_USER_DOWNLOAD" %}
               <a class="btn btn-danger" href="{% url "delete_commcare_users" domain %}">
                 <i class="fa-regular fa-trash-can"></i>
-                {% trans "Bulk Delete Users" %}
+                {% trans "Bulk Delete Mobile Workers" %}
               </a>
               <a class="btn btn-default" href="{% url "commcare_users_lookup" domain %}">
                 <i class="fa fa-search"></i>
-                {% trans "Bulk Lookup of Users" %}
+                {% trans "Bulk Lookup of Mobile Workers" %}
               </a>
             {% endif %}
           {% endif %}
diff --git a/corehq/apps/users/tests/test_authorization.py b/corehq/apps/users/tests/test_authorization.py
index 1a3e1790dc63..958e21794e96 100644
--- a/corehq/apps/users/tests/test_authorization.py
+++ b/corehq/apps/users/tests/test_authorization.py
@@ -2,7 +2,7 @@
 
 from decorator import contextmanager
 from django.test import TestCase
-from nose.tools import nottest, istest
+from django.utils.functional import classproperty
 
 from corehq.apps.domain.models import Domain
 from corehq.apps.domain.shortcuts import create_domain
@@ -11,9 +11,12 @@
 from corehq.apps.users.role_utils import UserRolePresets
 
 
-@nottest
 class BaseAuthorizationTest(TestCase):
 
+    @classproperty
+    def __test__(cls):
+        return cls is not BaseAuthorizationTest
+
     @classmethod
     def setUpTestData(cls):
         cls.domain = 'my-domain'
@@ -141,7 +144,6 @@ def test_has_permission__default_yes__null_domain(self):
         self.assertFalse(self.user.has_permission(None, 'report_an_issue'))
 
 
-@istest
 class TestMobileUserAuthorizationFunctions(BaseAuthorizationTest):
     @classmethod
     def _create_user(cls, domain):
@@ -164,7 +166,6 @@ def test_is_domain_admin__admin_role(self):
             self.assertFalse(self.user.is_domain_admin(self.domain))
 
 
-@istest
 class TestWebUserAuthorizationFunctions(BaseAuthorizationTest):
     @classmethod
     def _create_user(cls, domain):
@@ -177,7 +178,6 @@ def _create_user(cls, domain):
         )
 
 
-@istest
 class TestSuperUserAuthorizationFunctions(BaseAuthorizationTest):
     @classmethod
     def _create_user(cls, domain):
diff --git a/corehq/apps/users/tests/test_signals.py b/corehq/apps/users/tests/test_signals.py
index 0a206fbcfdb0..13df903878ca 100644
--- a/corehq/apps/users/tests/test_signals.py
+++ b/corehq/apps/users/tests/test_signals.py
@@ -10,6 +10,7 @@
 from corehq.apps.es.users import user_adapter
 from corehq.apps.reports.analytics.esaccessors import get_user_stubs
 from corehq.apps.users.tests.util import patch_user_data_db_layer
+from corehq.tests.util.context import add_context
 from corehq.util.es.testing import sync_users_to_es
 from corehq.util.test_utils import mock_out_couch
 
@@ -58,7 +59,6 @@ def test_webuser_save(self, send_to_es, invalidate, sync_usercases,
 
 
 @mock_out_couch()
-@patch_user_data_db_layer()
 @patch('corehq.apps.users.models.CouchUser.sync_to_django_user', new=MagicMock)
 @patch('corehq.apps.analytics.signals.update_hubspot_properties')
 @patch('corehq.apps.callcenter.tasks.sync_usercases')
@@ -66,6 +66,9 @@ def test_webuser_save(self, send_to_es, invalidate, sync_usercases,
 @es_test(requires=[user_adapter], setup_class=True)
 class TestUserSyncToEs(SimpleTestCase):
 
+    def setUp(self):
+        add_context(patch_user_data_db_layer(), self)
+
     @sync_users_to_es()
     def test_sync_to_es_create_update_delete(self, *mocks):
         domain = 'user_es_domain'
diff --git a/corehq/apps/users/tests/test_tasks.py b/corehq/apps/users/tests/test_tasks.py
index 570690cec7ee..5046e361ae2a 100644
--- a/corehq/apps/users/tests/test_tasks.py
+++ b/corehq/apps/users/tests/test_tasks.py
@@ -38,7 +38,9 @@ def setUpClass(cls):
 
         # Set up domains
         cls.domain = create_domain('test')
+        cls.addClassCleanup(cls.domain.delete)
         cls.mirror_domain = create_domain('mirror')
+        cls.addClassCleanup(cls.mirror_domain.delete)
         create_enterprise_permissions('web@web.com', 'test', ['mirror'])
 
         # Set up user
@@ -49,17 +51,11 @@ def setUpClass(cls):
             created_by=None,
             created_via=None,
         )
+        cls.addClassCleanup(cls.web_user.delete, None, None)
 
         cls.today = datetime.today().date()
         cls.last_week = cls.today - timedelta(days=7)
 
-    @classmethod
-    def tearDownClass(cls):
-        delete_all_users()
-        cls.domain.delete()
-        cls.mirror_domain.delete()
-        super().tearDownClass()
-
     def _last_accessed(self, user, domain):
         domain_membership = user.get_domain_membership(domain, allow_enterprise=False)
         if domain_membership:
diff --git a/corehq/apps/users/tests/util.py b/corehq/apps/users/tests/util.py
index 0e51958f4708..aa9385d1d6f3 100644
--- a/corehq/apps/users/tests/util.py
+++ b/corehq/apps/users/tests/util.py
@@ -32,6 +32,12 @@ def __init__(self, user_schema=None):
         self.init_patcher = None
         self.schema_patcher = None
 
+    def __call__(self, func):
+        if isinstance(func, type):
+            raise NotImplementedError(
+                f"this decorator can only be used to wrap test functions (got: {func})")
+        return super().__call__(func)
+
     def __enter__(self):
         self.init_patcher = patch(
             'corehq.apps.users.user_data.UserData.for_user', new=lambda u, d: UserData({}, None, d))
diff --git a/corehq/apps/users/views/__init__.py b/corehq/apps/users/views/__init__.py
index 7487dd8ca15e..eaae7df73eb5 100644
--- a/corehq/apps/users/views/__init__.py
+++ b/corehq/apps/users/views/__init__.py
@@ -11,6 +11,7 @@
 from crispy_forms.utils import render_crispy_form
 
 from corehq.apps.cloudcare.dbaccessors import get_cloudcare_apps
+from corehq.apps.custom_data_fields.edit_entity import CustomDataEditor
 from corehq.apps.custom_data_fields.models import CustomDataFieldsProfile, CustomDataFieldsDefinition
 from corehq.apps.registry.utils import get_data_registry_dropdown_options
 from corehq.apps.reports.models import TableauVisualization, TableauUser
@@ -31,6 +32,7 @@
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils.decorators import method_decorator
+from django.utils.functional import cached_property
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext as _, ngettext, gettext_lazy, gettext_noop
 
@@ -1144,7 +1146,8 @@ def invite_web_user_form(self):
                 is_add_user=is_add_user,
                 should_show_location=self.request.project.uses_locations,
                 can_edit_tableau_config=can_edit_tableau_config,
-                request=self.request
+                request=self.request,
+                custom_data=self.custom_data
             )
         return AdminInvitesUserForm(
             initial=initial,
@@ -1153,8 +1156,24 @@ def invite_web_user_form(self):
             is_add_user=is_add_user,
             should_show_location=self.request.project.uses_locations,
             can_edit_tableau_config=can_edit_tableau_config,
-            request=self.request
+            request=self.request,
+            custom_data=self.custom_data
+        )
+
+    @cached_property
+    def custom_data(self):
+        from corehq.apps.users.views.mobile import UserFieldsView
+        post_dict = None
+        if self.request.method == 'POST':
+            post_dict = self.request.POST
+        custom_data = CustomDataEditor(
+            field_view=UserFieldsView,
+            domain=self.domain,
+            post_dict=post_dict,
+            ko_model="custom_fields",
+            request_user=self.request.couch_user
         )
+        return custom_data
 
     @property
     @memoized
@@ -1165,9 +1184,13 @@ def request_id(self):
 
     @property
     def page_context(self):
-        return {
+        ctx = {
             'registration_form': self.invite_web_user_form,
+            **self.custom_data.field_view.get_field_page_context(
+                self.domain, self.request.couch_user, self.custom_data, None
+            )
         }
+        return ctx
 
     def _assert_user_has_permission_to_access_locations(self, assigned_location_ids):
         if not set(assigned_location_ids).issubset(set(SQLLocation.objects.accessible_to_user(
@@ -1197,6 +1220,7 @@ def post(self, request, *args, **kwargs):
                                          program_id=data.get("program", None),
                                          assigned_location_ids=data.get("assigned_locations", None),
                                          profile=profile,
+                                         custom_user_data=data.get("custom_user_data"),
                                          tableau_role=data.get("tableau_role", None),
                                          tableau_group_ids=data.get("tableau_group_ids", None)
                                          )
@@ -1546,7 +1570,7 @@ def change_password(request, domain, login_id):
     else:
         form = SetUserPasswordForm(request.project, login_id, user=django_user)
     json_dump['formHTML'] = render_crispy_form(form)
-    return HttpResponse(json.dumps(json_dump))
+    return JsonResponse(json_dump)
 
 
 @httpdigest
diff --git a/corehq/apps/zapier/tests/test_zapier_forwarding.py b/corehq/apps/zapier/tests/test_zapier_forwarding.py
index 94bd93429204..95aa75ca32be 100644
--- a/corehq/apps/zapier/tests/test_zapier_forwarding.py
+++ b/corehq/apps/zapier/tests/test_zapier_forwarding.py
@@ -1,11 +1,13 @@
 import uuid
+from collections import namedtuple
 from datetime import datetime, timedelta
+from unittest.mock import patch
 
 from django.test import TestCase
 
 from casexml.apps.case.mock import CaseBlock
-from corehq.apps.hqcase.utils import submit_case_blocks
 
+from corehq.apps.hqcase.utils import submit_case_blocks
 from corehq.apps.zapier.consts import EventTypes
 from corehq.apps.zapier.models import ZapierSubscription
 from corehq.apps.zapier.tests.test_utils import bootrap_domain_for_zapier
@@ -15,6 +17,9 @@
 ZAPIER_CASE_TYPE = 'animal'
 
 
+ResponseMock = namedtuple('ResponseMock', ['status_code', 'reason'])
+
+
 class TestZapierCaseForwarding(TestCase):
 
     @classmethod
@@ -22,12 +27,16 @@ def setUpClass(cls):
         super(TestZapierCaseForwarding, cls).setUpClass()
         cls.domain = DOMAIN
         cls.domain_object, cls.web_user, cls.api_key = bootrap_domain_for_zapier(cls.domain)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.web_user.delete(cls.domain, deleted_by=None)
-        cls.domain_object.delete()
-        super(TestZapierCaseForwarding, cls).tearDownClass()
+        cls.addClassCleanup(cls.domain_object.delete)
+        cls.addClassCleanup(cls.web_user.delete, cls.domain, deleted_by=None)
+
+        simple_request_patch = patch('corehq.motech.repeaters.models.simple_request')
+        simple_request_func = simple_request_patch.start()
+        simple_request_func.return_value = ResponseMock(
+            status_code=503,
+            reason='Service Unavailable',
+        )
+        cls.addClassCleanup(simple_request_patch.stop)
 
     def tearDown(self):
         ZapierSubscription.objects.all().delete()
diff --git a/corehq/ex-submodules/casexml/apps/phone/tests/test_extension_indexes.py b/corehq/ex-submodules/casexml/apps/phone/tests/test_extension_indexes.py
index 43f511dd29de..590fe2d8ba1a 100644
--- a/corehq/ex-submodules/casexml/apps/phone/tests/test_extension_indexes.py
+++ b/corehq/ex-submodules/casexml/apps/phone/tests/test_extension_indexes.py
@@ -91,7 +91,7 @@ def rename(names, map={}, number=count()):
         seen[sig] = test["name"]
 
 
-class TestSequenceMeta(type):
+class SequenceTestMeta(type):
 
     def __new__(mcs, name, bases, dict):
         tests_to_run = get_test_file_json('case_relationship_tests')
@@ -110,7 +110,7 @@ def __new__(mcs, name, bases, dict):
 
 
 @sharded
-class IndexTreeTest(BaseSyncTest, metaclass=TestSequenceMeta):
+class IndexTreeTest(BaseSyncTest, metaclass=SequenceTestMeta):
     """Fetch all testcases from data/case_relationship_tests.json and run them
 
     Each testcase is structured as follows:
diff --git a/corehq/ex-submodules/casexml/apps/phone/tests/utils.py b/corehq/ex-submodules/casexml/apps/phone/tests/utils.py
index 6384f280a632..20969c93ab0e 100644
--- a/corehq/ex-submodules/casexml/apps/phone/tests/utils.py
+++ b/corehq/ex-submodules/casexml/apps/phone/tests/utils.py
@@ -64,7 +64,15 @@ def deprecated_generate_restore_payload(project, user, restore_id="", version=V1
     ).get_payload().as_string()
 
 
-def call_fixture_generator(gen, restore_user, project=None, last_sync=None, app=None, device_id=''):
+def call_fixture_generator(
+    gen,
+    restore_user,
+    project=None,
+    last_sync=None,
+    app=None,
+    device_id='',
+    current_sync_log=None,
+):
     """
     Convenience function for use in unit tests
 
@@ -84,4 +92,6 @@ def call_fixture_generator(gen, restore_user, project=None, last_sync=None, app=
     if last_sync:
         params.sync_log_id = last_sync._id
         restore_state._last_sync_log = last_sync
+    if current_sync_log:
+        restore_state.current_sync_log = current_sync_log
     return gen(restore_state)
diff --git a/corehq/ex-submodules/couchexport/tests/test_excel_format_value.py b/corehq/ex-submodules/couchexport/tests/test_excel_format_value.py
index f8e7c8c80e03..0e6bb9ca7715 100644
--- a/corehq/ex-submodules/couchexport/tests/test_excel_format_value.py
+++ b/corehq/ex-submodules/couchexport/tests/test_excel_format_value.py
@@ -1,6 +1,7 @@
 import datetime
 from decimal import Decimal
 
+import pytest
 from openpyxl.styles import numbers
 from testil import eq
 
@@ -16,130 +17,168 @@ def check(input, output, format, output_type):
     eq(type(value), output_type)
 
 
-def test_integers():
-    yield check, '3423', 3423, numbers.FORMAT_NUMBER, int
-    yield check, '-234', -234, numbers.FORMAT_NUMBER, int
-    yield check, 324, 324, numbers.FORMAT_NUMBER, int
-
-
-def test_decimal():
-    yield check, '4.0345', 4.0345, numbers.FORMAT_NUMBER_00, float
-    yield check, '-3.234', -3.234, numbers.FORMAT_NUMBER_00, float
-    yield check, 5.032, 5.032, numbers.FORMAT_NUMBER_00, float
-    yield check, Decimal('3.00'), 3.00, numbers.FORMAT_NUMBER_00, float
-
-
-def test_boolean():
-    yield check, 'TRUE', True, numbers.FORMAT_GENERAL, bool
-    yield check, 'True', True, numbers.FORMAT_GENERAL, bool
-    yield check, 'true', True, numbers.FORMAT_GENERAL, bool
-    yield check, True, True, numbers.FORMAT_GENERAL, bool
-
-    yield check, 'FALSE', False, numbers.FORMAT_GENERAL, bool
-    yield check, 'False', False, numbers.FORMAT_GENERAL, bool
-    yield check, 'false', False, numbers.FORMAT_GENERAL, bool
-    yield check, False, False, numbers.FORMAT_GENERAL, bool
-
-
-def test_decimal_eur():
-    yield check, '6,9234', 6.9234, numbers.FORMAT_NUMBER_00, float
-    yield check, '-5,342', -5.342, numbers.FORMAT_NUMBER_00, float
-
-
-def test_percentage():
-    yield check, '80%', 0.8, numbers.FORMAT_PERCENTAGE, float
-    yield check, '-50%', -0.5, numbers.FORMAT_PERCENTAGE, float
-    yield check, '3.45%', 0.0345, numbers.FORMAT_PERCENTAGE_00, float
-    yield check, '-4.35%', -0.0435, numbers.FORMAT_PERCENTAGE_00, float
-
-
-def test_comma_separated_us():
-    yield check, '3,000.0234', 3000.0234, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float
-    yield check, '3,234,000.342', 3234000.342, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float
-    yield check, '5,000,343', 5000343, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float
-    yield check, '-5,334.32', -5334.32, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float
-
-
-def test_comma_separated_eur():
-    yield check, '5.600,0322', 5600.0322, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float
-    yield check, '5.600,0322', 5600.0322, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float
-    yield check, '8.435.600,0322', 8435600.0322, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float
-    yield check, '5.555.600', 5555600, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float
-    yield check, '-2.433,032', -2433.032, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float
-
-
-def test_currency_usd():
-    yield check, '$3,534.02', 3534.02, numbers.FORMAT_CURRENCY_USD_SIMPLE, float
-    yield check, '$99', 99, numbers.FORMAT_CURRENCY_USD_SIMPLE, float
-    yield check, '$5,000', 5000, numbers.FORMAT_CURRENCY_USD_SIMPLE, float
-    yield check, '-$234.02', -234.02, numbers.FORMAT_CURRENCY_USD_SIMPLE, float
-    yield check, '$4.4302', 4.4302, numbers.FORMAT_CURRENCY_USD_SIMPLE, float
-
-
-def test_currency_eur():
-    yield check, '€5.323,09', 5323.09, numbers.FORMAT_CURRENCY_EUR_SIMPLE, float
-    yield check, '-€303,03', -303.03, numbers.FORMAT_CURRENCY_EUR_SIMPLE, float
-    yield check, '€22', 22, numbers.FORMAT_CURRENCY_EUR_SIMPLE, float
-    yield check, '€3.303', 3303, numbers.FORMAT_CURRENCY_EUR_SIMPLE, float
-    yield check, '€3,003', 3.003, numbers.FORMAT_CURRENCY_EUR_SIMPLE, float
-
-
-def test_date():
-    yield check, '2020-01-20', datetime.datetime(2020, 1, 20, 0, 0), \
-        numbers.FORMAT_DATE_YYYYMMDD2, datetime.datetime
-    yield check, '2020/01/20', datetime.datetime(2020, 1, 20, 0, 0), \
-        numbers.FORMAT_DATE_YYYYMMDD2, datetime.datetime
-    yield check, '2020.01.20', datetime.datetime(2020, 1, 20, 0, 0), \
-        numbers.FORMAT_DATE_YYYYMMDD2, datetime.datetime
-    yield check, datetime.date(2020, 1, 20), datetime.date(2020, 1, 20), \
-        numbers.FORMAT_DATE_YYYYMMDD2, datetime.date
-
-
-def test_datetime():
-    yield check, '2020-01-20 12:33', \
-        datetime.datetime(2020, 1, 20, 12, 33), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-    yield check, '2020-01-20 12:33:22', \
-        datetime.datetime(2020, 1, 20, 12, 33, 22), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-    yield check, '2020-01-20 1:33:22PM', \
-        datetime.datetime(2020, 1, 20, 13, 33, 22), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-    yield check, '2020-01-20 09:33:22.890000-6:00', \
-        datetime.datetime(2020, 1, 20, 9, 33, 22, 890000), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-    yield check, '2020-01-20 09:33:22.890000-6', \
-        datetime.datetime(2020, 1, 20, 9, 33, 22, 890000), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-    yield check, datetime.datetime(2020, 1, 20, 11, 11), \
-        datetime.datetime(2020, 1, 20, 11, 11), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-    yield check, '2020-01-17T15:45:37.268000Z', \
-        datetime.datetime(2020, 1, 17, 15, 45, 37, 268000), \
-        numbers.FORMAT_DATE_DATETIME, datetime.datetime
-
-
-def test_time():
-    yield check, '12:33', '12:33', numbers.FORMAT_DATE_TIME4, str
-    yield check, '12:33:66', '12:33:66', numbers.FORMAT_DATE_TIME4, str
-    yield check, '09:33:22.890000-6:00', '09:33:22.890000-6:00', numbers.FORMAT_DATE_TIME4, str
-    yield check, '09:33:22.890000-6', '09:33:22.890000-6', numbers.FORMAT_DATE_TIME4, str
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('3423', 3423, numbers.FORMAT_NUMBER, int),
+    ('-234', -234, numbers.FORMAT_NUMBER, int),
+    (324, 324, numbers.FORMAT_NUMBER, int),
+])
+def test_integers(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('4.0345', 4.0345, numbers.FORMAT_NUMBER_00, float),
+    ('-3.234', -3.234, numbers.FORMAT_NUMBER_00, float),
+    (5.032, 5.032, numbers.FORMAT_NUMBER_00, float),
+    (Decimal('3.00'), 3.00, numbers.FORMAT_NUMBER_00, float),
+])
+def test_decimal(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('TRUE', True, numbers.FORMAT_GENERAL, bool),
+    ('True', True, numbers.FORMAT_GENERAL, bool),
+    ('true', True, numbers.FORMAT_GENERAL, bool),
+    (True, True, numbers.FORMAT_GENERAL, bool),
+
+    ('FALSE', False, numbers.FORMAT_GENERAL, bool),
+    ('False', False, numbers.FORMAT_GENERAL, bool),
+    ('false', False, numbers.FORMAT_GENERAL, bool),
+    (False, False, numbers.FORMAT_GENERAL, bool),
+])
+def test_boolean(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('6,9234', 6.9234, numbers.FORMAT_NUMBER_00, float),
+    ('-5,342', -5.342, numbers.FORMAT_NUMBER_00, float),
+])
+def test_decimal_eur(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('80%', 0.8, numbers.FORMAT_PERCENTAGE, float),
+    ('-50%', -0.5, numbers.FORMAT_PERCENTAGE, float),
+    ('3.45%', 0.0345, numbers.FORMAT_PERCENTAGE_00, float),
+    ('-4.35%', -0.0435, numbers.FORMAT_PERCENTAGE_00, float),
+])
+def test_percentage(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('3,000.0234', 3000.0234, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float),
+    ('3,234,000.342', 3234000.342, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float),
+    ('5,000,343', 5000343, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float),
+    ('-5,334.32', -5334.32, numbers.FORMAT_NUMBER_COMMA_SEPARATED1, float),
+])
+def test_comma_separated_us(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('5.600,0322', 5600.0322, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float),
+    ('5.600,0322', 5600.0322, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float),
+    ('8.435.600,0322', 8435600.0322, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float),
+    ('5.555.600', 5555600, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float),
+    ('-2.433,032', -2433.032, numbers.FORMAT_NUMBER_COMMA_SEPARATED2, float),
+])
+def test_comma_separated_eur(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('$3,534.02', 3534.02, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('$99', 99, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('$5,000', 5000, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('-$234.02', -234.02, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('$4.4302', 4.4302, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+])
+def test_currency_usd(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('$3,534.02', 3534.02, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('$99', 99, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('$5,000', 5000, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('-$234.02', -234.02, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+    ('$4.4302', 4.4302, numbers.FORMAT_CURRENCY_USD_SIMPLE, float),
+])
+def test_currency_eur(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('2020-01-20', datetime.datetime(2020, 1, 20, 0, 0),
+        numbers.FORMAT_DATE_YYYYMMDD2, datetime.datetime),
+    ('2020/01/20', datetime.datetime(2020, 1, 20, 0, 0),
+        numbers.FORMAT_DATE_YYYYMMDD2, datetime.datetime),
+    ('2020.01.20', datetime.datetime(2020, 1, 20, 0, 0),
+        numbers.FORMAT_DATE_YYYYMMDD2, datetime.datetime),
+    (datetime.date(2020, 1, 20), datetime.date(2020, 1, 20),
+        numbers.FORMAT_DATE_YYYYMMDD2, datetime.date),
+])
+def test_date(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('2020-01-20 12:33',
+        datetime.datetime(2020, 1, 20, 12, 33),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+    ('2020-01-20 12:33:22',
+        datetime.datetime(2020, 1, 20, 12, 33, 22),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+    ('2020-01-20 1:33:22PM',
+        datetime.datetime(2020, 1, 20, 13, 33, 22),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+    ('2020-01-20 09:33:22.890000-6:00',
+        datetime.datetime(2020, 1, 20, 9, 33, 22, 890000),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+    ('2020-01-20 09:33:22.890000-6',
+        datetime.datetime(2020, 1, 20, 9, 33, 22, 890000),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+    (datetime.datetime(2020, 1, 20, 11, 11),
+        datetime.datetime(2020, 1, 20, 11, 11),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+    ('2020-01-17T15:45:37.268000Z',
+        datetime.datetime(2020, 1, 17, 15, 45, 37, 268000),
+        numbers.FORMAT_DATE_DATETIME, datetime.datetime),
+])
+def test_datetime(input, output, format, output_type):
+    check(input, output, format, output_type)
+
+
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('12:33', '12:33', numbers.FORMAT_DATE_TIME4, str),
+    ('12:33:66', '12:33:66', numbers.FORMAT_DATE_TIME4, str),
+    ('09:33:22.890000-6:00', '09:33:22.890000-6:00', numbers.FORMAT_DATE_TIME4, str),
+    ('09:33:22.890000-6', '09:33:22.890000-6', numbers.FORMAT_DATE_TIME4, str),
+])
+def test_time(input, output, format, output_type):
+    check(input, output, format, output_type)
 
 
 def test_missing():
-    yield check, MISSING_VALUE, MISSING_VALUE, numbers.FORMAT_TEXT, str
+    check(MISSING_VALUE, MISSING_VALUE, numbers.FORMAT_TEXT, str)
 
 
 def test_empty():
-    yield check, EMPTY_VALUE, EMPTY_VALUE, numbers.FORMAT_TEXT, str
+    check(EMPTY_VALUE, EMPTY_VALUE, numbers.FORMAT_TEXT, str)
 
 
-def test_text():
-    yield check, 'hi this is text', 'hi this is text', numbers.FORMAT_TEXT, str
-    yield check, '1241234eeeesffsfs', '1241234eeeesffsfs', numbers.FORMAT_TEXT, str
-    yield check, {'en': 'Thanks', 'de': 'Danke'}, "{'en': 'Thanks', 'de': 'Danke'}", \
-          numbers.FORMAT_TEXT, str
+@pytest.mark.parametrize("input, output, format, output_type", [
+    ('hi this is text', 'hi this is text', numbers.FORMAT_TEXT, str),
+    ('1241234eeeesffsfs', '1241234eeeesffsfs', numbers.FORMAT_TEXT, str),
+    ({'en': 'Thanks', 'de': 'Danke'}, "{'en': 'Thanks', 'de': 'Danke'}", numbers.FORMAT_TEXT, str),
+])
+def test_text(input, output, format, output_type):
+    check(input, output, format, output_type)
 
 
 def test_bad_date_string():
-    yield check, '112020-02-2609', '112020-02-2609', numbers.FORMAT_TEXT, str
+    check('112020-02-2609', '112020-02-2609', numbers.FORMAT_TEXT, str)
diff --git a/corehq/ex-submodules/couchforms/analytics.py b/corehq/ex-submodules/couchforms/analytics.py
index eb7f4658e1e2..5470a5d5a727 100644
--- a/corehq/ex-submodules/couchforms/analytics.py
+++ b/corehq/ex-submodules/couchforms/analytics.py
@@ -1,6 +1,6 @@
 import datetime
 
-from corehq.apps.es import FormES
+from corehq.apps.es import AppES, FormES
 from corehq.apps.es.aggregations import TermsAggregation
 from corehq.const import MISSING_APP_ID
 from corehq.util.quickcache import quickcache
@@ -132,15 +132,18 @@ def get_form_analytics_metadata(domain, app_id, xmlns):
         return None
 
 
-def get_exports_by_form(domain):
+def get_exports_by_form(domain, use_es=False):
     from corehq.apps.app_manager.models import Application
-    rows = Application.get_db().view(
-        'exports_forms_by_app/view',
-        startkey=[domain],
-        endkey=[domain, {}],
-        group=True,
-        stale=stale_ok()
-    ).all()
+    if use_es:
+        rows = _get_export_forms_by_app_es(domain)
+    else:
+        rows = Application.get_db().view(
+            'exports_forms_by_app/view',
+            startkey=[domain],
+            endkey=[domain, {}],
+            group=True,
+            stale=stale_ok()
+        ).all()
     form_count_breakdown = get_form_count_breakdown_for_domain(domain)
 
     for row in rows:
@@ -155,6 +158,26 @@ def get_exports_by_form(domain):
     return rows
 
 
+def _get_export_forms_by_app_es(domain):
+    rows = []
+    apps = AppES().domain(domain).is_build(False).run().hits
+    for app in apps:
+        for module_id, module in enumerate(app.get("modules", [])):
+            for form_id, form in enumerate(module.get("forms", [])):
+                rows.append({
+                    "key": [app['domain'], app['_id'], form["xmlns"]],
+                    "value": {
+                        "xmlns": form["xmlns"],
+                        "app": {"name": app["name"], "langs": app["langs"], "id": app["_id"]},
+                        "module": {"name": module["name"], "id": module_id},
+                        "form": {"name": form["name"], "id": form_id},
+                        "app_deleted": app["doc_type"] in ["Application-Deleted", "LinkedApplication-Deleted"],
+                    }
+                })
+
+    return rows
+
+
 def get_form_count_breakdown_for_domain(domain):
     query = (FormES(for_export=True)
              .domain(domain)
diff --git a/corehq/ex-submodules/couchforms/tests/test_analytics.py b/corehq/ex-submodules/couchforms/tests/test_analytics.py
index 55143d8c0255..2d732b572396 100644
--- a/corehq/ex-submodules/couchforms/tests/test_analytics.py
+++ b/corehq/ex-submodules/couchforms/tests/test_analytics.py
@@ -2,6 +2,7 @@
 import uuid
 
 from django.test import TestCase
+from corehq.apps.app_manager.tests.util import delete_all_apps
 
 from couchforms.analytics import (
     domain_has_submission_in_last_30_days,
@@ -13,6 +14,7 @@
     get_number_of_forms_in_domain,
 )
 
+from corehq.apps.es.apps import app_adapter
 from corehq.apps.es.client import manager
 from corehq.apps.es.forms import form_adapter
 from corehq.apps.es.tests.utils import es_test
@@ -34,7 +36,7 @@
 from testapps.test_pillowtop.utils import process_pillow_changes
 
 
-@es_test(requires=[form_adapter], setup_class=True)
+@es_test(requires=[form_adapter, app_adapter], setup_class=True)
 @disable_quickcache
 class ExportsFormsAnalyticsTest(TestCase, DocTestMixin):
     maxDiff = None
@@ -46,25 +48,36 @@ def setUpClass(cls):
 
         from corehq.apps.app_manager.models import Application, Form, Module
         delete_all_xforms()
+        delete_all_apps()
 
         cls.domain = 'exports_forms_analytics_domain'
         cls.app_id_1 = 'a' + uuid.uuid4().hex
         cls.app_id_2 = 'b' + uuid.uuid4().hex
+        cls.app_id_3 = 'c' + uuid.uuid4().hex
         cls.xmlns_1 = 'my://crazy.xmlns/'
         cls.xmlns_2 = 'my://crazy.xmlns/app'
+        cls.xmlns_3 = 'my://crazy.xmlns/deleted-app'
         cls.apps = [
             Application(_id=cls.app_id_2, domain=cls.domain,
-                        modules=[Module(forms=[Form(xmlns=cls.xmlns_2)])])
+                        modules=[Module(forms=[Form(xmlns=cls.xmlns_2)])]),
+            Application(_id=cls.app_id_3, domain=cls.domain,
+                        modules=[Module(forms=[Form(xmlns=cls.xmlns_3)])])
         ]
         for app in cls.apps:
             app.save()
+        cls.apps[1].delete_app()
+        cls.apps[1].save()
         cls.forms = [
             create_form_for_test(domain=cls.domain, app_id=cls.app_id_1, xmlns=cls.xmlns_1, save=False),
             create_form_for_test(domain=cls.domain, app_id=cls.app_id_1, xmlns=cls.xmlns_1, save=False),
             create_form_for_test(domain=cls.domain, app_id=cls.app_id_2, xmlns=cls.xmlns_2, save=False),
+            create_form_for_test(domain=cls.domain, app_id=cls.app_id_3, xmlns=cls.xmlns_3, save=False),
         ]
         cls.error_forms = [create_form_for_test(domain=cls.domain, state=XFormInstance.ERROR, save=False)]
         cls.all_forms = cls.forms + cls.error_forms
+
+        for app in cls.apps:
+            app_adapter.index(app, refresh=True)
         for form in cls.all_forms:
             form_adapter.index(form, refresh=True)
 
@@ -97,6 +110,8 @@ def test_get_form_analytics_metadata__app(self):
 
     @flaky_slow
     def test_get_exports_by_form(self):
+        # Call this twice, since the couchdb `update_after` to force couchdb to return the right results
+        get_exports_by_form(self.domain)
         self.assertEqual(get_exports_by_form(self.domain), [{
             'value': {'xmlns': 'my://crazy.xmlns/', 'submissions': 2},
             'key': ['exports_forms_analytics_domain', self.app_id_1,
@@ -110,6 +125,43 @@ def test_get_exports_by_form(self):
                 'app_deleted': False, 'submissions': 1},
             'key': ['exports_forms_analytics_domain', self.app_id_2,
                     'my://crazy.xmlns/app']
+        }, {
+            'value': {
+                'xmlns': 'my://crazy.xmlns/deleted-app',
+                'form': {'name': {}, 'id': 0},
+                'app': {'langs': [], 'name': None, 'id': self.app_id_3},
+                'module': {'name': {}, 'id': 0},
+                'app_deleted': True, 'submissions': 1,
+            },
+            'key': ['exports_forms_analytics_domain', self.app_id_3,
+                    'my://crazy.xmlns/deleted-app']
+        }])
+
+    def test_get_exports_by_form_es(self):
+        self.assertEqual(get_exports_by_form(self.domain, use_es=True), [{
+            'value': {'xmlns': 'my://crazy.xmlns/', 'submissions': 2},
+            'key': ['exports_forms_analytics_domain', self.app_id_1,
+                    'my://crazy.xmlns/']
+        }, {
+            'value': {
+                'xmlns': 'my://crazy.xmlns/app',
+                'form': {'name': {}, 'id': 0},
+                'app': {'langs': [], 'name': None, 'id': self.app_id_2},
+                'module': {'name': {}, 'id': 0},
+                'app_deleted': False, 'submissions': 1},
+            'key': ['exports_forms_analytics_domain', self.app_id_2,
+                    'my://crazy.xmlns/app']
+        }, {
+            'value': {
+                'xmlns': 'my://crazy.xmlns/deleted-app',
+                'submissions': 1,
+                'form': {'name': {}, 'id': 0},
+                'app': {'langs': [], 'name': None, 'id': self.app_id_3},
+                'module': {'name': {}, 'id': 0},
+                'app_deleted': True
+            },
+            'key': ['exports_forms_analytics_domain', self.app_id_3,
+                    'my://crazy.xmlns/deleted-app']
         }])
 
 
diff --git a/corehq/ex-submodules/couchforms/tests/test_geopoint.py b/corehq/ex-submodules/couchforms/tests/test_geopoint.py
index afc745386c5d..b3f6a4ce7f6c 100644
--- a/corehq/ex-submodules/couchforms/tests/test_geopoint.py
+++ b/corehq/ex-submodules/couchforms/tests/test_geopoint.py
@@ -1,28 +1,26 @@
 from decimal import Decimal
 
+import pytest
 from jsonobject.exceptions import BadValueError
 from nose.tools import assert_equal, assert_raises
 
 from ..geopoint import GeoPoint
 
 
-def test_valid_geopoint_properties():
-    for input_string, output in [
-        ('42.3739063 -71.1109113 0.0 886.0', ('42.3739063', '-71.1109113', '0.0', '886.0')),
-        ('-7.130 -41.563 7.53E-4 8.0', ('-7.130', '-41.563', '0', '8.0')),
-        ('-7.130 -41.563 -2.2709742188453674E-4 8.0', ('-7.130', '-41.563', '0', '8.0')),
-        ('-7.130 -41.563', ('-7.130', '-41.563', 'NaN', 'NaN')),
-        ('-7.130 -41.563 1.2E-3 0', ('-7.130', '-41.563', '0.012', '0')),
-        ('-7.130 -41.563 0.0 1.0', ('-7.130', '-41.563', '0.0', '1.0')),
-    ]:
-        actual = GeoPoint.from_string(input_string, flexible=True)
-        expected = GeoPoint(*(Decimal(x) for x in output))
-    yield _geopoints_equal, actual, expected
+@pytest.mark.parametrize("input_string, output", [
+    ('42.3739063 -71.1109113 0.0 886.0', ('42.3739063', '-71.1109113', '0.0', '886.0')),
+    ('-7.130 -41.563 7.53E-4 8.0', ('-7.130', '-41.563', '0', '8.0')),
+    ('-7.130 -41.563 -2.2709742188453674E-4 8.0', ('-7.130', '-41.563', '0', '8.0')),
+    ('-7.130 -41.563', ('-7.130', '-41.563', 'NaN', 'NaN')),
+    ('-7.130 -41.563 1.2E-3 0', ('-7.130', '-41.563', '0.0012', '0')),
+    ('-7.130 -41.563 0.0 1.0', ('-7.130', '-41.563', '0.0', '1.0')),
+])
+def test_valid_geopoint_properties(input_string, output):
+    actual = GeoPoint.from_string(input_string, flexible=True)
+    expected = GeoPoint(*(Decimal(x) for x in output))
 
-
-def _geopoints_equal(a, b):
     for field in ['latitude', 'longitude', 'altitude', 'accuracy']:
-        assert_equal(str(getattr(a, field)), str(getattr(b, field)))
+        assert_equal(str(getattr(actual, field)), str(getattr(expected, field)))
 
 
 def test_inflexible_is_strict():
@@ -30,19 +28,15 @@ def test_inflexible_is_strict():
         GeoPoint.from_string('-7.130 -41.563', flexible=False)
 
 
-def test_invalid_geopoint_properties():
-    for input_string in [
-            'these are not decimals',
-            '42.3739063 -71.1109113 0.0 whoops',
-            '42.3739063 -71.1109113 0.0',  # only three elements
-            3,  # wrong type
-            '24.85676533097921 240.27256620218806 0.0 0.0',  # out of bounds
-            '-11.683438999546881 -184.6692769950829 0.0 0.0',  # out of bounds
-            'NaN -71.669 0.0 0.0',
-    ]:
-        yield _is_invalid_input, input_string
-
-
-def _is_invalid_input(input_string):
+@pytest.mark.parametrize("input_string", [
+    'these are not decimals',
+    '42.3739063 -71.1109113 0.0 whoops',
+    '42.3739063 -71.1109113 0.0',  # only three elements
+    3,  # wrong type
+    '24.85676533097921 240.27256620218806 0.0 0.0',  # out of bounds
+    '-11.683438999546881 -184.6692769950829 0.0 0.0',  # out of bounds
+    'NaN -71.669 0.0 0.0',
+])
+def test_invalid_geopoint_properties(input_string):
     with assert_raises(BadValueError):
         GeoPoint.from_string(input_string)
diff --git a/corehq/ex-submodules/dimagi/utils/tests/test_database.py b/corehq/ex-submodules/dimagi/utils/tests/test_database.py
index 6768dbaf1b93..f7e48b44f484 100644
--- a/corehq/ex-submodules/dimagi/utils/tests/test_database.py
+++ b/corehq/ex-submodules/dimagi/utils/tests/test_database.py
@@ -1,3 +1,4 @@
+import pytest
 from testil import Config, assert_raises, eq
 
 from requests.exceptions import RequestException
@@ -7,23 +8,22 @@
 from ..couch import database as mod
 
 
-def test_retry_on_couch_error():
-    @timelimit
-    def test(n, error=None):
-        func, calls = make_couch_retry_function(n, error)
-        with mock_retry_sleep() as sleeps:
-            eq(func(n), n * 2)
-        eq(sleeps, ([0.1] + [2 ** i for i in range(n - 1)]) if n else [])
-        eq(len(calls), n + 1)
-
-    yield test, 0
-    yield test, 1
-    yield test, 2
-    yield test, 3
-    yield test, 4
-    yield test, 5
-
-    yield test, 1, mod.BulkFetchException
+@pytest.mark.parametrize("n, error", [
+    (0, None),
+    (1, None),
+    (2, None),
+    (3, None),
+    (4, None),
+    (5, None),
+    (1, mod.BulkFetchException),
+])
+@timelimit
+def test_retry_on_couch_error(n, error):
+    func, calls = make_couch_retry_function(n, error)
+    with mock_retry_sleep() as sleeps:
+        eq(func(n), n * 2)
+    eq(sleeps, ([0.1] + [2 ** i for i in range(n - 1)]) if n else [])
+    eq(len(calls), n + 1)
 
 
 @timelimit
diff --git a/corehq/ex-submodules/dimagi/utils/tests/test_retry.py b/corehq/ex-submodules/dimagi/utils/tests/test_retry.py
index 9443211bcf2a..c6a8e4d2c665 100644
--- a/corehq/ex-submodules/dimagi/utils/tests/test_retry.py
+++ b/corehq/ex-submodules/dimagi/utils/tests/test_retry.py
@@ -1,30 +1,39 @@
 from contextlib import contextmanager
 from unittest.mock import patch
+
+import pytest
 from testil import assert_raises, eq
 
 from corehq.util.test_utils import timelimit
 from .. import retry as mod
 
 
-def test_retry_on():
-    retry = mod.retry_on(Error, OtherError)
+class Error(Exception):
+    pass
 
-    @timelimit
-    def test(n, error=Error):
-        func, calls = make_retry_function(retry, n, error)
-        with mock_retry_sleep() as sleeps:
-            eq(func(n), n * 2)
-        eq(sleeps, ([0.1] + [2 ** i for i in range(n - 1)]) if n else [])
-        eq(len(calls), n + 1)
 
-    yield test, 0
-    yield test, 1
-    yield test, 2
-    yield test, 3
-    yield test, 4
-    yield test, 5
+class OtherError(Exception):
+    pass
+
+
+@pytest.mark.parametrize("n, error", [
+    (0, Error),
+    (1, Error),
+    (2, Error),
+    (3, Error),
+    (4, Error),
+    (5, Error),
+    (1, OtherError),
+])
+@timelimit
+def test_retry_on(n, error):
+    retry = mod.retry_on(Error, OtherError)
 
-    yield test, 1, OtherError
+    func, calls = make_retry_function(retry, n, error)
+    with mock_retry_sleep() as sleeps:
+        eq(func(n), n * 2)
+    eq(sleeps, ([0.1] + [2 ** i for i in range(n - 1)]) if n else [])
+    eq(len(calls), n + 1)
 
 
 @timelimit
@@ -60,14 +69,6 @@ def test_retry_with_delays():
     eq(len(calls), 6)
 
 
-class Error(Exception):
-    pass
-
-
-class OtherError(Exception):
-    pass
-
-
 def make_retry_function(decorator, n_errors, error):
     @decorator
     def maybe_error(arg):
diff --git a/corehq/ex-submodules/dimagi/utils/tests/test_undo.py b/corehq/ex-submodules/dimagi/utils/tests/test_undo.py
index 96253ab5b5f0..cd0064199bc4 100644
--- a/corehq/ex-submodules/dimagi/utils/tests/test_undo.py
+++ b/corehq/ex-submodules/dimagi/utils/tests/test_undo.py
@@ -9,7 +9,7 @@
 
 
 class TestDocument(Document):
-    pass
+    __test__ = False
 
 
 class TestSubDocument(TestDocument):
diff --git a/corehq/ex-submodules/dimagi/utils/tests/test_web.py b/corehq/ex-submodules/dimagi/utils/tests/test_web.py
index 72936e7cfd8b..32cc97bd03af 100644
--- a/corehq/ex-submodules/dimagi/utils/tests/test_web.py
+++ b/corehq/ex-submodules/dimagi/utils/tests/test_web.py
@@ -1,26 +1,26 @@
+import pytest
 from testil import eq, assert_raises
 
 from dimagi.utils.web import get_ip, json_request
 
 
-def test_get_ip():
+@pytest.mark.parametrize("request_meta, expected_value", [
     # localhost default
-    yield _test_get_ip, {}, '127.0.0.1'
+    ({}, '127.0.0.1'),
     # garbage default
-    yield _test_get_ip, {'REMOTE_ADDR': 'garbage'}, '10.0.0.1'
+    ({'REMOTE_ADDR': 'garbage'}, '10.0.0.1'),
     # Use x-forwarded-for
-    yield _test_get_ip, {'HTTP_X_FORWARDED_FOR': '54.13.132.27'}, '54.13.132.27'
+    ({'HTTP_X_FORWARDED_FOR': '54.13.132.27'}, '54.13.132.27'),
     # Use remote address
-    yield _test_get_ip, {'REMOTE_ADDR': '44.44.44.44'}, '44.44.44.44'
+    ({'REMOTE_ADDR': '44.44.44.44'}, '44.44.44.44'),
     # Use x-forwarded-for over remote address
-    yield _test_get_ip, {'HTTP_X_FORWARDED_FOR': '54.13.132.27', 'REMOTE_ADDR': '44.44.44.44'}, '54.13.132.27'
+    ({'HTTP_X_FORWARDED_FOR': '54.13.132.27', 'REMOTE_ADDR': '44.44.44.44'}, '54.13.132.27'),
     # Use x-forwarded-for first IP address if many
-    yield _test_get_ip, {'HTTP_X_FORWARDED_FOR': '54.13.132.27, 10.200.40.12'}, '54.13.132.27'
+    ({'HTTP_X_FORWARDED_FOR': '54.13.132.27, 10.200.40.12'}, '54.13.132.27'),
     # Use x-forwarded-for first IP address if many (even if no space)
-    yield _test_get_ip, {'HTTP_X_FORWARDED_FOR': '54.13.132.27,10.200.40.12'}, '54.13.132.27'
-
-
-def _test_get_ip(request_meta, expected_value):
+    ({'HTTP_X_FORWARDED_FOR': '54.13.132.27,10.200.40.12'}, '54.13.132.27'),
+])
+def test_get_ip(request_meta, expected_value):
     class FakeRequest:
         def __init__(self):
             self.META = request_meta
@@ -28,46 +28,25 @@ def __init__(self):
     eq(get_ip(FakeRequest()), expected_value)
 
 
-def test_json_request():
+@pytest.mark.parametrize("params, kwargs, expected_result", [
     # empty
-    yield _test_json_request, {}, {}, {}
+    ({}, {}, {}),
     # quoted string
-    yield _test_json_request, {'hello': '"world"'}, {}, {'hello': 'world'}
+    ({'hello': '"world"'}, {}, {'hello': 'world'}),
     # string of an integer
-    yield _test_json_request, {'hello': '123'}, {}, {'hello': 123}
+    ({'hello': '123'}, {}, {'hello': 123}),
     # string of an object
-    yield (
-        _test_json_request,
-        {'hello': '{"foo": "bar"}'},
-        {},
-        {'hello': {'foo': 'bar'}},
-    )
+    ({'hello': '{"foo": "bar"}'}, {}, {'hello': {'foo': 'bar'}}),
     # boolean
-    yield (
-        _test_json_request,
-        {'hello': 'true'},
-        {},
-        {'hello': True},
-    )
+    ({'hello': 'true'}, {}, {'hello': True}),
     # booleans as strings
-    yield (
-        _test_json_request,
-        {'hello': 'true'},
-        {'booleans_as_strings': True},
-        {'hello': 'true'},
-    )
+    ({'hello': 'true'}, {'booleans_as_strings': True}, {'hello': 'true'}),
     # key is not a string
-    yield _test_json_request, {123: '"world"'}, {}, {'123': 'world'}
+    ({123: '"world"'}, {}, {'123': 'world'}),
     # lenient
-    yield (
-        _test_json_request,
-        {'hello': 'not JSON'},
-        {},  # {'lenient': True}
-        {'hello': 'not JSON'},
-    )
-
-
-def _test_json_request(params, kwargs, expected_result):
+    ({'hello': 'not JSON'}, {}, {'hello': 'not JSON'}),  # {} -> {'lenient': True}
+])
+def test_json_request(params, kwargs, expected_result):
     eq(json_request(params, **kwargs), expected_result)
 
 
diff --git a/corehq/ex-submodules/phonelog/tests/test_sumologic.py b/corehq/ex-submodules/phonelog/tests/test_sumologic.py
index c596c0c27976..52b4378fc0dd 100644
--- a/corehq/ex-submodules/phonelog/tests/test_sumologic.py
+++ b/corehq/ex-submodules/phonelog/tests/test_sumologic.py
@@ -18,15 +18,17 @@ def setUp(self):
         self.received_on = datetime.utcnow()
 
     def _get_xform(self, filename):
-        xform = FormProcessorInterface(self.domain).new_xform(convert_xform_to_json(self.get_xml(filename)))
+        xml = self.get_xml(filename)
+        xform = FormProcessorInterface(self.domain).new_xform(convert_xform_to_json(xml))
         xform.received_on = self.received_on
+        xform.get_xml = lambda: xml
         return xform
 
     def test_log_error(self):
         xform = self._get_xform('log_subreport')
         compiled_log = SumoLogicLog(self.domain, xform).log_subreport()
         expected_log = (
-            "[log_date=2018-02-13T15:19:30.622-05] [log_submission_date={received}] [log_type=maintenance] "
+            "[log_date=2018-02-13T20:19:30.622000Z] [log_submission_date={received}] [log_type=maintenance] "
             "[domain={domain}] [username=t1] [device_id=014915000230428] [app_version=260] "
             "[cc_version=2.43] [msg=Succesfully submitted 1 device reports to server.]"
         ).format(domain=self.domain, received=self.received_on)
@@ -37,7 +39,7 @@ def test_usererror(self):
         xform = self._get_xform('usererror_subreport')
         compiled_log = SumoLogicLog(self.domain, xform).user_error_subreport()
         expected_log = (
-            "[log_date=2018-02-22T17:21:21.201-05] [log_submission_date={received}] [log_type=error-config] "
+            "[log_date=2018-02-22T22:21:21.201000Z] [log_submission_date={received}] [log_type=error-config] "
             "[domain={domain}] [username=t1] [device_id=014915000230428] [app_version=260] "
             "[cc_version=2.43] [msg=This is a test user error] [app_id=73d5f08b9d55fe48602906a89672c214] "
             "[user_id=37cc2dcdb1abf5c16bab0763f435e6b7] [session=session] [expr=an expression]"
@@ -49,10 +51,12 @@ def test_forceclose(self):
         xform = self._get_xform('forceclose_subreport')
         compiled_log = SumoLogicLog(self.domain, xform).force_close_subreport()
         expected_log = (
-            "[log_date=2018-02-22T17:21:21.232-05] [log_submission_date={received}] [log_type=forceclose] "
+            "[log_date=2018-02-22T22:21:21.232000Z] [log_submission_date={received}] [log_type=forceclose] "
             "[domain={domain}] [username=t1] [device_id=014915000230428] [app_version=260] "
             "[cc_version=2.43] "
-            """[msg=java.lang.RuntimeException: Unable to start activity ComponentInfo{{org.commcare.dalvik.debug/org.commcare.activities.MenuActivity}}: java.lang.RuntimeException
+            "[msg=java.lang.RuntimeException: Unable to start activity "
+            "ComponentInfo{{org.commcare.dalvik.debug/org.commcare.activities.MenuActivity}}: "
+            """java.lang.RuntimeException
         at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2416)
         at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2476)
         at android.app.ActivityThread.-wrap11(ActivityThread.java)
diff --git a/corehq/ex-submodules/pillow_retry/tests/test_retry.py b/corehq/ex-submodules/pillow_retry/tests/test_retry.py
index 2c64b91fb8f9..2946cfe9f6cd 100644
--- a/corehq/ex-submodules/pillow_retry/tests/test_retry.py
+++ b/corehq/ex-submodules/pillow_retry/tests/test_retry.py
@@ -20,7 +20,7 @@
 
 
 class TestException(Exception):
-    pass
+    __test__ = False
 
 
 class TestMixin(object):
diff --git a/corehq/ex-submodules/pillowtop/pillow/interface.py b/corehq/ex-submodules/pillowtop/pillow/interface.py
index e2886b4226d2..06234b250116 100644
--- a/corehq/ex-submodules/pillowtop/pillow/interface.py
+++ b/corehq/ex-submodules/pillowtop/pillow/interface.py
@@ -374,13 +374,26 @@ def __record_change_metric_in_datadog(self, metric, change, processing_time=None
             metrics_counter(metric, tags=metric_tags)
 
             change_lag = (datetime.utcnow() - change.metadata.publish_timestamp).total_seconds()
-            metrics_gauge('commcare.change_feed.change_lag', change_lag, tags={
-                'pillow_name': self.get_name(),
-                'topic': _topic_for_ddog(
-                    TopicPartition(change.topic, change.partition)
-                    if change.partition is not None else change.topic
-                ),
-            }, multiprocess_mode=MPM_MAX)
+            dd_topic = _topic_for_ddog(
+                TopicPartition(change.topic, change.partition)
+                if change.partition is not None else change.topic)
+            metrics_gauge(
+                'commcare.change_feed.change_lag',
+                change_lag,
+                tags={
+                    'pillow_name': self.get_name(),
+                    'topic': dd_topic
+                },
+                multiprocess_mode=MPM_MAX
+            )
+            if change.partition is not None:
+                # adding check for partition as dd_topic may or
+                # may not contain partition name.
+                # and for the pillows that we are interested in
+                # we would be needing both topic and partition.
+                from corehq.project_limits.gauge import case_pillow_lag_gauge
+                if case_pillow_lag_gauge.feature_key == change.topic:
+                    case_pillow_lag_gauge.report(dd_topic, change_lag)
 
             if processing_time:
                 tags = {'pillow_name': self.get_name()}
diff --git a/corehq/ex-submodules/pillowtop/processors/sample.py b/corehq/ex-submodules/pillowtop/processors/sample.py
index f74e996efddf..37debb828348 100644
--- a/corehq/ex-submodules/pillowtop/processors/sample.py
+++ b/corehq/ex-submodules/pillowtop/processors/sample.py
@@ -39,6 +39,7 @@ class TestProcessor(PillowProcessor):
     """
     Processor that just keeps the change in an in-memory list for testing
     """
+    __test__ = False
 
     def __init__(self):
         self.changes_seen = []
diff --git a/corehq/ex-submodules/pillowtop/tests/test_dao.py b/corehq/ex-submodules/pillowtop/tests/test_dao.py
index 20141ab96c42..0dc5777a0fd2 100644
--- a/corehq/ex-submodules/pillowtop/tests/test_dao.py
+++ b/corehq/ex-submodules/pillowtop/tests/test_dao.py
@@ -1,5 +1,6 @@
 from abc import abstractmethod
 from django.test import SimpleTestCase
+from django.utils.functional import classproperty
 from fakecouch import FakeCouchDb
 from pillowtop.dao.couch import CouchDocumentStore
 from pillowtop.dao.exceptions import DocumentNotFoundError
@@ -8,6 +9,10 @@
 
 class _AbstractDocumentStoreTestCase(SimpleTestCase):
 
+    @classproperty
+    def __test__(cls):
+        return not getattr(cls.dao.fget, "__isabstractmethod__", False)
+
     @property
     @abstractmethod
     def dao(self):
diff --git a/corehq/ex-submodules/pillowtop/tests/utils.py b/corehq/ex-submodules/pillowtop/tests/utils.py
index 3e06bcb9a924..610a870a2adb 100644
--- a/corehq/ex-submodules/pillowtop/tests/utils.py
+++ b/corehq/ex-submodules/pillowtop/tests/utils.py
@@ -12,7 +12,7 @@
     },
     "properties": {
         "doc_type": {
-            "index": "not_analyzed", "type": "string"
+            "type": "keyword"
         },
     }
 }
diff --git a/corehq/ex-submodules/soil/__init__.py b/corehq/ex-submodules/soil/__init__.py
index 0a5ef1f197fb..36f6d4071f3b 100644
--- a/corehq/ex-submodules/soil/__init__.py
+++ b/corehq/ex-submodules/soil/__init__.py
@@ -1,4 +1,3 @@
-import json
 import os
 import re
 import stat
@@ -9,13 +8,18 @@
 from django.conf import settings
 from django.core import cache
 from django.core.cache import DEFAULT_CACHE_ALIAS
+from django.http import HttpResponse, JsonResponse, StreamingHttpResponse
 from django.urls import reverse
-from django.http import HttpResponse, StreamingHttpResponse
 
 from django_transfer import TransferHttpResponse
-from soil.progress import get_task_progress, get_multiple_task_progress, set_task_progress
-from corehq.blobs import get_blob_db, CODES
 
+from soil.progress import (
+    get_multiple_task_progress,
+    get_task_progress,
+    set_task_progress,
+)
+
+from corehq.blobs import CODES, get_blob_db
 from corehq.const import ONE_DAY
 
 GLOBAL_RW = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IWGRP | stat.S_IROTH | stat.S_IWOTH
@@ -70,7 +74,7 @@ def get_cache(self):
         return cache.caches[self.cache_backend]
 
     def get_content(self):
-        raise NotImplemented("Use CachedDownload or FileDownload!")
+        raise NotImplementedError("Use CachedDownload or FileDownload!")
 
     def get_filename(self):
         """
@@ -120,11 +124,11 @@ def toHttpResponse(self):
         return response
 
     def get_start_response(self):
-        return HttpResponse(json.dumps({
+        return JsonResponse({
             'download_id': self.download_id,
             'download_url': reverse('ajax_job_poll', kwargs={'download_id': self.download_id}),
             'message': self.message
-        }))
+        })
 
     def __str__(self):
         return "content-type: %s, disposition: %s" % (self.content_type, self.content_disposition)
@@ -237,8 +241,8 @@ def __init__(self, filename, mimetype="text/plain",
                  transfer_encoding=None, extras=None, download_id=None, cache_backend=SOIL_DEFAULT_CACHE,
                  use_transfer=False, content_type=None, owner_ids=None):
         super(FileDownload, self).__init__(
-                content_type if content_type else mimetype, content_disposition,
-                transfer_encoding, extras, download_id, cache_backend, owner_ids=owner_ids)
+            content_type if content_type else mimetype, content_disposition,
+            transfer_encoding, extras, download_id, cache_backend, owner_ids=owner_ids)
         self.filename = filename
         self.use_transfer = use_transfer
 
diff --git a/corehq/extensions/tests.py b/corehq/extensions/tests.py
index b64b2d56e02d..89b672f5c1ab 100644
--- a/corehq/extensions/tests.py
+++ b/corehq/extensions/tests.py
@@ -1,5 +1,6 @@
 import re
 
+import pytest
 import testil
 
 from corehq.extensions.interface import CommCareExtensions, ExtensionError, ResultFormat
@@ -44,19 +45,15 @@ def demo_extension_3(**kwargs):
     return "p3"
 
 
-def test_commcare_extensions():
-    def check(args, kwargs, expected):
-        results = ext_point_a(*args, **kwargs)
-        testil.eq(results, expected)
-
-    cases = [
-        ([], {"arg1": 1, "domain": "d1"}, ["p2", "p3"]),
-        ([], {"arg1": 2, "domain": "d1"}, ["p3"]),
-        ([1, "d2"], {}, ["p1", "p2"]),
-        ([], {"arg1": 2, "domain": "d2"}, []),
-    ]
-    for args, kwargs, expected in cases:
-        yield check, args, kwargs, expected
+@pytest.mark.parametrize("args, kwargs, expected", [
+    ([], {"arg1": 1, "domain": "d1"}, ["p2", "p3"]),
+    ([], {"arg1": 2, "domain": "d1"}, ["p3"]),
+    ([1, "d2"], {}, ["p1", "p2"]),
+    ([], {"arg1": 2, "domain": "d2"}, []),
+])
+def test_commcare_extensions(args, kwargs, expected):
+    results = ext_point_a(*args, **kwargs)
+    testil.eq(results, expected)
 
 
 def test_validation_not_callable():
diff --git a/corehq/feature_previews.py b/corehq/feature_previews.py
index 69ad8bbbb761..364a93b05ccc 100644
--- a/corehq/feature_previews.py
+++ b/corehq/feature_previews.py
@@ -134,6 +134,15 @@ def previews_enabled_for_domain(domain):
     )
 )
 
+USE_LOCATION_DISPLAY_NAME = FeaturePreview(
+    slug='use_location_display_name',
+    label=_('Use location name'),
+    description=_(
+        "This setting changes the location dropdown to display location name instead of "
+        "the full location path."
+    )
+)
+
 
 def enable_callcenter(domain_name, checked):
     from corehq.apps.domain.models import Domain
diff --git a/corehq/form_processor/document_stores.py b/corehq/form_processor/document_stores.py
index ba03738ca5ad..63fe89f5cf35 100644
--- a/corehq/form_processor/document_stores.py
+++ b/corehq/form_processor/document_stores.py
@@ -60,10 +60,20 @@ def __init__(self, domain, case_type=None):
         self.domain = domain
         self.case_type = case_type
 
-    def get_document(self, doc_id):
+    def get_document(self, doc_id, *, external_id=None):
         try:
-            return CommCareCase.objects.get_case(doc_id, self.domain).to_json()
-        except CaseNotFound as e:
+            if external_id is None:
+                return CommCareCase.objects.get_case(doc_id, self.domain).to_json()
+            else:
+                case = CommCareCase.objects.get_case_by_external_id(
+                    self.domain,
+                    external_id,
+                    raise_multiple=True
+                )
+                if case:
+                    return case.to_json()
+                raise CaseNotFound(f"external_id: '{external_id}'")
+        except (CaseNotFound, CommCareCase.MultipleObjectsReturned) as e:
             raise DocumentNotFoundError(e)
 
     def iter_document_ids(self):
@@ -112,9 +122,9 @@ def __init__(self, store, track_load):
         self.store = store
         self.track_load = track_load
 
-    def get_document(self, doc_id):
+    def get_document(self, doc_id, *args, **kwargs):
         self.track_load()
-        return self.store.get_document(doc_id)
+        return self.store.get_document(doc_id, *args, **kwargs)
 
     def iter_documents(self, ids):
         for doc in self.store.iter_documents(ids):
diff --git a/corehq/form_processor/models/cases.py b/corehq/form_processor/models/cases.py
index c697ab7ef7bc..09434b648f98 100644
--- a/corehq/form_processor/models/cases.py
+++ b/corehq/form_processor/models/cases.py
@@ -1216,6 +1216,15 @@ def get_most_recent_form_transaction(self, case_id):
             .first()
         )
 
+    def get_last_n_recent_form_transaction(self, case_id, limit):
+        return (
+            self.partitioned_query(case_id)
+            .filter(case_id=case_id, revoked=False)
+            .annotate(type_filter=F('type').bitand(self.model.TYPE_FORM))
+            .filter(type_filter=self.model.TYPE_FORM)
+            .order_by("-server_date")[:limit]
+        )
+
     def get_transactions_by_type(self, case_id, transaction_type):
         return list(self.plproxy_raw(
             'SELECT * from get_case_transactions_by_type(%s, %s)',
@@ -1386,6 +1395,10 @@ def is_case_rebuild(self):
     def xmlns(self):
         return self.details.get('xmlns', None) if self.details else None
 
+    @property
+    def device_id(self):
+        return self.details.get('device_id', None) if self.details else None
+
     @classmethod
     @memoized
     def case_rebuild_types(cls):
@@ -1476,7 +1489,7 @@ def _from_form(cls, case, xform, transaction_type):
                 server_date=xform.received_on,
                 type=transaction_type,
                 revoked=not xform.is_normal,
-                details=FormSubmissionDetail(xmlns=xform.xmlns).to_json()
+                details=FormSubmissionDetail(xmlns=xform.xmlns, device_id=xform.device_id).to_json()
             )
 
     @classmethod
@@ -1544,6 +1557,7 @@ def __eq__(self, other):
 class FormSubmissionDetail(CaseTransactionDetail):
     _type = CaseTransaction.TYPE_FORM
     xmlns = StringProperty()
+    device_id = StringProperty()
 
 
 class RebuildWithReason(CaseTransactionDetail):
diff --git a/corehq/form_processor/models/forms.py b/corehq/form_processor/models/forms.py
index 1305ad2f0149..cdf4f2ae5440 100644
--- a/corehq/form_processor/models/forms.py
+++ b/corehq/form_processor/models/forms.py
@@ -637,6 +637,7 @@ def history(self):
         return operations
 
     @property
+    @memoized
     def metadata(self):
         from ..utils import clean_metadata
         if const.TAG_META in self.form_data:
@@ -650,6 +651,13 @@ def type(self):
     def name(self):
         return self.form_data.get(const.TAG_NAME, "")
 
+    @property
+    def device_id(self):
+        try:
+            return self.metadata and self.metadata.deviceID
+        except MissingFormXml:
+            pass
+
     @memoized
     def get_sync_token(self):
         from casexml.apps.phone.exceptions import MissingSyncLog
diff --git a/corehq/form_processor/submission_post.py b/corehq/form_processor/submission_post.py
index a4fc2cc0cd28..5ec27f887e1c 100644
--- a/corehq/form_processor/submission_post.py
+++ b/corehq/form_processor/submission_post.py
@@ -398,7 +398,7 @@ def _log_form_completion(self, form, submission_type):
     def _conditionally_send_device_logs_to_sumologic(self, instance):
         url = getattr(settings, 'SUMOLOGIC_URL', None)
         if (url and SUMOLOGIC_LOGS.enabled(instance.form_data.get('device_id'), NAMESPACE_OTHER)
-                and not BLOCK_SUMOLOGIC_LOGS.enabled(instance.form_data.get('device_id'), self.domain)):
+                and not BLOCK_SUMOLOGIC_LOGS.enabled(self.domain)):
             SumoLogicLog(self.domain, instance).send_data(url)
 
     def _invalidate_caches(self, xform):
diff --git a/corehq/form_processor/tests/test_basics.py b/corehq/form_processor/tests/test_basics.py
index 7716a00f295f..d6e39cb9c6b7 100644
--- a/corehq/form_processor/tests/test_basics.py
+++ b/corehq/form_processor/tests/test_basics.py
@@ -122,12 +122,14 @@ def test_create_case(self):
         case_id = uuid.uuid4().hex
         modified_on = datetime.utcnow()
         xmlns = 'http://commcare.org/test_xmlns'
+        device_id = "a.b.c.DemoDevice"
         _submit_case_block(
             True, case_id, user_id='user1', owner_id='owner1', case_type='demo',
             case_name='create_case', date_modified=modified_on, date_opened=modified_on, update={
                 'dynamic': '123'
             },
-            xmlns=xmlns
+            xmlns=xmlns,
+            device_id=device_id
         )
 
         case = self.casedb.get_case(case_id, DOMAIN)
@@ -149,6 +151,7 @@ def test_create_case(self):
         transactions = case.get_form_transactions()
         self.assertEqual(1, len(transactions))
         self.assertEqual(transactions[0].xmlns, xmlns)
+        self.assertEqual(transactions[0].device_id, device_id)
 
     def test_create_case_unicode_name(self):
         """
diff --git a/corehq/form_processor/tests/test_sql_update_strategy.py b/corehq/form_processor/tests/test_sql_update_strategy.py
index fcc9c0b47aa4..d71490b312b2 100644
--- a/corehq/form_processor/tests/test_sql_update_strategy.py
+++ b/corehq/form_processor/tests/test_sql_update_strategy.py
@@ -1,3 +1,4 @@
+import pytest
 from django.test import TestCase
 from freezegun import freeze_time
 from unittest.mock import patch
@@ -205,19 +206,16 @@ def _check_for_reconciliation_error_soft_assert(self, soft_assert_mock):
         soft_assert_mock.reset_mock()
 
 
-def test_update_known_properties_with_empty_values():
-    def test(prop):
-        case = SqlCaseUpdateStrategy.case_implementation_class()
-        setattr(case, prop, "value")
-        action = CaseUpdateAction(block=None, **{prop: ""})
+@pytest.mark.parametrize("prop", [p for p, d in KNOWN_PROPERTIES.items() if d is not None])
+def test_update_known_properties_with_empty_values(prop):
+    case = SqlCaseUpdateStrategy.case_implementation_class()
+    setattr(case, prop, "value")
+    action = CaseUpdateAction(block=None, **{prop: ""})
 
-        SqlCaseUpdateStrategy(case)._update_known_properties(action)
+    SqlCaseUpdateStrategy(case)._update_known_properties(action)
 
-        eq(getattr(case, prop), "")
+    eq(getattr(case, prop), "")
 
-    # verify that at least one property will be tested
-    assert any(v is not None for v in KNOWN_PROPERTIES.values()), KNOWN_PROPERTIES
 
-    for prop, default in KNOWN_PROPERTIES.items():
-        if default is not None:
-            yield test, prop
+def test_at_least_one_property_will_be_tested():
+    assert any(v is not None for v in KNOWN_PROPERTIES.values()), KNOWN_PROPERTIES
diff --git a/corehq/form_processor/tests/test_system_action.py b/corehq/form_processor/tests/test_system_action.py
index c3c671047a55..b085479217ca 100644
--- a/corehq/form_processor/tests/test_system_action.py
+++ b/corehq/form_processor/tests/test_system_action.py
@@ -1,5 +1,6 @@
 from uuid import uuid4
 
+import pytest
 from django.test import TestCase
 
 from testil import eq
@@ -27,11 +28,11 @@ def test_unauthorized_system_action(self):
             XFormInstance.objects.get_form(form_id, domain)
 
 
-def test_system_action_constants():
-    def test(actual, expected):
-        eq(actual, expected,
-            f"Changing the value of this constant will break all "
-            f"'{expected}' system action forms in existence.")
-
-    yield test, ARCHIVE_FORM, "archive_form"
-    yield test, HARD_DELETE_CASE_AND_FORMS, "hard_delete_case_and_forms"
+@pytest.mark.parametrize("actual, expected", [
+    (ARCHIVE_FORM, "archive_form"),
+    (HARD_DELETE_CASE_AND_FORMS, "hard_delete_case_and_forms"),
+])
+def test_system_action_constants(actual, expected):
+    eq(actual, expected,
+        f"Changing the value of this constant will break all "
+        f"'{expected}' system action forms in existence.")
diff --git a/corehq/form_processor/tests/utils.py b/corehq/form_processor/tests/utils.py
index 1b1242622c47..fb56fbffbc43 100644
--- a/corehq/form_processor/tests/utils.py
+++ b/corehq/form_processor/tests/utils.py
@@ -8,7 +8,7 @@
 from django.test import TestCase, TransactionTestCase
 from django.utils.functional import classproperty
 
-from nose.plugins.attrib import attr
+import pytest
 from nose.tools import nottest
 from unittest import skipIf, skipUnless
 
@@ -112,7 +112,7 @@ def sharded(cls):
 
     Was previously named @use_sql_backend
     """
-    return patch_shard_db_transactions(attr(sharded=True)(cls))
+    return patch_shard_db_transactions(pytest.mark.sharded(cls))
 
 
 def only_run_with_non_partitioned_database(cls):
diff --git a/corehq/form_processor/utils/xform.py b/corehq/form_processor/utils/xform.py
index 8d572be1b7fe..5243b99599bc 100644
--- a/corehq/form_processor/utils/xform.py
+++ b/corehq/form_processor/utils/xform.py
@@ -67,6 +67,7 @@ class TestFormMetadata(jsonobject.JsonObject):
     time_start = jsonobject.DateTimeProperty(default=datetime(2013, 4, 19, 16, 53, 2))
     # Set this property to fake the submission time
     received_on = jsonobject.DateTimeProperty(default=datetime.utcnow)
+    __test__ = False
 
 
 class FormSubmissionBuilder(object):
diff --git a/corehq/messaging/scheduling/forms.py b/corehq/messaging/scheduling/forms.py
index 3ae6508d633a..d9a61a407f7e 100644
--- a/corehq/messaging/scheduling/forms.py
+++ b/corehq/messaging/scheduling/forms.py
@@ -2929,7 +2929,8 @@ class ConditionalAlertScheduleForm(ScheduleForm):
         ScheduleInstance.RECIPIENT_TYPE_USER_GROUP,
         CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_OWNER,
         CaseScheduleInstanceMixin.RECIPIENT_TYPE_LAST_SUBMITTING_USER,
-        CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER,
+        CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
+        CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID,
         CaseScheduleInstanceMixin.RECIPIENT_TYPE_CUSTOM,
     ]
 
@@ -2995,6 +2996,10 @@ class ConditionalAlertScheduleForm(ScheduleForm):
         required=False,
     )
 
+    user_id_case_property = CharField(
+        required=False,
+    )
+
     email_case_property = CharField(
         required=False,
     )
@@ -3170,7 +3175,10 @@ def update_recipient_types_choices(self):
             (CaseScheduleInstanceMixin.RECIPIENT_TYPE_LAST_SUBMITTING_USER, _("The Case's Last Submitting User")),
             (CaseScheduleInstanceMixin.RECIPIENT_TYPE_PARENT_CASE, _("The Case's Parent Case")),
             (CaseScheduleInstanceMixin.RECIPIENT_TYPE_ALL_CHILD_CASES, _("The Case's Child Cases")),
-            (CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER, _("User Specified via Case Property")),
+            (CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
+                _("Username Specified via Case Property")),
+            (CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID,
+                _("User ID Specified via Case Property")),
             (CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_EMAIL, _("Email Specified via Case Property")),
         ]
         new_choices.extend(self.fields['recipient_types'].choices)
@@ -3210,8 +3218,10 @@ def add_initial_recipients(self, recipients, initial):
         for recipient_type, recipient_id in recipients:
             if recipient_type == CaseScheduleInstanceMixin.RECIPIENT_TYPE_CUSTOM:
                 initial['custom_recipient'] = recipient_id
-            if recipient_type == CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER:
+            if recipient_type == CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME:
                 initial['username_case_property'] = recipient_id
+            if recipient_type == CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID:
+                initial['user_id_case_property'] = recipient_id
             if recipient_type == CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_EMAIL:
                 initial['email_case_property'] = recipient_id
 
@@ -3377,7 +3387,13 @@ def get_recipients_layout_fields(self):
                 _("Username Case Property"),
                 twbscrispy.InlineField('username_case_property'),
                 data_bind="visible: recipientTypeSelected('%s')" %
-                          CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER,
+                          CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
+            ),
+            hqcrispy.B3MultiField(
+                _("User ID Case Property"),
+                twbscrispy.InlineField('user_id_case_property'),
+                data_bind="visible: recipientTypeSelected('%s')" %
+                          CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID,
             ),
             hqcrispy.B3MultiField(
                 _("Email Case Property"),
@@ -3776,9 +3792,13 @@ def distill_recipients(self):
             custom_recipient_id = self.cleaned_data['custom_recipient']
             result.append((CaseScheduleInstanceMixin.RECIPIENT_TYPE_CUSTOM, custom_recipient_id))
 
-        if CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER in recipient_types:
+        if CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME in recipient_types:
             username_case_property = self.cleaned_data['username_case_property']
-            result.append((CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER, username_case_property))
+            result.append((CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
+                           username_case_property))
+        if CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID in recipient_types:
+            user_id_case_property = self.cleaned_data['user_id_case_property']
+            result.append((CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID, user_id_case_property))
         if CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_EMAIL in recipient_types:
             email_case_property = self.cleaned_data['email_case_property']
             result.append((CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_EMAIL, email_case_property))
diff --git a/corehq/messaging/scheduling/scheduling_partitioned/models.py b/corehq/messaging/scheduling/scheduling_partitioned/models.py
index 4c45f40ff8e8..7d4b21615259 100644
--- a/corehq/messaging/scheduling/scheduling_partitioned/models.py
+++ b/corehq/messaging/scheduling/scheduling_partitioned/models.py
@@ -558,7 +558,8 @@ class CaseScheduleInstanceMixin(object):
     RECIPIENT_TYPE_PARENT_CASE = 'ParentCase'
     RECIPIENT_TYPE_ALL_CHILD_CASES = 'AllChildCases'
     RECIPIENT_TYPE_CUSTOM = 'CustomRecipient'
-    RECIPIENT_TYPE_CASE_PROPERTY_USER = 'CasePropertyUser'
+    RECIPIENT_TYPE_CASE_PROPERTY_USERNAME = 'CasePropertyUser'
+    RECIPIENT_TYPE_CASE_PROPERTY_USER_ID = 'CasePropertyUserId'
     RECIPIENT_TYPE_CASE_PROPERTY_EMAIL = 'CasePropertyEmail'
 
     @property
@@ -634,10 +635,14 @@ def recipient(self):
                 settings.AVAILABLE_CUSTOM_SCHEDULING_RECIPIENTS[self.recipient_id][0]
             )
             return custom_function(self)
-        elif self.recipient_type == self.RECIPIENT_TYPE_CASE_PROPERTY_USER:
+        elif self.recipient_type == self.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME:
             username = self.case.get_case_property(self.recipient_id)
-            full_username = format_username(username, self.domain)
-            return CommCareUser.get_by_username(full_username)
+            if username:
+                return CouchUser.get_by_username(format_username(username, self.domain))
+        elif self.recipient_type == self.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID:
+            user_id = self.case.get_case_property(self.recipient_id)
+            if user_id:
+                return CouchUser.get_by_user_id(user_id)
         elif self.recipient_type == self.RECIPIENT_TYPE_CASE_PROPERTY_EMAIL:
             return EmailAddressRecipient(self.case, self.recipient_id)
         else:
diff --git a/corehq/messaging/scheduling/scheduling_partitioned/tests/test_dbaccessors_partitioned.py b/corehq/messaging/scheduling/scheduling_partitioned/tests/test_dbaccessors_partitioned.py
index 8fdacbbf9b7a..abd7cc91787f 100644
--- a/corehq/messaging/scheduling/scheduling_partitioned/tests/test_dbaccessors_partitioned.py
+++ b/corehq/messaging/scheduling/scheduling_partitioned/tests/test_dbaccessors_partitioned.py
@@ -24,11 +24,16 @@
 from corehq.sql_db.tests.utils import DefaultShardingTestConfigMixIn
 from datetime import datetime, date
 from django.test import TestCase
+from django.utils.functional import classproperty
 
 
 @only_run_with_partitioned_database
 class BaseSchedulingPartitionedDBAccessorsTest(DefaultShardingTestConfigMixIn, TestCase):
 
+    @classproperty
+    def __test__(cls):
+        return cls is not BaseSchedulingPartitionedDBAccessorsTest
+
     @classmethod
     def setUpClass(cls):
         super(BaseSchedulingPartitionedDBAccessorsTest, cls).setUpClass()
diff --git a/corehq/messaging/scheduling/static/scheduling/js/broadcasts_list.js b/corehq/messaging/scheduling/static/scheduling/js/broadcasts_list.js
index 92ea7fb926f8..b42b8b756d47 100644
--- a/corehq/messaging/scheduling/static/scheduling/js/broadcasts_list.js
+++ b/corehq/messaging/scheduling/static/scheduling/js/broadcasts_list.js
@@ -4,7 +4,7 @@ hqDefine("scheduling/js/broadcasts_list", [
     'knockout',
     'hqwebapp/js/assert_properties',
     'hqwebapp/js/initial_page_data',
-    "hqwebapp/js/bootstrap3/components.ko",     // pagination
+    "hqwebapp/js/components/pagination",
 ], function (
     $,
     _,
diff --git a/corehq/messaging/scheduling/static/scheduling/js/conditional_alert_list.js b/corehq/messaging/scheduling/static/scheduling/js/conditional_alert_list.js
index d658fa9978e4..283bc27a557c 100644
--- a/corehq/messaging/scheduling/static/scheduling/js/conditional_alert_list.js
+++ b/corehq/messaging/scheduling/static/scheduling/js/conditional_alert_list.js
@@ -4,7 +4,8 @@ hqDefine("scheduling/js/conditional_alert_list", [
     'underscore',
     'hqwebapp/js/assert_properties',
     'hqwebapp/js/initial_page_data',
-    'hqwebapp/js/bootstrap3/components.ko',    // pagination and search box widgets
+    'hqwebapp/js/components/pagination',
+    'hqwebapp/js/components/search_box',
 ], function (
     $,
     ko,
@@ -12,8 +13,6 @@ hqDefine("scheduling/js/conditional_alert_list", [
     assertProperties,
     initialPageData
 ) {
-    var table = null;
-
     var rule = function (options) {
         var self = ko.mapping.fromJS(options);
         self.requestInProgress = ko.observable(false);
diff --git a/corehq/messaging/scheduling/tests/test_recipients.py b/corehq/messaging/scheduling/tests/test_recipients.py
index 86139d64ed7f..fa1a5e066f39 100644
--- a/corehq/messaging/scheduling/tests/test_recipients.py
+++ b/corehq/messaging/scheduling/tests/test_recipients.py
@@ -621,7 +621,7 @@ def test_username_case_property_recipient(self):
             instance = CaseTimedScheduleInstance(
                 domain=self.domain,
                 case_id=case.case_id,
-                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER,
+                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
                 recipient_id='recipient'
             )
             self.assertEqual(instance.recipient.get_id, self.full_mobile_user.get_id)
@@ -636,7 +636,7 @@ def test_username_case_property_recipient(self):
             instance = CaseTimedScheduleInstance(
                 domain=self.domain,
                 case_id=case.case_id,
-                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER,
+                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
                 recipient_id='recipient'
             )
             self.assertIsNone(instance.recipient)
@@ -650,11 +650,42 @@ def test_username_case_property_recipient(self):
             instance = CaseTimedScheduleInstance(
                 domain=self.domain,
                 case_id=case.case_id,
-                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER,
+                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USERNAME,
                 recipient_id='recipient'
             )
             self.assertIsNone(instance.recipient)
 
+    def test_user_id_case_property_recipient(self):
+        # test valid ID
+        with create_case(
+                self.domain,
+                'person',
+                owner_id=self.city_location.location_id,
+                update={'hq_user_id': self.web_user.get_id}
+        ) as case:
+            instance = CaseTimedScheduleInstance(
+                domain=self.domain,
+                case_id=case.case_id,
+                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID,
+                recipient_id='hq_user_id'
+            )
+            self.assertEqual(instance.recipient.get_id, self.web_user.get_id)
+
+        # test invalid ID
+        with create_case(
+                self.domain,
+                'person',
+                owner_id=self.city_location.location_id,
+                update={'hq_user_id': '1234abcd'}
+        ) as case:
+            instance = CaseTimedScheduleInstance(
+                domain=self.domain,
+                case_id=case.case_id,
+                recipient_type=CaseScheduleInstanceMixin.RECIPIENT_TYPE_CASE_PROPERTY_USER_ID,
+                recipient_id='hq_user_id'
+            )
+            self.assertEqual(instance.recipient, None)
+
     def test_email_case_property_recipient(self):
         with create_case(
                 self.domain,
diff --git a/corehq/messaging/smsbackends/telerivet/tests/test_log_call.py b/corehq/messaging/smsbackends/telerivet/tests/test_log_call.py
index 1fa8286e661b..1c63e1a1240e 100644
--- a/corehq/messaging/smsbackends/telerivet/tests/test_log_call.py
+++ b/corehq/messaging/smsbackends/telerivet/tests/test_log_call.py
@@ -16,9 +16,8 @@ def setUp(self):
         self.backend.set_extra_fields(webhook_secret='abc')
         self.backend.save()
 
-    def tearDown(self):
-        self.backend.delete()
-        super(TelerivetLogCallTestCase, self).tearDown()
+        clear_cache = SQLTelerivetBackend.by_webhook_secret.clear
+        self.addCleanup(clear_cache, SQLTelerivetBackend, 'abc')
 
     def simulate_inbound_call(self, phone_number):
         return Client().post('/telerivet/in/', {
diff --git a/corehq/messaging/smsbackends/telerivet/tests/test_webhook_lookup.py b/corehq/messaging/smsbackends/telerivet/tests/test_webhook_lookup.py
index 55096febd491..765b1575eb15 100644
--- a/corehq/messaging/smsbackends/telerivet/tests/test_webhook_lookup.py
+++ b/corehq/messaging/smsbackends/telerivet/tests/test_webhook_lookup.py
@@ -25,9 +25,10 @@ def setUp(self):
         )
         self.backend2.save()
 
-    def tearDown(self):
-        self.backend1.delete()
-        self.backend2.delete()
+        clear_cache = SQLTelerivetBackend.by_webhook_secret.clear
+        self.addCleanup(clear_cache, SQLTelerivetBackend, 'abc')
+        self.addCleanup(clear_cache, SQLTelerivetBackend, 'def')
+        self.addCleanup(clear_cache, SQLTelerivetBackend, 'ghi')
 
     def test_webhook_lookup(self):
         self.assertEqual(
diff --git a/corehq/messaging/smsbackends/tropo/views.py b/corehq/messaging/smsbackends/tropo/views.py
index f03b704decf8..2aa594995a53 100644
--- a/corehq/messaging/smsbackends/tropo/views.py
+++ b/corehq/messaging/smsbackends/tropo/views.py
@@ -1,13 +1,14 @@
 import json
-from corehq.apps.sms.api import incoming as incoming_sms
+from datetime import datetime
+
 from django.http import HttpResponse, HttpResponseBadRequest
-from django.views.decorators.csrf import csrf_exempt
+
 from corehq.apps.ivr.models import Call
+from corehq.apps.sms.api import incoming as incoming_sms
 from corehq.apps.sms.models import INCOMING, PhoneNumber
+from corehq.apps.sms.util import strip_plus
 from corehq.apps.sms.views import IncomingBackendView
 from corehq.messaging.smsbackends.tropo.models import SQLTropoBackend
-from datetime import datetime
-from corehq.apps.sms.util import strip_plus
 
 
 def sms_in(request, backend_id=None):
@@ -25,9 +26,9 @@ def sms_in(request, backend_id=None):
                 numberToDial = params["numberToDial"]
                 msg = params["msg"]
                 t = Tropo()
-                t.call(to = numberToDial, network = "SMS")
+                t.call(to=numberToDial, network="SMS")
                 t.say(msg)
-                return HttpResponse(t.RenderJson())
+                return HttpResponse(t.RenderJson(), content_type='application/json')
         # Handle incoming SMS
         phone_number = None
         text = None
@@ -41,7 +42,7 @@ def sms_in(request, backend_id=None):
         incoming_sms(phone_number, text, SQLTropoBackend.get_api_id(), backend_id=backend_id)
         t = Tropo()
         t.hangup()
-        return HttpResponse(t.RenderJson())
+        return HttpResponse(t.RenderJson(), content_type='application/json')
     else:
         return HttpResponseBadRequest("Bad Request")
 
@@ -76,7 +77,7 @@ def ivr_in(request):
 
         t = Tropo()
         t.reject()
-        return HttpResponse(t.RenderJson())
+        return HttpResponse(t.RenderJson(), content_type='application/json')
     else:
         return HttpResponseBadRequest("Bad Request")
 
diff --git a/corehq/messaging/smsbackends/twilio/views.py b/corehq/messaging/smsbackends/twilio/views.py
index 57b204de3fdc..f3d42f0754d0 100644
--- a/corehq/messaging/smsbackends/twilio/views.py
+++ b/corehq/messaging/smsbackends/twilio/views.py
@@ -34,7 +34,7 @@ def post(self, request, api_key, *args, **kwargs):
             domain_scope=self.domain,
             backend_id=self.backend_couch_id
         )
-        return HttpResponse(EMPTY_RESPONSE)
+        return HttpResponse(EMPTY_RESPONSE, content_type='application/xml')
 
 
 class TwilioIncomingIVRView(IncomingBackendView):
@@ -48,4 +48,4 @@ def post(self, request, api_key, *args, **kwargs):
         from_number = request.POST.get('From')
         call_sid = request.POST.get('CallSid')
         log_call(from_number, '%s-%s' % (SQLTwilioBackend.get_api_id(), call_sid))
-        return HttpResponse(IVR_RESPONSE)
+        return HttpResponse(IVR_RESPONSE, content_type='application/xml')
diff --git a/corehq/messaging/tests/test_smsbackends.py b/corehq/messaging/tests/test_smsbackends.py
index 22ea8a80763e..756982a9c004 100644
--- a/corehq/messaging/tests/test_smsbackends.py
+++ b/corehq/messaging/tests/test_smsbackends.py
@@ -1,5 +1,7 @@
 from unittest.mock import patch
 
+import pytest
+
 from corehq.apps.hqadmin.management.commands import verify_ssl_connections
 
 
@@ -17,19 +19,20 @@ def console(message, style):
         assert not list(Command.iter_sms_endpoints(ConsoleChecker))
 
 
-def test_sms_urls():
+@pytest.mark.parametrize(
+    "model_class",
+    [m for _, m in verify_ssl_connections.iter_sms_model_classes()],
+)
+def test_sms_urls(model_class):
     def test_manager(model_class):
         class NoDbManager:
             def filter(**kw):
                 return [model_class()]
         return NoDbManager
 
-    def test(model_class):
-        def log(msg):
-            raise NotImplementedError
-        with patch.object(model_class, "active_objects", test_manager(model_class)):
-            urls = list(verify_ssl_connections.iter_sms_urls(model_class, log))
-            assert urls, f"{model_class} has no URL(s)"
+    def log(msg):
+        raise NotImplementedError
 
-    for name, model_class in verify_ssl_connections.iter_sms_model_classes():
-        yield test, model_class
+    with patch.object(model_class, "active_objects", test_manager(model_class)):
+        urls = list(verify_ssl_connections.iter_sms_urls(model_class, log))
+        assert urls, f"{model_class} has no URL(s)"
diff --git a/corehq/middleware.py b/corehq/middleware.py
index 6d3d98633672..1e9049c2352f 100644
--- a/corehq/middleware.py
+++ b/corehq/middleware.py
@@ -340,6 +340,10 @@ def get_view_func(view_fn, view_kwargs):
 
 
 class SecureCookiesMiddleware(MiddlewareMixin):
+    """Sets `secure` flag for cookies on the response object.
+    Must be come before middleware that adds cookies, because of order and layering.
+    https://docs.djangoproject.com/en/4.2/topics/http/middleware/#middleware-order-and-layering
+    """
 
     def process_response(self, request, response):
         if hasattr(response, 'cookies') and response.cookies:
diff --git a/corehq/motech/admin.py b/corehq/motech/admin.py
new file mode 100644
index 000000000000..c773c63560c7
--- /dev/null
+++ b/corehq/motech/admin.py
@@ -0,0 +1,32 @@
+from django.contrib import admin
+from django.utils.html import escape
+from .models import ConnectionSettings
+
+
+class ConnectionSettingsAdmin(admin.ModelAdmin):
+    model = ConnectionSettings
+    fieldsets = [(None, {
+        'description': escape('To edit, go to /a/<domain>/motech/conn/'),
+        'fields': [
+            'domain',
+            'name',
+            'notify_addresses_str',
+            'url',
+            'auth_type',
+            'skip_cert_verify',
+            'is_deleted',
+        ],
+    })]
+    search_fields = ('name', 'domain',)
+
+    def has_add_permission(self, request, obj=None):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+
+admin.site.register(ConnectionSettings, ConnectionSettingsAdmin)
diff --git a/corehq/motech/auth.py b/corehq/motech/auth.py
index 37fd35dcaa86..e0026e9b083d 100644
--- a/corehq/motech/auth.py
+++ b/corehq/motech/auth.py
@@ -1,4 +1,5 @@
 import re
+from corehq import toggles
 from typing import TYPE_CHECKING, Optional
 from urllib.parse import urljoin
 
@@ -6,6 +7,7 @@
 
 import attr
 import requests
+import time
 from oauthlib.oauth2 import LegacyApplicationClient, BackendApplicationClient
 from requests import Session
 from requests.auth import AuthBase, HTTPBasicAuth, HTTPDigestAuth
@@ -185,6 +187,8 @@ def __init__(
         token_url: str,
         refresh_url: str,
         pass_credentials_in_header: bool,
+        include_client_id: bool,
+        scope: str,
         connection_settings: 'ConnectionSettings',
     ):
         self.base_url = base_url
@@ -193,6 +197,8 @@ def __init__(
         self.token_url = token_url
         self.refresh_url = refresh_url
         self.pass_credentials_in_header = pass_credentials_in_header
+        self.include_client_id = include_client_id
+        self.scope = scope
         self.connection_settings = connection_settings
 
     @property
@@ -215,20 +221,32 @@ def set_last_token(token):
             # Used by OAuth2Session
             self.last_token = token
 
-        if not self.last_token or self.last_token.get('refresh_token') is None:
-            client = BackendApplicationClient(client_id=self.client_id)
+        request_fresh_token = not self.last_token or self.last_token.get('refresh_token') is None
+
+        if toggles.SUPERSET_ANALYTICS.enabled(domain_name):
+            if (
+                self.last_token
+                and self.last_token.get('expires_at')
+                and self.last_token.get('expires_at') > (time.time() + 10)  # 10 seconds buffer for delays
+            ):
+                request_fresh_token = False
+
+        if request_fresh_token:
+            client = BackendApplicationClient(client_id=self.client_id, scope=self.scope)
             session = OAuth2Session(client=client)
             if self.pass_credentials_in_header:
                 auth = HTTPBasicAuth(self.client_id, self.client_secret)
                 self.last_token = session.fetch_token(
                     token_url=self.token_url,
                     auth=auth,
+                    include_client_id=self.include_client_id,
                 )
             else:
                 self.last_token = session.fetch_token(
                     token_url=self.token_url,
                     client_id=self.client_id,
                     client_secret=self.client_secret,
+                    include_client_id=self.include_client_id,
                 )
 
         refresh_kwargs = {
@@ -266,6 +284,8 @@ def __init__(
         token_url: str,
         refresh_url: str,
         pass_credentials_in_header: bool,
+        include_client_id: bool,
+        scope: str,
         connection_settings: 'ConnectionSettings',
     ):
         self.base_url = base_url
@@ -276,6 +296,8 @@ def __init__(
         self.token_url = token_url
         self.refresh_url = refresh_url
         self.pass_credentials_in_header = pass_credentials_in_header
+        self.include_client_id = include_client_id
+        self.scope = scope
         self.connection_settings = connection_settings
 
     @property
@@ -303,7 +325,7 @@ def set_last_token(token):
         # without error, or refactoring the way sessions are used across
         # all repeaters.
         if not self.last_token or self.last_token.get('refresh_token') is None:
-            client = LegacyApplicationClient(client_id=self.client_id)
+            client = LegacyApplicationClient(client_id=self.client_id, scope=self.scope)
             session = OAuth2Session(client=client)
             if self.pass_credentials_in_header:
                 auth = HTTPBasicAuth(self.client_id, self.client_secret)
@@ -312,6 +334,7 @@ def set_last_token(token):
                     username=self.username,
                     password=self.password,
                     auth=auth,
+                    include_client_id=self.include_client_id,
                 )
             else:
                 self.last_token = session.fetch_token(
@@ -320,6 +343,7 @@ def set_last_token(token):
                     password=self.password,
                     client_id=self.client_id,
                     client_secret=self.client_secret,
+                    include_client_id=self.include_client_id,
                 )
 
         # Return session that refreshes token automatically
diff --git a/corehq/motech/const.py b/corehq/motech/const.py
index dba68890a1f0..052622d68ec4 100644
--- a/corehq/motech/const.py
+++ b/corehq/motech/const.py
@@ -47,7 +47,9 @@
 REQUEST_DELETE = "DELETE"
 REQUEST_POST = "POST"
 REQUEST_PUT = "PUT"
-REQUEST_METHODS = (REQUEST_DELETE, REQUEST_POST, REQUEST_PUT)
+REQUEST_GET = "GET"
+DEFAULT_REQUEST_METHODS = (REQUEST_DELETE, REQUEST_POST, REQUEST_PUT)
+ALL_REQUEST_METHODS = (REQUEST_DELETE, REQUEST_POST, REQUEST_PUT, REQUEST_GET)
 
 
 @attr.s(auto_attribs=True, frozen=True, kw_only=True)
diff --git a/corehq/motech/fhir/admin.py b/corehq/motech/fhir/admin.py
index f9be833356fc..77dfd2b61d74 100644
--- a/corehq/motech/fhir/admin.py
+++ b/corehq/motech/fhir/admin.py
@@ -69,6 +69,7 @@ class FHIRImportConfigAdmin(admin.ModelAdmin):
     )
     list_filter = ('domain',)
     list_select_related = ('connection_settings',)
+    autocomplete_fields = ('connection_settings',)
 
 
 class FHIRImportResourcePropertyInline(admin.TabularInline):
diff --git a/corehq/motech/fhir/tests/test_matchers.py b/corehq/motech/fhir/tests/test_matchers.py
index e57d357a8b7e..d62142fbc1d8 100644
--- a/corehq/motech/fhir/tests/test_matchers.py
+++ b/corehq/motech/fhir/tests/test_matchers.py
@@ -2,6 +2,7 @@
 from decimal import Decimal
 from uuid import uuid4
 
+import pytest
 from django.test import SimpleTestCase
 
 from nose.tools import assert_equal
@@ -18,8 +19,20 @@
     PropertyWeight,
 )
 
+JOHN = {'name': [{'given': 'Henry John Colchester'.split()}]}
 
-def test_given_name_method():
+
+@pytest.mark.parametrize("resource, candidate, expected", [
+    # candidate "H. John" matches patient "Henry John Colchester"
+    (JOHN, {'name': [{'given': ['H.', 'John']}]}, True),
+    # candidate "John" does not match patient "Henry John Colchester"
+    (JOHN, {'name': [{'given': ['John']}]}, False),
+    (JOHN, {'name': [{'given': ['Henry']}]}, True),
+    (JOHN, {'name': [{'given': ['H.', 'J.', 'C.']}]}, False),
+    # candidate "Eric John Marwood" matches "Henry John Colchester"
+    (JOHN, {'name': [{'given': ['Eric', 'John', 'Marwood']}]}, True),
+])
+def test_given_name_method(resource, candidate, expected):
     """
     Test the GivenName ComparisonMethod as used by PersonMatcher
     """
@@ -27,21 +40,16 @@ def test_given_name_method():
     assert pw in PersonMatcher.property_weights
     method = pw.method
 
-    john = {'name': [{'given': 'Henry John Colchester'.split()}]}
-    for resource, candidate, expected in [
-        # candidate "H. John" matches patient "Henry John Colchester"
-        (john, {'name': [{'given': ['H.', 'John']}]}, True),
-        # candidate "John" does not match patient "Henry John Colchester"
-        (john, {'name': [{'given': ['John']}]}, False),
-        (john, {'name': [{'given': ['Henry']}]}, True),
-        (john, {'name': [{'given': ['H.', 'J.', 'C.']}]}, False),
-        # candidate "Eric John Marwood" matches "Henry John Colchester"
-        (john, {'name': [{'given': ['Eric', 'John', 'Marwood']}]}, True),
-    ]:
-        yield check_method, method, resource, candidate, expected
-
-
-def test_organization_name_method():
+    check_method(method, resource, candidate, expected)
+
+
+@pytest.mark.parametrize("resource, candidate, expected", [
+    ({'name': 'Dimagi'}, {'name': 'Dimagi'}, True),
+    ({'name': 'Dimagi'}, {'name': 'DiMaggi'}, True),
+    ({'name': 'Dimagi'}, {'name': 'Di Maggi'}, False),
+    ({'name': 'Dimagi'}, {'name': 'dimCGI'}, True),
+])
+def test_organization_name_method(resource, candidate, expected):
     """
     Test the OrganizationName method as used by OrganizationMatcher
     """
@@ -49,14 +57,7 @@ def test_organization_name_method():
     assert pw in OrganizationMatcher.property_weights
     method = pw.method
 
-    dimagi = {'name': 'Dimagi'}
-    for resource, candidate, expected in [
-        (dimagi, {'name': 'Dimagi'}, True),
-        (dimagi, {'name': 'DiMaggi'}, True),
-        (dimagi, {'name': 'Di Maggi'}, False),
-        (dimagi, {'name': 'dimCGI'}, True),
-    ]:
-        yield check_method, method, resource, candidate, expected
+    check_method(method, resource, candidate, expected)
 
 
 def check_method(method, a, b, expected):
@@ -64,18 +65,14 @@ def check_method(method, a, b, expected):
     assert_equal(result, expected)
 
 
-def test_negative_identifier():
-    for a, b, expected in [
-        ('name|Beth Harmon', 'name|Elizabeth Harmon', False),
-        ('name|Beth', 'name|Beth', True),
-        ('name|Elizabeth Harmon', 'name|Elisabeth Harmon', True),
-        ('given_name|Elizabeth', 'family_name|Harmon', True),
-    ]:
-        yield check_compare, NegativeIdentifier, a, b, expected
-
-
-def check_compare(method_class, a, b, expected):
-    result = method_class.compare(a, b)
+@pytest.mark.parametrize("a, b, expected", [
+    ('name|Beth Harmon', 'name|Elizabeth Harmon', False),
+    ('name|Beth', 'name|Beth', True),
+    ('name|Elizabeth Harmon', 'name|Elisabeth Harmon', True),
+    ('given_name|Elizabeth', 'family_name|Harmon', True),
+])
+def test_negative_identifier(a, b, expected):
+    result = NegativeIdentifier.compare(a, b)
     assert_equal(result, expected)
 
 
diff --git a/corehq/motech/fhir/tests/test_searchers.py b/corehq/motech/fhir/tests/test_searchers.py
index 0398350da28a..cc183c6e4067 100644
--- a/corehq/motech/fhir/tests/test_searchers.py
+++ b/corehq/motech/fhir/tests/test_searchers.py
@@ -1,6 +1,7 @@
 from unittest.mock import Mock
 
 import attr
+import pytest
 from nose.tools import assert_equal, assert_in, assert_true
 
 from corehq.motech.auth import BasicAuthManager
@@ -16,154 +17,154 @@
 )
 
 
-def test_param_helper():
+@pytest.mark.parametrize("resource, expected_valueset", [
+    (
+        {'name': [{'given': ['Jane'], 'family': 'Fonda'}]},
+        'Fonda',
+    ),
+    (
+        {'name': [
+            {'given': ['Jane'], 'family': 'Fonda'},
+            {'given': ['Jane'], 'family': 'Plemiannikov'},
+        ]},
+        {'Fonda', 'Plemiannikov'},
+    ),
+])
+def test_param_helper(resource, expected_valueset):
     search_param = SearchParam('family', '$.name[*].family', ParamHelper)
-    for resource, expected_valueset in [
-        (
-            {'name': [{'given': ['Jane'], 'family': 'Fonda'}]},
-            'Fonda',
-        ),
-        (
-            {'name': [
-                {'given': ['Jane'], 'family': 'Fonda'},
-                {'given': ['Jane'], 'family': 'Plemiannikov'},
-            ]},
-            {'Fonda', 'Plemiannikov'},
-        ),
-    ]:
-        yield check_param_helper, search_param, resource, expected_valueset
+    check_param_helper(search_param, resource, expected_valueset)
 
 
-def test_given_name():
+@pytest.mark.parametrize("resource, expected_valueset", [
+    (
+        {'name': [{'given': ['Jane'], 'family': 'Fonda'}]},
+        'Jane',
+    ),
+    (
+        {'name': [{'given': ['Jane', 'Seymour'], 'family': 'Fonda'}]},
+        'Jane Seymour',
+    ),
+    (
+        {'name': [{'family': 'Fonda'}]},
+        None,
+    ),
+])
+def test_given_name(resource, expected_valueset):
     search_param = SearchParam('given', '$.name[0].given', GivenName)
-    for resource, expected_valueset in [
-        (
-            {'name': [{'given': ['Jane'], 'family': 'Fonda'}]},
-            'Jane',
-        ),
-        (
-            {'name': [{'given': ['Jane', 'Seymour'], 'family': 'Fonda'}]},
-            'Jane Seymour',
-        ),
-        (
-            {'name': [{'family': 'Fonda'}]},
-            None,
-        ),
-    ]:
-        yield check_param_helper, search_param, resource, expected_valueset
+    check_param_helper(search_param, resource, expected_valueset)
 
 
-def test_each_unique_value_given_names():
+@pytest.mark.parametrize("resource, expected_valueset", [
+    (
+        {'name': [{'given': ['Jane'], 'family': 'Fonda'}]},
+        'Jane',
+    ),
+    (
+        {'name': [{'given': ['Jane', 'Seymour'], 'family': 'Fonda'}]},
+        {'Jane', 'Seymour'},
+    ),
+    (
+        {'name': [{'family': 'Fonda'}]},
+        None,
+    ),
+    (
+        {'name': [
+            {'given': ['Jane'], 'family': 'Fonda'},
+            {'given': ['Jane'], 'family': 'Plemiannikov'},
+        ]},
+        'Jane',
+    ),
+    (
+        {'name': [
+            {'given': ['Jane', 'Seymour'], 'family': 'Fonda'},
+            {'given': ['Jane', 'Seymour'], 'family': 'Plemiannikov'},
+        ]},
+        {'Jane', 'Seymour'},
+    ),
+    (
+        {'name': [
+            {'given': ['Jane', 'Seymour'], 'family': 'Fonda'},
+            {'given': ['Jane', 'S.'], 'family': 'Plemiannikov'},
+        ]},
+        {'Jane', 'S.', 'Seymour'},
+    ),
+    (
+        {'name': [
+            {'family': 'Fonda'},
+            {'family': 'Plemiannikov'},
+        ]},
+        None,
+    ),
+])
+def test_each_unique_value_given_names(resource, expected_valueset):
     search_param = SearchParam('given', '$.name[*].given', EachUniqueValue)
-    for resource, expected_valueset in [
-        (
-            {'name': [{'given': ['Jane'], 'family': 'Fonda'}]},
-            'Jane',
-        ),
-        (
-            {'name': [{'given': ['Jane', 'Seymour'], 'family': 'Fonda'}]},
-            {'Jane', 'Seymour'},
-        ),
-        (
-            {'name': [{'family': 'Fonda'}]},
-            None,
-        ),
-        (
-            {'name': [
-                {'given': ['Jane'], 'family': 'Fonda'},
-                {'given': ['Jane'], 'family': 'Plemiannikov'},
-            ]},
-            'Jane',
-        ),
-        (
-            {'name': [
-                {'given': ['Jane', 'Seymour'], 'family': 'Fonda'},
-                {'given': ['Jane', 'Seymour'], 'family': 'Plemiannikov'},
-            ]},
-            {'Jane', 'Seymour'},
-        ),
-        (
-            {'name': [
-                {'given': ['Jane', 'Seymour'], 'family': 'Fonda'},
-                {'given': ['Jane', 'S.'], 'family': 'Plemiannikov'},
-            ]},
-            {'Jane', 'S.', 'Seymour'},
-        ),
-        (
-            {'name': [
-                {'family': 'Fonda'},
-                {'family': 'Plemiannikov'},
-            ]},
-            None,
-        ),
-    ]:
-        yield check_param_helper, search_param, resource, expected_valueset
+    check_param_helper(search_param, resource, expected_valueset)
 
 
-def test_each_unique_value_countries():
+@pytest.mark.parametrize("resource, expected_valueset", [
+    (
+        {'address': [{'country': 'USA'}]},
+        'USA',
+    ),
+    (
+        {'address': [
+            {'country': 'USA'},
+            {'country': 'France'},
+        ]},
+        {'USA', 'France'},
+    ),
+    (
+        {'address': [
+            {'state': 'New York'},
+            {'state': 'Île-de-France'},
+        ]},
+        None,
+    ),
+    (
+        {'address': [
+            {'state': 'New York'},
+            {'country': 'France'},
+        ]},
+        'France',
+    ),
+])
+def test_each_unique_value_countries(resource, expected_valueset):
     search_param = SearchParam('country', '$.address[*].country',
                                EachUniqueValue)
-    for resource, expected_valueset in [
-        (
-            {'address': [{'country': 'USA'}]},
-            'USA',
-        ),
-        (
-            {'address': [
-                {'country': 'USA'},
-                {'country': 'France'},
-            ]},
-            {'USA', 'France'},
-        ),
-        (
-            {'address': [
-                {'state': 'New York'},
-                {'state': 'Île-de-France'},
-            ]},
-            None,
-        ),
-        (
-            {'address': [
-                {'state': 'New York'},
-                {'country': 'France'},
-            ]},
-            'France',
-        ),
-    ]:
-        yield check_param_helper, search_param, resource, expected_valueset
+    check_param_helper(search_param, resource, expected_valueset)
 
 
-def test_each_unique_value_phones():
+@pytest.mark.parametrize("resource, expected_valueset", [
+    (
+        {'telecom': [{'system': 'phone', 'value': '(555) 675 5745'}]},
+        '(555) 675 5745',
+    ),
+    (
+        {'telecom': [
+            {'system': 'phone', 'value': '+1 555 675 5745'},
+            {'system': 'phone', 'value': '(555) 675 5745'},
+        ]},
+        {'+1 555 675 5745', '(555) 675 5745'},
+    ),
+    (
+        {'telecom': [
+            {'system': 'email', 'value': 'user@example.com'},
+            {'system': 'email', 'value': 'admin@example.com'},
+        ]},
+        None,
+    ),
+    (
+        {'telecom': [
+            {'system': 'phone', 'value': '+1 555 675 5745'},
+            {'system': 'email', 'value': 'user@example.com'},
+        ]},
+        '+1 555 675 5745',
+    ),
+])
+def test_each_unique_value_phones(resource, expected_valueset):
     search_param = SearchParam('phone', "$.telecom[?system='phone'].value",
                                EachUniqueValue)
-    for resource, expected_valueset in [
-        (
-            {'telecom': [{'system': 'phone', 'value': '(555) 675 5745'}]},
-            '(555) 675 5745',
-        ),
-        (
-            {'telecom': [
-                {'system': 'phone', 'value': '+1 555 675 5745'},
-                {'system': 'phone', 'value': '(555) 675 5745'},
-            ]},
-            {'+1 555 675 5745', '(555) 675 5745'},
-        ),
-        (
-            {'telecom': [
-                {'system': 'email', 'value': 'user@example.com'},
-                {'system': 'email', 'value': 'admin@example.com'},
-            ]},
-            None,
-        ),
-        (
-            {'telecom': [
-                {'system': 'phone', 'value': '+1 555 675 5745'},
-                {'system': 'email', 'value': 'user@example.com'},
-            ]},
-            '+1 555 675 5745',
-        ),
-    ]:
-        yield check_param_helper, search_param, resource, expected_valueset
+    check_param_helper(search_param, resource, expected_valueset)
 
 
 def check_param_helper(search_param, resource, expected_valueset):
diff --git a/corehq/motech/forms.py b/corehq/motech/forms.py
index c921940a0c28..30e92b2773aa 100644
--- a/corehq/motech/forms.py
+++ b/corehq/motech/forms.py
@@ -59,6 +59,16 @@ class ConnectionSettingsForm(forms.ModelForm):
         help_text=_('Pass credentials in Basic Auth header when requesting a token'),
         required=False,
     )
+    include_client_id = forms.BooleanField(
+        label=_('Include client ID'),
+        help_text=_('Send the client ID in the body of the token request'),
+        required=False,
+    )
+    scope = forms.CharField(
+        label=_('Scope'),
+        help_text=_('Space-separated list of scopes e.g. "read write"'),
+        required=False,
+    )
     skip_cert_verify = forms.BooleanField(
         label="",
         help_text=_('Do not use in a production environment'),
@@ -92,6 +102,8 @@ class Meta:
             'plaintext_password',
             'client_id',
             'plaintext_client_secret',
+            'include_client_id',
+            'scope',
             'skip_cert_verify',
             'notify_addresses_str',
             'token_url',
@@ -132,6 +144,7 @@ def helper(self):
         from corehq.motech.views import ConnectionSettingsListView
 
         helper = hqcrispy.HQFormHelper()
+        helper.form_class = "form-horizontal"
         helper.layout = crispy.Layout(
             crispy.Field('name'),
             crispy.Field('notify_addresses_str'),
@@ -147,11 +160,13 @@ def helper(self):
                     crispy.Field('auth_preset'),
                     crispy.Field('token_url'),
                     crispy.Field('refresh_url'),
-                    twbscrispy.PrependedText('pass_credentials_in_header', ''),
+                    crispy.Field('pass_credentials_in_header'),
+                    crispy.Field('include_client_id'),
+                    crispy.Field('scope'),
                 ),
                 id="div_id_oauth_settings",
             ),
-            twbscrispy.PrependedText('skip_cert_verify', ''),
+            crispy.Field('skip_cert_verify'),
             self.test_connection_button,
 
             twbscrispy.StrictButton(
diff --git a/corehq/motech/generic_inbound/backend/base.py b/corehq/motech/generic_inbound/backend/base.py
index 208934cbc688..7abaa3628125 100644
--- a/corehq/motech/generic_inbound/backend/base.py
+++ b/corehq/motech/generic_inbound/backend/base.py
@@ -26,8 +26,8 @@ def get_basic_error_response(cls, request_id, status_code, message):
         It can also be used for basic errors that don't require additional context."""
         raise NotImplementedError
 
-    def __init__(self, api_model, request_data):
-        self.api_model = api_model
+    def __init__(self, configurable_api, request_data):
+        self.configurable_api = configurable_api
         self.request_data = request_data
 
     def run(self):
@@ -37,7 +37,7 @@ def run(self):
                 self.request_data.couch_user,
                 self.request_data.user_agent,
                 self.get_context(),
-                self.api_model,
+                self.configurable_api,
             )
             return self.get_success_response(response_json)
         except GenericInboundRequestFiltered:
@@ -60,11 +60,12 @@ def run(self):
 
     def get_context(self):
         return get_evaluation_context(
-            self.request_data.restore_user,
-            self.request_data.request_method,
-            self.request_data.query,
-            self.request_data.headers,
-            self._get_body_for_eval_context()
+            domain=self.request_data.domain,
+            restore_user=self.request_data.restore_user,
+            method=self.request_data.request_method,
+            query=self.request_data.query,
+            headers=self.request_data.headers,
+            body=self._get_body_for_eval_context()
         )
 
     def get_success_response(self, response_json):
@@ -90,11 +91,12 @@ def _get_validation_error(self, status_code, message, errors):
         raise NotImplementedError
 
 
-def _execute_generic_api(domain, couch_user, device_id, context, api_model):
-    _apply_api_filter(api_model, context)
-    _validate_api_request(api_model, context)
+def _execute_generic_api(domain, couch_user, device_id, context, configurable_api):
+    # context is all data returned in structure corehq.motech.generic_inbound.utils.get_evaluation_context
+    _apply_api_filter(configurable_api, context)
+    _validate_api_request(configurable_api, context)
 
-    data = api_model.parsed_expression(context.root_doc, context)
+    data = configurable_api.parsed_expression(context.root_doc, context)
 
     if not isinstance(data, list):
         # the bulk API always requires a list
@@ -122,6 +124,7 @@ def _apply_api_filter(api, eval_context):
     if not api_filter:
         return False
 
+    # root_doc here is the all data available as in corehq.motech.generic_inbound.utils.get_evaluation_context
     if not api_filter(eval_context.root_doc, eval_context):
         raise GenericInboundRequestFiltered()
 
diff --git a/corehq/motech/generic_inbound/backend/hl7.py b/corehq/motech/generic_inbound/backend/hl7.py
index 58278011d46a..de97afbfaac3 100644
--- a/corehq/motech/generic_inbound/backend/hl7.py
+++ b/corehq/motech/generic_inbound/backend/hl7.py
@@ -29,8 +29,8 @@ def get_basic_error_response(cls, request_id, status_code, message):
             content_type=HL7_CONTENT_TYPE
         )
 
-    def __init__(self, api_model, request_data):
-        super().__init__(api_model, request_data)
+    def __init__(self, configurable_api, request_data):
+        super().__init__(configurable_api, request_data)
         self.hl7_message = None
 
     def _get_body_for_eval_context(self):
diff --git a/corehq/motech/generic_inbound/models.py b/corehq/motech/generic_inbound/models.py
index 071927091555..b1e2654d0377 100644
--- a/corehq/motech/generic_inbound/models.py
+++ b/corehq/motech/generic_inbound/models.py
@@ -31,10 +31,13 @@ class ConfigurableAPI(models.Model):
     updated_on = models.DateTimeField(auto_now=True)
     name = models.CharField(max_length=255)
     description = models.TextField(blank=True, null=True)
+    # UCR Expression to filter incoming requests before they are processed
     filter_expression = models.ForeignKey(
         UCRExpression, on_delete=models.PROTECT, related_name="api_filter", null=True, blank=True)
+    # UCR Expression to transform the incoming data to be processed
     transform_expression = models.ForeignKey(
         UCRExpression, on_delete=models.PROTECT, related_name="api_expression")
+    # type of data backend like JSON, HL7 etc
     backend = models.CharField(max_length=100, default=ApiBackendOptions.json)
 
     objects = AuditingManager()
diff --git a/corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html b/corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
index ec2a27ec3698..dba8ee7b82ea 100644
--- a/corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
+++ b/corehq/motech/generic_inbound/templates/generic_inbound/api_edit.html
@@ -13,7 +13,7 @@
 {% registerurl 'ucr_expressions' domain %}
 <div id="edit-api">
   <div class="mb-3">
-    <pre id="api_url">{{ api_model.absolute_url }}</pre>
+    <pre id="api_url">{{ configurable_api.absolute_url }}</pre>
     <a class="btn btn-outline-primary" onclick="copyData('api_url')">
       <i class="fa fa-copy"></i> {% trans "Copy URL" %}
     </a>
@@ -37,7 +37,7 @@
           <tr>
             <td>
               <input type="hidden" data-bind="value: id, attr: {name: `validations-${$index()}-id`}">
-              <input type="hidden" value="{{ api_model.id }}" data-bind="attr: {name: `validations-${$index()}-api`}">
+              <input type="hidden" value="{{ configurable_api.id }}" data-bind="attr: {name: `validations-${$index()}-api`}">
               <input type="text" maxlength="64" class="textinput textInput form-control" required data-bind="
                 value: name, attr: {name: `validations-${$index()}-name`}, css: {'is-invalid': nameError}">
               <span data-bind="visible: nameError, css: {'invalid-feedback': nameError}">
diff --git a/corehq/motech/generic_inbound/tests/test_api_processing.py b/corehq/motech/generic_inbound/tests/test_api_processing.py
index 016f511e7383..2e2c11f35d3b 100644
--- a/corehq/motech/generic_inbound/tests/test_api_processing.py
+++ b/corehq/motech/generic_inbound/tests/test_api_processing.py
@@ -36,50 +36,85 @@ class TestGenericInboundAPI(SimpleTestCase):
     domain_name = 'ucr-api-test'
 
     def test_spec_error(self):
-        api_model = ConfigurableAPI(
+        configurable_api = ConfigurableAPI(
             domain=self.domain_name,
             transform_expression=UCRExpression(definition={})
         )
         # mock 'get_validations' to prevent reverse foreign key lookup on unsaved obj
-        api_model.get_validations = lambda: []
+        configurable_api.get_validations = lambda: []
         user = MockUser()
-        context = get_evaluation_context(user, 'post', {}, {}, {})
+        context = get_evaluation_context(
+            domain=self.domain_name,
+            restore_user=user,
+            method='post',
+            query={},
+            headers={},
+            body={}
+        )
         with self.assertRaises(BadSpecError):
-            _execute_generic_api(self.domain_name, user, "device_id", context, api_model)
+            _execute_generic_api(self.domain_name, user, "device_id", context, configurable_api)
 
     def test_no_filter(self):
-        api_model = ConfigurableAPI(
+        configurable_api = ConfigurableAPI(
             domain=self.domain_name,
             transform_expression=UCRExpression(definition={
                 'type': 'dict', 'properties': {'case_type': 'patient'}
             }),
         )
         user = MockUser()
-        context = get_evaluation_context(user, 'post', {}, {}, {"resource": {"type": "patient"}})
-        self.assertFalse(_apply_api_filter(api_model, context))
+        context = get_evaluation_context(
+            domain=self.domain_name,
+            restore_user=user,
+            method='post',
+            query={},
+            headers={},
+            body={"resource": {"type": "patient"}}
+        )
+        self.assertFalse(_apply_api_filter(configurable_api, context))
 
     def test_filter_pass(self):
-        api_model = _get_api_with_filter(self.domain_name)
+        configurable_api = _get_api_with_filter(self.domain_name)
         user = MockUser()
-        context = get_evaluation_context(user, 'post', {}, {}, {"resource": {"type": "patient"}})
-        self.assertTrue(_apply_api_filter(api_model, context))
+        context = get_evaluation_context(
+            domain=self.domain_name,
+            restore_user=user,
+            method='post',
+            query={},
+            headers={},
+            body={"resource": {"type": "patient"}}
+        )
+        self.assertTrue(_apply_api_filter(configurable_api, context))
 
     def test_filter_fail(self):
-        api_model = _get_api_with_filter(self.domain_name)
+        configurable_api = _get_api_with_filter(self.domain_name)
         user = MockUser()
-        context = get_evaluation_context(user, 'post', {}, {}, {"resource": {"type": "client"}})
+        context = get_evaluation_context(
+            domain=self.domain_name,
+            restore_user=user,
+            method='post',
+            query={},
+            headers={},
+            body={"resource": {"type": "client"}}
+        )
         with self.assertRaises(GenericInboundRequestFiltered):
-            _apply_api_filter(api_model, context)
+            _apply_api_filter(configurable_api, context)
 
     def test_validation_pass(self):
-        api_model = _get_api_with_validation(self.domain_name)
+        configurable_api = _get_api_with_validation(self.domain_name)
         user = MockUser()
-        context = get_evaluation_context(user, 'post', {}, {}, {"resource": {"type": "patient"}})
-        self.assertTrue(_validate_api_request(api_model, context))
+        context = get_evaluation_context(
+            domain=self.domain_name,
+            restore_user=user,
+            method='post',
+            query={},
+            headers={},
+            body={"resource": {"type": "patient"}}
+        )
+        self.assertTrue(_validate_api_request(configurable_api, context))
 
     def test_validation_errors(self):
-        api_model = _get_api_with_validation(self.domain_name)
-        validations = api_model.get_validations()
+        configurable_api = _get_api_with_validation(self.domain_name)
+        validations = configurable_api.get_validations()
         client_validation_expression = UCRExpression(
             expression_type=UCR_NAMED_FILTER,
             definition={
@@ -89,16 +124,23 @@ def test_validation_errors(self):
                 "property_value": "client"
             })
         validations.append(ConfigurableApiValidation(
-            api=api_model,
+            api=configurable_api,
             name="is also patient",
             message="must be patient again",
             expression=client_validation_expression,
         ))
         user = MockUser()
         # 1st validation should fail, 2nd should succeed
-        context = get_evaluation_context(user, 'post', {}, {}, {"resource": {"type": "employee"}})
+        context = get_evaluation_context(
+            domain=self.domain_name,
+            restore_user=user,
+            method='post',
+            query={},
+            headers={},
+            body={"resource": {"type": "employee"}}
+        )
         with self.assertRaises(GenericInboundValidationError) as cm:
-            _execute_generic_api(self.domain_name, user, "device_id", context, api_model)
+            _execute_generic_api(self.domain_name, user, "device_id", context, configurable_api)
 
         self.assertEqual(cm.exception.errors, [
             {"name": "is patient", "message": "must be patient"},
@@ -132,7 +174,7 @@ def setUpTestData(cls):
         )
 
     def test_named_filter(self):
-        api_model = ConfigurableAPI(
+        configurable_api = ConfigurableAPI(
             domain=self.domain_name,
             filter_expression=UCRExpression(
                 expression_type=UCR_NAMED_FILTER,
@@ -140,10 +182,10 @@ def test_named_filter(self):
             ),
         )
         # this also tests that an exception isn't raised
-        self.assertIsNotNone(api_model.parsed_filter)
+        self.assertIsNotNone(configurable_api.parsed_filter)
 
     def test_named_expression(self):
-        api_model = ConfigurableAPI(
+        configurable_api = ConfigurableAPI(
             domain=self.domain_name,
             transform_expression=UCRExpression(
                 expression_type=UCR_NAMED_EXPRESSION,
@@ -151,7 +193,7 @@ def test_named_expression(self):
             ),
         )
         # this also tests that an exception isn't raised
-        self.assertIsNotNone(api_model.parsed_expression)
+        self.assertIsNotNone(configurable_api.parsed_expression)
 
     def test_named_expression_in_validation(self):
         validation_expression = UCRExpression.objects.create(
@@ -159,16 +201,17 @@ def test_named_expression_in_validation(self):
             definition={"type": "named", "name": "patient_case_filter"}
         )
 
-        api_model = ConfigurableAPI.objects.create(domain=self.domain_name, transform_expression=self.expression)
+        configurable_api = ConfigurableAPI.objects.create(domain=self.domain_name,
+                                                          transform_expression=self.expression)
         ConfigurableApiValidation.objects.create(
-            api=api_model, name="is patient", message="must be patient", expression=validation_expression
+            api=configurable_api, name="is patient", message="must be patient", expression=validation_expression
         )
         # this also tests that an exception isn't raised
-        self.assertIsNotNone(api_model.get_validations()[0].parsed_expression)
+        self.assertIsNotNone(configurable_api.get_validations()[0].parsed_expression)
 
 
 def _get_api_with_validation(domain_name, expression=None):
-    api_model = ConfigurableAPI(
+    configurable_api = ConfigurableAPI(
         domain=domain_name,
         transform_expression=UCRExpression(definition={
             'type': 'dict', 'properties': {'case_type': 'patient'}
@@ -184,15 +227,15 @@ def _get_api_with_validation(domain_name, expression=None):
         })
     validations = [
         ConfigurableApiValidation(
-            api=api_model,
+            api=configurable_api,
             name="is patient",
             message="must be patient",
             expression=validation_expression,
         )
     ]
     # mock 'get_validations'
-    api_model.get_validations = lambda: validations
-    return api_model
+    configurable_api.get_validations = lambda: validations
+    return configurable_api
 
 
 def _get_api_with_filter(domain_name):
@@ -204,11 +247,11 @@ def _get_api_with_filter(domain_name):
             "operator": "eq",
             "property_value": "patient"
         })
-    api_model = ConfigurableAPI(
+    configurable_api = ConfigurableAPI(
         domain=domain_name,
         filter_expression=filter_expression,
         transform_expression=UCRExpression(definition={
             'type': 'dict', 'properties': {'case_type': 'patient'}
         }),
     )
-    return api_model
+    return configurable_api
diff --git a/corehq/motech/generic_inbound/utils.py b/corehq/motech/generic_inbound/utils.py
index 34cc6ed5d8da..e200eb569967 100644
--- a/corehq/motech/generic_inbound/utils.py
+++ b/corehq/motech/generic_inbound/utils.py
@@ -1,11 +1,10 @@
-import json
 import uuid
 from base64 import urlsafe_b64encode
 from functools import cached_property
 
 from django.conf import settings
 from django.db import transaction
-from django.http import QueryDict, HttpResponse, JsonResponse
+from django.http import QueryDict, HttpResponse
 from django.utils.translation import gettext as _
 
 import attr
@@ -129,8 +128,9 @@ def make_processing_attempt(response, request_log, is_retry=False):
     )
 
 
-def get_evaluation_context(restore_user, method, query, headers, body):
+def get_evaluation_context(domain, restore_user, method, query, headers, body):
     return EvaluationContext({
+        'domain': domain,
         'request': {
             'method': method,
             'query': query,
@@ -157,9 +157,9 @@ def get_request_data():
         make_processing_attempt(response, request_log, is_retry=True)
 
 
-def process_api_request(api_model, request_id, get_request_data):
+def process_api_request(configurable_api, request_id, get_request_data):
     try:
-        backend_cls = api_model.backend_class
+        backend_cls = configurable_api.backend_class
     except GenericInboundApiError as e:
         response = ApiResponse(status=500, internal_response={'error': str(e)})
     else:
@@ -168,7 +168,7 @@ def process_api_request(api_model, request_id, get_request_data):
         except GenericInboundUserError as e:
             response = backend_cls.get_basic_error_response(request_id, 400, str(e))
         else:
-            response = backend_cls(api_model, request_data).run()
+            response = backend_cls(configurable_api, request_data).run()
     return response
 
 
diff --git a/corehq/motech/generic_inbound/views.py b/corehq/motech/generic_inbound/views.py
index 09e17d4e9aad..69f9cd2c780c 100644
--- a/corehq/motech/generic_inbound/views.py
+++ b/corehq/motech/generic_inbound/views.py
@@ -122,7 +122,7 @@ def api_id(self):
 
     @property
     @memoized
-    def api(self):
+    def configurable_api(self):
         try:
             return ConfigurableAPI.objects.get(domain=self.domain, id=self.api_id)
         except ConfigurableAPI.DoesNotExist:
@@ -134,8 +134,8 @@ def page_url(self):
 
     def get_form(self):
         if self.request.method == 'POST':
-            return ConfigurableAPIUpdateForm(self.request, self.request.POST, instance=self.api)
-        return ConfigurableAPIUpdateForm(self.request, instance=self.api)
+            return ConfigurableAPIUpdateForm(self.request, self.request.POST, instance=self.configurable_api)
+        return ConfigurableAPIUpdateForm(self.request, instance=self.configurable_api)
 
     @property
     def main_context(self):
@@ -147,11 +147,11 @@ def main_context(self):
         ]
         main_context.update({
             "form": self.get_form(),
-            "api_model": self.api,
+            "configurable_api": self.configurable_api,
             "filter_expressions": filter_expressions,
             "validations": [
                 validation.to_json()
-                for validation in self.api.validations.all()
+                for validation in self.configurable_api.validations.all()
             ],
             "page_title": self.page_title
         })
@@ -159,7 +159,7 @@ def main_context(self):
 
     def post(self, request, domain, **kwargs):
         form = self.get_form()
-        validation_formset = ApiValidationFormSet(self.request.POST, instance=self.api)
+        validation_formset = ApiValidationFormSet(self.request.POST, instance=self.configurable_api)
         if form.is_valid() and validation_formset.is_valid():
             form.save()
             validation_formset.save()
diff --git a/corehq/motech/migrations/0015_requestlog_duration.py b/corehq/motech/migrations/0015_requestlog_duration.py
new file mode 100644
index 000000000000..41fc012e1a49
--- /dev/null
+++ b/corehq/motech/migrations/0015_requestlog_duration.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.14 on 2024-08-17 18:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("motech", "0014_alter_connectionsettings_password"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="requestlog",
+            name="duration",
+            field=models.IntegerField(null=True),
+        ),
+    ]
diff --git a/corehq/motech/migrations/0016_connectionsettings_include_client_id_and_more.py b/corehq/motech/migrations/0016_connectionsettings_include_client_id_and_more.py
new file mode 100644
index 000000000000..1dfe7a21ecc7
--- /dev/null
+++ b/corehq/motech/migrations/0016_connectionsettings_include_client_id_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.14 on 2024-08-22 12:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('motech', '0015_requestlog_duration'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='connectionsettings',
+            name='include_client_id',
+            field=models.BooleanField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='connectionsettings',
+            name='scope',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/corehq/motech/models.py b/corehq/motech/models.py
index aa4c9e8ec714..5ab0f0f7123b 100644
--- a/corehq/motech/models.py
+++ b/corehq/motech/models.py
@@ -51,6 +51,7 @@ class RequestLogEntry:
     response_status: int
     response_headers: dict
     response_body: str
+    duration: int
 
 
 class ConnectionQuerySet(models.QuerySet):
@@ -102,6 +103,8 @@ class ConnectionSettings(models.Model):
     token_url = models.CharField(max_length=255, blank=True, null=True)
     refresh_url = models.CharField(max_length=255, blank=True, null=True)
     pass_credentials_in_header = models.BooleanField(default=None, null=True)
+    include_client_id = models.BooleanField(default=None, null=True)
+    scope = models.TextField(null=True, blank=True)
     notify_addresses_str = models.CharField(max_length=255, default="")
     # last_token is stored encrypted because it can contain secrets
     last_token_aes = models.TextField(blank=True, default="")
@@ -114,7 +117,7 @@ class ConnectionSettings(models.Model):
     encrypted_fields = {"password": PASSWORD_PLACEHOLDER, "client_secret": PASSWORD_PLACEHOLDER}
 
     def __str__(self):
-        return self.name
+        return f"{self.name} [{self.domain}]"
 
     @property
     def repeaters(self):
@@ -203,6 +206,8 @@ def get_auth_manager(self):
                 token_url=self.token_url,
                 refresh_url=self.refresh_url,
                 pass_credentials_in_header=self.pass_credentials_in_header,
+                include_client_id=self.include_client_id,
+                scope=self.scope or None,
                 connection_settings=self,
             )
 
@@ -236,6 +241,8 @@ def get_auth_manager(self):
                 token_url=self.token_url,
                 refresh_url=self.refresh_url,
                 pass_credentials_in_header=self.pass_credentials_in_header,
+                include_client_id=self.include_client_id,
+                scope=self.scope or None,
                 connection_settings=self,
             )
         raise ValueError(f'Unknown auth type {self.auth_type!r}')
@@ -308,6 +315,7 @@ class RequestLog(models.Model):
     response_status = models.IntegerField(null=True, db_index=True)
     response_headers = jsonfield.JSONField(blank=True, null=True)
     response_body = models.TextField(blank=True, null=True)
+    duration = models.IntegerField(null=True)  # milliseconds
 
     class Meta:
         db_table = 'dhis2_jsonapilog'
@@ -327,4 +335,5 @@ def log(level: int, log_entry: RequestLogEntry):
             response_status=log_entry.response_status,
             response_headers=log_entry.response_headers,
             response_body=as_text(log_entry.response_body)[:MAX_REQUEST_LOG_LENGTH],
+            duration=log_entry.duration,
         )
diff --git a/corehq/motech/openmrs/tests/test_tasks.py b/corehq/motech/openmrs/tests/test_tasks.py
index 66990865c9a4..0ff81ade7131 100644
--- a/corehq/motech/openmrs/tests/test_tasks.py
+++ b/corehq/motech/openmrs/tests/test_tasks.py
@@ -2,13 +2,14 @@
 import doctest
 import json
 import logging
+import re
 from contextlib import contextmanager
 
 from django.test import SimpleTestCase
 
 import pytz
 from unittest.mock import patch
-from nose.tools import assert_raises_regex
+from nose.tools import assert_raises
 from requests.exceptions import ConnectTimeout, ReadTimeout
 
 from corehq.apps.groups.models import Group
@@ -193,8 +194,7 @@ def test_bad_data_type():
         'property': 'data_proxima_consulta'
     }
     with get_importer(bad_column_mapping) as importer:
-        with assert_raises_regex(
-            ConfigurationError,
+        with assert_raises(ConfigurationError, msg=re.compile(re.escape(
             'Errors importing from <OpenmrsImporter None admin@http://www.example.com/openmrs>:\n'
             'Unable to deserialize value 1551564000000 '
             'in column "data_proxima_consulta" '
@@ -202,7 +202,7 @@ def test_bad_data_type():
             'OpenMRS data type is given as "omrs_datetime". '
             'CommCare data type is given as "cc_date": '
             "argument of type 'int' is not iterable"
-        ):
+        ))):
             get_case_properties(patient, importer)
 
 
diff --git a/corehq/motech/rate_limiter.py b/corehq/motech/rate_limiter.py
index 6f1bc6923c67..61220da918fd 100644
--- a/corehq/motech/rate_limiter.py
+++ b/corehq/motech/rate_limiter.py
@@ -6,7 +6,7 @@
     PerUserRateDefinition,
     RateLimiter,
 )
-from corehq.toggles import RATE_LIMIT_REPEATERS, NAMESPACE_DOMAIN
+from corehq.toggles import RATE_LIMIT_REPEATERS, RATE_LIMIT_REPEATER_ATTEMPTS, NAMESPACE_DOMAIN
 from corehq.util.decorators import silence_and_report_error, run_only_when
 from corehq.util.metrics import metrics_gauge, metrics_counter
 from corehq.util.quickcache import quickcache
@@ -55,14 +55,34 @@ def _get_per_user_repeater_wait_milliseconds_rate_definition(domain):
 )
 
 
+repeater_attempts_rate_limiter = RateLimiter(
+    feature_key='repeater_attempts',
+    get_rate_limits=lambda scope: get_dynamic_rate_definition(
+        "repeater_attempts",
+        default=RateDefinition(
+            per_week=None,
+            per_day=None,
+            per_hour=360000,
+            per_minute=6000,
+            per_second=100,
+        ),
+    ).get_rate_limits(),
+)
+
+
 SHOULD_RATE_LIMIT_REPEATERS = not settings.UNIT_TESTING
 
 
-@run_only_when(lambda: SHOULD_RATE_LIMIT_REPEATERS)
+@run_only_when(SHOULD_RATE_LIMIT_REPEATERS)
 @silence_and_report_error("Exception raised in the repeater rate limiter",
                           'commcare.repeaters.rate_limiter_errors')
-def rate_limit_repeater(domain):
-    if global_repeater_rate_limiter.allow_usage() or repeater_rate_limiter.allow_usage(domain):
+def rate_limit_repeater(domain, repeater_id):
+    limit_attempts = RATE_LIMIT_REPEATER_ATTEMPTS.enabled(domain, namespace=NAMESPACE_DOMAIN)
+    is_under_attempt_limit = repeater_attempts_rate_limiter.allow_usage(repeater_id) if limit_attempts else True
+
+    if global_repeater_rate_limiter.allow_usage() and is_under_attempt_limit:
+        allow_usage = True
+    elif repeater_rate_limiter.allow_usage(domain):
         allow_usage = True
     elif not RATE_LIMIT_REPEATERS.enabled(domain, namespace=NAMESPACE_DOMAIN):
         allow_usage = True
@@ -87,6 +107,13 @@ def report_repeater_usage(domain, milliseconds):
     _report_current_global_repeater_thresholds()
 
 
+@run_only_when(SHOULD_RATE_LIMIT_REPEATERS)
+@silence_and_report_error("Exception raised reporting usage to the repeater attempt rate limiter",
+                          'commcare.repeaters.report_usage_errors')
+def report_repeater_attempt(repeater_id):
+    repeater_attempts_rate_limiter.report_usage(repeater_id)
+
+
 @quickcache([], timeout=60)  # Only report up to once a minute
 def _report_current_global_repeater_thresholds():
     for scope, limits in global_repeater_rate_limiter.iter_rates():
diff --git a/corehq/motech/repeaters/const.py b/corehq/motech/repeaters/const.py
index 35a47e4700e4..cec83aa1d125 100644
--- a/corehq/motech/repeaters/const.py
+++ b/corehq/motech/repeaters/const.py
@@ -6,10 +6,14 @@
 
 MAX_RETRY_WAIT = timedelta(days=7)
 MIN_RETRY_WAIT = timedelta(minutes=60)
-RATE_LIMITER_DELAY_RANGE = (timedelta(minutes=0), timedelta(minutes=15))
+RATE_LIMITER_DELAY_RANGE = (
+    timedelta(minutes=getattr(settings, 'MIN_REPEATER_RATE_LIMIT_DELAY', 0)),
+    timedelta(minutes=getattr(settings, 'MAX_REPEATER_RATE_LIMIT_DELAY', 15)),
+)
 CHECK_REPEATERS_INTERVAL = timedelta(minutes=5)
 CHECK_REPEATERS_PARTITION_COUNT = settings.CHECK_REPEATERS_PARTITION_COUNT
 CHECK_REPEATERS_KEY = 'check-repeaters-key'
+ENDPOINT_TIMER = 'endpoint_timer'
 # Number of attempts to an online endpoint before cancelling payload
 MAX_ATTEMPTS = 3
 # Number of exponential backoff attempts to an offline endpoint
@@ -23,6 +27,7 @@ class State(IntegerChoices):
     Success = 4, _('Succeeded')
     Cancelled = 8, _('Cancelled')
     Empty = 16, _('Empty')  # There was nothing to send. Implies Success.
+    InvalidPayload = 32, _('Invalid Payload')  # Implies Cancelled.
 
 
 RECORD_PENDING_STATE = State.Pending
@@ -30,6 +35,7 @@ class State(IntegerChoices):
 RECORD_FAILURE_STATE = State.Fail
 RECORD_CANCELLED_STATE = State.Cancelled
 RECORD_EMPTY_STATE = State.Empty
+RECORD_INVALIDPAYLOAD_STATE = State.InvalidPayload
 
 
 class UCRRestrictionFFStatus(IntegerChoices):
diff --git a/corehq/motech/repeaters/exceptions.py b/corehq/motech/repeaters/exceptions.py
index 1105432fa086..f78c08cc306b 100644
--- a/corehq/motech/repeaters/exceptions.py
+++ b/corehq/motech/repeaters/exceptions.py
@@ -23,3 +23,7 @@ def __init__(self, repeater_type):
 
     def __str__(self):
         return self.message
+
+
+class BulkActionMissingParameters(Exception):
+    pass
diff --git a/corehq/motech/repeaters/expression/forms.py b/corehq/motech/repeaters/expression/forms.py
index ddeca4edb897..8892c5580ee1 100644
--- a/corehq/motech/repeaters/expression/forms.py
+++ b/corehq/motech/repeaters/expression/forms.py
@@ -1,4 +1,4 @@
-from django.forms import CharField, ValidationError
+from django.forms import CharField, ValidationError, ChoiceField
 from django.utils.translation import gettext_lazy as _
 
 from corehq.apps.userreports.exceptions import BadSpecError
@@ -7,35 +7,120 @@
 from corehq.apps.userreports.specs import FactoryContext
 from corehq.apps.userreports.ui import help_text
 from corehq.apps.userreports.ui.fields import JsonField
+from corehq.motech.const import ALL_REQUEST_METHODS, REQUEST_POST, REQUEST_PUT
 from corehq.motech.repeaters.forms import GenericRepeaterForm
 
 
-class CaseExpressionRepeaterForm(GenericRepeaterForm):
+LABELS = {
+    'case_action_filter_expression': _("Response case action filter expression"),
+    'case_action_expression': _("Response case action expression"),
+}
+
+
+class BaseExpressionRepeaterForm(GenericRepeaterForm):
     configured_filter = JsonField(expected_type=dict, help_text=help_text.CONFIGURED_FILTER)
-    configured_expression = JsonField(expected_type=dict)
+    configured_expression = JsonField(expected_type=dict, required=False, help_text=_(
+        "This expression is used to generate the request payload. It is required for POST, and PUT requests."
+    ))
     url_template = CharField(
         required=False,
         help_text=_("Items to add to the end of the URL. Please see the documentation for more information.")
     )
 
+    case_action_filter_expression = JsonField(
+        expected_type=dict, required=False,
+        label=LABELS['case_action_filter_expression'],
+        help_text=_(
+            "Use this to determine if the response should create or update a case. "
+            "If left blank, no action will be taken. "
+            'For more info see <a target="_blank" href="'
+            'https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters'
+            '">these docs</a>'
+        )
+    )
+    case_action_expression = JsonField(
+        expected_type=dict, required=False,
+        label=LABELS['case_action_expression'],
+        help_text=_(
+            "Use this to create a Case API payload which will be used to create or update a case. "
+            'For more info see <a target="_blank" href="'
+            'https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters'
+            '">these docs</a>'
+        )
+    )
+
+    def set_extra_django_form_fields(self):
+        super().set_extra_django_form_fields()
+
+        # Allow GET requests
+        self.fields['request_method'] = ChoiceField(
+            label=_("HTTP Request Method"),
+            choices=[(rm, rm) for rm in ALL_REQUEST_METHODS],
+            initial=REQUEST_POST,
+            required=True,
+        )
+
     def get_ordered_crispy_form_fields(self):
         fields = super().get_ordered_crispy_form_fields()
-        return fields + ['url_template', 'configured_filter', 'configured_expression']
+        return fields + [
+            'url_template', 'configured_filter', 'configured_expression',
+            'case_action_filter_expression', 'case_action_expression'
+        ]
 
     def clean_configured_expression(self):
-        try:
-            ExpressionFactory.from_spec(
-                self.cleaned_data['configured_expression'], FactoryContext.empty(domain=self.domain)
-            )
-        except BadSpecError as e:
-            raise ValidationError(e)
-
-        return self.cleaned_data['configured_expression']
+        return self._clean_expression('configured_expression')
 
     def clean_configured_filter(self):
+        return self._clean_filter(self.cleaned_data['configured_filter'])
+
+    def clean_case_action_expression(self):
+        return self._clean_expression('case_action_expression')
+
+    def clean_case_action_filter_expression(self):
+        raw = self.cleaned_data.get('case_action_filter_expression')
+        if raw:
+            return self._clean_filter(raw)
+        return raw
+
+    def clean(self):
+        cleaned_data = super().clean()
+        request_method = self.cleaned_data['request_method']
+        body_required = request_method in (REQUEST_POST, REQUEST_PUT)
+        if body_required and not self.cleaned_data['configured_expression']:
+            raise ValidationError({
+                'configured_expression': _("This field is required for {request_method} requests.").format(
+                    request_method=request_method
+                ),
+            })
+
+        case_filter = bool(cleaned_data.get('case_action_filter_expression'))
+        case_operation = bool(cleaned_data.get('case_action_expression'))
+        if case_filter ^ case_operation:
+            field = 'case_action_expression' if case_filter else 'case_action_filter_expression'
+            other = 'case_action_filter_expression' if case_filter else 'case_action_expression'
+            raise ValidationError({
+                field: _("This field is required when '{other}' is provided").format(
+                    other=LABELS[other]
+                ),
+            })
+        return cleaned_data
+
+    def _clean_expression(self, field_name):
+        raw = self.cleaned_data.get(field_name)
+        if raw:
+            try:
+                ExpressionFactory.from_spec(
+                    raw, FactoryContext.empty(domain=self.domain)
+                )
+            except BadSpecError as e:
+                raise ValidationError(e)
+
+        return raw
+
+    def _clean_filter(self, raw_expression):
         try:
-            FilterFactory.from_spec(self.cleaned_data['configured_filter'])
+            FilterFactory.from_spec(raw_expression, FactoryContext.empty(domain=self.domain))
         except BadSpecError as e:
             raise ValidationError(e)
 
-        return self.cleaned_data['configured_filter']
+        return raw_expression
diff --git a/corehq/motech/repeaters/expression/repeater_generators.py b/corehq/motech/repeaters/expression/repeater_generators.py
index 3e9f203923f3..f54773e2c36e 100644
--- a/corehq/motech/repeaters/expression/repeater_generators.py
+++ b/corehq/motech/repeaters/expression/repeater_generators.py
@@ -16,7 +16,7 @@ def content_type(self):
         return 'application/json'
 
     def get_payload(self, repeat_record, payload_doc, parsed_expression):
-        result = parsed_expression(payload_doc, EvaluationContext(payload_doc))
+        result = _generate_payload(payload_doc, parsed_expression)
         return json.dumps(result, cls=DjangoJSONEncoder)
 
     def get_url(self, repeat_record, url_template, payload_doc):
@@ -24,7 +24,8 @@ def get_url(self, repeat_record, url_template, payload_doc):
             return ""
 
         required_template_vars = [fn for _, fn, _, _ in Formatter().parse(url_template) if fn is not None]
-        context = EvaluationContext(payload_doc)
+        payload_doc_json = payload_doc.to_json()
+        context = EvaluationContext(payload_doc_json)
         expressions = {
             expression.name: expression.wrapped_definition(context)
             for expression in UCRExpression.objects.filter(
@@ -35,7 +36,7 @@ def get_url(self, repeat_record, url_template, payload_doc):
         }
         return url_template.format(
             **{
-                template_var: expressions[template_var](payload_doc) if template_var in expressions else ""
+                template_var: expressions[template_var](payload_doc_json) if template_var in expressions else ""
                 for template_var in required_template_vars
             }
         )
@@ -44,19 +45,16 @@ def get_url(self, repeat_record, url_template, payload_doc):
 class ArcGISFormExpressionPayloadGenerator(ExpressionPayloadGenerator):
 
     def get_url(self, repeat_record, url_template, payload_doc):
-        if not (
-            toggles.UCR_EXPRESSION_REGISTRY.enabled(repeat_record.domain)
-            and toggles.ARCGIS_INTEGRATION.enabled(repeat_record.domain)
-        ):
+        if not toggles.ARCGIS_INTEGRATION.enabled(repeat_record.domain):
             return ""
+        return super().get_url(repeat_record, url_template, payload_doc)
 
     @property
     def content_type(self):
         return 'application/x-www-form-urlencoded'
 
     def get_payload(self, repeat_record, payload_doc, parsed_expression):
-        payload_doc_json = payload_doc.to_json()
-        payload = parsed_expression(payload_doc_json, EvaluationContext(payload_doc_json))
+        payload = _generate_payload(payload_doc, parsed_expression)
         conn_settings = repeat_record.repeater.connection_settings
         api_token = conn_settings.plaintext_password
         formatted_payload = {
@@ -65,3 +63,8 @@ def get_payload(self, repeat_record, payload_doc, parsed_expression):
             'token': api_token,
         }
         return formatted_payload
+
+
+def _generate_payload(payload_doc, parsed_expression):
+    payload_doc_json = payload_doc.to_json()
+    return parsed_expression(payload_doc_json, EvaluationContext(payload_doc_json))
diff --git a/corehq/motech/repeaters/expression/repeaters.py b/corehq/motech/repeaters/expression/repeaters.py
index 90dbab80d5db..d3b746eda435 100644
--- a/corehq/motech/repeaters/expression/repeaters.py
+++ b/corehq/motech/repeaters/expression/repeaters.py
@@ -1,17 +1,40 @@
+import logging
+from json import JSONDecodeError
+
 from django.utils.translation import gettext_lazy as _
 
 from memoized import memoized
 
+from dimagi.utils.logging import notify_exception
+
+from corehq.apps.hqcase.api.updates import handle_case_update
+from corehq.apps.hqcase.case_helper import UserDuck
+from corehq.apps.hqcase.utils import REPEATER_RESPONSE_XMLNS
 from corehq.apps.userreports.expressions.factory import ExpressionFactory
 from corehq.apps.userreports.filters.factory import FilterFactory
 from corehq.apps.userreports.specs import EvaluationContext, FactoryContext
-from corehq.form_processor.models import CommCareCase, XFormInstance
+from corehq.form_processor.models import (
+    CaseTransaction,
+    CommCareCase,
+    XFormInstance,
+)
+from corehq.motech.repeater_helpers import RepeaterResponse
 from corehq.motech.repeaters.expression.repeater_generators import (
+    ArcGISFormExpressionPayloadGenerator,
     ExpressionPayloadGenerator,
 )
-from corehq.motech.repeaters.models import OptionValue, Repeater
-from corehq.motech.repeaters.expression.repeater_generators import ArcGISFormExpressionPayloadGenerator
-from corehq.toggles import EXPRESSION_REPEATER, ARCGIS_INTEGRATION
+from corehq.motech.repeaters.models import (
+    OptionValue,
+    Repeater,
+    is_response,
+    is_success_response,
+)
+from corehq.toggles import ARCGIS_INTEGRATION, EXPRESSION_REPEATER
+
+# max number of repeater updates in a chain before we stop forwarding
+MAX_REPEATER_CHAIN_LENGTH = 5
+
+logger = logging.getLogger(__name__)
 
 
 class BaseExpressionRepeater(Repeater):
@@ -25,6 +48,9 @@ class Meta:
     configured_expression = OptionValue(default=dict)
     url_template = OptionValue(default=None)
 
+    case_action_filter_expression = OptionValue(default=dict)
+    case_action_expression = OptionValue(default=dict)
+
     payload_generator_classes = (ExpressionPayloadGenerator,)
 
     @property
@@ -37,6 +63,20 @@ def parsed_filter(self):
     def parsed_expression(self):
         return ExpressionFactory.from_spec(self.configured_expression, FactoryContext.empty(domain=self.domain))
 
+    @property
+    @memoized
+    def parsed_case_action_filter(self):
+        return FilterFactory.from_spec(
+            self.case_action_filter_expression, FactoryContext.empty(domain=self.domain)
+        )
+
+    @property
+    @memoized
+    def parsed_case_action_expression(self):
+        return ExpressionFactory.from_spec(
+            self.case_action_expression, FactoryContext.empty(domain=self.domain)
+        )
+
     @classmethod
     def available_for_domain(cls, domain):
         return EXPRESSION_REPEATER.enabled(domain)
@@ -47,6 +87,9 @@ def allowed_to_forward(self, payload):
 
     @memoized
     def get_payload(self, repeat_record):
+        if not self.configured_expression:
+            return None
+
         return self.generator.get_payload(
             repeat_record,
             self.payload_doc(repeat_record),
@@ -63,6 +106,44 @@ def get_url(self, repeat_record):
             )
         return base_url
 
+    def handle_response(self, response, repeat_record):
+        attempt = super().handle_response(response, repeat_record)
+        if self.case_action_filter_expression and is_response(response):
+            try:
+                message = self._process_response_as_case_update(response, repeat_record)
+            except Exception as e:
+                notify_exception(None, "Error processing response from Repeater request", e)
+            else:
+                attempt.message += f"\n\n{message}"
+                attempt.save()
+
+    def _process_response_as_case_update(self, response, repeat_record):
+        domain = repeat_record.domain
+        context = get_evaluation_context(domain, repeat_record, self.payload_doc(repeat_record), response)
+        if not self.parsed_case_action_filter(context.root_doc, context):
+            return "Response did not match filter"
+
+        form_id = self._perform_case_update(domain, context)
+        return f"Response generated a form: {form_id}"
+
+    def _perform_case_update(self, domain, context):
+        data = self.parsed_case_action_expression(context.root_doc, context)
+        if data:
+            data = data if isinstance(data, list) else [data]
+            form, _ = handle_case_update(
+                domain=domain,
+                data=data,
+                user=UserDuck('system', ''),
+                device_id=self.device_id,
+                is_creation=False,
+                xmlns=REPEATER_RESPONSE_XMLNS,
+            )
+            return form.form_id
+
+    @property
+    def device_id(self):
+        return f'{__name__}.{self.__class__.__name__}:{self.id}'
+
 
 class CaseExpressionRepeater(BaseExpressionRepeater):
 
@@ -78,7 +159,28 @@ def form_class_name(self):
 
     @memoized
     def payload_doc(self, repeat_record):
-        return CommCareCase.objects.get_case(repeat_record.payload_id, repeat_record.domain).to_json()
+        return CommCareCase.objects.get_case(repeat_record.payload_id, repeat_record.domain)
+
+    def allowed_to_forward(self, payload):
+        allowed = super().allowed_to_forward(payload)
+        if not allowed:
+            return False
+
+        transactions = CaseTransaction.objects.get_last_n_recent_form_transaction(
+            payload.case_id, MAX_REPEATER_CHAIN_LENGTH
+        )
+        for transaction in transactions:
+            if transaction.xmlns != REPEATER_RESPONSE_XMLNS:
+                # non-repeater update found, allow forwarding
+                return True
+
+            if transaction.device_id == self.device_id:
+                # all transactions to this point have been repeater updates
+                # and the last one was from this repeater, it's a cycle, don't forward
+                return False
+
+        # Allow forwarding as long as we haven't hit the max chain length
+        return len(transactions) < MAX_REPEATER_CHAIN_LENGTH
 
 
 class FormExpressionRepeater(BaseExpressionRepeater):
@@ -120,3 +222,73 @@ def available_for_domain(cls, domain):
             super(ArcGISFormExpressionRepeater, cls).available_for_domain(domain)
             and ARCGIS_INTEGRATION.enabled(domain)
         )
+
+    def send_request(self, repeat_record, payload):
+        response = super().send_request(repeat_record, payload)
+        if is_success_response(response) and 'error' in response.json():
+            # It _looks_ like a success response, but it's an error. :/
+            return self._error_response(response.json()['error'])
+        return response
+
+    @staticmethod
+    def _error_response(error_json):
+        """
+        The ArcGIS API returns error responses with status code 200.
+
+        This method extracts the details from the response JSON, and
+        returns a RepeaterResponse with the error details so that the
+        response will be handled correctly.
+
+        >>> error_json = {
+        ...     "code": 503,
+        ...     "details": [],
+        ...     "message": "An error occurred."
+        ... }
+        >>> resp = ArcGISFormExpressionRepeater._error_response(error_json)
+        >>> resp.status_code
+        503
+        >>> resp.reason
+        'An error occurred.'
+
+        """
+        # The ArcGIS REST API documentation does not give the error
+        # response schema, so we have to guess based on what we've seen.
+
+        # `status_code` is required for us to make decisions about the
+        # repeat record.  If `error_json` does not include "code", then
+        # use 500 so that the repeat record will be sent again later.
+        status_code = error_json.get('code', 500)
+
+        # `reason` is what is shown in the Repeat Records Report under
+        # the "Responses" button. If `error_json` is missing "message",
+        # then set a value that is more useful to users than no message.
+        fallback_msg = _('[No error message given by ArcGIS]')
+        reason = error_json.get('message', fallback_msg)
+        if 'messageCode' in error_json:
+            reason += f' ({error_json["messageCode"]})'
+
+        return RepeaterResponse(
+            status_code=status_code,
+            reason=reason,
+            text='\n'.join(error_json.get('details', [])),
+        )
+
+
+def get_evaluation_context(domain, repeat_record, payload_doc, response):
+    try:
+        body = response.json()
+    except JSONDecodeError:
+        body = response.text
+    return EvaluationContext({
+        'domain': domain,
+        'success': is_success_response(response),
+        'payload': {
+            'id': repeat_record.payload_id,
+            'doc': payload_doc.to_json(),
+        },
+        'response': {
+            'status_code': response.status_code,
+            'headers': response.headers,
+            'body': body,
+        },
+    })
diff --git a/corehq/motech/repeaters/expression/tests.py b/corehq/motech/repeaters/expression/tests.py
index c7468c685b51..cfb99dfa0bc6 100644
--- a/corehq/motech/repeaters/expression/tests.py
+++ b/corehq/motech/repeaters/expression/tests.py
@@ -1,29 +1,49 @@
+import dataclasses
+import doctest
 import json
-from datetime import datetime, timedelta
 import uuid
+from datetime import datetime, timedelta
+from unittest.mock import Mock, patch
 
 from django.test import TestCase
 
-from casexml.apps.case.mock import CaseFactory
+from casexml.apps.case.mock import CaseBlock, CaseFactory
 
 from corehq.apps.accounting.models import SoftwarePlanEdition
 from corehq.apps.accounting.tests.utils import DomainSubscriptionMixin
 from corehq.apps.accounting.utils import clear_plan_version_cache
 from corehq.apps.domain.shortcuts import create_domain
+from corehq.apps.hqcase.utils import REPEATER_RESPONSE_XMLNS
 from corehq.apps.receiverwrapper.util import submit_form_locally
 from corehq.apps.userreports.models import UCRExpression
+from corehq.form_processor.models import CaseTransaction, CommCareCase
+from corehq.form_processor.models.cases import FormSubmissionDetail
 from corehq.motech.models import ConnectionSettings
+from corehq.motech.repeaters.const import State
 from corehq.motech.repeaters.expression.repeaters import (
+    MAX_REPEATER_CHAIN_LENGTH,
+    ArcGISFormExpressionRepeater,
     CaseExpressionRepeater,
-    ArcGISFormExpressionRepeater
+    FormExpressionRepeater,
 )
 from corehq.motech.repeaters.models import RepeatRecord
-from corehq.util.test_utils import flag_enabled
+from corehq.util.test_utils import flag_enabled, generate_cases
+
 
-from casexml.apps.case.mock import CaseBlock
+@dataclasses.dataclass
+class MockResponse:
+    status_code: int
+    text: str = ""
+    headers: dict = dataclasses.field(default_factory=dict)
+    reason: str = "success"
+
+    def json(self):
+        return json.loads(self.text)
 
 
 class BaseExpressionRepeaterTest(TestCase, DomainSubscriptionMixin):
+    xmlns = 'http://foo.org/bar/123'
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -52,6 +72,20 @@ def repeat_records(cls, domain_name):
         later = datetime.utcnow() + timedelta(hours=48 + 1)
         return RepeatRecord.objects.filter(domain=domain_name, next_check__lt=later)
 
+    def _create_case_block(self, case_id):
+        return CaseBlock(
+            create=True,
+            case_id=case_id,
+            case_type='person',
+            case_name=uuid.uuid4().hex,
+        ).as_text()
+
+    def _create_case(self, xmlns):
+        return self.factory.post_case_blocks(
+            [self._create_case_block(uuid.uuid4().hex)],
+            xmlns=xmlns,
+        )[0]
+
 
 @flag_enabled('EXPRESSION_REPEATER')
 class CaseExpressionRepeaterTest(BaseExpressionRepeaterTest):
@@ -126,6 +160,13 @@ def test_payload(self):
             "a-constant": "foo",
         }))
 
+    def test_payload_empty_expression(self):
+        self.repeater.configured_expression = None
+        self.repeater.save()
+        self.factory.create_case(case_type='forward-me')
+        repeat_record = self.repeat_records(self.domain).all()[0]
+        self.assertIsNone(repeat_record.get_payload())
+
     @flag_enabled("UCR_EXPRESSION_REGISTRY")
     def test_custom_url(self):
 
@@ -160,10 +201,230 @@ def test_custom_url(self):
             expected_url
         )
 
+    def test_process_response_filter(self):
+        self.factory.create_case(case_type='forward-me')
+        repeat_record = self.repeat_records(self.domain).all()[0]
+        self.repeater.case_action_filter_expression = {
+            "type": "boolean_expression",
+            "expression": {
+                "type": "jsonpath",
+                "jsonpath": "response.status_code",
+            },
+            "operator": "eq",
+            "property_value": 201,
+        }
+        self.repeater._perform_case_update = Mock(return_value="fake_form_id")
+        response = MockResponse(200)
+        message = self.repeater._process_response_as_case_update(response, repeat_record)
+        self.assertEqual(message, "Response did not match filter")
+        self.repeater._perform_case_update.assert_not_called()
+
+        response = MockResponse(201)
+        message = self.repeater._process_response_as_case_update(response, repeat_record)
+        self.assertEqual(message, "Response generated a form: fake_form_id")
+        self.repeater._perform_case_update.assert_called()
+
+    def test_process_response(self):
+        self.factory.create_case(case_type='forward-me')
+        repeat_record = self.repeat_records(self.domain).all()[0]
+        self.repeater.case_action_filter_expression = {
+            "type": "boolean_expression",
+            "expression": {
+                "type": "jsonpath",
+                "jsonpath": "response.status_code",
+            },
+            "operator": "eq",
+            "property_value": 200,
+        }
+        self.repeater.case_action_expression = {
+            'type': 'dict',
+            'properties': {
+                'create': False,
+                'case_id': {
+                    'type': 'jsonpath',
+                    'jsonpath': 'payload.id',
+                },
+                'properties': {
+                    'type': 'dict',
+                    'properties': {
+                        'type': 'dict',
+                        'prop_from_response': {
+                            'type': 'jsonpath',
+                            'jsonpath': 'response.body.aValue',
+                        }
+                    }
+                }
+            }
+        }
+        response = MockResponse(200, '{"aValue": "aResponseValue"}')
+        self.repeater.handle_response(response, repeat_record)
+        case = CommCareCase.objects.get_case(repeat_record.payload_id, self.domain)
+        self.assertEqual(case.get_case_property('prop_from_response'), 'aResponseValue')
+
+        # case shouldn't be eligible to forward again because it was just updated by the repeater
+        self.assertFalse(self.repeater.allowed_to_forward(case))
+
+        # case should be eligible to forward by a different repeater (one with a different id)
+        self.repeater.id = "a different repeater"
+        self.assertTrue(self.repeater.allowed_to_forward(case))
+
+    @generate_cases([
+        ([{"is_repeater": False, "this_repeater": False}], True),
+        ([{"is_repeater": True, "this_repeater": True}], False),
+        ([{"is_repeater": True, "this_repeater": False}], True),
+        # 1 below max chain length
+        ([{"is_repeater": True, "this_repeater": False}] * (MAX_REPEATER_CHAIN_LENGTH - 1), True),
+        # at max chain length
+        ([{"is_repeater": True, "this_repeater": False}] * MAX_REPEATER_CHAIN_LENGTH, False),
+        # transaction from this repeater
+        ([
+             {"is_repeater": True, "this_repeater": False},  # noqa
+             {"is_repeater": True, "this_repeater": False},
+             {"is_repeater": True, "this_repeater": True},
+        ], False),
+        # non-repeater transaction
+        ([
+             {"is_repeater": True, "this_repeater": False},  # noqa
+             {"is_repeater": True, "this_repeater": False},
+             {"is_repeater": False, "this_repeater": False},
+        ], True),
+    ])
+    def test_allowed_to_forward(self, transaction_details, can_forward):
+        case = self.factory.create_case(case_type='forward-me')
+        transactions = []
+        for transaction in transaction_details:
+            xmlns = REPEATER_RESPONSE_XMLNS if transaction["is_repeater"] else "another_xmlns"
+            device_id = self.repeater.device_id if transaction["this_repeater"] else "another_device_id"
+            detail = FormSubmissionDetail(xmlns=xmlns, device_id=device_id).to_json()
+            transactions.append(CaseTransaction(details=detail))
+        with patch(
+            'corehq.motech.repeaters.expression.repeaters.CaseTransaction.objects.get_last_n_recent_form_transaction',  # noqa
+            return_value=transactions
+        ):
+            self.assertEqual(self.repeater.allowed_to_forward(case), can_forward)
+
+
+class FormExpressionRepeaterTest(BaseExpressionRepeaterTest):
+
+    xform_xml_template = """<?xml version='1.0' ?>
+        <data xmlns:jrm="http://dev.commcarehq.org/jr/xforms" xmlns="{}">
 
-class ArcGISExpressionRepeaterTest(BaseExpressionRepeaterTest):
+            <meta>
+                <n3:location xmlns:n3="http://commcarehq.org/xforms">1.1 2.2 3.3 4.4</n3:location>
+                <instanceID>{}</instanceID>
+            </meta>
+        {}
+        </data>
+        """
+
+    def _create_repeater(self):
+        self.repeater = FormExpressionRepeater(
+            domain=self.domain,
+            connection_settings_id=self.connection.id,
+            configured_filter={
+                "type": "boolean_expression",
+                "expression": {
+                    "type": "property_name",
+                    "property_name": "xmlns",
+                },
+                "operator": "eq",
+                "property_value": self.xmlns,
+            },
+            configured_expression={
+                "type": "dict",
+                "properties": {
+                    "case_id": {
+                        "type": "property_path",
+                        "property_path": ["form", "case", "@case_id"],
+                    },
+                    "properties": {
+                        "type": "dict",
+                        "properties": {
+                            "meta_gps_point": {
+                                "type": "property_path",
+                                "property_path": ["form", "meta", "location", "#text"],
+                            },
+                        },
+                    },
+                },
+            },
+        )
+        self.repeater.save()
+
+    def expected_payload(self, case_id):
+        return json.dumps({
+            'case_id': case_id,
+            'properties': {
+                'meta_gps_point': '1.1 2.2 3.3 4.4'
+            }
+        })
+
+    def test_filter_forms(self):
+        forwardable_form = self._create_case(self.xmlns)
+        self._create_case(xmlns='http://do-not.org/forward')
+        self.assertEqual(RepeatRecord.objects.filter(domain=self.domain).count(), 1)
+        repeat_records = self.repeat_records(self.domain).all()
+        self.assertEqual(repeat_records[0].payload_id, forwardable_form.form_id)
+
+    def test_payload(self):
+        instance_id = uuid.uuid4().hex
+        case_id = uuid.uuid4().hex
+        xform_xml = self.xform_xml_template.format(
+            self.xmlns,
+            instance_id,
+            self._create_case_block(case_id),
+        )
+        submit_form_locally(xform_xml, self.domain)
+        repeat_record = self.repeat_records(self.domain).all()[0]
+        self.assertEqual(repeat_record.get_payload(), self.expected_payload(case_id))
+
+    def test_process_response(self):
+        instance_id = uuid.uuid4().hex
+        case_id = uuid.uuid4().hex
+        xform_xml = self.xform_xml_template.format(
+            self.xmlns,
+            instance_id,
+            self._create_case_block(case_id),
+        )
+        submit_form_locally(xform_xml, self.domain)
+        repeat_record = self.repeat_records(self.domain).all()[0]
+        self.repeater.case_action_filter_expression = {
+            "type": "boolean_expression",
+            "expression": {
+                "type": "jsonpath",
+                "jsonpath": "response.status_code",
+            },
+            "operator": "eq",
+            "property_value": 200,
+        }
+        self.repeater.case_action_expression = {
+            'type': 'dict',
+            'properties': {
+                'create': False,
+                'case_id': {
+                    'type': 'jsonpath',
+                    'jsonpath': 'payload.doc.form.case.@case_id',
+                },
+                'properties': {
+                    'type': 'dict',
+                    'properties': {
+                        'type': 'dict',
+                        'prop_from_response': {
+                            'type': 'jsonpath',
+                            'jsonpath': 'response.body.aValue',
+                        }
+                    }
+                }
+            }
+        }
+        response = MockResponse(200, '{"aValue": "aResponseValue"}')
+        self.repeater.handle_response(response, repeat_record)
+        case = CommCareCase.objects.get_case(case_id, self.domain)
+        self.assertEqual(case.get_case_property('prop_from_response'), 'aResponseValue')
+
+
+class ArcGISExpressionRepeaterTest(FormExpressionRepeaterTest):
 
-    xmlns = 'http://foo.org/bar/123'
     xform_xml_template = """<?xml version='1.0' ?>
         <data xmlns:jrm="http://dev.commcarehq.org/jr/xforms" xmlns="{}">
             <person_name>Timmy</person_name>
@@ -239,37 +500,8 @@ def _create_repeater(self):
         )
         self.repeater.save()
 
-    def _create_case_block(self):
-        return CaseBlock(
-            create=True,
-            case_id=uuid.uuid4().hex,
-            case_type='person',
-            case_name=uuid.uuid4().hex,
-        ).as_text()
-
-    def _create_case(self, xmlns):
-        return self.factory.post_case_blocks(
-            [self._create_case_block()],
-            xmlns=xmlns,
-        )[0]
-
-    def test_filter_forms(self):
-        forwardable_form = self._create_case(self.xmlns)
-        self._create_case(xmlns='http://do-not.org/forward')
-        self.assertEqual(RepeatRecord.objects.filter(domain=self.domain).count(), 1)
-        repeat_records = self.repeat_records(self.domain).all()
-        self.assertEqual(repeat_records[0].payload_id, forwardable_form.form_id)
-
-    def test_payload(self):
-        instance_id = uuid.uuid4().hex
-        xform_xml = self.xform_xml_template.format(
-            self.xmlns,
-            instance_id,
-            self._create_case_block(),
-        )
-        submit_form_locally(xform_xml, self.domain)
-        repeat_record = self.repeat_records(self.domain).all()[0]
-        self.assertEqual(repeat_record.get_payload(), {
+    def expected_payload(self, case_id):
+        return {
             'features': json.dumps([{
                 'attributes': {
                     'name': 'Timmy',
@@ -284,4 +516,129 @@ def test_payload(self):
             }]),
             'f': 'json',
             'token': ''
-        })
+        }
+
+    def test_send_request_error_handling(self):
+        case_id = uuid.uuid4().hex
+        xform_xml = self.xform_xml_template.format(
+            self.xmlns,
+            uuid.uuid4().hex,
+            self._create_case_block(case_id),
+        )
+        with patch(
+            'corehq.motech.repeaters.models.simple_request',
+            return_value=MockResponse(429, 'Too many requests'),
+        ):
+            # The repeat record is first sent when the payload is registered
+            submit_form_locally(xform_xml, self.domain)
+        repeat_record = self.repeat_records(self.domain).all()[0]
+        self.assertEqual(repeat_record.state, State.Fail)
+
+        arcgis_error_response = MockResponse(200, json.dumps({
+            "error": {
+                "code": 403,
+                "details": [
+                    "You do not have permissions to access this resource or "
+                    "perform this operation."
+                ],
+                "message": "You do not have permissions to access this "
+                           "resource or perform this operation.",
+                "messageCode": "GWM_0003",
+            }
+        }))
+        with patch(
+            'corehq.motech.repeaters.models.simple_request',
+            return_value=arcgis_error_response,
+        ):
+            self.repeater.fire_for_record(repeat_record)
+
+        self.assertEqual(repeat_record.state, State.InvalidPayload)
+
+    def test_error_response_with_message_code(self):
+        error_json = {
+            "code": 403,
+            "details": [
+                "You do not have permissions to access this resource or "
+                "perform this operation."
+            ],
+            "message": "You do not have permissions to access this resource "
+                       "or perform this operation.",
+            "messageCode": "GWM_0003",
+        }
+        resp = ArcGISFormExpressionRepeater._error_response(error_json)
+        self.assertEqual(resp.status_code, 403)
+        self.assertEqual(
+            resp.reason,
+            "You do not have permissions to access this resource or perform "
+            "this operation. (GWM_0003)"
+        )
+        self.assertEqual(
+            resp.text,
+            "You do not have permissions to access this resource or perform "
+            "this operation."
+        )
+
+    def test_error_response_without_message_code(self):
+        error_json = {
+            "code": 503,
+            "details": [],
+            "message": "An error occurred."
+        }
+        resp = ArcGISFormExpressionRepeater._error_response(error_json)
+        self.assertEqual(resp.status_code, 503)
+        self.assertEqual(resp.reason, "An error occurred.")
+        self.assertEqual(resp.text, "")
+
+    def test_error_response_with_empty_error(self):
+        error_json = {}
+        resp = ArcGISFormExpressionRepeater._error_response(error_json)
+        self.assertEqual(resp.status_code, 500)
+        self.assertEqual(resp.reason, "[No error message given by ArcGIS]")
+        self.assertEqual(resp.text, "")
+
+    @flag_enabled("UCR_EXPRESSION_REGISTRY")
+    @flag_enabled("ARCGIS_INTEGRATION")
+    def test_custom_url(self):
+        self.repeater.url_template = "/{variable1}/a_thing/delete?case_id={case_id}&{missing_variable}='foo'"
+
+        UCRExpression.objects.create(
+            name='variable1',
+            domain=self.domain,
+            expression_type="named_expression",
+            definition={
+                "type": "jsonpath",
+                "jsonpath": "form.person_name"
+            },
+        )
+        UCRExpression.objects.create(
+            name='case_id',
+            domain=self.domain,
+            expression_type="named_expression",
+            definition={
+                "type": "jsonpath",
+                "jsonpath": "form.case.@case_id"
+            },
+        )
+
+        case_id = uuid.uuid4().hex
+        xform_xml = self.xform_xml_template.format(
+            self.xmlns,
+            uuid.uuid4().hex,
+            self._create_case_block(case_id),
+        )
+        submit_form_locally(xform_xml, self.domain)
+        repeat_record = self.repeat_records(self.domain).all()[0]
+
+        expected_url = self.connection.url + f"/Timmy/a_thing/delete?case_id={case_id}&='foo'"
+
+        self.assertEqual(
+            self.repeater.get_url(repeat_record),
+            expected_url
+        )
+
+
+def test_doctests():
+    import corehq.motech.repeaters.expression.repeaters as module
+
+    results = doctest.testmod(module)
+    assert results.failed == 0
diff --git a/corehq/motech/repeaters/expression/views.py b/corehq/motech/repeaters/expression/views.py
index 331a3a2aeab4..14eb357dea1c 100644
--- a/corehq/motech/repeaters/expression/views.py
+++ b/corehq/motech/repeaters/expression/views.py
@@ -1,13 +1,12 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from corehq.motech.repeaters.expression.forms import CaseExpressionRepeaterForm
+from corehq.motech.repeaters.expression.forms import BaseExpressionRepeaterForm
 from corehq.motech.repeaters.views import AddRepeaterView, EditRepeaterView
 
 
-class AddCaseExpressionRepeaterView(AddRepeaterView):
-    urlname = 'add_case_expression_repeater'
-    repeater_form_class = CaseExpressionRepeaterForm
+class BaseExpressionRepeaterView(AddRepeaterView):
+    repeater_form_class = BaseExpressionRepeaterForm
 
     @property
     def page_url(self):
@@ -16,22 +15,43 @@ def page_url(self):
     def set_repeater_attr(self, repeater, cleaned_data):
         repeater = super().set_repeater_attr(repeater, cleaned_data)
         repeater.configured_filter = (
-            self.add_repeater_form.cleaned_data['configured_filter'])
+            self.add_repeater_form.cleaned_data['configured_filter']
+        )
         repeater.configured_expression = (
-            self.add_repeater_form.cleaned_data['configured_expression'])
+            self.add_repeater_form.cleaned_data['configured_expression']
+        )
         repeater.url_template = self.add_repeater_form.cleaned_data['url_template']
+        repeater.case_action_filter_expression = (
+            self.add_repeater_form.cleaned_data['case_action_filter_expression']
+        )
+        repeater.case_action_expression = (
+            self.add_repeater_form.cleaned_data['case_action_expression']
+        )
         return repeater
 
 
-class EditCaseExpressionRepeaterView(EditRepeaterView, AddCaseExpressionRepeaterView):
+class AddCaseExpressionRepeaterView(BaseExpressionRepeaterView):
+    urlname = 'add_case_expression_repeater'
+
+
+class EditCaseExpressionRepeaterView(EditRepeaterView, BaseExpressionRepeaterView):
     urlname = 'edit_case_expression_repeater'
     page_title = _("Edit Case Repeater")
 
 
-class AddArcGISFormExpressionRepeaterView(AddCaseExpressionRepeaterView):
+class AddFormExpressionRepeaterView(BaseExpressionRepeaterView):
+    urlname = 'add_form_expression_repeater'
+
+
+class EditFormExpressionRepeaterView(EditRepeaterView, BaseExpressionRepeaterView):
+    urlname = 'edit_form_expression_repeater'
+    page_title = _('Edit Form Repeater')
+
+
+class AddArcGISFormExpressionRepeaterView(BaseExpressionRepeaterView):
     urlname = 'add_arcgis_form_expression_repeater'
 
 
-class EditArcGISFormExpressionRepeaterView(EditRepeaterView, AddCaseExpressionRepeaterView):
+class EditArcGISFormExpressionRepeaterView(EditRepeaterView, BaseExpressionRepeaterView):
     urlname = 'edit_arcgis_form_expression_repeater'
     page_title = _("Edit ArcGIS Form Repeater")
diff --git a/corehq/motech/repeaters/forms.py b/corehq/motech/repeaters/forms.py
index 0a9348ce4332..88c3b45e7135 100644
--- a/corehq/motech/repeaters/forms.py
+++ b/corehq/motech/repeaters/forms.py
@@ -12,7 +12,7 @@
 from corehq.apps.hqwebapp.widgets import BootstrapCheckboxInput
 from corehq.apps.reports.analytics.esaccessors import get_case_types_for_domain
 from corehq.apps.users.util import raw_username
-from corehq.motech.const import REQUEST_METHODS, REQUEST_POST
+from corehq.motech.const import DEFAULT_REQUEST_METHODS, REQUEST_POST
 from corehq.motech.models import ConnectionSettings
 from corehq.motech.repeaters.repeater_generators import RegisterGenerator
 from corehq.motech.views import ConnectionSettingsListView
@@ -59,7 +59,7 @@ def set_extra_django_form_fields(self):
         )
         self.fields['request_method'] = forms.ChoiceField(
             label=_("HTTP Request Method"),
-            choices=[(rm, rm) for rm in REQUEST_METHODS],
+            choices=[(rm, rm) for rm in DEFAULT_REQUEST_METHODS],
             initial=REQUEST_POST,
             required=True,
         )
@@ -72,6 +72,7 @@ def set_extra_django_form_fields(self):
 
     def _initialize_crispy_layout(self):
         self.helper = hqcrispy.HQFormHelper(self)
+        self.helper.form_class = 'form-horizontal'
 
         self.helper.layout = crispy.Layout(
             crispy.Fieldset(
diff --git a/corehq/motech/repeaters/management/commands/find_missing_repeat_records.py b/corehq/motech/repeaters/management/commands/find_missing_repeat_records.py
index 86dff0117aca..a3e2b0ac30c8 100644
--- a/corehq/motech/repeaters/management/commands/find_missing_repeat_records.py
+++ b/corehq/motech/repeaters/management/commands/find_missing_repeat_records.py
@@ -18,7 +18,6 @@
 
 from dimagi.utils.parsing import string_to_utc_datetime
 
-from corehq.util.metrics import metrics_counter
 
 logger = logging.getLogger(__name__)
 
@@ -523,10 +522,6 @@ def create_case_repeater_register(repeater, domain, payload):
         next_check=now,
         payload_id=payload.get_id
     )
-    metrics_counter('commcare.repeaters.new_record', tags={
-        'domain': domain,
-        'doc_type': repeater.repeater_type
-    })
     repeat_record.attempt_forward_now()
     return repeat_record
 
diff --git a/corehq/motech/repeaters/migrations/0002_repeaters_db.py b/corehq/motech/repeaters/migrations/0002_repeaters_db.py
index b2147c2bb0ab..e76e410f382c 100644
--- a/corehq/motech/repeaters/migrations/0002_repeaters_db.py
+++ b/corehq/motech/repeaters/migrations/0002_repeaters_db.py
@@ -7,6 +7,8 @@
 from django.db import connections, migrations
 from django.db.utils import DEFAULT_DB_ALIAS
 
+from corehq.util.django_migrations import skip_on_fresh_install
+
 # Use a separate user for the fdw connection because postgres_fdw
 # changes session settings like search_path that interfere with other
 # clients because of pg_bouncer connection pooling.
@@ -120,12 +122,14 @@
 
 class RepeatersMigration(migrations.RunSQL):
 
+    @skip_on_fresh_install
     def database_forwards(self, app_label, schema_editor, from_state, to_state):
         if self.should_apply(schema_editor):
             assert count_records(schema_editor.connection, "repeatrecord") == 0
             assert count_records(schema_editor.connection, "repeatrecordattempt") == 0
             self._run_sql(schema_editor, self.sql.format(**self.context))
 
+    @skip_on_fresh_install
     def database_backwards(self, app_label, schema_editor, from_state, to_state):
         if self.should_apply(schema_editor):
             assert count_records(connections["repeaters"], "repeatrecord") == 0
diff --git a/corehq/motech/repeaters/migrations/0013_alter_repeatrecord_state_and_more.py b/corehq/motech/repeaters/migrations/0013_alter_repeatrecord_state_and_more.py
new file mode 100644
index 000000000000..8fea4f82b080
--- /dev/null
+++ b/corehq/motech/repeaters/migrations/0013_alter_repeatrecord_state_and_more.py
@@ -0,0 +1,40 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("repeaters", "0012_formexpressionrepeater_arcgisformexpressionrepeater"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="repeatrecord",
+            name="state",
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, "Pending"),
+                    (2, "Failed"),
+                    (4, "Succeeded"),
+                    (8, "Cancelled"),
+                    (16, "Empty"),
+                    (32, "Invalid Payload"),
+                ],
+                default=1,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="repeatrecordattempt",
+            name="state",
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, "Pending"),
+                    (2, "Failed"),
+                    (4, "Succeeded"),
+                    (8, "Cancelled"),
+                    (16, "Empty"),
+                    (32, "Invalid Payload"),
+                ]
+            ),
+        ),
+    ]
diff --git a/corehq/motech/repeaters/migrations/0014_alter_repeater_request_method.py b/corehq/motech/repeaters/migrations/0014_alter_repeater_request_method.py
new file mode 100644
index 000000000000..4d372e053ddc
--- /dev/null
+++ b/corehq/motech/repeaters/migrations/0014_alter_repeater_request_method.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.15 on 2024-10-19 08:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('repeaters', '0013_alter_repeatrecord_state_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='repeater',
+            name='request_method',
+            field=models.CharField(choices=[('DELETE', 'DELETE'), ('POST', 'POST'), ('PUT', 'PUT'), ('GET', 'GET')], default='POST', max_length=16),
+        ),
+    ]
diff --git a/corehq/motech/repeaters/models.py b/corehq/motech/repeaters/models.py
index d7091219530c..28e304db8a46 100644
--- a/corehq/motech/repeaters/models.py
+++ b/corehq/motech/repeaters/models.py
@@ -68,8 +68,9 @@
 import traceback
 import uuid
 from collections import defaultdict
+from contextlib import nullcontext
 from datetime import datetime, timedelta
-from typing import Any
+from http import HTTPStatus
 from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 
 from django.db import models, router
@@ -102,7 +103,7 @@
 )
 from corehq.motech.const import (
     MAX_REQUEST_LOG_LENGTH,
-    REQUEST_METHODS,
+    ALL_REQUEST_METHODS,
     REQUEST_POST,
 )
 from corehq.motech.models import ConnectionSettings
@@ -120,6 +121,7 @@
 from corehq.util.urlvalidate.urlvalidate import PossibleSSRFAttempt
 
 from .const import (
+    ENDPOINT_TIMER,
     MAX_ATTEMPTS,
     MAX_BACKOFF_ATTEMPTS,
     MAX_RETRY_WAIT,
@@ -141,6 +143,21 @@
     UserPayloadGenerator,
 )
 
+# Retry responses with these status codes. All other 4XX status codes
+# are treated as InvalidPayload errors.
+HTTP_STATUS_4XX_RETRY = (
+    HTTPStatus.BAD_REQUEST,
+    HTTPStatus.REQUEST_TIMEOUT,
+    HTTPStatus.CONFLICT,
+    HTTPStatus.PRECONDITION_FAILED,
+    HTTPStatus.LOCKED,
+    HTTPStatus.FAILED_DEPENDENCY,
+    HTTPStatus.TOO_EARLY,
+    HTTPStatus.UPGRADE_REQUIRED,
+    HTTPStatus.PRECONDITION_REQUIRED,
+    HTTPStatus.TOO_MANY_REQUESTS,
+)
+
 
 def log_repeater_timeout_in_datadog(domain):
     metrics_counter('commcare.repeaters.timeout', tags={'domain': domain})
@@ -251,7 +268,7 @@ class Repeater(RepeaterSuperProxy):
     name = models.CharField(max_length=255, null=True)
     format = models.CharField(max_length=64, null=True)
     request_method = models.CharField(
-        choices=list(zip(REQUEST_METHODS, REQUEST_METHODS)),
+        choices=list(zip(ALL_REQUEST_METHODS, ALL_REQUEST_METHODS)),
         default=REQUEST_POST,
         max_length=16,
     )
@@ -350,18 +367,6 @@ def _repeater_type(cls):
     def repeat_records_ready(self):
         return self.repeat_records.filter(state__in=(State.Pending, State.Fail))
 
-    @property
-    def is_ready(self):
-        """
-        Returns True if there are repeat records to be sent.
-        """
-        if self.is_paused or toggles.PAUSE_DATA_FORWARDING.enabled(self.domain):
-            return False
-        if not (self.next_attempt_at is None
-                or self.next_attempt_at < timezone.now()):
-            return False
-        return self.repeat_records_ready.exists()
-
     def set_next_attempt(self):
         now = datetime.utcnow()
         interval = _get_retry_interval(self.last_attempt_at, now)
@@ -400,11 +405,6 @@ def register(self, payload, fire_synchronously=False):
             next_check=now,
             payload_id=payload.get_id
         )
-        metrics_counter('commcare.repeaters.new_record', tags={
-            'domain': self.domain,
-            'doc_type': self.repeater_type,
-            'mode': 'sync' if fire_synchronously else 'async'
-        })
         repeat_record.save()
 
         if fire_synchronously:
@@ -432,12 +432,15 @@ def retire(self):
         self.is_deleted = True
         Repeater.objects.filter(id=self.repeater_id).update(is_deleted=True)
 
-    def fire_for_record(self, repeat_record):
+    def _time_request(self, repeat_record, payload, timing_context):
+        with timing_context(ENDPOINT_TIMER) if timing_context else nullcontext():
+            return self.send_request(repeat_record, payload)
+
+    def fire_for_record(self, repeat_record, timing_context=None):
         payload = self.get_payload(repeat_record)
         try:
-            response = self.send_request(repeat_record, payload)
+            response = self._time_request(repeat_record, payload, timing_context)
         except (Timeout, ConnectionError) as error:
-            log_repeater_timeout_in_datadog(self.domain)
             self.handle_response(RequestConnectionError(error), repeat_record)
         except RequestException as err:
             self.handle_response(err, repeat_record)
@@ -469,16 +472,24 @@ def send_request(self, repeat_record, payload):
 
     def handle_response(self, result, repeat_record):
         """
-        route the result to the success, failure, or exception handlers
+        route the result to the success, failure, timeout, or exception handlers
 
         result may be either a response object or an exception
         """
-        if isinstance(result, Exception):
-            repeat_record.handle_exception(result)
-        elif is_response(result) and 200 <= result.status_code < 300 or result is True:
-            repeat_record.handle_success(result)
+        if isinstance(result, RequestConnectionError):
+            return repeat_record.handle_timeout(result)
+        elif isinstance(result, Exception):
+            return repeat_record.handle_exception(result)
+        elif is_success_response(result):
+            return repeat_record.handle_success(result)
+        elif not is_response(result) or (
+            500 <= result.status_code < 600
+            or result.status_code in HTTP_STATUS_4XX_RETRY
+        ):
+            return repeat_record.handle_failure(result)
         else:
-            repeat_record.handle_failure(result)
+            message = format_response(result)
+            return repeat_record.handle_payload_error(message)
 
     def get_headers(self, repeat_record):
         # to be overridden
@@ -965,6 +976,17 @@ def iter_partition(self, start, partition, total_partitions):
     def get_domains_with_records(self):
         return self.order_by().values_list("domain", flat=True).distinct()
 
+    def get_repeat_record_ids(self, domain, repeater_id=None, state=None, payload_id=None):
+        where = models.Q(domain=domain)
+        if repeater_id:
+            where &= models.Q(repeater__id=repeater_id)
+        if state:
+            where &= models.Q(state=state)
+        if payload_id:
+            where &= models.Q(payload_id=payload_id)
+
+        return list(self.filter(where).order_by().values_list("id", flat=True))
+
 
 class RepeatRecord(models.Model):
     domain = models.CharField(max_length=126)
@@ -1007,7 +1029,7 @@ def requeue(self):
         # preserves the value of `self.failure_reason`.
         if self.succeeded:
             self.state = State.Pending
-        elif self.state == State.Cancelled:
+        elif self.state in (State.Cancelled, State.InvalidPayload):
             self.state = State.Fail
         self.next_check = datetime.utcnow()
         self.max_possible_tries = self.num_attempts + MAX_BACKOFF_ATTEMPTS
@@ -1027,10 +1049,11 @@ def add_success_attempt(self, response):
         # although the Couch RepeatRecord did the same.
         code = getattr(response, "status_code", None)
         state = State.Empty if code == 204 else State.Success
-        self.attempt_set.create(state=state, message=format_response(response) or '')
+        attempt = self.attempt_set.create(state=state, message=format_response(response) or '')
         self.state = state
         self.next_check = None
         self.save()
+        return attempt
 
     def add_client_failure_attempt(self, message, retry=True):
         """
@@ -1038,7 +1061,7 @@ def add_client_failure_attempt(self, message, retry=True):
         service is assumed to be in a good state, so do not back off, so
         that this repeat record does not hold up the rest.
         """
-        self._add_failure_attempt(message, MAX_ATTEMPTS, retry)
+        return self._add_failure_attempt(message, MAX_ATTEMPTS, retry)
 
     def add_server_failure_attempt(self, message):
         """
@@ -1051,7 +1074,7 @@ def add_server_failure_attempt(self, message):
            days and will hold up all other payloads.
 
         """
-        self._add_failure_attempt(message, MAX_BACKOFF_ATTEMPTS)
+        return self._add_failure_attempt(message, MAX_BACKOFF_ATTEMPTS)
 
     def _add_failure_attempt(self, message, max_attempts, retry=True):
         if retry and self.num_attempts < max_attempts:
@@ -1063,16 +1086,18 @@ def _add_failure_attempt(self, message, max_attempts, retry=True):
         self.state = state
         self.next_check = (attempt.created_at + wait) if state == State.Fail else None
         self.save()
+        return attempt
 
-    def add_payload_exception_attempt(self, message, tb_str):
-        self.attempt_set.create(
-            state=State.Cancelled,
+    def add_payload_error_attempt(self, message, traceback_str):
+        attempt = self.attempt_set.create(
+            state=State.InvalidPayload,
             message=message,
-            traceback=tb_str,
+            traceback=traceback_str,
         )
-        self.state = State.Cancelled
+        self.state = State.InvalidPayload
         self.next_check = None
         self.save()
+        return attempt
 
     @property
     def attempts(self):
@@ -1147,20 +1172,20 @@ def exceeded_max_retries(self):
     def repeater_type(self):
         return self.repeater.repeater_type
 
-    def fire(self, force_send=False):
+    def fire(self, force_send=False, timing_context=None):
         if force_send or not self.succeeded:
             try:
-                self.repeater.fire_for_record(self)
+                self.repeater.fire_for_record(self, timing_context=timing_context)
             except Exception as e:
-                log_repeater_error_in_datadog(self.domain, status_code=None,
-                                              repeater_type=self.repeater_type)
-                self.handle_payload_exception(e)
+                self.handle_payload_error(str(e), traceback_str=traceback.format_exc())
                 raise
 
     def attempt_forward_now(self, *, is_retry=False, fire_synchronously=False):
         from corehq.motech.repeaters.tasks import (
             process_repeat_record,
+            process_datasource_repeat_record,
             retry_process_repeat_record,
+            retry_process_datasource_repeat_record,
         )
 
         if self.next_check is None or self.next_check > datetime.utcnow():
@@ -1180,8 +1205,12 @@ def attempt_forward_now(self, *, is_retry=False, fire_synchronously=False):
             # data from overwriting the work of another.
             return
 
-        # separated for improved datadog reporting
-        task = retry_process_repeat_record if is_retry else process_repeat_record
+        if self.repeater_type in ['DataSourceRepeater']:
+            # separated for improved datadog reporting
+            task = retry_process_datasource_repeat_record if is_retry else process_datasource_repeat_record
+        else:
+            # separated for improved datadog reporting
+            task = retry_process_repeat_record if is_retry else process_repeat_record
         if fire_synchronously:
             task(self.id, self.domain)
         else:
@@ -1198,16 +1227,23 @@ def handle_success(self, response):
                 response.status_code,
                 self.repeater_type
             )
-        self.add_success_attempt(response)
+        return self.add_success_attempt(response)
 
     def handle_failure(self, response):
-        self.add_server_failure_attempt(format_response(response))
+        log_repeater_error_in_datadog(self.domain, response.status_code, self.repeater_type)
+        return self.add_server_failure_attempt(format_response(response))
 
     def handle_exception(self, exception):
-        self.add_client_failure_attempt(str(exception))
+        log_repeater_error_in_datadog(self.domain, None, self.repeater_type)
+        return self.add_client_failure_attempt(str(exception))
 
-    def handle_payload_exception(self, exception):
-        self.add_client_failure_attempt(str(exception), retry=False)
+    def handle_timeout(self, exception):
+        log_repeater_timeout_in_datadog(self.domain)
+        return self.add_server_failure_attempt(str(exception))
+
+    def handle_payload_error(self, message, traceback_str=''):
+        log_repeater_error_in_datadog(self.domain, status_code=None, repeater_type=self.repeater_type)
+        return self.add_payload_error_attempt(message, traceback_str)
 
     def cancel(self):
         self.state = State.Cancelled
@@ -1270,86 +1306,8 @@ def _get_retry_interval(last_checked, now):
     return interval
 
 
-def get_payload(repeater: Repeater, repeat_record: RepeatRecord) -> str:
-    try:
-        return repeater.get_payload(repeat_record)
-    except Exception as err:
-        log_repeater_error_in_datadog(
-            repeater.domain,
-            status_code=None,
-            repeater_type=repeater.__class__.__name__
-        )
-        repeat_record.add_payload_exception_attempt(
-            message=str(err),
-            tb_str=traceback.format_exc()
-        )
-        raise
-
-
-def send_request(
-    repeater: Repeater,
-    repeat_record: RepeatRecord,
-    payload: Any,
-) -> bool:
-    """
-    Calls ``repeater.send_request()`` and handles the result.
-
-    Returns True on success or cancelled, which means the caller should
-    not retry. False means a retry should be attempted later.
-    """
-
-    def is_success(resp):
-        return (
-            is_response(resp)
-            and 200 <= resp.status_code < 300
-            # `response` is `True` if the payload did not need to be
-            # sent. (This can happen, for example, with DHIS2 if the
-            # form that triggered the forwarder doesn't contain data
-            # for a DHIS2 Event.)
-            or resp is True
-        )
-
-    def allow_retries(response):
-        # respect the `retry` field of RepeaterResponse
-        return getattr(response, 'retry', True)
-
-    def later_might_be_better(resp):
-        return is_response(resp) and resp.status_code in (
-            502,  # Bad Gateway
-            503,  # Service Unavailable
-            504,  # Gateway Timeout
-        )
-
-    try:
-        response = repeater.send_request(repeat_record, payload)
-    except (Timeout, ConnectionError) as err:
-        log_repeater_timeout_in_datadog(repeat_record.domain)
-        message = str(RequestConnectionError(err))
-        repeat_record.add_server_failure_attempt(message)
-    except Exception as err:
-        repeat_record.add_client_failure_attempt(str(err))
-    else:
-        if is_success(response):
-            if is_response(response):
-                # Log success in Datadog if the payload was sent.
-                log_repeater_success_in_datadog(
-                    repeater.domain,
-                    response.status_code,
-                    repeater_type=repeater.__class__.__name__
-                )
-            repeat_record.add_success_attempt(response)
-        else:
-            message = format_response(response)
-            if later_might_be_better(response):
-                repeat_record.add_server_failure_attempt(message)
-            else:
-                retry = allow_retries(response)
-                repeat_record.add_client_failure_attempt(message, retry)
-    return repeat_record.state in (State.Success, State.Cancelled, State.Empty)  # Don't retry
-
-
 def has_failed(record):
-    return record.state in (State.Fail, State.Cancelled)
+    return record.state in (State.Fail, State.Cancelled, State.InvalidPayload)
 
 
 def format_response(response):
@@ -1361,6 +1319,18 @@ def format_response(response):
     return f'{response.status_code}: {response.reason}'
 
 
+def is_success_response(response):
+    return (
+        is_response(response)
+        and 200 <= response.status_code < 300
+        # `response` is `True` if the payload did not need to be sent.
+        # (This can happen, for example, if a form submission is
+        # transformed into a payload, but the form didn't contain any
+        # relevant data and so the payload is empty.)
+        or response is True
+    )
+
+
 def is_response(duck):
     """
     Returns True if ``duck`` has the attributes of a Requests response
diff --git a/corehq/motech/repeaters/signals.py b/corehq/motech/repeaters/signals.py
index c14225f69613..b4c131e24e42 100644
--- a/corehq/motech/repeaters/signals.py
+++ b/corehq/motech/repeaters/signals.py
@@ -26,9 +26,10 @@
 
 def create_form_repeat_records(sender, xform, **kwargs):
     from corehq.motech.repeaters.models import FormRepeater
-    from corehq.motech.repeaters.expression.repeaters import ArcGISFormExpressionRepeater
+    from corehq.motech.repeaters.expression.repeaters import ArcGISFormExpressionRepeater, FormExpressionRepeater
     if not xform.is_duplicate:
         create_repeat_records(FormRepeater, xform)
+        create_repeat_records(FormExpressionRepeater, xform)
         create_repeat_records(ArcGISFormExpressionRepeater, xform)
 
 
diff --git a/corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js b/corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
index c8f888a3dc13..74a997935f1e 100644
--- a/corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
+++ b/corehq/motech/repeaters/static/repeaters/js/bootstrap3/repeat_record_report.js
@@ -1,10 +1,11 @@
 /* globals ace */
+'use strict';
 hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
-    var initialPageData = hqImport("hqwebapp/js/initial_page_data"),
+    const initialPageData = hqImport("hqwebapp/js/initial_page_data"),
         selectAll = document.getElementById('select-all'),
-        cancelAll = document.getElementById('cancel-all'),
-        requeueAll = document.getElementById('requeue-all'),
-        $popUp = $('#are-you-sure');
+        selectPending = document.getElementById('select-pending'),
+        selectCancelled = document.getElementById('select-cancelled'),
+        $popUp = $('#are-you-sure'),
         $confirmButton = $('#confirm-button');
 
     $(function () {
@@ -48,16 +49,17 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
                 },
             });
         });
-        var editor = null;
+
+        let editor = null;
         $('#view-record-payload-modal').on('shown.bs.modal', function (event) {
-            var recordData = $(event.relatedTarget).data(),
+            const recordData = $(event.relatedTarget).data(),
                 $modal = $(this);
 
             $.get({
                 url: initialPageData.reverse("repeat_record"),
                 data: { record_id: recordData.recordId },
                 success: function (data) {
-                    var $payload = $modal.find('.payload'),
+                    const $payload = $modal.find('.payload'),
                         contentType = data.content_type;
 
                     if (editor === null) {
@@ -76,13 +78,13 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
                     }
                     if (contentType === 'text/xml') {
                         editor.session.setMode('ace/mode/xml');
-                    } else if (contentType === 'application/json') {
+                    } else if (['application/json', 'application/x-www-form-urlencoded'].includes(contentType)) {
                         editor.session.setMode('ace/mode/json');
                     }
                     editor.session.setValue(data.payload);
                 },
                 error: function (data) {
-                    var defaultText = gettext('Failed to fetch payload'),
+                    const defaultText = gettext('Failed to fetch payload'),
                         errorMessage = data.responseJSON ? data.responseJSON.error : null;
 
                     $modal.find('.modal-body').text(errorMessage || defaultText);
@@ -97,11 +99,11 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
         });
 
         $('#report-content').on('click', '.resend-record-payload', function () {
-            var $btn = $(this),
+            const $btn = $(this),
                 recordId = $btn.data().recordId;
             $btn.disableButton();
 
-            postResend($btn, recordId);
+            postResend($btn, {'record_id': recordId});
         });
 
         $('#resend-all-button').on('click', function () {
@@ -110,11 +112,11 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
         });
 
         $('#report-content').on('click', '.cancel-record-payload', function () {
-            var $btn = $(this),
+            const $btn = $(this),
                 recordId = $btn.data().recordId;
             $btn.disableButton();
 
-            postOther($btn, recordId, 'cancel');
+            postOther($btn, {'record_id': recordId}, 'cancel');
         });
 
         $('#cancel-all-button').on('click', function () {
@@ -123,11 +125,11 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
         });
 
         $('#report-content').on('click', '.requeue-record-payload', function () {
-            var $btn = $(this),
+            const $btn = $(this),
                 recordId = $btn.data().recordId;
             $btn.disableButton();
 
-            postOther($btn, recordId, 'requeue');
+            postOther($btn, {'record_id': recordId}, 'requeue');
         });
 
         $('#requeue-all-button').on('click', function () {
@@ -136,116 +138,110 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
         });
 
         $('#confirm-button').on('click', function () {
-            var itemsToSend = getCheckboxes(), action = getAction(), $btn;
+            const requestBody = getRequestBody(),
+                action = getAction();
+            let $btn;
 
             $popUp.modal('hide');
-            if (action == 'resend') {
+            if (action === 'resend') {
                 $btn = $('#resend-all-button');
                 $btn.disableButton();
-                postResend($btn, itemsToSend);
-            } else if (action == 'cancel') {
+                postResend($btn, requestBody);
+            } else if (action === 'cancel') {
                 $btn = $('#cancel-all-button');
                 $btn.disableButton();
-                postOther($btn, itemsToSend, action);
-            } else if (action == 'requeue') {
+                postOther($btn, requestBody, action);
+            } else if (action === 'requeue') {
                 $btn = $('#requeue-all-button');
                 $btn.disableButton();
-                postOther($btn, itemsToSend, action);
+                postOther($btn, requestBody, action);
             }
         });
 
         function performAction(action) {
-            if (isAnythingChecked()) {
-                if (isActionPossibleForCheckedItems(action)) {
-                    $('#warning').addClass('hide');
-                    $('#not-allowed').addClass('hide');
+            const bulkSelection = bulkSelectionChecked();
+            const checkedRecords = getCheckedRecords();
+            if (bulkSelection || checkedRecords.length > 0) {
+                if (bulkSelection) { setFlag(bulkSelection); }
+                // only applies to checked items, not bulk selections
+                // leaving as is to preserve behavior
+                if (isActionPossibleForCheckedItems(action, checkedRecords)) {
+                    hideAllWarnings();
                     $popUp.modal('show');
                 } else {
-                    $('#warning').addClass('hide');
-                    $('#not-allowed').removeClass('hide');
+                    showWarning('not-allowed');
                 }
             } else {
-                $('#warning').removeClass('hide');
-                $('#not-allowed').addClass('hide');
+                showWarning('no-selection');
             }
         }
 
-        function isAnythingChecked() {
-            var items = document.getElementsByName('xform_ids');
-
+        function bulkSelectionChecked() {
             if (selectAll.checked) {
-                setFlag('select_all');
-                return true;
-            } else if (cancelAll.checked) {
-                setFlag('cancel_all');
-                return true;
-            } else if (requeueAll.checked) {
-                setFlag('requeue_all');
-                return true;
-            }
-
-            for (var i = 0; i < items.length; i++) {
-                if (items[i].checked) {
-                    return true;
-                }
+                return 'select_all';
+            } else if (selectPending.checked) {
+                return 'select_pending';
+            } else if (selectCancelled.checked) {
+                return 'select_cancelled';
             }
+        }
 
-            return false;
+        function getCheckedRecords() {
+            return $.find('input[type=checkbox][name=xform_ids]:checked');
         }
 
-        function isActionPossibleForCheckedItems(action) {
-            var items = document.getElementsByName('xform_ids');
-            for (var i = 0; i < items.length; i++) {
-                if (items[i].checked) {
-                    var id = items[i].getAttribute('data-id');
-                    var query = '[data-record-id="' + id + '"][class="btn btn-default ' + action + '-record-payload"]';
-                    var button = document.querySelector(query);
-                    if (button == null) {
-                        return false;
-                    }
+        function isActionPossibleForCheckedItems(action, items) {
+            for (const item of items) {
+                const id = item.getAttribute('data-id');
+                const query = `[data-record-id="${id}"][class="btn btn-default ${action}-record-payload"]`;
+                const button = document.querySelector(query);
+                if (!button) {
+                    return false;
                 }
             }
 
             return true;
         }
 
-        function getCheckboxes() {
-            if (selectAll.checked) {
-                return selectAll.getAttribute('data-id');
-            } else if (cancelAll.checked) {
-                return cancelAll.getAttribute('data-id');
-            } else if (requeueAll.checked) {
-                return requeueAll.getAttribute('data-id');
+        function getRequestBody() {
+            const bulkSelectors = [selectAll, selectPending, selectCancelled];
+            if (bulkSelectors.some(selector => selector.checked)) {
+                return getBulkSelectionProperties();
             } else {
-                var items = document.getElementsByName('xform_ids'),
-                    itemsToSend = '';
-                for (var i = 0; i < items.length; i++) {
-                    if (items[i].type == 'checkbox' && items[i].checked == true) {
-                        itemsToSend += items[i].getAttribute('data-id') + ' '
-                    }
-                }
-
-                return itemsToSend;
+                return getRecordIds();
             }
         }
 
-        function postResend(btn, arg) {
+        function getBulkSelectionProperties() {
+            return {
+                payload_id: initialPageData.get('payload_id'),
+                repeater_id: initialPageData.get('repeater_id'),
+                flag: getFlag(),
+            };
+        }
+
+        function getRecordIds() {
+            const recordEls = getCheckedRecords();
+            const recordIds = recordEls.map(
+                record => record.getAttribute('data-id')
+            ).join(' ');
+            return {record_id: recordIds};
+        }
+
+        function postResend(btn, data) {
             $.post({
                 url: initialPageData.reverse("repeat_record"),
-                data: {
-                    record_id: arg,
-                    flag: getFlag(),
-                },
-                success: function (data) {
+                data: data,
+                success: function (response) {
                     btn.removeSpinnerFromButton();
-                    if (data.success) {
+                    if (response.success) {
                         btn.text(gettext('Success!'));
                         btn.addClass('btn-success');
                     } else {
                         btn.text(gettext('Failed'));
                         btn.addClass('btn-danger');
                         $('#payload-error-modal').modal('show');
-                        $('#payload-error-modal .error-message').text(data.failure_reason);
+                        $('#payload-error-modal .error-message').text(response.failure_reason);
                     }
                 },
                 error: function () {
@@ -256,13 +252,10 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
             });
         }
 
-        function postOther(btn, arg, action) {
+        function postOther(btn, data, action) {
             $.post({
                 url: initialPageData.reverse(action + '_repeat_record'),
-                data: {
-                    record_id: arg,
-                    flag: getFlag(),
-                },
+                data: data,
                 success: function () {
                     btn.removeSpinnerFromButton();
                     btn.text(gettext('Success!'));
@@ -291,5 +284,20 @@ hqDefine('repeaters/js/bootstrap3/repeat_record_report', function () {
         function getFlag() {
             return $confirmButton.attr('data-flag');
         }
+
+        function showWarning(reason) {
+            if (reason === 'no-selection') {
+                $('#no-selection').removeClass('hide');
+                $('#not-allowed').addClass('hide');
+            } else if (reason === 'not-allowed') {
+                $('#not-allowed').removeClass('hide');
+                $('#no-selection').addClass('hide');
+            }
+        }
+
+        function hideAllWarnings() {
+            $('#no-selection').addClass('hide');
+            $('#not-allowed').addClass('hide');
+        }
     });
 });
diff --git a/corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js b/corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
index 3c37e7b324df..7941bff485d6 100644
--- a/corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
+++ b/corehq/motech/repeaters/static/repeaters/js/bootstrap5/repeat_record_report.js
@@ -1,10 +1,11 @@
 /* globals ace */
+'use strict';
 hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
-    var initialPageData = hqImport("hqwebapp/js/initial_page_data"),
+    const initialPageData = hqImport("hqwebapp/js/initial_page_data"),
         selectAll = document.getElementById('select-all'),
-        cancelAll = document.getElementById('cancel-all'),
-        requeueAll = document.getElementById('requeue-all'),
-        $popUp = $('#are-you-sure');
+        selectPending = document.getElementById('select-pending'),
+        selectCancelled = document.getElementById('select-cancelled'),
+        $popUp = $('#are-you-sure'),
         $confirmButton = $('#confirm-button');
 
     $(function () {
@@ -48,16 +49,17 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
                 },
             });
         });
-        var editor = null;
+
+        let editor = null;
         $('#view-record-payload-modal').on('shown.bs.modal', function (event) {
-            var recordData = $(event.relatedTarget).data(),
+            const recordData = $(event.relatedTarget).data(),
                 $modal = $(this);
 
             $.get({
                 url: initialPageData.reverse("repeat_record"),
                 data: { record_id: recordData.recordId },
                 success: function (data) {
-                    var $payload = $modal.find('.payload'),
+                    const $payload = $modal.find('.payload'),
                         contentType = data.content_type;
 
                     if (editor === null) {
@@ -82,7 +84,7 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
                     editor.session.setValue(data.payload);
                 },
                 error: function (data) {
-                    var defaultText = gettext('Failed to fetch payload'),
+                    const defaultText = gettext('Failed to fetch payload'),
                         errorMessage = data.responseJSON ? data.responseJSON.error : null;
 
                     $modal.find('.modal-body').text(errorMessage || defaultText);
@@ -97,11 +99,11 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
         });
 
         $('#report-content').on('click', '.resend-record-payload', function () {
-            var $btn = $(this),
+            const $btn = $(this),
                 recordId = $btn.data().recordId;
             $btn.disableButton();
 
-            postResend($btn, recordId);
+            postResend($btn, {'record_id': recordId});
         });
 
         $('#resend-all-button').on('click', function () {
@@ -110,11 +112,11 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
         });
 
         $('#report-content').on('click', '.cancel-record-payload', function () {
-            var $btn = $(this),
+            const $btn = $(this),
                 recordId = $btn.data().recordId;
             $btn.disableButton();
 
-            postOther($btn, recordId, 'cancel');
+            postOther($btn, {'record_id': recordId}, 'cancel');
         });
 
         $('#cancel-all-button').on('click', function () {
@@ -123,11 +125,11 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
         });
 
         $('#report-content').on('click', '.requeue-record-payload', function () {
-            var $btn = $(this),
+            const $btn = $(this),
                 recordId = $btn.data().recordId;
             $btn.disableButton();
 
-            postOther($btn, recordId, 'requeue');
+            postOther($btn, {'record_id': recordId}, 'requeue');
         });
 
         $('#requeue-all-button').on('click', function () {
@@ -136,116 +138,110 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
         });
 
         $('#confirm-button').on('click', function () {
-            var itemsToSend = getCheckboxes(), action = getAction(), $btn;
+            const requestBody = getRequestBody(),
+                action = getAction();
+            let $btn;
 
             $popUp.modal('hide');  /* todo B5: plugin:modal */
-            if (action == 'resend') {
+            if (action === 'resend') {
                 $btn = $('#resend-all-button');
                 $btn.disableButton();
-                postResend($btn, itemsToSend);
-            } else if (action == 'cancel') {
+                postResend($btn, requestBody);
+            } else if (action === 'cancel') {
                 $btn = $('#cancel-all-button');
                 $btn.disableButton();
-                postOther($btn, itemsToSend, action);
-            } else if (action == 'requeue') {
+                postOther($btn, requestBody, action);
+            } else if (action === 'requeue') {
                 $btn = $('#requeue-all-button');
                 $btn.disableButton();
-                postOther($btn, itemsToSend, action);
+                postOther($btn, requestBody, action);
             }
         });
 
         function performAction(action) {
-            if (isAnythingChecked()) {
-                if (isActionPossibleForCheckedItems(action)) {
-                    $('#warning').addClass('hide');
-                    $('#not-allowed').addClass('hide');
+            const bulkSelection = bulkSelectionChecked();
+            const checkedRecords = getCheckedRecords();
+            if (bulkSelection || checkedRecords.length > 0) {
+                if (bulkSelection) { setFlag(bulkSelection); }
+                // only applies to checked items, not bulk selections
+                // leaving as is to preserve behavior
+                if (isActionPossibleForCheckedItems(action, checkedRecords)) {
+                    hideAllWarnings();
                     $popUp.modal('show');  /* todo B5: plugin:modal */
                 } else {
-                    $('#warning').addClass('hide');
-                    $('#not-allowed').removeClass('hide');
+                    showWarning('not-allowed');
                 }
             } else {
-                $('#warning').removeClass('hide');
-                $('#not-allowed').addClass('hide');
+                showWarning('no-selection');
             }
         }
 
-        function isAnythingChecked() {
-            var items = document.getElementsByName('xform_ids');
-
+        function bulkSelectionChecked() {
             if (selectAll.checked) {
-                setFlag('select_all');
-                return true;
-            } else if (cancelAll.checked) {
-                setFlag('cancel_all');
-                return true;
-            } else if (requeueAll.checked) {
-                setFlag('requeue_all');
-                return true;
-            }
-
-            for (var i = 0; i < items.length; i++) {
-                if (items[i].checked) {
-                    return true;
-                }
+                return 'select_all';
+            } else if (selectPending.checked) {
+                return 'select_pending';
+            } else if (selectCancelled.checked) {
+                return 'select_cancelled';
             }
+        }
 
-            return false;
+        function getCheckedRecords() {
+            return $.find('input[type=checkbox][name=xform_ids]:checked');
         }
 
-        function isActionPossibleForCheckedItems(action) {
-            var items = document.getElementsByName('xform_ids');
-            for (var i = 0; i < items.length; i++) {
-                if (items[i].checked) {
-                    var id = items[i].getAttribute('data-id');
-                    var query = '[data-record-id="' + id + '"][class="btn btn-default ' + action + '-record-payload"]';
-                    var button = document.querySelector(query);
-                    if (button == null) {
-                        return false;
-                    }
+        function isActionPossibleForCheckedItems(action, items) {
+            for (const item of items) {
+                const id = item.getAttribute('data-id');
+                const query = `[data-record-id="${id}"][class="btn btn-default ${action}-record-payload"]`;
+                const button = document.querySelector(query);
+                if (!button) {
+                    return false;
                 }
             }
 
             return true;
         }
 
-        function getCheckboxes() {
-            if (selectAll.checked) {
-                return selectAll.getAttribute('data-id');
-            } else if (cancelAll.checked) {
-                return cancelAll.getAttribute('data-id');
-            } else if (requeueAll.checked) {
-                return requeueAll.getAttribute('data-id');
+        function getRequestBody() {
+            const bulkSelectors = [selectAll, selectPending, selectCancelled];
+            if (bulkSelectors.some(selector => selector.checked)) {
+                return getBulkSelectionProperties();
             } else {
-                var items = document.getElementsByName('xform_ids'),
-                    itemsToSend = '';
-                for (var i = 0; i < items.length; i++) {
-                    if (items[i].type == 'checkbox' && items[i].checked == true) {
-                        itemsToSend += items[i].getAttribute('data-id') + ' '
-                    }
-                }
-
-                return itemsToSend;
+                return getRecordIds();
             }
         }
 
-        function postResend(btn, arg) {
+        function getBulkSelectionProperties() {
+            return {
+                payload_id: initialPageData.get('payload_id'),
+                repeater_id: initialPageData.get('repeater_id'),
+                flag: getFlag(),
+            };
+        }
+
+        function getRecordIds() {
+            const recordEls = getCheckedRecords();
+            const recordIds = recordEls.map(
+                record => record.getAttribute('data-id')
+            ).join(' ');
+            return {record_id: recordIds};
+        }
+
+        function postResend(btn, data) {
             $.post({
                 url: initialPageData.reverse("repeat_record"),
-                data: {
-                    record_id: arg,
-                    flag: getFlag(),
-                },
-                success: function (data) {
+                data: data,
+                success: function (response) {
                     btn.removeSpinnerFromButton();
-                    if (data.success) {
+                    if (response.success) {
                         btn.text(gettext('Success!'));
                         btn.addClass('btn-success');
                     } else {
                         btn.text(gettext('Failed'));
                         btn.addClass('btn-danger');
                         $('#payload-error-modal').modal('show');  /* todo B5: plugin:modal */
-                        $('#payload-error-modal .error-message').text(data.failure_reason);
+                        $('#payload-error-modal .error-message').text(response.failure_reason);
                     }
                 },
                 error: function () {
@@ -256,13 +252,10 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
             });
         }
 
-        function postOther(btn, arg, action) {
+        function postOther(btn, data, action) {
             $.post({
                 url: initialPageData.reverse(action + '_repeat_record'),
-                data: {
-                    record_id: arg,
-                    flag: getFlag(),
-                },
+                data: data,
                 success: function () {
                     btn.removeSpinnerFromButton();
                     btn.text(gettext('Success!'));
@@ -291,5 +284,20 @@ hqDefine('repeaters/js/bootstrap5/repeat_record_report', function () {
         function getFlag() {
             return $confirmButton.attr('data-flag');
         }
+
+        function showWarning(reason) {
+            if (reason === 'no-selection') {
+                $('#no-selection').removeClass('hide');
+                $('#not-allowed').addClass('hide');
+            } else if (reason === 'not-allowed') {
+                $('#not-allowed').removeClass('hide');
+                $('#no-selection').addClass('hide');
+            }
+        }
+
+        function hideAllWarnings() {
+            $('#no-selection').addClass('hide');
+            $('#not-allowed').addClass('hide');
+        }
     });
 });
diff --git a/corehq/motech/repeaters/static/repeaters/js/repeat_record_report_selects.js b/corehq/motech/repeaters/static/repeaters/js/repeat_record_report_selects.js
index 1f8c35505de0..4676be9995d4 100644
--- a/corehq/motech/repeaters/static/repeaters/js/repeat_record_report_selects.js
+++ b/corehq/motech/repeaters/static/repeaters/js/repeat_record_report_selects.js
@@ -1,9 +1,9 @@
-/* globals ace */
-hqDefine('repeaters/js/repeat_record_report_selects', function() {
-    var items = document.getElementsByName('xform_ids'),
-        all = document.getElementById('select-all'),
-        allCancel = document.getElementById('cancel-all'),
-        allRequeue = document.getElementById('requeue-all'),
+'use strict';
+hqDefine('repeaters/js/repeat_record_report_selects', function () {
+    const items = document.getElementsByName('xform_ids'),
+        selectAll = document.getElementById('select-all'),
+        selectPending = document.getElementById('select-pending'),
+        selectCancelled = document.getElementById('select-cancelled'),
         buttonCancel = document.getElementById('cancel-all-button'),
         buttonRequeue = document.getElementById('requeue-all-button');
 
@@ -18,9 +18,9 @@ hqDefine('repeaters/js/repeat_record_report_selects', function() {
     });
 
     $('#select-all').on('click', function () {
-        if (all.checked) {
+        if (selectAll.checked) {
             selectItems();
-            uncheck(allCancel, allRequeue);
+            uncheck(selectPending, selectCancelled);
             turnOffCancelRequeue();
         } else {
             unSelectItems();
@@ -28,11 +28,11 @@ hqDefine('repeaters/js/repeat_record_report_selects', function() {
         }
     });
 
-    $('#cancel-all').on('click', function () {
+    $('#select-pending').on('click', function () {
         unSelectItems();
-        uncheck(all, allRequeue);
+        uncheck(selectAll, selectCancelled);
         turnOnCancelRequeue();
-        if (allCancel.checked) {
+        if (selectPending.checked) {
             buttonRequeue.disabled = true;
             checkMultipleItems('cancel');
         } else {
@@ -40,11 +40,11 @@ hqDefine('repeaters/js/repeat_record_report_selects', function() {
         }
     });
 
-    $('#requeue-all').on('click', function () {
+    $('#select-cancelled').on('click', function () {
         unSelectItems();
-        uncheck(all, allCancel);
+        uncheck(selectAll, selectPending);
         turnOnCancelRequeue();
-        if (allRequeue.checked) {
+        if (selectCancelled.checked) {
             buttonCancel.disabled = true;
             checkMultipleItems('requeue');
         } else {
@@ -53,22 +53,24 @@ hqDefine('repeaters/js/repeat_record_report_selects', function() {
     });
 
     $('body').on('DOMNodeInserted', 'tbody', function () {
-      for (var i = 0; i < items.length; i++) {
-            $(items[i]).on('click', uncheckSelects);
+        for (const item of items) {
+            $(item).on('click', uncheckSelects);
         }
     });
 
     function selectItems() {
-        for (var i = 0; i < items.length; i++) {
-            if (items[i].type == 'checkbox')
-                items[i].checked = true;
+        for (const item of items) {
+            if (item.type === 'checkbox') {
+                item.checked = true;
+            }
         }
     }
 
     function unSelectItems() {
-        for (var i = 0; i < items.length; i++) {
-            if (items[i].type == 'checkbox')
-                items[i].checked = false;
+        for (const item of items) {
+            if (item.type === 'checkbox') {
+                item.checked = false;
+            }
         }
     }
 
@@ -78,9 +80,9 @@ hqDefine('repeaters/js/repeat_record_report_selects', function() {
     }
 
     function uncheckSelects() {
-        all.checked = false;
-        allCancel.checked = false;
-        allRequeue.checked = false;
+        selectAll.checked = false;
+        selectPending.checked = false;
+        selectCancelled.checked = false;
         turnOnCancelRequeue();
     }
 
@@ -95,15 +97,15 @@ hqDefine('repeaters/js/repeat_record_report_selects', function() {
     }
 
     function checkMultipleItems(action) {
-        for (var i = 0; i < items.length; i++) {
-            var id = items[i].getAttribute('data-id');
-            var query = '[data-record-id="' + id + '"][class="btn btn-default ' + action + '-record-payload"]';
-            var button = document.querySelector(query);
-            if (button != null && items[i].type == 'checkbox') {
-                if (items[i].checked) {
-                    items[i].checked = false;
+        for (const item of items) {
+            const id = item.getAttribute('data-id');
+            const query = `[data-record-id="${id}"][class="btn btn-default ${action}-record-payload"]`;
+            const button = document.querySelector(query);
+            if (!!button && item.type === 'checkbox') {
+                if (item.checked) {
+                    item.checked = false;
                 } else {
-                    items[i].checked = true;
+                    item.checked = true;
                 }
             }
         }
diff --git a/corehq/motech/repeaters/tasks.py b/corehq/motech/repeaters/tasks.py
index fef33321789c..eb6e5403594a 100644
--- a/corehq/motech/repeaters/tasks.py
+++ b/corehq/motech/repeaters/tasks.py
@@ -15,23 +15,28 @@
     make_buckets_from_timedeltas,
     metrics_counter,
     metrics_gauge_task,
+    metrics_histogram,
     metrics_histogram_timer,
 )
 from corehq.util.metrics.const import MPM_MAX
-from corehq.util.soft_assert import soft_assert
 from corehq.util.timer import TimingContext
 
 from .const import (
     CHECK_REPEATERS_INTERVAL,
     CHECK_REPEATERS_KEY,
     CHECK_REPEATERS_PARTITION_COUNT,
+    ENDPOINT_TIMER,
     MAX_RETRY_WAIT,
     RATE_LIMITER_DELAY_RANGE,
     State,
 )
 from .models import RepeatRecord, domain_can_forward
 
-from ..rate_limiter import report_repeater_usage, rate_limit_repeater
+from ..rate_limiter import (
+    rate_limit_repeater,
+    report_repeater_attempt,
+    report_repeater_usage,
+)
 
 _check_repeaters_buckets = make_buckets_from_timedeltas(
     timedelta(seconds=10),
@@ -41,8 +46,6 @@
     timedelta(hours=5),
     timedelta(hours=10),
 )
-MOTECH_DEV = '@'.join(('nhooper', 'dimagi.com'))
-_soft_assert = soft_assert(to=MOTECH_DEV)
 logging = get_task_logger(__name__)
 
 DELETE_CHUNK_SIZE = 5000
@@ -106,20 +109,12 @@ def check_repeaters_in_partition(partition):
         ):
             for record in RepeatRecord.objects.iter_partition(
                     start, partition, CHECK_REPEATERS_PARTITION_COUNT):
-                if not _soft_assert(
-                    datetime.utcnow() < twentythree_hours_later,
-                    "I've been iterating repeat records for 23 hours. I quit!"
-                ):
+
+                if datetime.utcnow() > twentythree_hours_later:
                     break
 
                 metrics_counter("commcare.repeaters.check.attempt_forward")
                 record.attempt_forward_now(is_retry=True)
-            else:
-                iterating_time = datetime.utcnow() - start
-                _soft_assert(
-                    iterating_time < timedelta(hours=6),
-                    f"It took {iterating_time} to iterate repeat records."
-                )
     finally:
         check_repeater_lock.release()
 
@@ -142,40 +137,82 @@ def retry_process_repeat_record(repeat_record_id, domain):
     _process_repeat_record(RepeatRecord.objects.get(id=repeat_record_id))
 
 
+@task(queue=settings.CELERY_REPEAT_RECORD_DATASOURCE_QUEUE)
+def process_datasource_repeat_record(repeat_record_id, domain):
+    """
+    NOTE: Keep separate from retry_process_datasource_repeat_record for monitoring purposes
+    Domain is present here for domain tagging in datadog
+    """
+    _process_repeat_record(RepeatRecord.objects.get(id=repeat_record_id))
+
+
+@task(queue=settings.CELERY_REPEAT_RECORD_DATASOURCE_QUEUE)
+def retry_process_datasource_repeat_record(repeat_record_id, domain):
+    """
+    NOTE: Keep separate from process_datasource_repeat_record for monitoring purposes
+    Domain is present here for domain tagging in datadog
+    """
+    _process_repeat_record(RepeatRecord.objects.get(id=repeat_record_id))
+
+
 def _process_repeat_record(repeat_record):
-    if repeat_record.state == State.Cancelled:
-        return
+    request_duration = action = None
+    with TimingContext('process_repeat_record') as timer:
+        if repeat_record.state == State.Cancelled:
+            return
 
-    if not domain_can_forward(repeat_record.domain) or repeat_record.exceeded_max_retries:
-        # When creating repeat records, we check if a domain can forward so
-        # we should never have a repeat record associated with a domain that
-        # cannot forward, but this is just to be sure
-        repeat_record.cancel()
-        repeat_record.save()
-        return
+        if not domain_can_forward(repeat_record.domain) or repeat_record.exceeded_max_retries:
+            # When creating repeat records, we check if a domain can forward so
+            # we should never have a repeat record associated with a domain that
+            # cannot forward, but this is just to be sure
+            repeat_record.cancel()
+            repeat_record.save()
+            return
 
-    if repeat_record.repeater.is_deleted:
-        repeat_record.cancel()
-        repeat_record.save()
-        return
+        if repeat_record.repeater.is_deleted:
+            repeat_record.cancel()
+            repeat_record.save()
+            return
 
-    try:
-        if repeat_record.repeater.is_paused or toggles.PAUSE_DATA_FORWARDING.enabled(repeat_record.domain):
-            # postpone repeat record by MAX_RETRY_WAIT so that it is not fetched
-            # in the next check to process repeat records, which helps to avoid
-            # clogging the queue
-            repeat_record.postpone_by(MAX_RETRY_WAIT)
-        elif rate_limit_repeater(repeat_record.domain):
-            # Spread retries evenly over the range defined by RATE_LIMITER_DELAY_RANGE
-            # with the intent of avoiding clumping and spreading load
-            repeat_record.postpone_by(random.uniform(*RATE_LIMITER_DELAY_RANGE))
-        elif repeat_record.is_queued():
-            with TimingContext() as timer:
-                repeat_record.fire()
-            # round up to the nearest millisecond, meaning always at least 1ms
-            report_repeater_usage(repeat_record.domain, milliseconds=int(timer.duration * 1000) + 1)
-    except Exception:
-        logging.exception('Failed to process repeat record: {}'.format(repeat_record.id))
+        try:
+            if repeat_record.repeater.is_paused or toggles.PAUSE_DATA_FORWARDING.enabled(repeat_record.domain):
+                # postpone repeat record by MAX_RETRY_WAIT so that it is not fetched
+                # in the next check to process repeat records, which helps to avoid
+                # clogging the queue
+                repeat_record.postpone_by(MAX_RETRY_WAIT)
+                action = 'paused'
+            elif rate_limit_repeater(repeat_record.domain, repeat_record.repeater.repeater_id):
+                # Spread retries evenly over the range defined by RATE_LIMITER_DELAY_RANGE
+                # with the intent of avoiding clumping and spreading load
+                repeat_record.postpone_by(random.uniform(*RATE_LIMITER_DELAY_RANGE))
+                action = 'rate_limited'
+            elif repeat_record.is_queued():
+                report_repeater_attempt(repeat_record.repeater.repeater_id)
+                with timer('fire_timing') as fire_timer:
+                    repeat_record.fire(timing_context=fire_timer)
+                # round up to the nearest millisecond, meaning always at least 1ms
+                report_repeater_usage(repeat_record.domain, milliseconds=int(fire_timer.duration * 1000) + 1)
+                action = 'attempted'
+                request_duration = [
+                    sub.duration for sub in fire_timer.to_list(exclude_root=True) if sub.name == ENDPOINT_TIMER
+                ][0]
+        except Exception:
+            logging.exception('Failed to process repeat record: {}'.format(repeat_record.id))
+            return
+
+    if action:
+        processing_time = timer.duration - request_duration if request_duration else timer.duration
+        metrics_histogram(
+            'commcare.repeaters.repeat_record_processing.timing',
+            processing_time * 1000,
+            buckets=(100, 500, 1000, 5000),
+            bucket_tag='duration',
+            bucket_unit='ms',
+            tags={
+                'domain': repeat_record.domain,
+                'action': action,
+            },
+        )
 
 
 metrics_gauge_task(
diff --git a/corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html b/corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
index badbcdfdc28a..f605665c0e1b 100644
--- a/corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+++ b/corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
@@ -42,22 +42,22 @@
               {% trans 'Requeue' %}
             </button>
             <label class="checkbox" >
-              <input type="checkbox" id="select-all" data-id="{{ form_query_string|urlencode }}">
+              <input type="checkbox" id="select-all">
                 {% blocktrans %}Select all {{ total }} payloads{% endblocktrans %}
             </label>
             <label class="checkbox" >
-              <input type="checkbox" id="cancel-all" data-id="{{ form_query_string_pending|urlencode }}">
+              <input type="checkbox" id="select-pending">
                 {% blocktrans %}Select {{ total_pending }} pending payloads{% endblocktrans %}
             </label>
             <label class="checkbox" >
-              <input type="checkbox" id="requeue-all" data-id="{{ form_query_string_cancelled|urlencode }}">
+              <input type="checkbox" id="select-cancelled">
                 {% blocktrans %}Select {{ total_cancelled }} cancelled payloads{% endblocktrans %}
             </label>
           </div>
         </div>
       {% endif %}
   </div>
-  <div id="warning" class="alert alert-warning hide">
+  <div id="no-selection" class="alert alert-warning hide">
     {% blocktrans %}Please select at least one payload{% endblocktrans %}
   </div>
   <div id="not-allowed" class="alert alert-warning hide">
@@ -91,6 +91,8 @@ <h4 class="modal-title">{% blocktrans %}Confirmation{% endblocktrans %}</h4>
     {% registerurl 'repeat_record' domain %}
     {% registerurl 'cancel_repeat_record' domain %}
     {% registerurl 'requeue_repeat_record' domain %}
+    {% initial_page_data 'payload_id' payload_id %}
+    {% initial_page_data 'repeater_id' repeater_id %}
 {% endblock %}
 
 {% block modals %}{{ block.super }}
@@ -115,14 +117,14 @@ <h4 class="modal-title">{% trans "Payload" %}</h4>
         </div>
     </div>
 
-    <!-- Modal for "Resend Payload" errors -->
+    <!-- Modal for error messages from server -->
     <div class="modal fade" id="payload-error-modal" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
                     </button>
-                    <h4 class="modal-title">{% trans "Payload Error" %}</h4>
+                    <h4 class="modal-title">{% trans "Error" %}</h4>
                 </div>
                 <div class="modal-body">
                     <div class="error-message"></div>
diff --git a/corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html b/corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
index 43485cad86b6..a834db0775d2 100644
--- a/corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+++ b/corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -42,22 +42,22 @@
               {% trans 'Requeue' %}
             </button>
             <label class="checkbox" >  {# todo B5: css:checkbox #}
-              <input type="checkbox" id="select-all" data-id="{{ form_query_string|urlencode }}">  {# todo B5: css:checkbox #}
+              <input type="checkbox" id="select-all">  {# todo B5: css:checkbox #}
                 {% blocktrans %}Select all {{ total }} payloads{% endblocktrans %}
             </label>
             <label class="checkbox" >  {# todo B5: css:checkbox #}
-              <input type="checkbox" id="cancel-all" data-id="{{ form_query_string_pending|urlencode }}">  {# todo B5: css:checkbox #}
+              <input type="checkbox" id="select-pending">  {# todo B5: css:checkbox #}
                 {% blocktrans %}Select {{ total_pending }} pending payloads{% endblocktrans %}
             </label>
             <label class="checkbox" >  {# todo B5: css:checkbox #}
-              <input type="checkbox" id="requeue-all" data-id="{{ form_query_string_cancelled|urlencode }}">  {# todo B5: css:checkbox #}
+              <input type="checkbox" id="select-cancelled">  {# todo B5: css:checkbox #}
                 {% blocktrans %}Select {{ total_cancelled }} cancelled payloads{% endblocktrans %}
             </label>
           </div>
         </div>
       {% endif %}
   </div>
-  <div id="warning" class="alert alert-warning d-none">
+  <div id="no-selection" class="alert alert-warning d-none">
     {% blocktrans %}Please select at least one payload{% endblocktrans %}
   </div>
   <div id="not-allowed" class="alert alert-warning d-none">
@@ -91,6 +91,8 @@ <h4 class="modal-title">{% blocktrans %}Confirmation{% endblocktrans %}</h4>
     {% registerurl 'repeat_record' domain %}
     {% registerurl 'cancel_repeat_record' domain %}
     {% registerurl 'requeue_repeat_record' domain %}
+    {% initial_page_data 'payload_id' payload_id %}
+    {% initial_page_data 'repeater_id' repeater_id %}
 {% endblock %}
 
 {% block modals %}{{ block.super }}
@@ -115,14 +117,14 @@ <h4 class="modal-title">{% trans "Payload" %}</h4>
         </div>
     </div>
 
-    <!-- Modal for "Resend Payload" errors -->
+    <!-- Modal for error messages from server -->
     <div class="modal fade" id="payload-error-modal" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">  {# todo B5: css:modal-header #}
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>  {# todo B5: css:close #}
                     </button>
-                    <h4 class="modal-title">{% trans "Payload Error" %}</h4>
+                    <h4 class="modal-title">{% trans "Error" %}</h4>
                 </div>
                 <div class="modal-body">
                     <div class="error-message"></div>
diff --git a/corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html b/corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
index 50ac2128445b..b2fe598f96e0 100644
--- a/corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
+++ b/corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
@@ -30,7 +30,7 @@
                             {% endif %}
                             {% if attempt.message %}
                                 <div class="well record-attempt" style="font-family: monospace;">
-                                    {{ attempt.message }}
+                                    {{ attempt.message|escape|linebreaksbr }}
                                 </div>
                             {% endif %}
                         </div>
diff --git a/corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html b/corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
index 441d5a388500..ccec66bd4b46 100644
--- a/corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
+++ b/corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
@@ -30,7 +30,7 @@
                             {% endif %}
                             {% if attempt.message %}
                                 <div class="card record-attempt" style="font-family: monospace;">  {# todo B5: css:well, inline style #}
-                                    {{ attempt.message }}
+                                    {{ attempt.message|escape|linebreaksbr }}
                                 </div>
                             {% endif %}
                         </div>
diff --git a/corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html b/corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
index a502a393621e..069941a94f02 100644
--- a/corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
+++ b/corehq/motech/repeaters/templates/repeaters/partials/repeater_row.html
@@ -16,6 +16,11 @@
             {{ repeater.count_State.Fail }}
         </a>
     </td>
+    <td>
+        <a href="{% url 'domain_report_dispatcher' domain report %}?repeater={{ repeater.repeater_id }}&amp;record_state=INVALIDPAYLOAD">
+            {{ repeater.count_State.InvalidPayload }}
+        </a>
+    </td>
     <td>
         <a href="{% url 'domain_report_dispatcher' domain report %}?repeater={{ repeater.repeater_id }}&amp;record_state=CANCELLED">
             {{ repeater.count_State.Cancelled }}
@@ -23,7 +28,7 @@
     </td>
     <td>
         <a href="{% url 'domain_report_dispatcher' domain report %}?repeater={{ repeater.repeater_id }}&amp;record_state=SUCCESS">
-            {{ repeater.count_State.Success }}
+            {{ repeater.count_State.EmptyOrSuccess }}
         </a>
     </td>
     <td>
diff --git a/corehq/motech/repeaters/templates/repeaters/repeaters.html b/corehq/motech/repeaters/templates/repeaters/repeaters.html
index 524763dc0d3d..9ef5a6e1bbb9 100644
--- a/corehq/motech/repeaters/templates/repeaters/repeaters.html
+++ b/corehq/motech/repeaters/templates/repeaters/repeaters.html
@@ -14,7 +14,7 @@ <h2>{{ type_info.friendly_name }}</h2>
             <table class="table table-striped table-bordered">
             <thead>
                 <tr>
-                    <th class="col-md-4">
+                    <th class="col-md-3">
                         {% trans 'Name' %}
                     </th>
                     <th class="col-md-1">
@@ -23,6 +23,9 @@ <h2>{{ type_info.friendly_name }}</h2>
                     <th class="col-md-1">
                         {% trans 'Failure' %}
                     </th>
+                    <th class="col-md-1">
+                        {% trans 'Invalid' %}
+                    </th>
                     <th class="col-md-1">
                         {% trans 'Cancelled' %}
                     </th>
diff --git a/corehq/motech/repeaters/tests/test_models.py b/corehq/motech/repeaters/tests/test_models.py
index 6789a9d9450e..b9ca3ea8d21a 100644
--- a/corehq/motech/repeaters/tests/test_models.py
+++ b/corehq/motech/repeaters/tests/test_models.py
@@ -1,21 +1,21 @@
 import uuid
 from contextlib import contextmanager
 from datetime import datetime, timedelta
-from unittest.mock import patch, Mock
+from http import HTTPStatus
+from unittest.mock import Mock, patch
 from uuid import uuid4
 
-from dateutil.parser import isoparse
-
 from django.conf import settings
 from django.db.models.deletion import ProtectedError
 from django.test import SimpleTestCase, TestCase
 from django.utils import timezone
 
+from dateutil.parser import isoparse
 from freezegun import freeze_time
-
 from nose.tools import assert_in, assert_raises
 
 from corehq.motech.models import ConnectionSettings
+from corehq.motech.repeater_helpers import RepeaterResponse
 from corehq.util.test_utils import _create_case
 
 from ..const import (
@@ -23,17 +23,20 @@
     MAX_BACKOFF_ATTEMPTS,
     RECORD_CANCELLED_STATE,
     RECORD_FAILURE_STATE,
+    RECORD_INVALIDPAYLOAD_STATE,
     RECORD_PENDING_STATE,
     RECORD_SUCCESS_STATE,
     State,
 )
 from ..models import (
+    HTTP_STATUS_4XX_RETRY,
     FormRepeater,
     Repeater,
     RepeatRecord,
     format_response,
     get_all_repeater_types,
     is_response,
+    is_success_response,
 )
 
 DOMAIN = 'test-domain'
@@ -362,17 +365,17 @@ def test_add_client_failure_attempt_no_retry(self):
         self.assertEqual(self.repeat_record.attempts[0].message, message)
         self.assertEqual(self.repeat_record.attempts[0].traceback, '')
 
-    def test_add_payload_exception_attempt(self):
+    def test_add_payload_error_attempt(self):
         message = 'ValueError: Schema validation failed'
         tb_str = 'Traceback ...'
-        self.repeat_record.add_payload_exception_attempt(message=message,
-                                                         tb_str=tb_str)
-        self.assertEqual(self.repeat_record.state, RECORD_CANCELLED_STATE)
+        self.repeat_record.add_payload_error_attempt(message=message,
+                                                     traceback_str=tb_str)
+        self.assertEqual(self.repeat_record.state, RECORD_INVALIDPAYLOAD_STATE)
         # Note: Our payload issues do not affect how we deal with their
         #       server issues:
         self.assertEqual(self.repeat_record.num_attempts, 1)
         self.assertEqual(self.repeat_record.attempts[0].state,
-                         RECORD_CANCELLED_STATE)
+                         RECORD_INVALIDPAYLOAD_STATE)
         self.assertEqual(self.repeat_record.attempts[0].message, message)
         self.assertEqual(self.repeat_record.attempts[0].traceback, tb_str)
 
@@ -392,6 +395,70 @@ def test_cached_attempts(self):
             self.assertEqual(len(self.repeat_record.attempts), 2)
 
 
+class TestRepeaterHandleResponse(RepeaterTestCase):
+
+    def get_repeat_record(self):
+        return self.repeater.repeat_records.create(
+            domain=DOMAIN,
+            payload_id='cafef00d',
+            registered_at=timezone.now(),
+        )
+
+    def test_handle_response_success(self):
+        resp = RepeaterResponse(
+            status_code=200,
+            reason='OK',
+            text='<h1>Hello World</h1>',
+        )
+        repeat_record = self.get_repeat_record()
+        self.repeater.handle_response(resp, repeat_record)
+        self.assertEqual(repeat_record.state, RECORD_SUCCESS_STATE)
+
+    def test_handle_response_server_failure(self):
+        resp = RepeaterResponse(
+            status_code=504,
+            reason='Gateway Timeout',
+        )
+        repeat_record = self.get_repeat_record()
+        self.repeater.handle_response(resp, repeat_record)
+        self.assertEqual(repeat_record.state, RECORD_FAILURE_STATE)
+
+    def test_handle_4XX_retry_codes(self):
+        for status_code in HTTP_STATUS_4XX_RETRY:
+            resp = RepeaterResponse(
+                status_code=status_code,
+                reason='Retry',
+            )
+            repeat_record = self.get_repeat_record()
+            self.repeater.handle_response(resp, repeat_record)
+            self.assertEqual(repeat_record.state, RECORD_FAILURE_STATE)
+
+    def test_handle_4XX_invalid_payload(self):
+        for http_status in HTTPStatus:
+            if (
+                400 <= http_status.value < 500
+                and http_status not in HTTP_STATUS_4XX_RETRY
+            ):
+                resp = RepeaterResponse(
+                    status_code=http_status.value,
+                    reason='Invalid Payload',
+                )
+                repeat_record = self.get_repeat_record()
+                self.repeater.handle_response(resp, repeat_record)
+                self.assertEqual(repeat_record.state, RECORD_INVALIDPAYLOAD_STATE)
+
+    def test_handle_5XX_retry(self):
+        for http_status in HTTPStatus:
+            if 500 <= http_status.value < 600:
+                resp = RepeaterResponse(
+                    status_code=http_status.value,
+                    reason='Invalid Payload',
+                )
+                repeat_record = self.get_repeat_record()
+                self.repeater.handle_response(resp, repeat_record)
+                self.assertEqual(repeat_record.state, RECORD_FAILURE_STATE)
+
+
 class TestConnectionSettingsUsedBy(TestCase):
 
     def setUp(self):
@@ -574,7 +641,7 @@ def test_count_by_repeater_and_state(self):
         self.make_records(2, state=State.Fail)
         self.make_records(3, state=State.Cancelled)
         self.make_records(5, state=State.Success)
-        counts = RepeatRecord.objects.count_by_repeater_and_state(domain="test")
+        counts = RepeatRecord.objects.count_by_repeater_and_state(domain=DOMAIN)
 
         rid = self.repeater.id
         self.assertEqual(counts[rid][State.Pending], 1)
@@ -645,23 +712,74 @@ def test_get_domains_with_records_with_filter(self):
             {'alex', 'alice'},
         )
 
-    def new_record(self, next_check=before_now, state=State.Pending, domain="test"):
+    def test_get_repeat_record_ids_for_domain(self):
+        cancelled = self.new_record(state=State.Cancelled, next_check=None)
+        success = self.new_record(state=State.Success, next_check=None)
+        self.new_record(domain="exclude")
+        ids = RepeatRecord.objects.get_repeat_record_ids(DOMAIN)
+        self.assertCountEqual([cancelled.id, success.id], ids)
+
+    def test_get_repeat_record_ids_for_repeater(self):
+        non_default_repeater = FormRepeater.objects.create(
+            domain=DOMAIN,
+            connection_settings=self.conn,
+        )
+
+        actual = self.new_record_for_repeater(non_default_repeater)
+        self.new_record()
+        ids = RepeatRecord.objects.get_repeat_record_ids(DOMAIN, repeater_id=non_default_repeater.id)
+        self.assertCountEqual([actual.id], ids)
+
+    def test_get_repeat_record_ids_for_state(self):
+        cancelled = self.new_record(state=State.Cancelled, next_check=None)
+        self.new_record(state=State.Success, next_check=None)
+        ids = RepeatRecord.objects.get_repeat_record_ids(DOMAIN, state=State.Cancelled)
+        self.assertCountEqual([cancelled.id], ids)
+
+    def test_get_repeat_record_ids_for_payload(self):
+        actual = self.new_record(payload_id="waldo")
+        self.new_record(payload_id="not-waldo")
+        ids = RepeatRecord.objects.get_repeat_record_ids(DOMAIN, payload_id="waldo")
+        self.assertCountEqual([actual.id], ids)
+
+    def test_get_repeat_record_ids_with_all_filters(self):
+        non_default_repeater = FormRepeater.objects.create(
+            domain=DOMAIN,
+            connection_settings=self.conn,
+        )
+        actual = self.new_record_for_repeater(non_default_repeater, state=State.Fail, payload_id="waldo")
+        self.new_record_for_repeater(non_default_repeater, state=State.Pending, payload_id="waldo")
+        self.new_record_for_repeater(non_default_repeater, state=State.Fail, payload_id="not-waldo")
+        self.new_record_for_repeater(self.repeater, state=State.Fail, payload_id="waldo")
+        ids = RepeatRecord.objects.get_repeat_record_ids(
+            DOMAIN, repeater_id=non_default_repeater.id, state=State.Fail, payload_id="waldo"
+        )
+        self.assertCountEqual([actual.id], ids)
+
+    def new_record(self, next_check=before_now, state=State.Pending, domain=DOMAIN, payload_id="c0ffee"):
+        return self.new_record_for_repeater(
+            self.repeater, next_check=next_check, state=state, domain=domain, payload_id=payload_id
+        )
+
+    def new_record_for_repeater(
+        self, repeater, next_check=before_now, state=State.Pending, domain=DOMAIN, payload_id="c0ffee"
+    ):
         return RepeatRecord.objects.create(
             domain=domain,
-            repeater_id=self.repeater.repeater_id,
-            payload_id="c0ffee",
+            repeater_id=repeater.repeater_id,
+            payload_id=payload_id,
             registered_at=self.before_now,
             next_check=next_check,
             state=state,
         )
 
-    def make_records(self, n, state=State.Pending):
+    def make_records(self, n, domain=DOMAIN, state=State.Pending, payload_id="c0ffee"):
         now = timezone.now() - timedelta(seconds=10)
         is_pending = state in [State.Pending, State.Fail]
         records = RepeatRecord.objects.bulk_create(RepeatRecord(
-            domain="test",
+            domain=domain,
             repeater=self.repeater,
-            payload_id="c0ffee",
+            payload_id=payload_id,
             registered_at=now,
             next_check=(now if is_pending else None),
             state=state,
@@ -815,3 +933,20 @@ def test_exceeded_max_retries_returns_false_if_not_failure_state(
         with patch.object(RepeatRecord, "num_attempts", 2), \
                 patch.object(repeat_record, "max_possible_tries", 1):
             self.assertFalse(repeat_record.exceeded_max_retries)
+
+
+class TestIsSuccessResponse(SimpleTestCase):
+
+    def test_true_response(self):
+        self.assertTrue(is_success_response(True))
+
+    def test_status_201_response(self):
+        response = Mock(status_code=201)
+        self.assertTrue(is_success_response(response))
+
+    def test_status_404_response(self):
+        response = Mock(status_code=404)
+        self.assertFalse(is_success_response(response))
+
+    def test_none_response(self):
+        self.assertFalse(is_success_response(None))
diff --git a/corehq/motech/repeaters/tests/test_models_slow.py b/corehq/motech/repeaters/tests/test_models_slow.py
index 29a3fa7585be..0a1641bb8a89 100644
--- a/corehq/motech/repeaters/tests/test_models_slow.py
+++ b/corehq/motech/repeaters/tests/test_models_slow.py
@@ -19,7 +19,7 @@
     RECORD_FAILURE_STATE,
     RECORD_SUCCESS_STATE,
 )
-from corehq.motech.repeaters.models import FormRepeater, send_request
+from corehq.motech.repeaters.models import FormRepeater
 from corehq.util.test_utils import timelimit
 
 DOMAIN = ''.join([random.choice(string.ascii_lowercase) for __ in range(20)])
@@ -67,8 +67,7 @@ def test_success_on_200(self):
         with patch('corehq.motech.repeaters.models.simple_request') as simple_request:
             simple_request.return_value = resp
 
-            payload = self.repeater.get_payload(self.repeat_record)
-            send_request(self.repeater, self.repeat_record, payload)
+            self.repeat_record.fire()
 
             self.assertEqual(self.repeat_record.attempts.last().state,
                              RECORD_SUCCESS_STATE)
@@ -81,8 +80,7 @@ def test_backoff_on_409(self):
         with patch('corehq.motech.repeaters.models.simple_request') as simple_request:
             simple_request.return_value = resp
 
-            payload = self.repeater.get_payload(self.repeat_record)
-            send_request(self.repeater, self.repeat_record, payload)
+            self.repeat_record.fire()
 
             self.assertEqual(self.repeat_record.attempts.last().state,
                              RECORD_FAILURE_STATE)
@@ -96,8 +94,7 @@ def test_backoff_on_500(self):
         with patch('corehq.motech.repeaters.models.simple_request') as simple_request:
             simple_request.return_value = resp
 
-            payload = self.repeater.get_payload(self.repeat_record)
-            send_request(self.repeater, self.repeat_record, payload)
+            self.repeat_record.fire()
 
             self.assertEqual(self.repeat_record.attempts.last().state,
                              RECORD_FAILURE_STATE)
@@ -133,8 +130,7 @@ def test_backoff_on_503(self):
         with patch('corehq.motech.repeaters.models.simple_request') as simple_request:
             simple_request.return_value = resp
 
-            payload = self.repeater.get_payload(self.repeat_record)
-            send_request(self.repeater, self.repeat_record, payload)
+            self.repeat_record.fire()
 
             self.assertEqual(self.repeat_record.attempts.last().state,
                              RECORD_FAILURE_STATE)
@@ -146,8 +142,7 @@ def test_backoff_on_connection_error(self):
         with patch('corehq.motech.repeaters.models.simple_request') as simple_request:
             simple_request.side_effect = ConnectionError()
 
-            payload = self.repeater.get_payload(self.repeat_record)
-            send_request(self.repeater, self.repeat_record, payload)
+            self.repeat_record.fire()
 
             self.assertEqual(self.repeat_record.attempts.last().state,
                              RECORD_FAILURE_STATE)
diff --git a/corehq/motech/repeaters/tests/test_repeater.py b/corehq/motech/repeaters/tests/test_repeater.py
index 02bffe9a9b36..c0ccad798999 100644
--- a/corehq/motech/repeaters/tests/test_repeater.py
+++ b/corehq/motech/repeaters/tests/test_repeater.py
@@ -207,9 +207,9 @@ def test_skip_duplicates(self):
         self.assertTrue(form.is_duplicate)
         self.assertEqual(len(self.repeat_records()), 2)
 
-    def test_repeater_failed_sends(self):
+    def test_server_failure_resends(self):
         """
-        This tests records that fail are requeued later
+        This tests records that encounter server errors are requeued later
         """
         def now():
             return datetime.utcnow()
@@ -219,8 +219,9 @@ def now():
 
         for repeat_record in repeat_records:
             with patch(
-                    'corehq.motech.repeaters.models.simple_request',
-                    return_value=MockResponse(status_code=404, reason='Not Found')) as mock_request:
+                'corehq.motech.repeaters.models.simple_request',
+                return_value=MockResponse(status_code=503, reason='Service Unavailable')
+            ) as mock_request:
                 repeat_record.fire()
                 self.assertEqual(mock_request.call_count, 1)
 
@@ -239,6 +240,28 @@ def now():
         )
         self.assertEqual(len(repeat_records), 2)
 
+    def test_bad_payload_invalid(self):
+        with patch(
+            'corehq.motech.repeaters.models.simple_request',
+            return_value=MockResponse(status_code=401, reason='Unauthorized')
+        ):
+            for repeat_record in self.repeat_records():
+                repeat_record.fire()
+
+        for repeat_record in self.repeat_records():
+            self.assertEqual(repeat_record.state, State.InvalidPayload)
+
+    def test_bad_request_fail(self):
+        with patch(
+            'corehq.motech.repeaters.models.simple_request',
+            return_value=MockResponse(status_code=400, reason='Bad Request')
+        ):
+            for repeat_record in self.repeat_records():
+                repeat_record.fire()
+
+        for repeat_record in self.repeat_records():
+            self.assertEqual(repeat_record.state, State.Fail)
+
     def test_update_failure_next_check(self):
         now = datetime.utcnow()
         record = RepeatRecord.objects.create(
@@ -670,22 +693,26 @@ def tearDown(self):
         FormProcessorTestUtils.delete_all_cases_forms_ledgers(self.domain)
         super().tearDown()
 
-    def test_get_payload_exception(self):
-        repeat_record = self.repeater.register(CommCareCase.objects.get_case(CASE_ID, self.domain))
+    def test_payload_exception_on_fire(self):
+        case = CommCareCase.objects.get_case(CASE_ID, self.domain)
+        with patch('corehq.motech.repeaters.models.simple_request') as mock_simple_post:
+            mock_simple_post.return_value.status_code = 503  # Fail and retry
+            rr = self.repeater.register(case)
         with self.assertRaises(Exception):
             with patch.object(CaseRepeater, 'get_payload', side_effect=Exception('Boom!')):
-                repeat_record.fire()
+                rr.fire()
 
+        repeat_record = RepeatRecord.objects.get(id=rr.id)
+        self.assertEqual(repeat_record.state, State.InvalidPayload)
         self.assertEqual(repeat_record.failure_reason, 'Boom!')
-        self.assertEqual(repeat_record.state, State.Cancelled)
 
-    def test_payload_exception(self):
+    def test_payload_exception_on_register(self):
         case = CommCareCase.objects.get_case(CASE_ID, self.domain)
         with patch.object(Repeater, "get_payload", side_effect=Exception('Payload error')):
             rr = self.repeater.register(case)
 
         repeat_record = RepeatRecord.objects.get(id=rr.id)
-        self.assertEqual(repeat_record.state, State.Cancelled)
+        self.assertEqual(repeat_record.state, State.InvalidPayload)
         self.assertEqual(repeat_record.failure_reason, "Payload error")
 
     def test_failure(self):
@@ -928,6 +955,8 @@ def test_trigger(self):
                 'email': '',
                 'eulas': '[]',
                 'resource_uri': '/a/user-repeater/api/v0.5/user/{}/'.format(user._id),
+                'locations': [],
+                'primary_location': None,
             }
         )
 
@@ -1243,8 +1272,10 @@ def setUp(self):
         super().setUp()
         self.config = get_sample_data_source()
         self.config.save()
+        self.addCleanup(self.config.delete)
         self.adapter = get_indicator_adapter(self.config)
         self.adapter.build_table()
+        self.addCleanup(self.adapter.drop_table)
         self.fake_time_now = datetime(2015, 4, 24, 12, 30, 8, 24886)
         self.pillow = _get_pillow([self.config], processor_chunk_size=100)
 
diff --git a/corehq/motech/repeaters/views/repeat_record_display.py b/corehq/motech/repeaters/views/repeat_record_display.py
index 13cc615d8eae..4fb0c6649e03 100644
--- a/corehq/motech/repeaters/views/repeat_record_display.py
+++ b/corehq/motech/repeaters/views/repeat_record_display.py
@@ -3,10 +3,11 @@
 
 from corehq.motech.repeaters.const import (
     RECORD_CANCELLED_STATE,
+    RECORD_EMPTY_STATE,
     RECORD_FAILURE_STATE,
+    RECORD_INVALIDPAYLOAD_STATE,
     RECORD_PENDING_STATE,
     RECORD_SUCCESS_STATE,
-    RECORD_EMPTY_STATE,
 )
 from corehq.util.timezones.conversions import ServerTime
 
@@ -70,6 +71,9 @@ def _get_state_tuple(record):
     elif record.state == RECORD_EMPTY_STATE:
         label_cls = 'success'
         label_text = _('Empty')
+    elif record.state == RECORD_INVALIDPAYLOAD_STATE:
+        label_cls = 'danger'
+        label_text = _('Invalid Payload')
     else:
         label_cls = ''
         label_text = ''
diff --git a/corehq/motech/repeaters/views/repeat_records.py b/corehq/motech/repeaters/views/repeat_records.py
index aa3d54865f29..27eea29eaefc 100644
--- a/corehq/motech/repeaters/views/repeat_records.py
+++ b/corehq/motech/repeaters/views/repeat_records.py
@@ -1,5 +1,6 @@
 import json
 import re
+from typing import Literal
 
 from django.db.models import Q
 from django.http import (
@@ -7,7 +8,6 @@
     HttpRequest,
     HttpResponse,
     JsonResponse,
-    QueryDict,
 )
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -42,6 +42,7 @@
 
 from ..const import State, RECORD_CANCELLED_STATE
 from ..models import RepeatRecord
+from ..exceptions import BulkActionMissingParameters
 from .repeat_record_display import RepeatRecordDisplay
 
 
@@ -244,23 +245,18 @@ def report_context(self):
         where = Q(domain=self.domain)
         if self.repeater_id:
             where &= Q(repeater_id=self.repeater_id)
+        if self.payload_id:
+            where &= Q(payload_id=self.payload_id)
         total = RepeatRecord.objects.filter(where).count()
         total_pending = RepeatRecord.objects.filter(where, state=State.Pending).count()  # include State.Fail?
         total_cancelled = RepeatRecord.objects.filter(where, state=State.Cancelled).count()
 
-        form_query_string = self.request.GET.urlencode()
-        form_query_string_cancelled = _change_record_state(
-            self.request.GET, 'CANCELLED').urlencode()
-        form_query_string_pending = _change_record_state(
-            self.request.GET, 'PENDING').urlencode()
-
         context.update(
             total=total,
             total_pending=total_pending,
             total_cancelled=total_cancelled,
-            form_query_string=form_query_string,
-            form_query_string_pending=form_query_string_pending,
-            form_query_string_cancelled=form_query_string_cancelled,
+            payload_id=self.payload_id,
+            repeater_id=self.repeater_id,
         )
         return context
 
@@ -296,7 +292,7 @@ def get(self, request, domain):
 
         if content_type == 'text/xml':
             payload = indent_xml(payload)
-        elif content_type == 'application/json':
+        elif content_type in ['application/json', 'application/x-www-form-urlencoded']:
             payload = pformat_json(payload)
 
         dhis2_errors = []
@@ -335,7 +331,10 @@ def get(self, request, domain):
     def post(self, request, domain):
         # Retriggers a repeat record
         if _get_flag(request):
-            _schedule_task_with_flag(request, domain, 'resend')
+            try:
+                _schedule_task_with_flag(request, domain, 'resend')
+            except BulkActionMissingParameters:
+                return _missing_parameters_response()
         else:
             _schedule_task_without_flag(request, domain, 'resend')
         return JsonResponse({'success': True})
@@ -345,8 +344,11 @@ def post(self, request, domain):
 @require_can_edit_web_users
 @requires_privilege_with_fallback(privileges.DATA_FORWARDING)
 def cancel_repeat_record(request, domain):
-    if _get_flag(request) == 'cancel_all':
-        _schedule_task_with_flag(request, domain, 'cancel')
+    if _get_flag(request) == 'select_pending':
+        try:
+            _schedule_task_with_flag(request, domain, 'cancel')
+        except BulkActionMissingParameters:
+            return _missing_parameters_response()
     else:
         _schedule_task_without_flag(request, domain, 'cancel')
 
@@ -357,14 +359,27 @@ def cancel_repeat_record(request, domain):
 @require_can_edit_web_users
 @requires_privilege_with_fallback(privileges.DATA_FORWARDING)
 def requeue_repeat_record(request, domain):
-    if _get_flag(request) == 'requeue_all':
-        _schedule_task_with_flag(request, domain, 'requeue')
+    if _get_flag(request) == 'select_cancelled':
+        try:
+            _schedule_task_with_flag(request, domain, 'requeue')
+        except BulkActionMissingParameters:
+            return _missing_parameters_response()
     else:
         _schedule_task_without_flag(request, domain, 'requeue')
 
     return HttpResponse('OK')
 
 
+def _missing_parameters_response():
+    return JsonResponse(
+        {
+            "failure_reason": _(
+                "Please filter to a specific repeater or payload before attempting a bulk action."
+            )
+        }
+    )
+
+
 def _get_record_ids_from_request(request):
     record_ids = request.POST.get('record_id') or ''
     return record_ids.strip().split()
@@ -374,33 +389,35 @@ def _get_flag(request: HttpRequest) -> str:
     return request.POST.get('flag') or ''
 
 
-def _change_record_state(query_dict: QueryDict, state: str) -> QueryDict:
-    if not state:
-        return query_dict
-    if 'record_state' in query_dict:
-        query_dict = query_dict.copy()  # Don't cause side effects. Also,
-        # request.GET is immutable and will raise AttributeError.
-        query_dict['record_state'] = state
-    return query_dict
+def _get_state_from_request(request):
+    flag = _get_flag(request)
+    return {
+        'select_all': None,
+        'select_pending': State.Pending,
+        'select_cancelled': State.Cancelled,
+    }[flag]
 
 
 def _schedule_task_with_flag(
     request: HttpRequest,
     domain: str,
-    action,  # type: Literal['resend', 'cancel', 'requeue']  # 3.8+
+    action: Literal['resend', 'cancel', 'requeue']
 ):
     task_ref = expose_cached_download(payload=None, expiry=1 * 60 * 60, file_extension=None)
-    payload_id = request.POST.get('payload_id') or None
-    repeater_id = request.POST.get('repeater') or None
+    payload_id = request.POST.get('payload_id', None)
+    repeater_id = request.POST.get('repeater_id', None)
+    if not any([repeater_id, payload_id]):
+        raise BulkActionMissingParameters
+    state = _get_state_from_request(request)
     task = task_generate_ids_and_operate_on_payloads.delay(
-        payload_id, repeater_id, domain, action)
+        payload_id, repeater_id, domain, action, state=state)
     task_ref.set_task(task)
 
 
 def _schedule_task_without_flag(
     request: HttpRequest,
     domain: str,
-    action,  # type: Literal['resend', 'cancel', 'requeue']  # 3.8+
+    action: Literal['resend', 'cancel', 'requeue']
 ):
     record_ids = _get_record_ids_from_request(request)
     task_ref = expose_cached_download(payload=None, expiry=1 * 60 * 60, file_extension=None)
diff --git a/corehq/motech/repeaters/views/repeaters.py b/corehq/motech/repeaters/views/repeaters.py
index 88b8e27b26a6..3c5c642c849e 100644
--- a/corehq/motech/repeaters/views/repeaters.py
+++ b/corehq/motech/repeaters/views/repeaters.py
@@ -53,6 +53,10 @@ def get_repeaters_with_state_counts(repeater_class):
             for repeater in repeaters:
                 assert not hasattr(repeater, "count_State"), repeater.count_State
                 repeater.count_State = {s.name: state_counts[repeater.id][s] for s in State}
+                repeater.count_State['EmptyOrSuccess'] = (
+                    repeater.count_State[State.Empty.name]
+                    + repeater.count_State[State.Success.name]
+                )
             return repeaters
 
         return [
diff --git a/corehq/motech/repeaters/views/tests/test_repeat_records.py b/corehq/motech/repeaters/views/tests/test_repeat_records.py
index d27140cb2a92..98a34064b4a6 100644
--- a/corehq/motech/repeaters/views/tests/test_repeat_records.py
+++ b/corehq/motech/repeaters/views/tests/test_repeat_records.py
@@ -1,6 +1,5 @@
 from datetime import datetime
 
-from django.http import QueryDict
 from django.test import SimpleTestCase, TestCase
 from nose.tools import assert_equal
 from unittest.mock import Mock
@@ -44,46 +43,6 @@ def test__get_flag(self):
             result = repeat_records._get_flag(mock_request)
             assert_equal(result, expected_result)
 
-    def test__change_record_state(self):
-        query_strings = [
-            None,
-            '',
-            'repeater=&record_state=&payload_id=payload_3',
-            'repeater=repeater_3&record_state=STATUS_2&payload_id=payload_2',
-            'repeater=&record_state=&payload_id=',
-            'repeater=repeater_1&record_state=STATUS_2&payload_id=payload_1',
-            'repeater=&record_state=STATUS&payload_id=payload_2',
-            'repeater=repeater_2&record_state=STATUS&payload_id=',
-        ]
-        strings_to_add = [
-            'NO_STATUS',
-            'NO_STATUS',
-            None,
-            '',
-            'STATUS',
-            'STATUS_2',
-            'STATUS_3',
-            'STATUS_4',
-        ]
-        desired_strings = [
-            '',
-            '',
-            'repeater=&record_state=&payload_id=payload_3',
-            'repeater=repeater_3&record_state=STATUS_2&payload_id=payload_2',
-            'repeater=&record_state=STATUS&payload_id=',
-            'repeater=repeater_1&record_state=STATUS_2&payload_id=payload_1',
-            'repeater=&record_state=STATUS_3&payload_id=payload_2',
-            'repeater=repeater_2&record_state=STATUS_4&payload_id=',
-        ]
-
-        for qs, str_to_add, expected_result in zip(query_strings,
-                                                   strings_to_add,
-                                                   desired_strings):
-            query_dict = QueryDict(qs)
-            result = repeat_records._change_record_state(
-                query_dict, str_to_add).urlencode()
-            self.assertEqual(result, expected_result)
-
 
 class TestDomainForwardingOptionsView(TestCase):
 
@@ -113,11 +72,13 @@ class view:
         self.assertEqual(repeater.count_State, {
             # templates that reference `count_State` may need to be
             # updated if the keys in this dict change
-            'Pending': 1,
-            'Fail': 0,
-            'Success': 0,
             'Cancelled': 0,
             'Empty': 0,
+            'EmptyOrSuccess': 0,
+            'Fail': 0,
+            'InvalidPayload': 0,
+            'Pending': 1,
+            'Success': 0
         })
 
 
diff --git a/corehq/motech/requests.py b/corehq/motech/requests.py
index a0ef0754ea78..2fc545392e20 100644
--- a/corehq/motech/requests.py
+++ b/corehq/motech/requests.py
@@ -14,6 +14,7 @@
 from corehq.motech.auth import AuthManager, BasicAuthManager
 from corehq.motech.const import (
     REQUEST_DELETE,
+    REQUEST_GET,
     REQUEST_POST,
     REQUEST_PUT,
     REQUEST_TIMEOUT,
@@ -24,7 +25,9 @@
     pformat_json,
     unpack_request_args,
 )
+from corehq.toggles import DECREASE_REPEATER_TIMEOUT
 from corehq.util.metrics import metrics_counter
+from corehq.util.timer import TimingContext
 from corehq.util.urlvalidate.urlvalidate import (
     InvalidURL,
     PossibleSSRFAttempt,
@@ -43,7 +46,8 @@ def request_wrapper(method, url, *args, **kwargs):
         response_headers = {}
         response_body = ''
         try:
-            response = func(method, url, *args, **kwargs)
+            with TimingContext() as timer:
+                response = func(method, url, *args, **kwargs)
             response_status = response.status_code
             response_headers = response.headers
             response_body = response.content
@@ -71,6 +75,7 @@ def request_wrapper(method, url, *args, **kwargs):
                 response_status=response_status,
                 response_headers=response_headers,
                 response_body=response_body,
+                duration=int(timer.duration * 1000) + 1,  # round up
             )
             logger(log_level, entry)
 
@@ -136,7 +141,10 @@ def send_request_unlogged(self, method, url, *args, **kwargs):
         raise_for_status = kwargs.pop('raise_for_status', False)
         if not self.verify:
             kwargs['verify'] = False
-        kwargs.setdefault('timeout', REQUEST_TIMEOUT)
+        request_timeout = REQUEST_TIMEOUT
+        if DECREASE_REPEATER_TIMEOUT.enabled(self.domain_name):
+            request_timeout = 60
+        kwargs.setdefault('timeout', request_timeout)
         if self._session:
             response = self._session.request(method, url, *args, **kwargs)
         else:
@@ -252,8 +260,10 @@ def simple_request(domain, url, data, *, headers, auth_manager, verify,
         data = data.encode('utf-8')
     default_headers = CaseInsensitiveDict({
         "content-type": "text/xml",
-        "content-length": str(len(data)),
     })
+    if data:
+        default_headers["content-length"] = str(len(data))
+
     default_headers.update(headers)
     requests = Requests(
         domain,
@@ -268,6 +278,7 @@ def simple_request(domain, url, data, *, headers, auth_manager, verify,
         REQUEST_DELETE: requests.delete,
         REQUEST_POST: requests.post,
         REQUEST_PUT: requests.put,
+        REQUEST_GET: requests.get,
     }
     try:
         request_method = request_methods[method]
diff --git a/corehq/motech/static/motech/js/connection_settings_detail.js b/corehq/motech/static/motech/js/connection_settings_detail.js
index 72d4acf80282..9ee53aef816f 100644
--- a/corehq/motech/static/motech/js/connection_settings_detail.js
+++ b/corehq/motech/static/motech/js/connection_settings_detail.js
@@ -20,6 +20,8 @@ hqDefine("motech/js/connection_settings_detail", [
                     'token_url',
                     'refresh_url',
                     'pass_credentials_in_header',
+                    'include_client_id',
+                    'scope',
                 ];
             if (authPreset === 'CUSTOM') {
                 _.each(customAuthPresetFields, function (field) {
@@ -33,7 +35,7 @@ hqDefine("motech/js/connection_settings_detail", [
 
         });
 
-        $authTypeSelect.change(function () {
+        $authTypeSelect.change(function (e, fromInitial) {
             let visible = {},
                 allFields = {
                     'username': gettext("Username"),
@@ -82,7 +84,7 @@ hqDefine("motech/js/connection_settings_detail", [
                     div.removeClass("d-none");
                     let label = visible[field] || allFields[field];
                     let labelElement = div.find('label');
-                    if (label && labelElement.length > 0 && labelElement.text() !== label) {
+                    if (!fromInitial && label && labelElement.length > 0 && labelElement.text() !== label) {
                         labelElement.text(label);
                         let fieldElement = $('#id_' + field);
                         fieldElement.val('');  // clear current value
@@ -141,6 +143,11 @@ hqDefine("motech/js/connection_settings_detail", [
                 plaintext_password: $('#id_plaintext_password').val(),
                 client_id: $('#id_client_id').val(),
                 plaintext_client_secret: $('#id_plaintext_client_secret').val(),
+                pass_credentials_in_header: $('#id_pass_credentials_in_header').prop('checked'),
+                include_client_id: $('#id_include_client_id').prop('checked'),
+                scope: $('#id_scope').val(),
+                token_url: $('#id_token_url').val(),
+                auth_preset: $('#id_auth_preset').val(),
                 skip_cert_verify: $('#id_skip_cert_verify').prop('checked'),
             };
             $testConnectionButton.disableButton();
@@ -162,7 +169,7 @@ hqDefine("motech/js/connection_settings_detail", [
         });
 
         // Set initial state
-        $authTypeSelect.trigger('change');
+        $authTypeSelect.trigger('change', [true]);
         $authPreset.trigger('change');
         $('#id_url').trigger('change');
     });
diff --git a/corehq/motech/templates/motech/log_detail.html b/corehq/motech/templates/motech/log_detail.html
index 675f1e92314f..28b76695bfe1 100644
--- a/corehq/motech/templates/motech/log_detail.html
+++ b/corehq/motech/templates/motech/log_detail.html
@@ -68,6 +68,12 @@
               <pre>{{ log.response_body|pp_json }}</pre>{% else %}&nbsp;
             {% endif %}</td>
           </tr>
+          <tr>
+            <th>{% trans "Request duration (ms)" %}:</th>
+            <td>{% if log.duration %}
+              {{ log.duration }}{% else %}&nbsp;
+            {% endif %}</td>
+          </tr>
         </table>
       </div>
       <p>
diff --git a/corehq/motech/templates/motech/logs.html b/corehq/motech/templates/motech/logs.html
index abe1d2ca712a..f5dfe274579f 100644
--- a/corehq/motech/templates/motech/logs.html
+++ b/corehq/motech/templates/motech/logs.html
@@ -87,6 +87,7 @@
           <th>{% trans "Payload" %}</th>
           <th>{% trans "Request" %}</th>
           <th>{% trans "Status" %}</th>
+          <th>{% trans "Duration (ms)" %}</th>
         </tr>
       </thead>
       <tbody>
@@ -104,6 +105,9 @@
           <td><a href="{% url 'motech_log_detail_view' domain log.id %}">
             {{ log.response_status }}
           </a></td>
+          <td><a href="{% url 'motech_log_detail_view' domain log.id %}">
+              {% if log.duration %}{{ log.duration }}{% else %}&nbsp;{% endif %}
+          </a></td>
         </tr>
       {% endfor %}
       </tbody>
diff --git a/corehq/motech/tests/test_models.py b/corehq/motech/tests/test_models.py
index 5c488de899c8..e1a1f70f66fa 100644
--- a/corehq/motech/tests/test_models.py
+++ b/corehq/motech/tests/test_models.py
@@ -5,7 +5,7 @@
 from django.test import SimpleTestCase, TestCase
 
 import requests
-from unittest.mock import Mock, patch
+from unittest.mock import ANY, Mock, patch
 
 from corehq.apps.hqwebapp.templatetags.hq_shared_tags import pp_json
 from corehq.motech.const import ALGO_AES, PASSWORD_PLACEHOLDER
@@ -80,6 +80,7 @@ def assert_create_called_with_request_body_and_params(
             response_body=as_text(self.content_json),
             response_status=self.status_code,
             response_headers=self.response_headers,
+            duration=ANY,
         )
 
     def test_post_with_no_args(self):
@@ -278,4 +279,5 @@ def get_entry(request_body):
             response_status=200,
             response_headers={},
             response_body='OK',
+            duration=0,
         )
diff --git a/corehq/motech/tests/test_simple_post.py b/corehq/motech/tests/test_simple_post.py
index bdee88802844..0199638724aa 100644
--- a/corehq/motech/tests/test_simple_post.py
+++ b/corehq/motech/tests/test_simple_post.py
@@ -86,6 +86,34 @@ def test_simple_request_DELETE():
         )
 
 
+def test_simple_request_get():
+    with patch.object(requests.Session, 'request') as request_mock, \
+         patch.object(RequestLog, 'log'):
+        request_mock.return_value = Response()
+        auth_manager = BasicAuthManager(TEST_API_USERNAME, TEST_API_PASSWORD)
+        simple_request(
+            domain=TEST_DOMAIN,
+            url=TEST_API_URL,
+            data=None,
+            headers={'Content-Type': 'text/xml+parrot'},
+            auth_manager=auth_manager,
+            verify=True,
+            payload_id=TEST_PAYLOAD_ID,
+            method="GET"
+        )
+
+        request_mock.assert_called_with(
+            'GET',
+            TEST_API_URL,
+            data=None,
+            headers={
+                'Content-Type': 'text/xml+parrot',
+            },
+            allow_redirects=True,
+            timeout=REQUEST_TIMEOUT,
+        )
+
+
 def test_simple_post():
     with patch.object(requests.Session, 'request') as request_mock, \
             patch.object(RequestLog, 'log') as log_mock:
diff --git a/corehq/motech/urls.py b/corehq/motech/urls.py
index 4d153e14d41c..aeae7ed19fe3 100644
--- a/corehq/motech/urls.py
+++ b/corehq/motech/urls.py
@@ -24,6 +24,8 @@
 from corehq.motech.repeaters.expression.views import (
     AddCaseExpressionRepeaterView,
     EditCaseExpressionRepeaterView,
+    AddFormExpressionRepeaterView,
+    EditFormExpressionRepeaterView,
     AddArcGISFormExpressionRepeaterView,
     EditArcGISFormExpressionRepeaterView,
 )
@@ -80,6 +82,8 @@
         {'repeater_type': 'DataRegistryCaseUpdateRepeater'}, name=AddCaseRepeaterView.urlname),
     url(r'^forwarding/new/CaseExpressionRepeater/$', AddCaseExpressionRepeaterView.as_view(),
         {'repeater_type': 'CaseExpressionRepeater'}, name=AddCaseExpressionRepeaterView.urlname),
+    url(r'^forwarding/new/FormExpressionRepeater/$', AddFormExpressionRepeaterView.as_view(),
+        {'repeater_type': 'FormExpressionRepeater'}, name=AddFormExpressionRepeaterView.urlname),
     url(r'^forwarding/new/ArcGISFormExpressionRepeater/$', AddArcGISFormExpressionRepeaterView.as_view(),
         {'repeater_type': 'ArcGISFormExpressionRepeater'}, name=AddArcGISFormExpressionRepeaterView.urlname),
     url(r'^forwarding/new/(?P<repeater_type>\w+)/$', AddRepeaterView.as_view(), name=AddRepeaterView.urlname),
@@ -109,6 +113,12 @@
         {'repeater_type': 'CaseExpressionRepeater'},
         name=EditCaseExpressionRepeaterView.urlname
     ),
+    url(
+        r'^forwarding/edit/FormExpressionRepeater/(?P<repeater_id>\w+)/$',
+        EditFormExpressionRepeaterView.as_view(),
+        {'repeater_type': 'FormExpressionRepeater'},
+        name=EditFormExpressionRepeaterView.urlname
+    ),
     url(
         r'^forwarding/edit/ArcGISFormExpressionRepeater/(?P<repeater_id>\w+)/$',
         EditArcGISFormExpressionRepeaterView.as_view(),
diff --git a/corehq/motech/utils.py b/corehq/motech/utils.py
index 4da790c08502..9d0cddd9fd38 100644
--- a/corehq/motech/utils.py
+++ b/corehq/motech/utils.py
@@ -212,7 +212,6 @@ def split_url(url):
             return url.split(connection.url.rstrip('/'))[1]
         except IndexError:
             return None
-
     for preset_slug, preset in AUTH_PRESETS.items():
         if (
             split_url(connection.token_url) == preset.token_endpoint
diff --git a/corehq/motech/views.py b/corehq/motech/views.py
index 3f5f175b7add..a1fd373042a6 100644
--- a/corehq/motech/views.py
+++ b/corehq/motech/views.py
@@ -24,7 +24,7 @@
 from corehq.apps.hqwebapp.views import CRUDPaginatedViewMixin
 from corehq.apps.users.decorators import require_permission
 from corehq.apps.users.models import HqPermissions
-from corehq.motech.const import PASSWORD_PLACEHOLDER
+from corehq.motech.const import PASSWORD_PLACEHOLDER, OAUTH2_CLIENT, OAUTH2_PWD
 from corehq.motech.forms import ConnectionSettingsForm, UnrecognizedHost
 from corehq.motech.models import ConnectionSettings, RequestLog
 from corehq.util.urlvalidate.urlvalidate import PossibleSSRFAttempt
@@ -308,7 +308,14 @@ def test_connection_settings(request, domain):
         raise Http404
 
     # If auth_type is set to None, we ignore this check
-    if request.POST.get('plaintext_password') == PASSWORD_PLACEHOLDER and request.POST.get('auth_type'):
+    auth_type = request.POST.get('auth_type')
+    client_secret = request.POST.get('plaintext_client_secret')
+    if auth_type in (OAUTH2_CLIENT, OAUTH2_PWD) and client_secret == PASSWORD_PLACEHOLDER:
+        return JsonResponse({
+            "success": False,
+            "response": _("Please enter client secret again."),
+        })
+    if auth_type and request.POST.get('plaintext_password') == PASSWORD_PLACEHOLDER:
         # The user is editing an existing instance, and the form is
         # showing the password placeholder. (We don't tell the user what
         # the API password is.)
diff --git a/corehq/pillows/case.py b/corehq/pillows/case.py
index a954ab6b66e5..baf58d49baeb 100644
--- a/corehq/pillows/case.py
+++ b/corehq/pillows/case.py
@@ -68,11 +68,19 @@ def get_case_to_elasticsearch_pillow(pillow_id='CaseToElasticsearchPillow', num_
 
 
 def get_case_pillow(
-        pillow_id='case-pillow', ucr_division=None,
-        include_ucrs=None, exclude_ucrs=None,
-        num_processes=1, process_num=0, ucr_configs=None, skip_ucr=False,
-        processor_chunk_size=DEFAULT_PROCESSOR_CHUNK_SIZE, topics=None,
-        dedicated_migration_process=False, **kwargs):
+    pillow_id='case-pillow',
+    ucr_division=None,
+    include_ucrs=None,
+    exclude_ucrs=None,
+    num_processes=1,
+    process_num=0,
+    ucr_configs=None,
+    skip_ucr=False,
+    processor_chunk_size=DEFAULT_PROCESSOR_CHUNK_SIZE,
+    topics=None,
+    dedicated_migration_process=False,
+    **kwargs,
+):
     """Return a pillow that processes cases. The processors include, UCR and elastic processors
 
     Processors:
diff --git a/corehq/pillows/case_search.py b/corehq/pillows/case_search.py
index cff744b1254a..e21b2137173a 100644
--- a/corehq/pillows/case_search.py
+++ b/corehq/pillows/case_search.py
@@ -1,6 +1,8 @@
 from django.core.mail import mail_admins
 from django.db import ProgrammingError
 
+from corehq.privileges import DATA_DICTIONARY
+from corehq.apps.accounting.utils import domain_has_privilege
 from corehq.apps.case_search.const import (
     GEOPOINT_VALUE,
     INDEXED_METADATA_BY_KEY,
@@ -19,10 +21,6 @@
 from corehq.apps.geospatial.utils import get_geo_case_property
 from corehq.form_processor.backends.sql.dbaccessors import CaseReindexAccessor
 from corehq.pillows.base import is_couch_change_for_sql_domain
-from corehq.toggles import (
-    GEOSPATIAL,
-    USH_CASE_CLAIM_UPDATES,
-)
 from corehq.util.doc_processor.sql import SqlDocumentProvider
 from corehq.util.log import get_traceback_string
 from corehq.util.quickcache import quickcache
@@ -84,8 +82,7 @@ def _get_case_properties(doc_dict):
     dynamic_properties = [_format_property(key, value, case_id)
                           for key, value in doc_dict['case_json'].items()]
 
-    if USH_CASE_CLAIM_UPDATES.enabled(domain) or GEOSPATIAL.enabled(domain):
-        _add_smart_types(dynamic_properties, domain, doc_dict['type'])
+    _add_smart_types(dynamic_properties, domain, doc_dict['type'])
 
     return base_case_properties + dynamic_properties
 
@@ -94,12 +91,10 @@ def _add_smart_types(dynamic_properties, domain, case_type):
     # Properties are stored in a dict like {"key": "dob", "value": "1900-01-01"}
     # `value` is a multi-field property that duck types numeric and date values
     # We can't do that for properties like geo_points in ES v2, as `ignore_malformed` is broken
-    if USH_CASE_CLAIM_UPDATES.enabled(domain):
-        gps_props = get_gps_properties(domain, case_type)
-        _add_gps_smart_types(dynamic_properties, gps_props)
-    if GEOSPATIAL.enabled(domain):
-        gps_props = [get_geo_case_property(domain)]
-        _add_gps_smart_types(dynamic_properties, gps_props)
+    gps_props = set({get_geo_case_property(domain)})
+    if domain_has_privilege(domain, DATA_DICTIONARY):
+        gps_props |= get_gps_properties(domain, case_type)
+    _add_gps_smart_types(dynamic_properties, gps_props)
 
 
 def _add_gps_smart_types(dynamic_properties, gps_props):
diff --git a/corehq/pillows/user.py b/corehq/pillows/user.py
index e51b73f753ac..2e87ab19e144 100644
--- a/corehq/pillows/user.py
+++ b/corehq/pillows/user.py
@@ -1,8 +1,6 @@
-import copy
 from corehq.apps.change_feed.consumer.feed import KafkaChangeFeed, KafkaCheckpointEventHandler
 from corehq.apps.change_feed import topics
 from corehq.apps.es.users import user_adapter
-from corehq.apps.groups.dbaccessors import get_group_id_name_map_by_user
 from corehq.apps.users.models import CommCareUser, CouchUser, WebUser
 from corehq.apps.users.util import WEIRD_USER_IDS
 from corehq.apps.userreports.data_source_providers import DynamicDataSourceProvider, StaticDataSourceProvider
@@ -106,8 +104,15 @@ def get_user_pillow_old(pillow_id='UserPillow', num_processes=1, process_num=0,
     )
 
 
-def get_user_pillow(pillow_id='user-pillow', num_processes=1, dedicated_migration_process=False, process_num=0,
-        skip_ucr=False, processor_chunk_size=DEFAULT_PROCESSOR_CHUNK_SIZE, **kwargs):
+def get_user_pillow(
+    pillow_id='user-pillow',
+    num_processes=1,
+    dedicated_migration_process=False,
+    process_num=0,
+    skip_ucr=False,
+    processor_chunk_size=DEFAULT_PROCESSOR_CHUNK_SIZE,
+    **kwargs,
+):
     """Processes users and sends them to ES and UCRs.
 
     Processors:
diff --git a/corehq/pillows/xform.py b/corehq/pillows/xform.py
index 582649cd632d..0b8d31c33bc2 100644
--- a/corehq/pillows/xform.py
+++ b/corehq/pillows/xform.py
@@ -84,11 +84,20 @@ def get_xform_to_elasticsearch_pillow(pillow_id='XFormToElasticsearchPillow', nu
     )
 
 
-def get_xform_pillow(pillow_id='xform-pillow', ucr_division=None,
-                     include_ucrs=None, exclude_ucrs=None,
-                     num_processes=1, process_num=0, ucr_configs=None, skip_ucr=False,
-                     processor_chunk_size=DEFAULT_PROCESSOR_CHUNK_SIZE,
-                     topics=None, dedicated_migration_process=False, **kwargs):
+def get_xform_pillow(
+        pillow_id='xform-pillow',
+        ucr_division=None,
+        include_ucrs=None,
+        exclude_ucrs=None,
+        num_processes=1,
+        process_num=0,
+        ucr_configs=None,
+        skip_ucr=False,
+        processor_chunk_size=DEFAULT_PROCESSOR_CHUNK_SIZE,
+        topics=None,
+        dedicated_migration_process=False,
+        **kwargs,
+):
     """Generic XForm change processor
 
     Processors:
diff --git a/corehq/project_limits/admin.py b/corehq/project_limits/admin.py
index 8e711475bad5..39bf92dd7c77 100644
--- a/corehq/project_limits/admin.py
+++ b/corehq/project_limits/admin.py
@@ -1,6 +1,10 @@
 from django.contrib import admin
 
-from corehq.project_limits.models import DynamicRateDefinition, RateLimitedTwoFactorLog
+from corehq.project_limits.models import (
+    DynamicRateDefinition,
+    PillowLagGaugeDefinition,
+    RateLimitedTwoFactorLog,
+)
 
 
 @admin.register(DynamicRateDefinition)
@@ -15,3 +19,11 @@ class RateLimitedTwoFactorLogAdmin(admin.ModelAdmin):
     list_display = ('date', 'username', 'method', 'window', 'status')
     list_filter = ('username',)
     ordering = ('-date',)
+
+
+@admin.register(PillowLagGaugeDefinition)
+class PillowThrottleDefinitionAdmin(admin.ModelAdmin):
+    list_display = ('key', 'wait_for_seconds',
+                    'max_value', 'average_value', 'is_enabled')
+    list_filter = ('key', 'is_enabled')
+    ordering = ('key',)
diff --git a/corehq/project_limits/gauge.py b/corehq/project_limits/gauge.py
new file mode 100644
index 000000000000..dff34107f29c
--- /dev/null
+++ b/corehq/project_limits/gauge.py
@@ -0,0 +1,181 @@
+from datetime import datetime, time, timedelta, timezone
+
+from django.core.cache import cache
+
+from corehq.apps.change_feed.topics import (
+    CASE_SQL,
+    get_all_kafka_partitons_for_topic,
+)
+from corehq.project_limits.models import AVG, PillowLagGaugeDefinition
+from corehq.util.quickcache import quickcache
+
+
+@quickcache(['kafka_topic'], memoize_timeout=60, timeout=24 * 60 * 60)
+def get_pillow_throttle_definition(kafka_topic):
+    try:
+        return PillowLagGaugeDefinition.objects.get(key=kafka_topic)
+    except PillowLagGaugeDefinition.DoesNotExist:
+        return None
+
+
+class Gauge:
+    """
+    The class is designed to track a bunch of related values.
+    For example, if we want to track pillow lag,
+    feature_key can be the topic that pillow is listening to
+    then all the partions for that topic would be scopes whose value we want to track and analyse.
+    Any mathematical operation can be performed on the values.
+    """
+    def __init__(self, feature_key, scope_fn, timeout=8 * 60):
+        """
+        :param feature_key: ``str`` Unique string that will identify the Gauge
+        :param scope_fn: ``function`` Function that will be used to get scopes that are to be tracked
+        :param timeout: ``int`` how many seconds the reported value should remain in cache.
+        """
+        self.feature_key = feature_key
+        self.timeout = timeout
+        self.scopes = scope_fn(feature_key)
+
+    def report(self, tracked_key, observerd_value):
+        """
+        :param tracked_key: ``str`` A key that identifies the tracked event
+        :param observerd_value: ``float`` The value of the tracked event
+        Saves the observed value for the tracked key and also updates last reported time.
+        """
+        assert tracked_key in self.scopes, f"{tracked_key} not in the following scopes {self.scopes}"
+
+        cache.set(self._tracked_event_cache_key(tracked_key), observerd_value, timeout=self.timeout)
+
+        cache.set(self._last_reported_timestamp_key, datetime.now(tz=timezone.utc), timeout=self.timeout)
+
+    @quickcache(['self.feature_key'], timeout=5 * 60, memoize_timeout=60)
+    def get_values(self):
+        """
+        returns a list of all the reported values for
+        all the scopes for the give feature key.
+        """
+        all_cache_keys = [self._tracked_event_cache_key(key) for key in self.scopes]
+        all_observed_values = cache.get_many(all_cache_keys)
+        return list(all_observed_values.values())
+
+    def _tracked_event_cache_key(self, tracked_key):
+        return f'{type(self).__name__}-{tracked_key}-key'
+
+    @property
+    def _last_reported_timestamp_key(self):
+        return f'{type(self).__name__}-{self.feature_key}-last-reported'
+
+    def get_last_reported_time(self):
+        "returns the last time when the lag was reported or will return ``datetime.min`` if not reported yet"
+        return cache.get(self._last_reported_timestamp_key, datetime.min)
+
+    def max(self):
+        """
+        return max lag for a given topic
+        """
+        values = self.get_values()
+        return max(values) if values else None
+
+    def min(self):
+        """
+        return min lag for a given topic
+        """
+        values = self.get_values()
+        return min(values) if values else None
+
+    def avg(self):
+        """
+        return average lag for a given topic
+        """
+        values = self.get_values()
+        return sum(values) / len(values) if values else None
+
+
+case_pillow_lag_gauge = Gauge(feature_key=CASE_SQL, scope_fn=get_all_kafka_partitons_for_topic)
+
+
+class GaugeLimiter:
+
+    def __init__(self, gauge, get_gauge_definition):
+        """
+        :param gauge: ``Gauge`` An instance of Gauge class
+        :param get_gauge_defintions: ``function``
+            A function to get config that GaugeLimiter will use to
+            figure out throttling conditions.
+        """
+        self.gauge = gauge
+        self.gauge_definition_fn = get_gauge_definition
+
+    def wait(self):
+        if not self.allow_usage():
+            time.sleep(self.gauge_definition.wait_for_seconds)
+
+    def allow_usage(self):
+        """
+        Checks for the throttle conditions provided in the Defintion class and evaluates them.
+        returns `True` it means that the usage should not be throttled.
+                `False` it means that the usage should be throttled.
+        """
+        if not self.gauge_definition:
+            # no throttling if config to throttle is not set.
+            return True
+        computed_value = None
+        if self.gauge_definition.aggregator == AVG:
+            computed_value = self.gauge.avg()
+        else:
+            computed_value = self.gauge.max()
+        return computed_value < self.gauge_definition.acceptable_value
+
+    @property
+    def gauge_definition(self):
+        """
+        Should return an instace of subclass of ThrottleDefinition
+        """
+        return self.gauge_definition_fn(self.gauge.feature_key)
+
+
+class PillowLagGaugeLimiter(GaugeLimiter):
+
+    def _has_pillow_reported_recently(self):
+        time_window = 15  # time window in minutes in which throttling should be applied
+        time_before_window = datetime.now(tz=timezone.utc) - timedelta(minutes=time_window)
+        return self.gauge.get_last_reported_time() > time_before_window
+
+    def allow_usage(self):
+        if not self.gauge_definition:
+            # No throttling if config to throttle is not set
+            return True
+        return not (self._is_ideal_throttle_condition() and self._has_pillow_reported_recently())
+
+    def _is_ideal_throttle_condition(self):
+        """
+        The ideal throttle conditions are -
+        - If throttler is enabled in the config AND
+        - If we have reported values from scopes AND
+        - The follwing conditions are considered -
+            - If both max_value and average_value are set on the Defintion model,
+            then both should be breached in order to throttle.
+            - If only max_value is defined, then only max_value would be observed.
+            - If only average_value is set, then only average value would be observed.
+        """
+        if not self.gauge_definition.is_enabled:
+            # if throttling is disabled, don't throttle
+            return False
+
+        max_observed_value = self.gauge.max()
+        avg_observed_value = self.gauge.avg()
+
+        if max_observed_value is None or avg_observed_value is None:
+            # Don't throttle unless both observed values are set
+            return False
+
+        max_value = self.gauge_definition.max_value
+        average_value = self.gauge_definition.average_value
+
+        if max_value is not None and average_value is not None:
+            return max_observed_value > max_value and avg_observed_value > average_value
+        elif max_value is not None:
+            return max_observed_value > max_value
+        elif average_value is not None:
+            return avg_observed_value > average_value
+        return False
diff --git a/corehq/project_limits/migrations/0003_pillowlaggaugedefinition.py b/corehq/project_limits/migrations/0003_pillowlaggaugedefinition.py
new file mode 100644
index 000000000000..7e29a6eb6b2e
--- /dev/null
+++ b/corehq/project_limits/migrations/0003_pillowlaggaugedefinition.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.2.15 on 2024-08-30 12:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('project_limits', '0002_ratelimitedtwofactorlog'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PillowLagGaugeDefinition',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('key', models.CharField(db_index=True, max_length=512, unique=True)),
+                ('wait_for_seconds', models.IntegerField()),
+                ('acceptable_value', models.FloatField(blank=True, default=None, null=True)),
+                ('aggregator', models.CharField(blank=True, choices=[('AVG', 'Average'), ('MAX', 'Maximum')], max_length=10, null=True)),
+                ('is_enabled', models.BooleanField(default=True)),
+                ('max_value', models.FloatField(blank=True, default=None, null=True)),
+                ('average_value', models.FloatField(blank=True, default=None, null=True)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/corehq/project_limits/models.py b/corehq/project_limits/models.py
index 6400a2f40e30..45af328acd4a 100644
--- a/corehq/project_limits/models.py
+++ b/corehq/project_limits/models.py
@@ -2,6 +2,14 @@
 
 import architect
 
+AVG = 'AVG'
+MAX = 'MAX'
+
+AGGREGATION_OPTIONS = [
+    (AVG, 'Average'),
+    (MAX, 'Maximum'),
+]
+
 
 class DynamicRateDefinition(models.Model):
     key = models.CharField(max_length=512, blank=False, null=False, unique=True, db_index=True)
@@ -24,6 +32,42 @@ def _clear_caches(self):
         get_dynamic_rate_definition.clear(self.key, {})
 
 
+class GaugeDefinition(models.Model):
+    """
+    An abstract model to be used to define configuration to limit gauge values.
+    The model is used by GaugeLimiter class to decide weather to limit or not.
+    """
+    key = models.CharField(max_length=512, blank=False, null=False, unique=True, db_index=True)
+    wait_for_seconds = models.IntegerField(null=False)
+    acceptable_value = models.FloatField(default=None, blank=True, null=True)
+    aggregator = models.CharField(max_length=10, null=True, blank=True, choices=AGGREGATION_OPTIONS)
+    is_enabled = models.BooleanField(default=True)
+
+    class Meta:
+        abstract = True
+
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        self._clear_caches()
+
+    def delete(self, *args, **kwargs):
+        super().delete(*args, **kwargs)
+        self._clear_caches()
+
+    def _clear_caches(self):
+        pass
+
+
+class PillowLagGaugeDefinition(GaugeDefinition):
+
+    max_value = models.FloatField(default=None, blank=True, null=True)
+    average_value = models.FloatField(default=None, blank=True, null=True)
+
+    def _clear_caches(self):
+        from corehq.project_limits.gauge import get_pillow_throttle_definition
+        get_pillow_throttle_definition.clear(self.key)
+
+
 @architect.install('partition', type='range', subtype='date', constraint='week', column='date')
 class RateLimitedTwoFactorLog(models.Model):
     date = models.DateTimeField(auto_now_add=True, db_index=True)
diff --git a/corehq/project_limits/tests/test_gauge.py b/corehq/project_limits/tests/test_gauge.py
new file mode 100644
index 000000000000..0fd823b709e1
--- /dev/null
+++ b/corehq/project_limits/tests/test_gauge.py
@@ -0,0 +1,212 @@
+from unittest.mock import patch
+
+from django.core.cache import cache
+from django.test import SimpleTestCase, TestCase
+
+from nose.tools import nottest
+
+from corehq.apps.change_feed import topics
+from corehq.apps.change_feed.topics import CASE_SQL
+from corehq.project_limits.gauge import (
+    Gauge,
+    PillowLagGaugeLimiter,
+    case_pillow_lag_gauge,
+    get_pillow_throttle_definition,
+)
+from corehq.project_limits.models import PillowLagGaugeDefinition
+
+
+class TestKafkaPillowGauge(SimpleTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.feature_key = CASE_SQL
+        cls.scopes = topics.get_all_kafka_partitons_for_topic(cls.feature_key)
+        cls.case_gauge = case_pillow_lag_gauge
+
+    @nottest
+    def _report_usage_for_multiple_partitions(self, gauge, partitions, lag_values):
+        for partition, lag in zip(partitions, lag_values):
+            gauge.report(partition, lag)
+            self.addCleanup(cache.delete, gauge._tracked_event_cache_key(partition))
+        self.addCleanup(cache.delete, gauge._last_reported_timestamp_key)
+
+    def test_report_usage(self):
+        kafka_partition = next(iter(self.scopes))
+        pillow_lag = 60
+
+        self.case_gauge.report(kafka_partition, pillow_lag)
+
+        cache_key = self.case_gauge._tracked_event_cache_key(kafka_partition)
+        self.addCleanup(cache.delete, cache_key)
+        saved_lag = cache.get(cache_key)
+        self.assertEqual(saved_lag, pillow_lag)
+        self.assertIsNotNone(self.case_gauge._last_reported_timestamp_key)
+
+    def test_get_values_for_single_partition(self):
+        lag_before_populating = self.case_gauge.get_values()
+        self.assertEqual(lag_before_populating, [])
+        self.case_gauge.get_values.clear(self.case_gauge)
+
+        partition = next(iter(self.scopes))
+        self.case_gauge.report(partition, 10)
+        self.addCleanup(cache.delete, partition)
+        self.addCleanup(self.case_gauge.get_values.clear, self.case_gauge)
+
+        self.assertEqual(self.case_gauge.get_values(), [10])
+
+    @patch.object(topics, 'get_all_kafka_partitons_for_topic')
+    def test_get_values_for_multiple_partitons(self, mock_get_all_kafka_partitons_for_topic):
+        mocked_partitions = ['topic-0', 'topic-1', 'topic-2']
+        mock_get_all_kafka_partitons_for_topic.return_value = mocked_partitions
+
+        lag_before_populating = self.case_gauge.get_values()
+        self.case_gauge.get_values.clear(self.case_gauge)
+
+        self.assertEqual(lag_before_populating, [])
+
+        lag_in_partitions = [10, 20, 30]
+        case_gauge_with_multiple_partitions = Gauge(CASE_SQL, topics.get_all_kafka_partitons_for_topic)
+
+        self._report_usage_for_multiple_partitions(
+            case_gauge_with_multiple_partitions, mocked_partitions, lag_in_partitions
+        )
+
+        self.assertEqual(case_gauge_with_multiple_partitions.get_values(), lag_in_partitions)
+        self.addCleanup(self.case_gauge.get_values.clear, self.case_gauge)
+
+    @patch.object(topics, 'get_all_kafka_partitons_for_topic')
+    def test_max(self, mock_get_all_kafka_partitons_for_topic):
+        mocked_partitions = ['topic-0', 'topic-1', 'topic-2']
+        mock_get_all_kafka_partitons_for_topic.return_value = mocked_partitions
+
+        lag_in_partitions = [10, 20, 30]
+        case_gauge_with_multiple_partitions = Gauge(CASE_SQL, topics.get_all_kafka_partitons_for_topic)
+
+        self._report_usage_for_multiple_partitions(
+            case_gauge_with_multiple_partitions, mocked_partitions, lag_in_partitions
+        )
+
+        self.assertEqual(case_gauge_with_multiple_partitions.max(), 30)
+        self.addCleanup(self.case_gauge.get_values.clear, self.case_gauge)
+
+    @patch.object(topics, 'get_all_kafka_partitons_for_topic')
+    def test_avg(self, mock_get_all_kafka_partitons_for_topic):
+        mocked_partitions = ['topic-0', 'topic-1', 'topic-2']
+        mock_get_all_kafka_partitons_for_topic.return_value = mocked_partitions
+
+        lag_in_partitions = [15, 15, 30]
+        case_gauge_with_multiple_partitions = Gauge(CASE_SQL, topics.get_all_kafka_partitons_for_topic)
+
+        self._report_usage_for_multiple_partitions(
+            case_gauge_with_multiple_partitions, mocked_partitions, lag_in_partitions
+        )
+
+        self.assertEqual(case_gauge_with_multiple_partitions.avg(), 20)
+        self.addCleanup(self.case_gauge.get_values.clear, self.case_gauge)
+
+
+class TestPillowLagGaugeLimiter(TestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.scopes = ['topic-0', 'topic-1']
+        cls.patcher = patch.object(topics, 'get_all_kafka_partitons_for_topic', return_value=cls.scopes)
+        cls.patcher.start()
+
+        cls.feature_key = CASE_SQL
+        cls.gauge_obj = Gauge(CASE_SQL, topics.get_all_kafka_partitons_for_topic)
+
+        cls.lag_limiter = PillowLagGaugeLimiter(cls.gauge_obj, get_pillow_throttle_definition)
+
+        PillowLagGaugeDefinition.objects.all().delete()
+        cls.gauge_defintion = PillowLagGaugeDefinition.objects.create(
+            key=cls.feature_key,
+            wait_for_seconds=5,
+            max_value=10,
+            average_value=8
+        )
+
+    def setUp(self):
+        super().setUp()
+        self._set_gauge_defintion(10, 8)
+
+    @nottest
+    def _set_gauge_defintion(self, max_value, average_value):
+        self.gauge_defintion.max_value = max_value
+        self.gauge_defintion.average_value = average_value
+        self.gauge_defintion.save()
+
+    def test_allow_usage_when_below_limits(self):
+        self.gauge_obj.report('topic-0', 5)
+        self.gauge_obj.report('topic-1', 7)
+
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_when_limit_breach_on_max_only(self):
+        self.gauge_obj.report('topic-0', 11)
+        self.gauge_obj.report('topic-1', 5)
+
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_when_limit_breach_on_avg_only(self):
+        self.gauge_obj.report('topic-0', 9)
+        self.gauge_obj.report('topic-1', 8)
+
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_when_limit_breach_on_avg_and_max(self):
+        self.gauge_obj.report('topic-0', 10)
+        self.gauge_obj.report('topic-1', 15)
+
+        self.assertFalse(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_with_average_not_set(self):
+        self._set_gauge_defintion(max_value=15, average_value=None)
+
+        self.gauge_obj.report('topic-0', 14)
+        self.gauge_obj.report('topic-1', 13)
+
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+        self.gauge_obj.get_values.clear(self.gauge_obj)
+
+        # Should not allow since max value is breached
+        self.gauge_obj.report('topic-0', 16)
+        self.assertFalse(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_with_max_not_set(self):
+        self._set_gauge_defintion(max_value=None, average_value=10)
+
+        self.gauge_obj.report('topic-0', 15)
+        self.gauge_obj.report('topic-1', 2)
+
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+        self.gauge_obj.get_values.clear(self.gauge_obj)
+        self.gauge_obj.report('topic-1', 8)
+
+        # Should not allow since average value is breached
+        self.assertFalse(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_with_single_partition(self):
+        self.gauge_obj.report('topic-0', 9)
+
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+    def test_allow_usage_with_no_reported_values(self):
+        self.assertTrue(self.lag_limiter.allow_usage())
+
+    def tearDown(self):
+        # cache cleanup
+        for scope in self.scopes:
+            cache.delete(self.gauge_obj._tracked_event_cache_key(scope))
+        self.gauge_obj.get_values.clear(self.gauge_obj)
+        return super().tearDown()
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.patcher.stop()
+        return super().tearDownClass()
diff --git a/corehq/project_limits/tests/test_rate_definition.py b/corehq/project_limits/tests/test_rate_definition.py
index 629cb47867fc..559f650f9d42 100644
--- a/corehq/project_limits/tests/test_rate_definition.py
+++ b/corehq/project_limits/tests/test_rate_definition.py
@@ -1,49 +1,37 @@
 import math
 import random
 
+import pytest
 import testil
 
 from corehq.project_limits.rate_limiter import RateDefinition
 
 
-def test_rate_definition_times():
-    def check(rate_def, factor):
-        testil.eq(
-            rate_def.times(factor),
-            RateDefinition(
-                per_second=times_or_none(rate_def.per_second, factor),
-                per_minute=times_or_none(rate_def.per_minute, factor),
-                per_hour=times_or_none(rate_def.per_hour, factor),
-                per_day=times_or_none(rate_def.per_day, factor),
-                per_week=times_or_none(rate_def.per_week, factor),
-            ),
-        )
-
+@pytest.mark.parametrize("_", range(15))
+def test_rate_definition_times(_):
     def times_or_none(number_or_none, factor):
         if number_or_none is None:
             return None
         else:
             return number_or_none * factor
 
-    for _ in range(15):
-        rate_def = _get_random_rate_def()
-        factor = int(random.expovariate(1 / 10000))
-        yield check, rate_def, factor
-
+    rate_def = _get_random_rate_def()
+    factor = int(random.expovariate(1 / 10000))
+
+    testil.eq(
+        rate_def.times(factor),
+        RateDefinition(
+            per_second=times_or_none(rate_def.per_second, factor),
+            per_minute=times_or_none(rate_def.per_minute, factor),
+            per_hour=times_or_none(rate_def.per_hour, factor),
+            per_day=times_or_none(rate_def.per_day, factor),
+            per_week=times_or_none(rate_def.per_week, factor),
+        ),
+    )
 
-def test_rate_definition_with_minimum():
 
-    def check(base_rate, floor_rate):
-        testil.eq(
-            base_rate.plus(floor_rate),
-            RateDefinition(
-                per_second=asymmetric_sum(base_rate.per_second, floor_rate.per_second),
-                per_minute=asymmetric_sum(base_rate.per_minute, floor_rate.per_minute),
-                per_hour=asymmetric_sum(base_rate.per_hour, floor_rate.per_hour),
-                per_day=asymmetric_sum(base_rate.per_day, floor_rate.per_day),
-                per_week=asymmetric_sum(base_rate.per_week, floor_rate.per_week)
-            )
-        )
+@pytest.mark.parametrize("_", range(15))
+def test_rate_definition_with_minimum(_):
 
     def asymmetric_sum(base_number_or_none, incr_number_or_none):
         """
@@ -64,55 +52,57 @@ def asymmetric_sum(base_number_or_none, incr_number_or_none):
         else:
             return base_number_or_none + incr_number_or_none
 
-    for _ in range(15):
-        base_rate = _get_random_rate_def()
-        incr_rate = _get_random_rate_def()
-        yield check, base_rate, incr_rate
-
-
-def test_rate_definition_map():
-    def check(rate_def, fn):
-        testil.eq(
-            rate_def.map(fn),
-            RateDefinition(
-                per_second=fn(rate_def.per_second),
-                per_minute=fn(rate_def.per_minute),
-                per_hour=fn(rate_def.per_hour),
-                per_day=fn(rate_def.per_day),
-                per_week=fn(rate_def.per_week),
-            ),
+    base_rate = _get_random_rate_def()
+    floor_rate = _get_random_rate_def()
+    testil.eq(
+        base_rate.plus(floor_rate),
+        RateDefinition(
+            per_second=asymmetric_sum(base_rate.per_second, floor_rate.per_second),
+            per_minute=asymmetric_sum(base_rate.per_minute, floor_rate.per_minute),
+            per_hour=asymmetric_sum(base_rate.per_hour, floor_rate.per_hour),
+            per_day=asymmetric_sum(base_rate.per_day, floor_rate.per_day),
+            per_week=asymmetric_sum(base_rate.per_week, floor_rate.per_week)
         )
+    )
 
+
+@pytest.mark.parametrize("_", range(15))
+def test_rate_definition_map(_):
     def preserve_none(fn):
         return lambda x: None if x is None else fn(x)
 
-    for _ in range(15):
-        rate_def = _get_random_rate_def()
-        fn, = random.choices([preserve_none(int),
-                              preserve_none(lambda x: x * x),
-                              preserve_none(math.exp)])
-        yield check, rate_def, fn
-
-
-def test_rate_definition_map_with_other():
-    def check(rate_def, fn, other):
-        testil.eq(
-            rate_def.map(fn, other),
-            RateDefinition(
-                per_second=fn(rate_def.per_second, other.per_second),
-                per_minute=fn(rate_def.per_minute, other.per_minute),
-                per_hour=fn(rate_def.per_hour, other.per_hour),
-                per_day=fn(rate_def.per_day, other.per_day),
-                per_week=fn(rate_def.per_week, other.per_week),
-            ),
-        )
+    rate_def = _get_random_rate_def()
+    fn, = random.choices([preserve_none(int),
+                          preserve_none(lambda x: x * x),
+                          preserve_none(math.exp)])
+    testil.eq(
+        rate_def.map(fn),
+        RateDefinition(
+            per_second=fn(rate_def.per_second),
+            per_minute=fn(rate_def.per_minute),
+            per_hour=fn(rate_def.per_hour),
+            per_day=fn(rate_def.per_day),
+            per_week=fn(rate_def.per_week),
+        ),
+    )
+
 
-    for _ in range(15):
-        rate_def = _get_random_rate_def()
-        fn, = random.choices([lambda x, y: max(filter(None, [x, y, -1])),
-                              lambda x, y: None if None in (x, y) else (x * y)])
-        other = _get_random_rate_def()
-        yield check, rate_def, fn, other
+@pytest.mark.parametrize("_", range(15))
+def test_rate_definition_map_with_other(_):
+    rate_def = _get_random_rate_def()
+    fn, = random.choices([lambda x, y: max(filter(None, [x, y, -1])),
+                          lambda x, y: None if None in (x, y) else (x * y)])
+    other = _get_random_rate_def()
+    testil.eq(
+        rate_def.map(fn, other),
+        RateDefinition(
+            per_second=fn(rate_def.per_second, other.per_second),
+            per_minute=fn(rate_def.per_minute, other.per_minute),
+            per_hour=fn(rate_def.per_hour, other.per_hour),
+            per_day=fn(rate_def.per_day, other.per_day),
+            per_week=fn(rate_def.per_week, other.per_week),
+        ),
+    )
 
 
 def _get_random_rate_def():
@@ -126,32 +116,22 @@ def _get_random_rate_def():
     )
 
 
-def test_rate_definition_against_fixed_user_table():
-    tab_delimited_table = """
-    # of users  second  minute  hour    day       week
-    1           1       10      33      73        215
-    10          1       10      60      280       1,250
-    100         1       17      330     2,350     11,600
-    1000        6       80      3,030   23,050    115,100
-    10000       51      710     30,030  230,050   1,150,100
-    100000      501     7,010   300,030 2,300,050 11,500,100
-    """
-
-    rows = tab_delimited_table.strip().splitlines()[1:]
-    table = [[int(cell.replace(',', '')) for cell in row.split()] for row in rows]
-
-    def check(n_users, per_second, per_minute, per_hour, per_day, per_week):
-        testil.eq(
-            per_user_rate.times(n_users).plus(floor_rate).map(int),
-            RateDefinition(
-                per_week=per_week,
-                per_day=per_day,
-                per_hour=per_hour,
-                per_minute=per_minute,
-                per_second=per_second,
-            ),
-        )
-
+@pytest.mark.parametrize(
+    "n_users, per_second, per_minute, per_hour, per_day, per_week",
+    [
+        [int(cell.replace(',', '')) for cell in row.split()]
+        for row in """
+        # of users  second  minute  hour     day        week
+        1           1       10      33       73         215
+        10          1       10      60       280        1,250
+        100         1       17      330      2,350      11,600
+        1000        6       80      3,030    23,050     115,100
+        10000       51      710     30,030   230,050    1,150,100
+        100000      501     7,010   300,030  2,300,050  11,500,100
+        """.strip().splitlines()[1:]
+    ],
+)
+def test_rate_definition_against_fixed_user_table(n_users, per_second, per_minute, per_hour, per_day, per_week):
     per_user_rate = RateDefinition(
         per_week=115,
         per_day=23,
@@ -166,5 +146,14 @@ def check(n_users, per_second, per_minute, per_hour, per_day, per_week):
         per_minute=10,
         per_second=1,
     )
-    for n_users, per_second, per_minute, per_hour, per_day, per_week in table:
-        yield check, n_users, per_second, per_minute, per_hour, per_day, per_week
+
+    testil.eq(
+        per_user_rate.times(n_users).plus(floor_rate).map(int),
+        RateDefinition(
+            per_week=per_week,
+            per_day=per_day,
+            per_hour=per_hour,
+            per_minute=per_minute,
+            per_second=per_second,
+        ),
+    )
diff --git a/corehq/reports.py b/corehq/reports.py
index 2211effc1ca0..0b74381667d4 100644
--- a/corehq/reports.py
+++ b/corehq/reports.py
@@ -126,7 +126,6 @@ def REPORTS(project):
             commtrack.SimplifiedInventoryReport,
             commtrack.InventoryReport,
             commtrack.CurrentStockStatusReport,
-            commtrack.StockStatusMapReport,
         )
         reports.insert(0, (gettext_lazy("CommCare Supply"), supply_reports))
 
diff --git a/corehq/sql_db/tests/test_checks.py b/corehq/sql_db/tests/test_checks.py
index c34b83ce8788..170eec65b66d 100644
--- a/corehq/sql_db/tests/test_checks.py
+++ b/corehq/sql_db/tests/test_checks.py
@@ -1,3 +1,4 @@
+import pytest
 from django.test import override_settings
 from nose.tools import assert_equal, assert_in
 
@@ -5,65 +6,61 @@
 
 from .utils import ignore_databases_override_warning
 
-
-def test_check_standby_configs():
-    databases = {
-        'default': {},
-        'other': {},
-        's1': {
-            'HQ_ACCEPTABLE_STANDBY_DELAY': 1
-        },
-        's2': {
-            'STANDBY': {
-                'MASTER': 'default'
-            }
-        },
-        's3': {
-            'STANDBY': {
-                'MASTER': 'other'
-            }
+DATABASES = {
+    'default': {},
+    'other': {},
+    's1': {
+        'HQ_ACCEPTABLE_STANDBY_DELAY': 1
+    },
+    's2': {
+        'STANDBY': {
+            'MASTER': 'default'
+        }
+    },
+    's3': {
+        'STANDBY': {
+            'MASTER': 'other'
         }
     }
+}
 
-    @ignore_databases_override_warning
-    def _check_settings(config, is_error):
-        settings = {
-            'DATABASES': databases,
-            'REPORTING_DATABASES': {
-                'db_A': config
-            }
-        }
-        with override_settings(**settings):
-            errors = check_standby_configs(None)
-            if is_error:
-                assert_equal(1, len(errors))
-                assert_in('settings.REPORTING_DATABASES.db_A', errors[0].msg)
-            else:
-                assert_equal(0, len(errors))
 
-    test_cases = [
-        ({
-            'WRITE': 'default',
-            'READ': [
-                ('default', 1),
-                ('s1', 1),
-                ('s2', 1)
-            ]
-        }, False),
-        ({
-            'WRITE': 'default',
-            'READ': [
-                ('default', 1),
-                ('s3', 1),
-            ]
-        }, True),
-        ({
-            'WRITE': 'default',
-            'READ': [
-                ('default', 1),
-                ('other', 1),
-            ]
-        }, True),
-    ]
-    for config, is_error in test_cases:
-        yield _check_settings, config, is_error
+@pytest.mark.parametrize("config, is_error", [
+    ({
+        'WRITE': 'default',
+        'READ': [
+            ('default', 1),
+            ('s1', 1),
+            ('s2', 1)
+        ]
+    }, False),
+    ({
+        'WRITE': 'default',
+        'READ': [
+            ('default', 1),
+            ('s3', 1),
+        ]
+    }, True),
+    ({
+        'WRITE': 'default',
+        'READ': [
+            ('default', 1),
+            ('other', 1),
+        ]
+    }, True),
+])
+@ignore_databases_override_warning
+def test_check_standby_configs(config, is_error):
+    settings = {
+        'DATABASES': DATABASES,
+        'REPORTING_DATABASES': {
+            'db_A': config
+        }
+    }
+    with override_settings(**settings):
+        errors = check_standby_configs(None)
+        if is_error:
+            assert_equal(1, len(errors))
+            assert_in('settings.REPORTING_DATABASES.db_A', errors[0].msg)
+        else:
+            assert_equal(0, len(errors))
diff --git a/corehq/sql_db/tests/test_partition_config.py b/corehq/sql_db/tests/test_partition_config.py
index 47d844415c87..da977bcd7166 100644
--- a/corehq/sql_db/tests/test_partition_config.py
+++ b/corehq/sql_db/tests/test_partition_config.py
@@ -4,6 +4,7 @@
 from django.test import SimpleTestCase
 from django.test.utils import override_settings
 
+import pytest
 from testil import assert_raises
 
 from corehq.sql_db.config import (
@@ -187,22 +188,18 @@ def test_get_standby_plproxy_config_legacy_format(self):
             _get_standby_plproxy_config(config)
 
 
+@pytest.mark.parametrize("config, exception", [
+    (INVALID_SHARD_RANGE_START, NotZeroStartError),
+    (INVALID_SHARD_RANGE_CONTINUOUS, NonContinuousShardsError),
+    (INVALID_SHARD_RANGE_POWER_2, NotPowerOf2Error),
+])
 @ignore_databases_override_warning
-def test_partition_config_validation():
-    def _run_test(config, exception, message):
-        settings = {
-            'DATABASES': TEST_DATABASES,
-        }
-        with override_settings(**settings), assert_raises(exception, msg=message):
-            PlProxyConfig.from_dict(config)
-
-    cases = [
-        (INVALID_SHARD_RANGE_START, NotZeroStartError, None),
-        (INVALID_SHARD_RANGE_CONTINUOUS, NonContinuousShardsError, None),
-        (INVALID_SHARD_RANGE_POWER_2, NotPowerOf2Error, None),
-    ]
-    for config, exception, message in cases:
-        yield _run_test, config, exception, message
+def test_partition_config_validation(config, exception):
+    settings = {
+        'DATABASES': TEST_DATABASES,
+    }
+    with override_settings(**settings), assert_raises(exception):
+        PlProxyConfig.from_dict(config)
 
 
 @ignore_databases_override_warning
diff --git a/corehq/sql_db/tests/test_routers.py b/corehq/sql_db/tests/test_routers.py
index e3e958e38884..728b8687a5f3 100644
--- a/corehq/sql_db/tests/test_routers.py
+++ b/corehq/sql_db/tests/test_routers.py
@@ -4,6 +4,7 @@
 from django.test import SimpleTestCase
 from django.test.utils import override_settings
 
+import pytest
 from unittest.mock import patch
 from nose.tools import assert_equal, assert_false, assert_true
 
@@ -89,11 +90,13 @@ def test_load_balanced_read_apps(_, __):
     assert_equal(get_load_balanced_app_db('users', default='default_option'), 'default_option')
 
 
-@ignore_databases_override_warning
-@override_settings(DATABASES=PARTITION_CONFIG_WITH_STANDBYS)
-def test_load_balanced_plproxy():
-    primary_config = PlProxyConfig.from_dict(PARTITION_CONFIG_WITH_STANDBYS)
-    standby_config = _get_standby_plproxy_config(primary_config)
+def _make_cases():
+    with (
+        ignore_databases_override_warning,
+        override_settings(DATABASES=PARTITION_CONFIG_WITH_STANDBYS),
+    ):
+        primary_config = PlProxyConfig.from_dict(PARTITION_CONFIG_WITH_STANDBYS)
+        standby_config = _get_standby_plproxy_config(primary_config)
 
     master_standby_mapping = {
         'db1': {'db1_standby'},
@@ -122,7 +125,12 @@ def _test_load_balanced_plproxy(primary_db, ok_standbys, expected_db):
         (plproxy_shard_0, [], plproxy_shard_0),
     ]
     for case in test_cases:
-        yield (_test_load_balanced_plproxy,) + case
+        yield _test_load_balanced_plproxy, case
+
+
+@pytest.mark.parametrize("test, args", list(_make_cases()))
+def test_load_balanced_plproxy(test, args):
+    test(*args)
 
 
 def test_get_read_write_db_for_partitioned_model_decorator():
@@ -135,16 +143,11 @@ def read():
     assert_false(allow_read_from_plproxy_standby())
 
 
-def test_get_read_write_db_for_partitioned_model():
-    test_cases = [
-        patch.dict(os.environ, {READ_FROM_PLPROXY_STANDBYS: '1'}),
-        read_from_plproxy_standbys(),
-    ]
-    for case in test_cases:
-        yield _test_get_read_write_db_for_partitioned_model, case
-
-
-def _test_get_read_write_db_for_partitioned_model(context):
+@pytest.mark.parametrize("context", [
+    patch.dict(os.environ, {READ_FROM_PLPROXY_STANDBYS: '1'}),
+    read_from_plproxy_standbys(),
+])
+def test_get_read_write_db_for_partitioned_model(context):
     assert_false(allow_read_from_plproxy_standby())
     with context:
         assert_true(allow_read_from_plproxy_standby())
diff --git a/corehq/tabs/tabclasses.py b/corehq/tabs/tabclasses.py
index 2782b18eab13..78c0d917af11 100644
--- a/corehq/tabs/tabclasses.py
+++ b/corehq/tabs/tabclasses.py
@@ -562,7 +562,7 @@ def should_see_dashboard_feed_paywall(self):
     @memoized
     def can_only_see_deid_exports(self):
         from corehq.apps.export.views.utils import user_can_view_deid_exports
-        return (not self.can_view_form_exports
+        return (not self.can_view_form_or_case_exports
                 and user_can_view_deid_exports(self.domain, self.couch_user))
 
     @property
@@ -663,12 +663,17 @@ def _get_export_data_views(self):
                 DeIdDailySavedExportListView,
                 DeIdDashboardFeedListView,
                 DeIdFormExportListView,
+                DeIdCaseExportListView,
                 ODataFeedListView,
             )
             export_data_views.append({
                 'title': _(DeIdFormExportListView.page_title),
                 'url': reverse(DeIdFormExportListView.urlname, args=(self.domain,)),
             })
+            export_data_views.append({
+                'title': _(DeIdCaseExportListView.page_title),
+                'url': reverse(DeIdCaseExportListView.urlname, args=(self.domain,)),
+            })
             export_data_views.extend([
                 {
                     'title': _(DeIdDailySavedExportListView.page_title),
@@ -1838,7 +1843,7 @@ def sidebar_items(self):
         if self.couch_user.is_superuser:
             from corehq.apps.enterprise.models import EnterprisePermissions
             if toggles.DOMAIN_PERMISSIONS_MIRROR.enabled_for_request(self._request) \
-                    or EnterprisePermissions.get_by_domain(self.domain).is_enabled:
+                    or EnterprisePermissions.is_source_domain(self.domain):
                 enterprise_views.append({
                     'title': _("Enterprise Permissions"),
                     'url': reverse("enterprise_permissions", args=[self.domain]),
diff --git a/corehq/tests/locks.py b/corehq/tests/locks.py
index 15fb20c0043d..c6f1e651b6e5 100644
--- a/corehq/tests/locks.py
+++ b/corehq/tests/locks.py
@@ -5,6 +5,8 @@
 
 import attr
 
+from corehq.tests.tools import nottest
+
 log = logging.getLogger(__name__)
 _LOCK = Lock()
 
@@ -69,6 +71,7 @@ def real_redis_client():
 _mock_redis_client = True
 
 
+@nottest
 @attr.s
 class TestRedisClient:
     lock = attr.ib()
diff --git a/corehq/tests/noseplugins/__init__.py b/corehq/tests/noseplugins/__init__.py
index e69de29bb2d1..26089201516b 100644
--- a/corehq/tests/noseplugins/__init__.py
+++ b/corehq/tests/noseplugins/__init__.py
@@ -0,0 +1 @@
+import corehq.tests.pytest_compat  # noqa: F401
diff --git a/corehq/tests/pytest_compat.py b/corehq/tests/pytest_compat.py
new file mode 100644
index 000000000000..94ed0ae88625
--- /dev/null
+++ b/corehq/tests/pytest_compat.py
@@ -0,0 +1,43 @@
+import sys
+from functools import wraps
+
+
+def _install_pytest_compat():
+    assert 'pytest' not in sys.modules, "Already installed or a real pytest is present"
+    sys.modules['pytest'] = sys.modules[__name__]
+
+
+class Marker:
+
+    def __getattr__(self, name):
+        def set_attribute(test_obj):
+            setattr(test_obj, name, True)
+            return test_obj
+        return set_attribute
+
+    def parametrize(self, arg_names, args_tuples):
+        def parametrize(func):
+            @wraps(func)
+            def test():
+                test_tuple = (func,)
+                test = (func,)
+                for args in args_tuples:
+                    if "," not in arg_names and (
+                        not isinstance(args, tuple)
+                        or len(args) != 1
+                    ):
+                        args = (args,)
+                    elif isinstance(args, list) and len(args) == arg_names.count(",") + 1:
+                        args = tuple(args)
+                    try:
+                        test_tuple = test + args
+                    except TypeError:
+                        raise TypeError(f"could not construct test tuple for {func} with args {args!r}")
+                    yield test_tuple
+            return test
+        return parametrize
+
+
+mark = Marker()
+
+_install_pytest_compat()
diff --git a/corehq/tests/test_middleware.py b/corehq/tests/test_middleware.py
index b0af8927d17b..2f0f78d48bfb 100644
--- a/corehq/tests/test_middleware.py
+++ b/corehq/tests/test_middleware.py
@@ -38,6 +38,7 @@ def slow_function_view(request):
 class TestReportDispatcher(ReportDispatcher):
     map_name = "REPORTS"
     prefix = "test"
+    __test__ = False
 
     @classmethod
     def get_reports(cls, domain):
@@ -50,6 +51,7 @@ def get_reports(cls, domain):
 class TestNoDomainReportDispatcher(ReportDispatcher):
     map_name = "REPORTS"
     prefix = "test_no_domain"
+    __test__ = False
 
     @classmethod
     def get_reports(cls, domain):
@@ -61,6 +63,7 @@ def get_reports(cls, domain):
 class TestCustomReportDispatcher(TestNoDomainReportDispatcher):
     map_name = "REPORTS"
     prefix = "test_custom"
+    __test__ = False
 
     def dispatch(self, request, *args, **kwargs):
         return CustomReport(request).view_response
@@ -173,23 +176,19 @@ 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.username = 'fingile'
         cls.password = '*******'
         cls.user = WebUser.create(cls.domain.name, cls.username, cls.password, None, None)
+        cls.addClassCleanup(cls.user.delete, cls.domain.name, deleted_by=None)
         cls.user.set_role(cls.domain.name, 'admin')
         cls.user.save()
 
     def setUp(self):
         self.client.login(username=self.username, password=self.password)
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.user.delete(cls.domain.name, deleted_by=None)
-        cls.domain.delete()
-        super().tearDownClass()
-
     def test_slow_domain_report(self, notify_exception):
         res = self.client.get('/domain1/slow_report/')
         self.assertEqual(res.status_code, 200)
diff --git a/corehq/tests/test_pickle.py b/corehq/tests/test_pickle.py
index 884060c30e67..207b8018d47d 100644
--- a/corehq/tests/test_pickle.py
+++ b/corehq/tests/test_pickle.py
@@ -1,5 +1,6 @@
 import pickle
 
+import pytest
 from testil import eq
 
 
@@ -17,9 +18,6 @@ def test_pickle_5():
     eq(pickle.loads(b'\x80\x05\x89.'), False)
 
 
-def test_dump_and_load_all_protocols():
-    def test(protocol):
-        eq(pickle.loads(pickle.dumps(False, protocol=protocol)), False)
-
-    for protocol in range(1, pickle.HIGHEST_PROTOCOL + 1):
-        yield test, protocol
+@pytest.mark.parametrize("protocol", range(1, pickle.HIGHEST_PROTOCOL + 1))
+def test_dump_and_load_all_protocols(protocol):
+    eq(pickle.loads(pickle.dumps(False, protocol=protocol)), False)
diff --git a/corehq/tests/tools.py b/corehq/tests/tools.py
new file mode 100644
index 000000000000..e600dc86c141
--- /dev/null
+++ b/corehq/tests/tools.py
@@ -0,0 +1,4 @@
+
+def nottest(fn):
+    fn.__test__ = False
+    return fn
diff --git a/corehq/tests/util/context.py b/corehq/tests/util/context.py
new file mode 100644
index 000000000000..63c4eef8441e
--- /dev/null
+++ b/corehq/tests/util/context.py
@@ -0,0 +1,18 @@
+from unittest import TestCase
+
+
+def add_context(context_manager, testcase):
+    """Enter context manager and ensure it is cleaned up on testcase teardown
+
+    Context manager exit will be scheduled with `addClassCleanup()` if
+    testcase is a subclass of `unittest.TestCase`. Otherwise it will be
+    scheduled with `addCleanup()`.
+
+    Returns the result of the entered context manager.
+    """
+    result = context_manager.__enter__()
+    if isinstance(testcase, type) and issubclass(testcase, TestCase):
+        testcase.addClassCleanup(context_manager.__exit__, None, None, None)
+    else:
+        testcase.addCleanup(context_manager.__exit__, None, None, None)
+    return result
diff --git a/corehq/tests/util/tests/test_warnings.py b/corehq/tests/util/tests/test_warnings.py
index efaadb52de88..67ed5dc8a19d 100644
--- a/corehq/tests/util/tests/test_warnings.py
+++ b/corehq/tests/util/tests/test_warnings.py
@@ -1,7 +1,7 @@
 import warnings
 from difflib import unified_diff
 from functools import wraps
-from unittest import TestCase, TestResult, TestSuite
+from unittest import TestCase, TestResult as Result, TestSuite as Suite
 from unittest.mock import patch
 
 from testil import Regex, assert_raises, eq
@@ -110,7 +110,7 @@ def runTest(self):
             log.append("test")
 
     log = []
-    TestSuite([Test()]).debug()
+    Suite([Test()]).debug()
     eq(log, ["setup", "test", "teardown"])
 
 
@@ -133,8 +133,8 @@ def runTest(self):
             log.append("test")
 
     log = []
-    result = TestResult()
-    TestSuite([Test()]).run(result)
+    result = Result()
+    Suite([Test()]).run(result)
     eq(str(result.errors), Regex(r" in setUpClass\\n .*Warning: fail"), result)
     eq(log, ["setup"])
 
@@ -158,8 +158,8 @@ def runTest(self):
             log.append("test")  # should not get here
 
     log = []
-    result = TestResult()
-    TestSuite([Test()]).run(result)
+    result = Result()
+    Suite([Test()]).run(result)
     eq(str(result.errors), Regex(r" in runTest\\n .*Warning: fail"), result)
     eq(log, ["setup", "teardown"])
 
@@ -182,7 +182,7 @@ def runTest(self):
             log.append("test")  # should not get here
 
     log = []
-    result = TestResult()
-    TestSuite([Test()]).run(result)
+    result = Result()
+    Suite([Test()]).run(result)
     eq(str(result.errors), Regex(r" in tearDownClass\\n .*Warning: fail"), result)
     eq(log, ["setup", "test"])
diff --git a/corehq/tests/util/warnings.py b/corehq/tests/util/warnings.py
index ab4350b5a3db..ef9334996b6f 100644
--- a/corehq/tests/util/warnings.py
+++ b/corehq/tests/util/warnings.py
@@ -3,8 +3,7 @@
 from functools import wraps
 from unittest import TestCase
 
-from nose.tools import nottest
-
+from corehq.tests.tools import nottest
 from corehq.util.test_utils import unit_testing_only
 
 
diff --git a/corehq/toggles/__init__.py b/corehq/toggles/__init__.py
index b7449452beca..3f3344d69185 100644
--- a/corehq/toggles/__init__.py
+++ b/corehq/toggles/__init__.py
@@ -976,6 +976,14 @@ def _ensure_valid_randomness(randomness):
     owner='Jenny Schweers',
 )
 
+LOCATION_FIELD_USER_PROVISIONING = FeatureRelease(
+    'location_field_user_provisioning',
+    'USH: Holding feature flag for various works relating to the location field',
+    TAG_RELEASE,
+    namespaces=[NAMESPACE_DOMAIN],
+    owner='Minha Lee',
+)
+
 WEB_APPS_ANCHORED_SUBMIT = StaticToggle(
     'web_apps_anchored_submit',
     'USH: Keep submit button anchored at the bottom of screen for forms in Web Apps',
@@ -1390,7 +1398,7 @@ def _commtrackify(domain_name, toggle_is_enabled):
 COMMTRACK = StaticToggle(
     'commtrack',
     "CommCare Supply",
-    TAG_SOLUTIONS_LIMITED,
+    TAG_DEPRECATED,
     description=(
         '<a href="https://help.commcarehq.org/display/commtrack/CommCare+Supply+Home">CommCare Supply</a> '
         "is a logistics and supply chain management module. It is designed "
@@ -1599,6 +1607,15 @@ def _commtrackify(domain_name, toggle_is_enabled):
     [NAMESPACE_DOMAIN],
 )
 
+
+EXPORTS_APPS_USE_ELASTICSEARCH = StaticToggle(
+    'export_apps_use_elasticsearch',
+    'Use elasticsearch when fetching apps for exports',
+    TAG_INTERNAL,
+    [NAMESPACE_DOMAIN],
+)
+
+
 DISABLE_COLUMN_LIMIT_IN_UCR = StaticToggle(
     'disable_column_limit_in_ucr',
     'Enikshay: Disable column limit in UCR',
@@ -1982,6 +1999,27 @@ def _commtrackify(domain_name, toggle_is_enabled):
     """
 )
 
+RATE_LIMIT_REPEATER_ATTEMPTS = DynamicallyPredictablyRandomToggle(
+    'rate_limit_repeater_attempts',
+    'Apply rate limiting to attempts for data forwarding (repeaters)',
+    TAG_INTERNAL,
+    [NAMESPACE_DOMAIN],
+    description="""
+    In addition to the rate limits based on time spent waiting, these rate limits ensure a project
+    is limited to how many records they can attempt to forward in a given time window.
+    """
+)
+
+DECREASE_REPEATER_TIMEOUT = StaticToggle(
+    'decrease_repeater_timeout',
+    'Decrease the request timeout value when forwarding data to external endpoints.',
+    TAG_INTERNAL,
+    [NAMESPACE_DOMAIN],
+    description="""
+    Decreases the request timeout from 5 minutes to 1 minute for repeater endpoints when enabled.
+    """
+)
+
 TEST_FORM_SUBMISSION_RATE_LIMIT_RESPONSE = StaticToggle(
     'test_form_submission_rate_limit_response',
     "Respond to all form submissions with a 429 response",
@@ -2471,17 +2509,6 @@ def _commtrackify(domain_name, toggle_is_enabled):
     owner='Simon Kelly'
 )
 
-EMBED_TABLEAU_REPORT_BY_USER = StaticToggle(
-    'embed_tableau_report_by_user',
-    'Use a Tableau username "HQ/{username}" to embed reports instead of "HQ/{role name}"',
-    TAG_INTERNAL,
-    namespaces=[NAMESPACE_DOMAIN],
-    description='By default, a Tableau username "HQ/{role name}" is sent to Tableau to get the embedded report. '
-                'Turn on this flag to instead send "HQ/{the user\'s HQ username}", i.e. "HQ/jdoe@dimagi.com", '
-                'to Tableau to get the embedded report.',
-    parent_toggles=[EMBEDDED_TABLEAU]
-)
-
 APPLICATION_RELEASE_LOGS = StaticToggle(
     'application_release_logs',
     'Show Application release logs',
@@ -2499,7 +2526,7 @@ def _commtrackify(domain_name, toggle_is_enabled):
     Each time a user is added/deleted/updated on HQ, an equivalent Tableau user with the username "HQ/{username}"
     will be added/deleted/updated on the linked Tableau server.
     """,
-    parent_toggles=[EMBED_TABLEAU_REPORT_BY_USER],
+    parent_toggles=[EMBEDDED_TABLEAU],
     help_link='https://confluence.dimagi.com/display/USH/Tableau+User+Syncing',
 )
 
@@ -2510,6 +2537,13 @@ def _commtrackify(domain_name, toggle_is_enabled):
     namespaces=[NAMESPACE_DOMAIN]
 )
 
+WEB_USER_INVITE_ADDITIONAL_FIELDS = StaticToggle(
+    'web_user_invite_additional_fields',
+    'USH: Enable additional fields in web user invite form for enhanced user details',
+    TAG_CUSTOM,
+    namespaces=[NAMESPACE_DOMAIN],
+)
+
 
 def _handle_attendance_tracking_role(domain, is_enabled):
     from corehq.apps.accounting.utils import domain_has_privilege
@@ -2894,14 +2928,16 @@ def domain_has_privilege_from_toggle(privilege_slug, domain):
 
 USH_RESTORE_FILE_LOCATION_CASE_SYNC_RESTRICTION = StaticToggle(
     'ush_restore_file_location_case_sync_restriction',
-    'USH: Limit the location-owned cases that show up in a user\'s restore file',
+    'USH: Limit the location-owned cases in a user\'s restore file, and allow marking whether a '
+    'location can have users assigned or not.',
     TAG_CUSTOM,
     namespaces=[NAMESPACE_DOMAIN],
     help_link='https://dimagi.atlassian.net/wiki/spaces/USH/pages/2252210196/Prevent+Syncing+of+Lower+Level+Locations',  # noqa: E501
     description="""
     In the 'Organizational Level' section of location management, web admins can specify which org level to
     expand to when syncing the location-owned cases included in a user's restore file. Limits cases in a user's
-    restore file and thus can improve performance.
+    restore file and thus can improve performance. Also allows marking whether a location can have users assigned
+    to it.
     """
 )
 
@@ -2927,10 +2963,3 @@ def domain_has_privilege_from_toggle(privilege_slug, domain):
     tag=TAG_CUSTOM,
     namespaces=[NAMESPACE_DOMAIN],
 )
-
-LOCATION_HAS_USERS = StaticToggle(
-    slug='location_has_users',
-    label='USH Dev: Allows marking whether a location should have users assigned or not.',
-    tag=TAG_PRODUCT,
-    namespaces=[NAMESPACE_DOMAIN],
-)
diff --git a/corehq/util/htmx_action.py b/corehq/util/htmx_action.py
new file mode 100644
index 000000000000..d7badd274f82
--- /dev/null
+++ b/corehq/util/htmx_action.py
@@ -0,0 +1,162 @@
+from django.http import HttpResponseForbidden, HttpResponse
+
+ANY_METHOD = 'any_method'
+
+
+class HqHtmxActionMixin:
+    """
+    A mixin for TemplateView classes that dispatches requests from HTMX where
+    the triggering element has the ``hq-hx-action`` attribute specified and
+    the ``HTTP_HQ_HX_ACTION`` is present (HQ-HX-Action in the header)
+
+    The dispatch method will then route the action request to the method in the
+    class with the same name as the slug present in ``hq-hx-action``.
+
+    A security requirement is that the receiving method must be decorated with ``@hq_hx_action()``
+
+    Each method decorated with ``hq_hx_action`` should receive the following arguments:
+        ``request``, ``*args``, ``**kwargs``
+
+    It should return a template response using:
+        - ``super().get(request, *args, **kwargs)``, or an equivalent method supported by the `TemplateView`
+        - ``self.render_htmx_no_response(request, *args, **kwargs)`` if no response is required
+        - ``self.render_htmx_partial_response(request, template, context)`` if a partial template
+          response is required that is different from the template in ``self.template_name``
+
+    Example trigger element in requesting HTML:
+
+        <div hq-hx-action="make_edit" hx-post="{{ url_to_view }}"...></div>
+
+    Example usage in receiving TemplateView:
+
+        @hq_hx_action()
+        def make_edit(request, *args, **kwargs):
+            ...
+            return super().get(request, *args, **kwargs)
+
+    To limit requests to a specific HTTP method, specify the method type in ``@hq_hx_action``.
+    For instance, to limit requests to ``POST``:
+
+        @hq_hx_action('post')
+        def make_edit(request, *args, **kwargs):
+            ...
+            return super().get(request, *args, **kwargs)
+
+    To raise exceptions in these HTMX action responses, you can raise an ``HtmxResponseException``
+    and override either ``default_htmx_error_template`` and/or ``get_htmx_error_template``
+    to return the appropriate error template based on the HTMX Action.
+
+    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"
+
+    def get_htmx_error_context(self, **kwargs):
+        """
+        Use this method to return the context for the HTMX error template.
+        :return: dict
+        """
+        return {}
+
+    def get_htmx_error_template(self, action, htmx_error):
+        """
+        Use this method to return the appropriate error template
+        based on the htmx error received.
+
+        :param action: string (the slug for the HTMX action taken)
+        :param htmx_error: HtmxResponseException
+        :return: string (path to template)
+        """
+        return self.default_htmx_error_template
+
+    def render_htmx_no_response(self, request, *args, **kwargs):
+        """
+        Return this when the HTMX triggering element uses
+        ``hx-swap="none"`` and there is no need to do additional view processing.
+        """
+        return HttpResponse("HTMX Response Successful")
+
+    def render_htmx_partial_response(self, request, template, context):
+        """
+        Return this when a partial template response separate from the parent class's
+        template should be returned.
+        """
+        return self.response_class(
+            request=request,
+            template=template,
+            context=context,
+            using=self.template_engine,
+            content_type=self.content_type
+        )
+
+    def dispatch(self, request, *args, **kwargs):
+        action = request.META.get('HTTP_HQ_HX_ACTION')
+        if not action:
+            return super().dispatch(request, *args, **kwargs)
+
+        handler = getattr(self, action, None)
+        if not callable(handler):
+            return HtmxResponseForbidden(
+                f"Method '{type(self).__name__}.{action}' "
+                f"does not exist"
+            )
+
+        action_method = getattr(handler, "hq_hx_action", None)
+        if not action_method:
+            return HtmxResponseForbidden(
+                f"Method '{type(self).__name__}.{action}' has no "
+                f"@hq_hx_action decorator."
+            )
+
+        if action_method != ANY_METHOD and action_method.lower() != request.method.lower():
+            return HtmxResponseForbidden(
+                f"Method '{type(self).__name__}.{action}' is not allowed to use "
+                f"HTTP {request.method} requests."
+            )
+
+        try:
+            response = handler(request, *args, **kwargs)
+        except HtmxResponseException as err:
+            context = self.get_htmx_error_context(**kwargs)
+            context["htmx_error"] = err
+            self.template_name = self.get_htmx_error_template(action, err)
+            return self.render_to_response(context)
+        return response
+
+
+def hq_hx_action(method=ANY_METHOD):
+    """
+    All methods that can be referenced from the value of an `hq-hx-action` attribute
+    must be decorated with ``@hq_hx_action``.
+
+    See ``HqHtmxActionMixin`` docstring for usage examples.
+    """
+    def decorator(func):
+        setattr(func, 'hq_hx_action', method)
+        return func
+    return decorator
+
+
+class HtmxResponseForbidden(HttpResponseForbidden):
+
+    def __init__(self, error_message, *args, **kwargs):
+        super().__init__(
+            error_message,
+            reason=f"Forbidden: {error_message}",
+            *args,
+            **kwargs
+        )
+
+
+class HtmxResponseException(Exception):
+    """
+    Exception class for triggering HTTP 4XX responses for HTMX responses, where expected.
+    """
+    status_code = 400
+    message = None
+
+    def __init__(self, message=None, status=None, *args, **kwargs):
+        self.message = message
+        if status is not None:
+            self.status_code = status
+        super().__init__(*args, **kwargs)
diff --git a/corehq/util/htmx_debug.py b/corehq/util/htmx_debug.py
new file mode 100644
index 000000000000..14166cda519d
--- /dev/null
+++ b/corehq/util/htmx_debug.py
@@ -0,0 +1,55 @@
+import random
+import time
+
+from django.http import HttpResponse
+
+
+class HqHtmxDebugMixin:
+    """
+    Use this mixin alongside `HqHtmxActionMixin` to help simulate server
+    issues and slow requests locally (or on staging if you like) during
+    the development phase.
+
+    Why a separate tool? Making the browser slow with dev tools throttling
+    just delays the request TO the server, rather than testing if the server
+    itself is slow.
+
+    e.g.:
+        class TodoListDemoView(HqHtmxDebugMixin, HqHtmxActionMixin, BasePageView):
+            ...
+
+    Remember: Order matters when using mixins. make sure `HqHtmxDebugMixin` appears first
+    to have things work properly!
+    """
+    # Simulate slow server responses by setting this to True and requests will wait
+    # ``slow_response_time`` seconds with each request
+    simulate_slow_response = False
+    slow_response_time = 5  # in seconds
+
+    # When True, simulate flaky gateway problems locally (to test HTMX retries or other error handling)
+    simulate_flaky_gateway = False
+
+    def dispatch(self, request, *args, **kwargs):
+        if self.simulate_slow_response:
+            time.sleep(self.slow_response_time)
+
+        if self.simulate_flaky_gateway and _is_mostly_false():
+            return FakeGatewayTimeoutResponse()
+
+        return super().dispatch(request, *args, **kwargs)
+
+
+class FakeGatewayTimeoutResponse(HttpResponse):
+    status_code = 504
+
+
+def _is_mostly_false():
+    """
+    This is a little utility to return mostly False and sometimes True.
+    Used to simulate a flaky gateway which usually returns a 200 response
+    but sometimes returns a 504.
+    """
+    return bool(random.choices(
+        [0, 1],
+        weights=[0.8, 0.2]
+    )[0])
diff --git a/corehq/util/jqueryrmi.py b/corehq/util/jqueryrmi.py
index e230f10b625a..ed2dbbcb2553 100644
--- a/corehq/util/jqueryrmi.py
+++ b/corehq/util/jqueryrmi.py
@@ -85,6 +85,6 @@ def _dispatch_super(self, request, *args, **kwargs):
 
     def json_response(self, response_data, status=200, **kwargs):
         out_data = json.dumps(response_data, cls=self.json_encoder, **kwargs)
-        response = HttpResponse(out_data, self.json_content_type, status=status)
+        response = HttpResponse(out_data, content_type=self.json_content_type, status=status)
         response['Cache-Control'] = 'no-cache'
         return response
diff --git a/corehq/util/metrics/load_counters.py b/corehq/util/metrics/load_counters.py
index 37838998e3cb..e257559ee003 100644
--- a/corehq/util/metrics/load_counters.py
+++ b/corehq/util/metrics/load_counters.py
@@ -62,6 +62,15 @@ def ucr_load_counter(engine_id, *args, **kw):
     return load_counter("ucr.{}".format(engine_id), *args, **kw)
 
 
+def dedupe_load_counter(*args, **kw):
+    """Make a deduplication load counter
+
+    This is used to count the number of cases that go through deduplication code.
+    """
+    # grep: commcare.load.dedupe
+    return load_counter("dedupe", *args, **kw)
+
+
 def schedule_load_counter(*args, **kw):
     """Make a schedule load counter function
 
diff --git a/corehq/util/metrics/tests/test_metrics.py b/corehq/util/metrics/tests/test_metrics.py
index 50b5ad514b51..4197b606ebdd 100644
--- a/corehq/util/metrics/tests/test_metrics.py
+++ b/corehq/util/metrics/tests/test_metrics.py
@@ -1,6 +1,7 @@
 from typing import Dict, Tuple
 
 from django.test import SimpleTestCase
+from django.utils.functional import classproperty
 
 from corehq.util.metrics.datadog import DatadogMetrics
 from corehq.util.metrics.prometheus import PrometheusMetrics
@@ -12,6 +13,10 @@
 class _TestMetrics(SimpleTestCase):
     provider_class = None
 
+    @classproperty
+    def __test__(cls):
+        return cls.provider_class is not None
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
diff --git a/corehq/util/test_utils.py b/corehq/util/test_utils.py
index 01f36df801e8..290245028e8e 100644
--- a/corehq/util/test_utils.py
+++ b/corehq/util/test_utils.py
@@ -5,10 +5,10 @@
 it makes sense to do so. See the docstring on that package for important
 guidelines.
 """
-import functools
 import json
 import logging
 import os
+import re
 import traceback
 import uuid
 from collections import namedtuple
@@ -182,7 +182,8 @@ class privilege_enabled:
         'corehq.apps.users.permissions.domain_has_privilege',
         'corehq.apps.users.views.mobile.users.domain_has_privilege',
         'django_prbac.decorators.has_privilege',
-        'corehq.apps.export.views.list.domain_has_privilege'
+        'corehq.apps.export.views.list.domain_has_privilege',
+        'corehq.pillows.case_search.domain_has_privilege'
     )
 
     def __init__(self, privilege_slug):
@@ -298,63 +299,6 @@ def NOOP(*args, **kwargs):
     pass
 
 
-class RunConfig(object):
-
-    def __init__(self, settings, pre_run=None, post_run=None):
-        self.settings = settings
-        self.pre_run = pre_run or NOOP
-        self.post_run = post_run or NOOP
-
-
-class RunWithMultipleConfigs(object):
-
-    def __init__(self, fn, run_configs):
-        self.fn = fn
-        self.run_configs = run_configs
-
-    def __call__(self, *args, **kwargs):
-        for run_config in self.run_configs:
-
-            def fn_with_pre_and_post(*args, **kwargs):
-                # make sure the pre and post run also run with the right settings
-                run_config.pre_run(*args, **kwargs)
-                self.fn(*args, **kwargs)
-                run_config.post_run(*args, **kwargs)
-
-            try:
-                call_with_settings(fn_with_pre_and_post, run_config.settings, args, kwargs)
-            except Exception:
-                print(self.fn, 'failed with the following settings:')
-                for key, value in run_config.settings.items():
-                    print('settings.{} = {!r}'.format(key, value))
-                raise
-
-
-def call_with_settings(fn, settings_dict, args, kwargs):
-    original_settings = {key: getattr(settings, key, None) for key in settings_dict}
-    try:
-        # set settings to new values
-        for key, value in settings_dict.items():
-            setattr(settings, key, value)
-        fn(*args, **kwargs)
-    finally:
-        # set settings back to original values
-        for key, value in original_settings.items():
-            setattr(settings, key, value)
-
-
-def run_with_multiple_configs(fn, run_configs, nose_tags=None):
-    from nose.plugins.attrib import attr
-    helper = RunWithMultipleConfigs(fn, run_configs)
-
-    @functools.wraps(fn)
-    @attr(**(nose_tags or {}))
-    def inner(*args, **kwargs):
-        return helper(*args, **kwargs)
-
-    return inner
-
-
 class capture_log_output(ContextDecorator):
     """
     Can be used as either a context manager or decorator.
@@ -445,6 +389,10 @@ def assign(owner, test):
                 "duplicate test case: {}.{}".format(owner, test.__name__)
             setattr(owner, test.__name__, test)
 
+        def argsrepr(args):
+            return obj_addr.sub(">", repr(args))
+
+        obj_addr = re.compile(r" at 0x[\da-f]{8,}>")
         tests = []
 
         if self.test_class is None:
@@ -469,7 +417,7 @@ def test(self, args=args):
                     return test_func(self, **args)
                 return test_func(self, *args)
 
-            test.__name__ = test_func.__name__ + repr(args)
+            test.__name__ = test_func.__name__ + argsrepr(args)
             assign(Test, test)
             tests.append(test)
 
diff --git a/corehq/util/tests/test_celery_utils.py b/corehq/util/tests/test_celery_utils.py
index 6bdde4590f7a..00020ba98c9f 100644
--- a/corehq/util/tests/test_celery_utils.py
+++ b/corehq/util/tests/test_celery_utils.py
@@ -1,5 +1,6 @@
 from datetime import timedelta, datetime
 
+import pytest
 from celery.schedules import crontab
 from freezegun import freeze_time
 from nose.tools import assert_equal, assert_raises
@@ -34,20 +35,15 @@ def test_deserialize_run_every_setting():
             deserialize_run_every_setting(input_value)
 
 
-def test_run_periodic_task_again():
-    def _test(run_every, last_run, duration, expected, now):
-        with freeze_time(now):
-            run_again = run_periodic_task_again(run_every, last_run, duration)
-        eq(run_again, expected)
-
+def make_cases():
     now = datetime.utcnow()
-    def nowfun(): return now
     all_hours = list(range(0, 24))
     all_hours_except_now = list(set(all_hours) - {now.hour})
     one_second = timedelta(seconds=1)
     one_second_ago = now - one_second
-    run_every_minute = crontab(nowfun=nowfun)
-    tests = [
+    run_every_minute = crontab(nowfun=lambda: now)
+
+    return {n: args + [now] for n, *args in [
         # (
         #   name,
         #   run_every,
@@ -78,19 +74,18 @@ def nowfun(): return now
         ),
         (
             'cron_inside_window',
-            crontab(hour=now.hour, nowfun=nowfun),
+            crontab(hour=now.hour, nowfun=lambda: now),
             one_second_ago,
             one_second,
             True
         ),
         (
             'cron_outside_window',
-            crontab(hour=all_hours_except_now, nowfun=nowfun),
+            crontab(hour=all_hours_except_now, nowfun=lambda: now),
             one_second_ago,
             one_second,
             False
         ),
-
         (
             'repeat_enough_time',
             timedelta(minutes=1),
@@ -105,7 +100,15 @@ def nowfun(): return now
             timedelta(seconds=40),
             False
         ),
-    ]
+    ]}
+
+
+TEST_CASES = make_cases()
+
 
-    for name, run_every, last_run, duration, expected in tests:
-        yield lambda n: _test(run_every, last_run, duration, expected, now), name
+@pytest.mark.parametrize("name", TEST_CASES)
+def test_run_periodic_task_again(name):
+    run_every, last_run, duration, expected, now = TEST_CASES[name]
+    with freeze_time(now):
+        run_again = run_periodic_task_again(run_every, last_run, duration)
+    eq(run_again, expected)
diff --git a/corehq/util/tests/test_couch.py b/corehq/util/tests/test_couch.py
index 575a4568b9d6..0a3409810b27 100644
--- a/corehq/util/tests/test_couch.py
+++ b/corehq/util/tests/test_couch.py
@@ -86,6 +86,7 @@ def test_get_document_or_404_success(self):
 
 
 class TestLoggingDB(object):
+    __test__ = False
 
     def __init__(self):
         self.docs_saved = []
diff --git a/corehq/util/tests/test_excel.py b/corehq/util/tests/test_excel.py
index 249804302da8..63ab68836ea2 100644
--- a/corehq/util/tests/test_excel.py
+++ b/corehq/util/tests/test_excel.py
@@ -52,3 +52,15 @@ def test_get_single_worksheet_missing(self):
         formula_filepath = self.get_path('formula_sheet', 'xlsx')
         with self.assertRaises(WorkbookJSONError):
             get_single_worksheet(formula_filepath, title='NotASheet')
+
+    def test_get_workbook_with_file_path_closes_file(self):
+        filepath = self.get_path('formula_sheet', 'xlsx')
+        assert isinstance(filepath, str), filepath
+        workbook = WorkbookJSONReader(filepath)
+
+        # assert workbook zip file has been closed
+        self.assertIsNone(workbook.wb._archive.fp)  # hack: deep reach
+
+        # should be able to get rows that were unconsumed before file closure
+        results = list(workbook.get_worksheet())
+        self.assertEqual(results, [{'name': 'ben', 'formula': 2}])
diff --git a/corehq/util/urlvalidate/test/test_urlsanitize.py b/corehq/util/urlvalidate/test/test_urlsanitize.py
index 1b0e70961589..84d2f2d33f3d 100644
--- a/corehq/util/urlvalidate/test/test_urlsanitize.py
+++ b/corehq/util/urlvalidate/test/test_urlsanitize.py
@@ -1,8 +1,6 @@
-import ipaddress
-import socket
-
 from django.test import SimpleTestCase
 
+import pytest
 from testil import assert_raises, eq
 
 from ..ip_resolver import CannotResolveHost
@@ -14,56 +12,35 @@
 from .mockipinfo import hostname_resolving_to_ips
 
 NO_RAISE = object()
-RAISE = object()
-
-
-INDEX_ACTION = 0
-INDEX_REASON = 1
-
-
-GOOGLE_IP = SUITE = None  # set in setup_module
-
-
-def setup_module():
-    global GOOGLE_IP, SUITE
-
-    GOOGLE_IP = ipaddress.ip_address(socket.gethostbyname('google.com'))
-    SUITE = [
-        ('https://google.com/', NO_RAISE),
-        ('http://google.com/', NO_RAISE),
-        ('http://google.com', NO_RAISE),
-        ('http://foo.example.com/', RAISE, CannotResolveHost('foo.example.com')),
-        ('http://localhost/', RAISE, PossibleSSRFAttempt('is_loopback')),
-        ('http://Localhost/', RAISE, PossibleSSRFAttempt('is_loopback')),
-        ('http://169.254.169.254/latest/meta-data', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://2852039166/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://7147006462/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://0xA9.0xFE.0xA9.0xFE/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://0x41414141A9FEA9FE/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://0xA9FEA9FE/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://0251.0376.0251.0376/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://0251.00376.000251.0000376/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://169.254.169.254.xip.io/', RAISE, PossibleSSRFAttempt('is_link_local')),
-        ('http://10.124.10.11', RAISE, PossibleSSRFAttempt('is_private')),
-        ('some-non-url', RAISE, InvalidURL()),
-    ]
-
-
-def test_example_suite():
-    for input_url, *expected in SUITE:
-        expected_action = expected[INDEX_ACTION]
-        if expected_action is NO_RAISE:
-            validate_user_input_url(input_url)
-        elif expected_action is RAISE:
-            expected_reason = expected[INDEX_REASON]
-            if type(expected_action) == PossibleSSRFAttempt:
-                with assert_raises(PossibleSSRFAttempt, msg=lambda e: eq(e.reason, expected_reason.reason)):
-                    validate_user_input_url(input_url)
-            else:
-                with assert_raises(type(expected_reason), msg=str(expected_reason)):
-                    validate_user_input_url(input_url)
+
+
+@pytest.mark.parametrize("input_url, expected", [
+    ('https://google.com/', NO_RAISE),
+    ('http://google.com/', NO_RAISE),
+    ('http://google.com', NO_RAISE),
+    ('http://foo.example.com/', CannotResolveHost('foo.example.com')),
+    ('http://localhost/', PossibleSSRFAttempt('is_loopback')),
+    ('http://Localhost/', PossibleSSRFAttempt('is_loopback')),
+    ('http://169.254.169.254/latest/meta-data', PossibleSSRFAttempt('is_link_local')),
+    ('http://2852039166/', PossibleSSRFAttempt('is_link_local')),
+    ('http://0xA9.0xFE.0xA9.0xFE/', PossibleSSRFAttempt('is_link_local')),
+    ('http://0xA9FEA9FE/', PossibleSSRFAttempt('is_link_local')),
+    ('http://0251.0376.0251.0376/', PossibleSSRFAttempt('is_link_local')),
+    ('http://0251.00376.000251.0000376/', PossibleSSRFAttempt('is_link_local')),
+    ('http://10.124.10.11', PossibleSSRFAttempt('is_private')),
+    ('some-non-url', InvalidURL()),
+])
+def test_example_urls(input_url, expected):
+    if expected is NO_RAISE:
+        validate_user_input_url(input_url)
+    else:
+        assert isinstance(expected, Exception), f"expected exception instance, got {expected!r}"
+        if type(expected) is PossibleSSRFAttempt:
+            with assert_raises(PossibleSSRFAttempt, msg=lambda e: eq(e.reason, expected.reason)):
+                validate_user_input_url(input_url)
         else:
-            raise Exception("expected action in suite should be NO_RAISE or RAISE")
+            with assert_raises(type(expected), msg=str(expected)):
+                validate_user_input_url(input_url)
 
 
 def test_rebinding():
diff --git a/corehq/util/workbook_json/excel.py b/corehq/util/workbook_json/excel.py
index 98ad92bc8db7..72a140138100 100644
--- a/corehq/util/workbook_json/excel.py
+++ b/corehq/util/workbook_json/excel.py
@@ -116,7 +116,7 @@ def set_field_value(cls, obj, field, value):
         # try boolean
         try:
             field, nothing = field.split('?')
-            assert(nothing.strip() == '')
+            assert nothing.strip() == ''
         except Exception:
             pass
         else:
@@ -245,14 +245,25 @@ def __init__(self, file_or_filename):
         self.worksheets_by_title = {}
         self.worksheets = []
 
-        for worksheet in self.wb.worksheets:
-            try:
-                ws = WorksheetJSONReader(worksheet, title=worksheet.title)
-            except IndexError:
-                raise JSONReaderError('This Excel file has unrecognised formatting. Please try downloading '
-                                      'the lookup table first, and then add data to it.')
-            self.worksheets_by_title[worksheet.title] = ws
-            self.worksheets.append(ws)
+        try:
+            for worksheet in self.wb.worksheets:
+                try:
+                    ws = WorksheetJSONReader(worksheet, title=worksheet.title)
+                except IndexError:
+                    raise JSONReaderError('This Excel file has unrecognised formatting. Please try downloading '
+                                        'the lookup table first, and then add data to it.')
+                self.worksheets_by_title[worksheet.title] = ws
+                self.worksheets.append(ws)
+        finally:
+            is_file_like = hasattr(file_or_filename, 'read')
+            if not is_file_like:
+                # This is safe because all sheets have been read by
+                # now. The underlying file is still open because sheets
+                # hold a reference to it, and ZipFile will not close it
+                # until all open file references have been closed.
+                # Additionally, openpyxl will not close the file if some
+                # rows are not consumed (possibly a bug in openpyxl).
+                self.wb._archive.close()
 
     def get_worksheet(self, title=None, index=None):
         if title is not None and index is not None:
diff --git a/corehq/warnings.py b/corehq/warnings.py
index 6a4e972381c6..f797bed2ebd2 100644
--- a/corehq/warnings.py
+++ b/corehq/warnings.py
@@ -19,7 +19,10 @@
     # (module_path, message_substring_or_regex, optional_warning_class, override_action)
 
     # warnings that may be resolved with a library upgrade
+    ("bs4.builder", "option of HTMLParser() has never done anything"),
     ("couchdbkit.schema.properties", "'collections.abc'"),
+    ("ddtrace.internal.module", "the imp module is deprecated"),
+    ("eulxml", "pkg_resources is deprecated as an API"),
     ("nose.importer", "the imp module is deprecated"),
     ("nose.util", "inspect.getargspec() is deprecated"),
     ("pkg_resources", "pkg_resources.declare_namespace"),
@@ -42,10 +45,15 @@
         UserWarning,
     ),
     (
-        # This should be tested on a newer version(>2.5) of ES.Should be removed if fixed
+        # Should be removed if fixed after upgrading to ES 6.x
         "elasticsearch5.connection.http_urllib3",
         "HTTPResponse.getheaders() is deprecated and will be removed in urllib3 v2.1.0."
     ),
+    (
+        # This should be tested on a newer version(>2.5) of ES.Should be removed if fixed
+        "elasticsearch6.connection.http_urllib3",
+        "HTTPResponse.getheaders() is deprecated and will be removed in urllib3 v2.1.0."
+    ),
     # Should be removed when Nose is updated
     ("nose.plugins.manager", "pkg_resources is deprecated as an API."),
 
diff --git a/custom/abt/reports/data_sources/supervisory_v2020.json b/custom/abt/reports/data_sources/supervisory_v2020.json
index 269f0516743f..515751077f37 100644
--- a/custom/abt/reports/data_sources/supervisory_v2020.json
+++ b/custom/abt/reports/data_sources/supervisory_v2020.json
@@ -456,6 +456,34 @@
                 "is_primary_key": false,
                 "transform": {},
                 "type": "expression"
+            },
+            {
+                "column_id": "description",
+                "datatype": "string",
+                "display_name": "description",
+                "expression": {
+                    "datatype": null,
+                    "property_name": "description",
+                    "type": "property_name"
+                },
+                "is_nullable": true,
+                "is_primary_key": false,
+                "transform": {},
+                "type": "expression"
+            },
+            {
+                "column_id": "time_spent",
+                "datatype": "string",
+                "display_name": "time_spent",
+                "expression": {
+                    "datatype": null,
+                    "property_name": "time_spent",
+                    "type": "property_name"
+                },
+                "is_nullable": true,
+                "is_primary_key": false,
+                "transform": {},
+                "type": "expression"
             }
         ],
         "description": "",
diff --git a/custom/abt/reports/expressions.py b/custom/abt/reports/expressions.py
index a76d4a65c9f2..9ee5b41a6800 100644
--- a/custom/abt/reports/expressions.py
+++ b/custom/abt/reports/expressions.py
@@ -196,6 +196,23 @@ def _get_flag_name(cls, item, spec):
     def _get_responsible_follow_up(self, spec):
         return spec.get('responsible_follow_up', "")
 
+    @classmethod
+    def _get_description(cls, item, spec):
+        description = ()
+        question = spec.get('description')
+        if question:
+            path = spec['base_path'] + question
+            description = cls._get_val(item, path)
+        return description if description != () else ''
+
+    @classmethod
+    def _get_time_spent(cls, item, spec):
+        time_spent = ()
+        path = spec.get('time_spent')
+        if path:
+            time_spent = cls._get_val(item, path)
+        return time_spent if time_spent != () else ''
+
     def __call__(self, item, evaluation_context=None):
         """
         Given a document (item), return a list of documents representing each
@@ -230,120 +247,145 @@ def __call__(self, item, evaluation_context=None):
                 form_value = self._get_val(partial, spec['question'])
                 warning_type = spec.get("warning_type", None)
 
-                if warning_type == "unchecked" and form_value:
-                    # Don't raise flag if no answer given
-                    ignore = spec.get("ignore", [])
-                    section = spec.get("section", "data")
-                    unchecked = self._get_unchecked(
-                        item,
-                        spec.get('base_path', []) + spec['question'],
-                        form_value,
-                        ignore,
-                        section
-                    )
-                    if unchecked:
-                        # Raise a flag because there are unchecked answers.
-                        docs.append({
-                            'flag': self._get_flag_name(item, spec),
-                            'warning': self._get_warning(spec, item).format(msg=", ".join(unchecked)),
-                            'comments': self._get_comments(
-                                partial if not self.comment_from_root else item,
-                                spec
-                            ),
-                            'names': names,
-                            'form_name': self._get_form_name(item),
-                            'responsible_follow_up': self._get_responsible_follow_up(spec)
-                        })
-
-                elif warning_type == "unchecked_special" and form_value:
-                    # Don't raise flag if no answer given
-                    ignore = spec.get("ignore", [])
-                    section = spec.get("section", "data")
-                    master_value = self._get_val(item, ['insecticide_prep_grp', 'Q10', 'sop_full_ppe'])
-                    second_unchecked = self._get_unchecked(
-                        item,
-                        spec.get('base_path', []) + spec['question'],
-                        form_value,
-                        ignore,
-                        section
-                    )
-                    if not master_value and second_unchecked:
-                        # Raise a flag because master question is not answered but duplicate question is.
-                        docs.append({
-                            'flag': self._get_flag_name(item, spec),
-                            'warning': self._get_warning(spec, item).format(msg=", ".join(second_unchecked)),
-                            'comments': self._get_comments(
-                                partial if not self.comment_from_root else item,
-                                spec
-                            ),
-                            'names': names,
-                            'form_name': self._get_form_name(item),
-                            'responsible_follow_up': self._get_responsible_follow_up(spec)
-                        })
-
-                elif warning_type == "q3_special" and form_value:
-                    # One of the questions doesn't follow the same format as the
-                    # others, hence this special case.
-                    missing_items = ""
-                    if form_value == "only_license":
-                        missing_items = "cell"
-                    if form_value == "only_cell":
-                        missing_items = "license"
-                    if form_value == "none":
-                        missing_items = "cell, license"
-                    if missing_items:
-                        docs.append({
-                            'flag': self._get_flag_name(item, spec),
-                            'warning': self._get_warning(spec, item).format(msg=missing_items),
-                            'comments': self._get_comments(
-                                partial if not self.comment_from_root else item,
-                                spec
-                            ),
-                            'names': names,
-                            'form_name': self._get_form_name(item),
-                            'responsible_follow_up': self._get_responsible_follow_up(spec)
-                        })
-                elif warning_type == "not_selected" and form_value:
-                    value = spec.get("value", "")
-                    if form_value and value not in form_value:
-                        warning_question_data = partial if not spec.get('warning_question_root', False) else item
-                        docs.append({
-                            'flag': self._get_flag_name(item, spec),
-                            'warning': self._get_warning(spec, item).format(
-                                msg=self._get_val(warning_question_data, spec.get('warning_question', None)) or ""
-                            ),
-                            'comments': self._get_comments(
-                                partial if not self.comment_from_root else item,
-                                spec
-                            ),
-                            'names': names,
-                            'form_name': self._get_form_name(item),
-                            'responsible_follow_up': self._get_responsible_follow_up(spec)
-                        })
-
+                flag_doc_methods = {
+                    'unchecked': self._get_unchecked_flag_doc,
+                    'unchecked_special': self._get_unchecked_special_flag_doc,
+                    'q3_special': self._get_q3_special_flag_doc,
+                    'not_selected': self._get_not_selected_flag_doc,
+                }
+                if warning_type in flag_doc_methods and form_value:
+                    method = flag_doc_methods[warning_type]
+                    flag_doc = method(item, spec, partial, names, form_value)
                 else:
-                    danger_value = spec.get('answer', [])
-                    if form_value == danger_value or (
-                        self._question_answered(form_value) and
-                        self._raise_for_any_answer(danger_value)
-                    ):
-                        warning_question_data = partial if not spec.get('warning_question_root', False) else item
-                        docs.append({
-                            'flag': self._get_flag_name(item, spec),
-                            'warning': self._get_warning(spec, item).format(
-                                msg=self._get_val(warning_question_data, spec.get('warning_question', None)) or ""
-                            ),
-                            'comments': self._get_comments(
-                                partial if not self.comment_from_root else item,
-                                spec
-                            ),
-                            'names': names,
-                            'form_name': self._get_form_name(item),
-                            'responsible_follow_up': self._get_responsible_follow_up(spec)
-                        })
+                    flag_doc = self._get_answer_flag_doc(item, spec, partial, names, form_value)
+                if flag_doc:
+                    docs.append(flag_doc)
 
         return docs
 
+    def _get_unchecked_flag_doc(self, item, spec, partial, names, form_value):
+        # Don't raise flag if no answer given
+        ignore = spec.get("ignore", [])
+        section = spec.get("section", "data")
+        unchecked = self._get_unchecked(
+            item,
+            spec.get('base_path', []) + spec['question'],
+            form_value,
+            ignore,
+            section
+        )
+        if unchecked:
+            # Raise a flag because there are unchecked answers.
+            return {
+                'flag': self._get_flag_name(item, spec),
+                'warning': self._get_warning(spec, item).format(msg=", ".join(unchecked)),
+                'comments': self._get_comments(
+                    partial if not self.comment_from_root else item,
+                    spec
+                ),
+                'names': names,
+                'form_name': self._get_form_name(item),
+                'responsible_follow_up': self._get_responsible_follow_up(spec),
+                'description': self._get_description(item, spec),
+                'time_spent': self._get_time_spent(item, spec),
+            }
+
+    def _get_unchecked_special_flag_doc(self, item, spec, partial, names, form_value):
+        # Don't raise flag if no answer given
+        ignore = spec.get("ignore", [])
+        section = spec.get("section", "data")
+        master_value = self._get_val(item, ['insecticide_prep_grp', 'Q10', 'sop_full_ppe'])
+        second_unchecked = self._get_unchecked(
+            item,
+            spec.get('base_path', []) + spec['question'],
+            form_value,
+            ignore,
+            section
+        )
+        if not master_value and second_unchecked:
+            # Raise a flag because master question is not answered but duplicate question is.
+            return {
+                'flag': self._get_flag_name(item, spec),
+                'warning': self._get_warning(spec, item).format(msg=", ".join(second_unchecked)),
+                'comments': self._get_comments(
+                    partial if not self.comment_from_root else item,
+                    spec
+                ),
+                'names': names,
+                'form_name': self._get_form_name(item),
+                'responsible_follow_up': self._get_responsible_follow_up(spec),
+                'description': self._get_description(item, spec),
+                'time_spent': self._get_time_spent(item, spec),
+            }
+
+    def _get_q3_special_flag_doc(self, item, spec, partial, names, form_value):
+        # One of the questions doesn't follow the same format as the
+        # others, hence this special case.
+        missing_items = ""
+        if form_value == "only_license":
+            missing_items = "cell"
+        if form_value == "only_cell":
+            missing_items = "license"
+        if form_value == "none":
+            missing_items = "cell, license"
+        if missing_items:
+            return {
+                'flag': self._get_flag_name(item, spec),
+                'warning': self._get_warning(spec, item).format(msg=missing_items),
+                'comments': self._get_comments(
+                    partial if not self.comment_from_root else item,
+                    spec
+                ),
+                'names': names,
+                'form_name': self._get_form_name(item),
+                'responsible_follow_up': self._get_responsible_follow_up(spec),
+                'description': self._get_description(item, spec),
+                'time_spent': self._get_time_spent(item, spec),
+            }
+
+    def _get_not_selected_flag_doc(self, item, spec, partial, names, form_value):
+        value = spec.get("value", "")
+        if form_value and value not in form_value:
+            warning_question_data = partial if not spec.get('warning_question_root', False) else item
+            return {
+                'flag': self._get_flag_name(item, spec),
+                'warning': self._get_warning(spec, item).format(
+                    msg=self._get_val(warning_question_data, spec.get('warning_question', None)) or ""
+                ),
+                'comments': self._get_comments(
+                    partial if not self.comment_from_root else item,
+                    spec
+                ),
+                'names': names,
+                'form_name': self._get_form_name(item),
+                'responsible_follow_up': self._get_responsible_follow_up(spec),
+                'description': self._get_description(item, spec),
+                'time_spent': self._get_time_spent(item, spec),
+            }
+
+    def _get_answer_flag_doc(self, item, spec, partial, names, form_value):
+        danger_value = spec.get('answer', [])
+        if form_value == danger_value or (
+                self._question_answered(form_value)
+                and self._raise_for_any_answer(danger_value)
+        ):
+            warning_question_data = partial if not spec.get('warning_question_root', False) else item
+            return {
+                'flag': self._get_flag_name(item, spec),
+                'warning': self._get_warning(spec, item).format(
+                    msg=self._get_val(warning_question_data, spec.get('warning_question', None)) or ""
+                ),
+                'comments': self._get_comments(
+                    partial if not self.comment_from_root else item,
+                    spec
+                ),
+                'names': names,
+                'form_name': self._get_form_name(item),
+                'responsible_follow_up': self._get_responsible_follow_up(spec),
+                'description': self._get_description(item, spec),
+                'time_spent': self._get_time_spent(item, spec),
+            }
+
 
 class AbtSupervisorExpressionSpec(AbtExpressionSpec):
     type = TypeProperty('abt_supervisor')
diff --git a/custom/abt/reports/flagspecs_v2020.yml b/custom/abt/reports/flagspecs_v2020.yml
index e457071bc736..623ff7820a25 100644
--- a/custom/abt/reports/flagspecs_v2020.yml
+++ b/custom/abt/reports/flagspecs_v2020.yml
@@ -11,6 +11,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème rapporté: pas de station de lavage de mains à l'entrée du site"
     warning_por: ""
     responsible_follow_up: "District Coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [people_hand_washing ]
     base_path: [morning_mobilization_grp, Q1a]
     comment: [hand_washing_station_comments]
@@ -22,6 +23,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Ne se lavent pas les mains avant d'entre sur le site d'opérations"
     warning_por: ""
     responsible_follow_up: "District Coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [sop_physical]
     base_path: [morning_mobilization_grp, Q2]
     comment: [sop_physical_comments]
@@ -33,6 +35,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Les chefs d'équipe n'effectuent pas d'inspection physique occasionnelle des opérations spéciales le matin."
     warning_por: "Problema reportado: Chefes de Equipa nao conduzem inspeccao fisica casualaos roceadores nas manhas."
     responsible_follow_up: "District coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [sop_health_problems]
     base_path: [morning_mobilization_grp]
     comment: [sop_physical_comments]
@@ -44,6 +47,8 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème de santé observé chez les opérateurs de pulvérisation. Remplissez un formulaire de rapport d'incident, si les symptômes sont probablement liés au travail."
     warning_por: "Problema reportado: Problemas de saude observado entre os roceadores. Preencher o Formulario de Relatorio de Incidente, se os sintomas estao relacionados com o trabalho."
     responsible_follow_up: "ECO"
+    description: [briefly_describe_the_situation]
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [mask]
     base_path: [morning_mobilization_grp, Q3]
     comment: [mask_comments]
@@ -55,6 +60,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: du personnel ne porte pas le masque ou ne matient pas les distances de sécurité"
     warning_por: ""
     responsible_follow_up: "District Coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [sop_eaten]
     base_path: [morning_mobilization_grp, Q4]
     comment: [sop_eaten_comments]
@@ -66,6 +72,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Les opérateurs de pulvérisation ne sont pas correctement nourris ou hydratés avant d'enfiler les EPI."
     warning_por: "Problema reportado: Roceador nao se alimentou ou hidratou propriamente antes de vestir EPI."
     responsible_follow_up: "District coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [insecticide_record]
     base_path: [morning_mobilization_grp, Q5]
     comment: [insecticide_record_comments]
@@ -77,6 +84,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Magasinier n'enregistre pas les numéros de série de tous les insecticides"
     warning_por: "Problema reportado: "
     responsible_follow_up: "ECO"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [teamlead_record]
     base_path: [morning_mobilization_grp, Q6]
     comment: [teamlead_record_comments]
@@ -88,6 +96,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Le chef d'équipe n'enregistre pas tous les numéros de série des insecticides"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [distrib_sign]
     base_path: [morning_mobilization_grp, Q7]
     comment: [distrib_sign_comments]
@@ -99,6 +108,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: chefs d'équipes et opérateurs de pulvérisation ne signent pas le formulaire de distribution d'insecticide"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [sop_full_ppe]
     base_path: [morning_mobilization_grp, Q8]
     comment: [sop_full_ppe_comments]
@@ -112,6 +122,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Le (s) opérateur (s) de pulvérisation ne porte (s) pas {msg} avant l'embarquement."
     warning_por: "Problema reportado: Roceador (s) nao esta usando {msg} antes de subir na viatura. "
     responsible_follow_up: "District coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [sop_eating_after_ppe]
     base_path: [morning_mobilization_grp, Q9]
     comment: [sop_eating_after_ppe_comments]
@@ -123,6 +134,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Opérateur (s) de pulvérisation mangeant ou buvant après avoir enfilé des EPI."
     warning_por: "Problema reportedo: Roceador(s) comendo ou bebendo antes de vestir EPI."
     responsible_follow_up: "District coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [sop_fill_pumps]
     comment: [sop_fill_pumps_comments]
     base_path: [morning_mobilization_grp, Q10]
@@ -134,6 +146,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Opérateur (s) de pulvérisation n'utilisant pas l'insecticide restant de la veille."
     warning_por: "Problema reportado: roceador (s) nao usam insecticida remanescente do dia anterior."
     responsible_follow_up: "District coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [barrels_empty_check]
     comment: [barrels_empty_check_comments]
     base_path: [morning_mobilization_grp, Q11]
@@ -145,6 +158,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: Tous les insecticides et l'eau de rinçage contaminée ne sont pas utilisés pour remplir les réservoirs des OP."
     warning_por: "Problema reportado: Os roceadores nao e usam todo insecticida e agua contaminada para encher os tanques das bombas."
     responsible_follow_up: "District coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
   - question: [vehicle_space]
     base_path: [morning_mobilization_grp, Q12]
     comment: [vehicle_space_comments]
@@ -156,6 +170,7 @@ http://openrosa.org/formdesigner/9C9BEDDA-9BF8-447F-A713-3148BDC2C1CE:
     warning_fr: "Problème signalé: les membres de l'équipe ne s'espacent pas correctement dans le véhicule"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [morning_mobilization_grp, results, time_spend_morning]
 # Module 1 Form 3: Spray Operator Transportation Vehicle Inspection
 http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
   - question: [current_certificate_issued]
@@ -169,6 +184,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Le véhicule n'a pas été inspecté avant le contrat."
     warning_por: "Problema notado: Viatura nao foi inspecionada antes do celebrar o contrato."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [transport_certification]
     comment: [transport_certification_comments]
     base_path: [vehicle_inspection_grp, transport_certification_grp, Q2]
@@ -180,6 +196,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Le conducteur ne conduit pas avec sa licence et / ou son certificat."
     warning_por: "Problema notado: Motoristas nao estao a conduzir com suas cartas de conducao e /ou certificados."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [driver_safety_training]
     comment: [driver_safety_training_comments]
     base_path: [vehicle_inspection_grp, Q3]
@@ -191,6 +208,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Fournir une formation de sécurité au conducteur."
     warning_por: "Problema notado: Providenciar o treinamento de seguranca ao motorista."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [pesticides_transported]
     comment: [pesticides_transported_comments]
     base_path: [vehicle_inspection_grp, Q4]
@@ -202,6 +220,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Séparer le transport des insecticides nécessaires pour les opérateurs et les insecticides autres que l'approvisionnement du jour."
     warning_por: "Problema notado: Necessidade de um transporte separado para os roceadores e pesticidas para alem dos de uso do dia."
     responsible_follow_up: "District Coordinator"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [consumer_goods_transported]
     comment: [consumer_goods_transported_comments]
     base_path: [vehicle_inspection_grp, Q5]
@@ -213,6 +232,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Violation en transportant des marchandises mixtes, suggére une nouvelle formation."
     warning_por: "Problema notado: Mistura no transporte de bens, violacao, sugere-se um re- treinamento."
     responsible_follow_up: "District Coordinator"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [drivers_equipped]
     comment: [drivers_equipped_comments]
     base_path: [vehicle_inspection_grp, Q6]
@@ -224,6 +244,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Les conducteurs n'ont pas de téléphone cellulaire et / ou d'EPI approprié."
     warning_por: "Problema notado: Motoristas nao tem telefone e/ ou EPI apropriado."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [driver_masked]
     base_path: [vehicle_inspection_grp, Q7]
     comment: [driver_masked_comments]
@@ -235,6 +256,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème signalé: Conducteur ne porte pas son masque"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [pesticides_secured]
     comment: [pesticides_secured_comments]
     base_path: [vehicle_inspection_grp, Q8]
@@ -246,6 +268,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Nécessité de fournir des matériaux pour sécuriser et attacher les insecticides dans le véhicule"
     warning_por: "Problema notada: Necessita de providenciar materialpara segurar e marrar os insecticidas no veiculo."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [fire_extinguisher]
     comment: [fire_extinguisher_comments]
     base_path: [vehicle_inspection_grp, Q9]
@@ -257,6 +280,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème signalé: Le véhicule de transport de insecticides doit toujours transporter un extincteur."
     warning_por: "Problema reportado: Veiculo de transporte de pesticida deve sempre ter o extintor de fogo."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [seats_railings]
     comment: [seats_railings_comments]
     base_path: [vehicle_inspection_grp, Q10]
@@ -268,6 +292,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Le véhicule de transport par des opérateurs de pulvérisation doit être configuré avec des sièges et des rampes"
     warning_por: "Problema notado: Veiculo de transporte de roceadores deve estar munido de bancos e corrimãos "
     responsible_follow_up: "District Coordinator"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [first_aid_stocked]
     comment: [first_aid_stocked_comments]
     base_path: [vehicle_inspection_grp, Q11]
@@ -281,6 +306,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Manquant {msg} pour la trousse de premiers soins pour le véhicule. Confirmer la date de livraison pour {msg} pour la trousse de premiers soins."
     warning_por: "Problema notado: Em falta {msg} para kit de primeiros socorros da viatura. Confirmar datas de entrega para {msg} para kit de primeiros socorros."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [spill_prep]
     comment: [spill_prep_comments]
     base_path: [vehicle_inspection_grp, Q12]
@@ -294,6 +320,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Manquant {msg} pour le véhicule. Confirmer la date de livraison pour {msg}."
     warning_por: "Problema notado: Faltando {msg} para o veiculo. Confirmar as datas de entrega {msg}."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [sops_seated_properly]
     comment: [sops_seated_properly_comments]
     base_path: [vehicle_inspection_grp, sears_grp, Q13]
@@ -305,6 +332,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème signalé: Les opérateurs de pulvérisation doivent être correctement assis avec la pompe fixée entre leurs jambes dans le véhicule de transport."
     warning_por: "Problema reportado: Roceadores deverao estar propriamente sentados com bombas segurdas entre as suas pernas na viatura."
     responsible_follow_up: "District Coordinator"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [vehicle_overcrowded]
     comment: [vehicle_overcrowded_comments]
     base_path: [vehicle_inspection_grp, Q14]
@@ -316,6 +344,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Nécessité de fournir un véhicule supplémentaire pour les opérateurs de pulvérisation."
     warning_por: "Problema notado: Necessita providenciar uma viatura adicional para os roceadores."
     responsible_follow_up: "Operation Manager"
+    time_spent: [summary, results, time_spend_transportation]
   - question: [pesticide_leakage]
     comment: [pesticide_leakage_comments]
     base_path: [vehicle_inspection_grp, Q15]
@@ -327,6 +356,7 @@ http://openrosa.org/formdesigner/DBE47466-9B6A-45F0-AF48-16D4CC605CC3:
     warning_fr: "Problème noté: Preuve de fuite de insecticide dans le véhicule."
     warning_por: "Problema notado: Evidencia de vazamento de insecticidas na viatura."
     responsible_follow_up: "ECO"
+    time_spent: [summary, results, time_spend_transportation]
 # Module 1 Form 6: End of Day Cleanup Inspection
 http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
   - question: [sop_return_in_ppe]
@@ -340,6 +370,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: tous les opérateurs de pulvérisation doivent continuer de porter l'EPI sur le chemin de retour des sites opérationnels"
     warning_por: "Problema reportado: Todos os roceadores deverão continuar usar o EPI no caminho de regresso a base operacional."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [eating_in_ppe]
     comment: [eating_in_ppe_comments]
     base_path: [obs_rcd_mgmt_grp, Q2]
@@ -351,6 +382,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: infrcomments faite en mangeant et/ou en buvant "
     warning_por: "Problema reportado: Violação relacionado a comer e/ou beber."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [reconcile_insecticide]
     base_path: [obs_rcd_mgmt_grp, Q3]
     comment: [reconcile_insecticide_comments]
@@ -362,6 +394,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Chef d'équipe ne réconcilie pas les unités d'insecticide avant le rinçage progressif"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [wash_criteria_met]
     comment: [wash_criteria_met_comments]
     base_path: [obs_rcd_mgmt_grp, Q4]
@@ -374,6 +407,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les chefs d'équipe ne supervisent pas le rinçage et le nettoyage"
     warning_por: "Problema reportado: Chefes de equipa nao supervisionam a lavagem do final do dia."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [wash_criteria_met]
     comment: [wash_criteria_met_comments]
     base_path: [obs_rcd_mgmt_grp, Q4]
@@ -386,6 +420,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problem reported: Wash facilities with soap and water must be available to operators."
     warning_por: "Problema reportado: Casas de banho com água e sabão  estar disponiveis para os roceadores."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [wash_criteria_met]
     comment: [wash_criteria_met_comments]
     base_path: [obs_rcd_mgmt_grp, Q4]
@@ -398,6 +433,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Tout le personnel dans l'aire de lavage doit porter un EPI complet."
     warning_por: "Problema reportado: Todo pessoal na area de lavagem deverão usar EPI completo.."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [accidents]
     comment: [accidents_comments]
     base_path: [obs_rcd_mgmt_grp, Q5]
@@ -409,6 +445,8 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Un incident a été signalé et un formulaire de rapport d'incident est nécessaire immédiatement. Effectuez un suivi auprès du chef de secteur pour vous assurer que le formulaire de rapport d'accident est rempli et envoyé à TPM et à ECM."
     warning_por: "Problema reportado: Algum incidente foi reportado e um relatório de incidente e necessário imediatamente. Seguimento com gestor do sector para certificar que o relatorio de acidente e preecnhido e enviado para  GTP e GCA."
     responsible_follow_up: "ECO"
+    description: [briefly_describe_the_situation]
+    time_spent: [results, time_spend_endofday]
   - question: [sop_irritation]
     comment: [sop_irritation_comments]
     base_path: [obs_rcd_mgmt_grp, Q6]
@@ -420,6 +458,8 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Exposition possible signalée: Suivi du statut de OP se plaignant d'irritation et s'assurer que le rapport d'incident a été envoyé au bureau à domicile TPM et ECM."
     warning_por: "Possivel exposição reportada: Seguimento do estado do roceador que reclamou de irritação e certificar-se que relatorio de incidente foi enviado para o escritório central GTP e GCA."
     responsible_follow_up: "ECO"
+    description: [briefly_describe_the_situation]
+    time_spent: [results, time_spend_endofday]
   - question: [form_criteria_check]
     comment: [form_criteria_check_comments]
     base_path: [obs_rcd_mgmt_grp, Q7]
@@ -432,6 +472,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les opérateurs de pulvérisation doivent remplir des formulaires de rapport quotidiens."
     warning_por: "Problema reportado: Roceadores deverao completar suas fichas d relatório diario."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [form_criteria_check]
     comment: [form_criteria_check_comments]
     base_path: [obs_rcd_mgmt_grp, Q7]
@@ -444,6 +485,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les superviseurs doivent vérifier les formulaires de pulvérisation."
     warning_por: "Problema reportado: Supervisores deverão verificar s fichas de pulverização."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [adequate_gravel]
     comment: [adequate_gravel_comments]
     base_path: [fsp_grp, Q8]
@@ -455,6 +497,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Gravier inadéquat dans la fosse d'infiltration"
     warning_por: "Problema reportado: Inadequado gravidade no tanque de retencaot."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [empties_returned]
     comment: [empties_returned_comments]
     base_path: [fsp_grp, Q9]
@@ -466,6 +509,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Le magasinier doit tenir des registres des insecticides distribués et retournés."
     warning_por: "Problema reportado: Fieis devem manter registos de insecticidas enviados e retornados."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [effluent_catch]
     comment: [effluent_catch_comments]
     base_path: [fsp_grp, Q10]
@@ -477,6 +521,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Le triple rinçage et la zone de lavage doivent être couverts d'une surface étanche et d'une fosse d'infiltration inclinée"
     warning_por: "Problema reportado: Tripla lavagem e area de lavagem deve estar coberto com lona plastica inclinada para o tanque de retencao."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [drums_water]
     comment: [drums_water_comments]
     base_path: [fsp_grp, Q11]
@@ -488,6 +533,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Eau insuffisante pour le triple rinçage."
     warning_por: "Problema reportado: Agua insufficiente para a tripla lavagem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pesticide_emptied]
     comment: [pesticide_emptied_comments]
     base_path: [fsp_grp, Q12]
@@ -499,6 +545,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Informer le coordinateur des opérations des violations de triple rinçage."
     warning_por: "Noticar ao coordenador das operações sobre a violação de procediemtno de tripla lavagem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_rinsed]
     comment: [pumps_rinsed_comments]
     base_path: [fsp_grp, Q14]
@@ -510,6 +557,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: violations du triple rinçage."
     warning_por: "Problema reportado: Viloção de tripla lavagem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_outside_rinsed]
     comment: [pumps_outside_rinsed_comments]
     base_path: [fsp_grp, Q15]
@@ -521,6 +569,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Pompes pas bien lavées"
     warning_por: "Problema reportado: Bombas nao adequadamente lavadas"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [equipment_rinsed]
     comment: [equipment_rinsed_comments]
     base_path: [fsp_grp, Q16]
@@ -532,6 +581,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: EPI pas bien lavé"
     warning_por: "Problema reportado: EPI nao propriamente lavado"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [worker_wash]
     base_path: [fsp_grp, Q17]
     comment: [worker_wash_comments]
@@ -543,6 +593,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les travailleurs ne se lavent pas les mains et le visage"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [mask_distance]
     base_path: [fsp_grp, Q18]
     comment: [copy-1-of-worker_wash_comments]
@@ -554,6 +605,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les travailleurs ne remettent pas leur masque après s'être lavés"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [contaminated_water_disposed]
     comment: [contaminated_water_disposed_comments]
     base_path: [fsp_grp, Q19]
@@ -565,6 +617,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Mauvais traitement des eaux usées."
     warning_por: "Problema reportado: Roceadores deverao lavar as mãos e cara com agua e sabao depois de remover o EPI."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [contaminated_water_drains]
     comment: [contaminated_water_drains_comments]
     base_path: [fsp_grp, Q20]
@@ -576,6 +629,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: L'eau ne s'écoule pas correctement dans la fosse."
     warning_por: "Problema reportado:  Deposição impropria de residuos liquidos."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [effluent_absorbed]
     comment: [effluent_absorbed_comments]
     base_path: [fsp_grp, Q21]
@@ -587,6 +641,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: La fosse n'est pas drainée correctement."
     warning_por: "Problema reportado: Agua nao drenando propriamnete para o tanque de retencao."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_hung]
     comment: [pumps_hung_comments]
     base_path: [fsp_grp, Q22]
@@ -598,6 +653,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les pompes ne sont pas suspendues à sécher"
     warning_por: "Problema reportado: Tanque de retenção nao drenando propriamente."
     responsible_follow_up: "Operation Manager"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_stored_properly]
     comment: [pumps_stored_properly_comments]
     base_path: [fsp_grp, Q23]
@@ -609,6 +665,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les pompes ne sont pas stockées correctement.."
     warning_por: "Problema reportado: Bombas nao penduradas para secar"
     responsible_follow_up: "Operation Manager"
+    time_spent: [results, time_spend_endofday]
   - question: [drums_covered]
     comment: [drums_covered_comments]
     base_path: [fsp_grp, Q24]
@@ -620,6 +677,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Barils d'eau de rinçage  et / ou d'effluents non couverts pendant la nuit."
     warning_por: "Problema reportado: Bombas nao armazenadas propiamente."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [msp_avoid_water]
     comment: [msp_avoid_water_comments]
     base_path: [msp_grp, Q25]
@@ -631,6 +689,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Le puisard mobile n'est pas installé à l'écart des plans d'eau, des pentes abruptes ou des zones sujettes aux inondations"
     warning_por: "Problema reportado: Lavagem e/ou baldes de lixo nao cobertos durante a noite."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [sachets_returned]
     comment: [sachets_returned_comments]
     base_path: [msp_grp, Q26]
@@ -642,6 +701,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Le magasinier doit tenir des registres des insecticides distribués et retournés."
     warning_por: "Problema reportado: Tanque de retencao Movel nao instalado distante de corpos de agua, inclinacoes ou locais propensos a inundacoes ."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [barrel_water_present]
     comment: [day1_operation_comments]
     base_path: [msp_grp, Q27]
@@ -653,6 +713,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les eaux usées provenant du fût de collecte sont restées dans l'aire de lavage pendant la nuit."
     warning_por: "Problema reportado: Fieis deverão manter os registos de pesticidas enviados e retornados."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [msp_correctly_installed]
     comment: [msp_correctly_installed_comments]
     base_path: [msp_grp, Q28]
@@ -664,6 +725,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: L'aire de triple rinçage et  lavage doit être couvert d'une surface étanche et incliné vers le puisard mobile."
     warning_por: "Problema reportado: Residuos liquidos ficaram no balde de colecta durante na area de lavagem durante a noite."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [rinse_water_drums]
     comment: [rinse_water_drums_comments]
     base_path: [msp_grp, Q29]
@@ -675,6 +737,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Eau insuffisante pour le triple rinçage."
     warning_por: "Problema reportado: Lavagem tripla e e area de lavagem deverão estar cobertos com lona plastica inlcinada para o tanque de retencao movel."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pesticide_emptied]
     comment: [pesticide_emptied_comments]
     base_path: [msp_grp, Q30]
@@ -686,6 +749,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Informer le coordinateur des opérations des violations de triple rinçage  "
     warning_por: "Problema reportado: Agua insufficiente para a tripla lavagem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_depressurized]
     comment: [pumps_depressurized_comments]
     base_path: [msp_grp, Q31]
@@ -697,6 +761,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Pulvérisateurs mal vidés"
     warning_por: "Notifficar o coordenador das operacoes sobre as violacoes da tripla lavagem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_rinsed]
     comment: [pumps_rinsed_comments]
     base_path: [msp_grp, Q32]
@@ -708,6 +773,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: violations du triple rinçage."
     warning_por: "Problema reportado: Violações da tripla lavagem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [pumps_rinsed_outside]
     comment: [pumps_rinsed_outside_comments]
     base_path: [msp_grp, Q33]
@@ -719,6 +785,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Pompes pas bien lavées"
     warning_por: "Problema reportado: Bombas nao lavadas propriamente"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [waste_water_distributed]
     comment: [waste_water_distributed_comments]
     base_path: [msp_grp, Q34]
@@ -730,6 +797,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les eaux usées provenant du fût de collecte ne sont pas distribuées dans les pompes de pulvérisation."
     warning_por: "Problema reportado: Residuos liquidos do balde de colecta nao distribuida para as bombas."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [equipment_rinsed]
     comment: [equipment_rinsed_comments]
     base_path: [msp_grp, Q35]
@@ -741,6 +809,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: EPI mal lavé"
     warning_por: "Problema reportado: EPI nao lavado propriamente."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [workers_wash]
     comment: [workers_wash_comments]
     base_path: [msp_grp, Q36]
@@ -752,6 +821,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les opérateurs doivent se laver les mains et le visage avec de l'eau et du savon après avoir retiré l'EPI."
     warning_por: "Problema reportado: Roceadores deverao lavar as mãos e cara com agua e sabao depois de tirar o EPI."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [face_mask]
     base_path: [msp_grp, Q37]
     comment: [face_mask_comments]
@@ -763,6 +833,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les travailleurs ne mettent pas leur masque après s'être lavés"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [msp_used]
     comment: [msp_used_comments]
     base_path: [msp_grp, Q38]
@@ -774,6 +845,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Mauvais traitement des eaux usées."
     warning_por: "Problema reportado:  Deposição impróprio de residuos liquidos."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [contaminated_water_drains]
     comment: [contaminated_water_drains_comments]
     base_path: [msp_grp, Q39]
@@ -785,6 +857,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: L'eau ne s'écoule pas correctement vers le puisard mobile."
     warning_por: "Problema reportado: Drenamento improprio de agua para o tanque de retencao."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [effluent_absorbed]
     comment: [effluent_absorbed_comments]
     base_path: [msp_grp, Q40]
@@ -796,6 +869,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: L'eau ne se vide pas correctement du puisard"
     warning_por: "Problema reportado: Tanque de retenção móvel nao esta drenando propriamente."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [drums_covered]
     comment: [drums_covered_comments]
     base_path: [msp_grp, Q41]
@@ -807,6 +881,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Barils d'eau de rinçage  et / ou d'effluents non couverts pendant la nuit."
     warning_por: "Problema reportado: Lavagem e /ou baldes de lixo nao foi coberto durante a noite."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [ground_restored]
     comment: [last_day_operations_comments]
     base_path: [msp_grp, Q42]
@@ -818,6 +893,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: MSP pas correctement restauré."
     warning_por: "Problema reportado: TRM nao foi propiramnete retornado ao cova."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [msp_removed]
     comment: [last_day_operations_comments]
     base_path: [msp_grp, Q42]
@@ -829,6 +905,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Le site d'installation de MSP n'est pas sécurisé à la fin de la journée."
     warning_por: "Problema reportado: Instalação do TRM no local nao foi seguradano final do dia."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [msp_secure]
     comment: [msp_stored_comments]
     base_path: [msp_grp, Q43]
@@ -840,6 +917,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: MSP doit être sécurisé à la fin de la journée."
     warning_por: "Problema reportado: TRM tem que ser segurado no final do dia."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_endofday]
   - question: [overalls_wash]
     comment: [overalls_wash_comments]
     base_path: [msp_grp, Q44]
@@ -851,6 +929,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les porteurs ne transportent pas les combinaisons à laver et sécher"
     warning_por: "Problema reportado: Carregadores nao transportam fatos de trabalho para ser lavados e secos"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
   - question: [overalls_clean]
     comment: [overalls_clean_comments]
     base_path: [msp_grp, Q45]
@@ -862,6 +941,7 @@ http://openrosa.org/formdesigner/381E6260-1C5F-4755-BA33-871E464A1C71:
     warning_fr: "Problème signalé: Les porteurs ne transportent pas de combinaisons propres aux équipes de terrain"
     warning_por: "Problema reportado: Carregadores nao transportam os fatos de trabalho limpos para o campo"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_endofday]
 # Module 1 Form 5: Storekeeper Performance Inspection
 http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
   - question: [ledger_present]
@@ -875,6 +955,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: pas de registre de stock dans le magasin"
     warning_por: "Problema reportado: Registo de estoque nao presente."
     responsible_follow_up: "Logistics Manager"
+    time_spent: [results, time_spend_storekeeper]
   - question: [ledger_updated]
     comment: [ledger_updated_comments]
     base_path: [stock_audit_grp, Q2]
@@ -886,6 +967,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: le registre de stock n'est pas entièrement mis à jour "
     warning_por: "Problema reportado: o livro do registo do armazem nao esta completa,ente actualizado."
     responsible_follow_up: "Logistics Manager"
+    time_spent: [results, time_spend_storekeeper]
   - question: [stock_cards_mounted]
     comment: [stock_cards_mounted_comments]
     base_path: [stock_audit_grp, Q3]
@@ -897,6 +979,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé : fiches de stocks non montées "
     warning_por: "Problema reportado: Cartoes de estoque nao estao montados."
     responsible_follow_up: "Logistics Manager"
+    time_spent: [results, time_spend_storekeeper]
   - question: [stock_cards_updated]
     comment: [stock_cards_updated_comments]
     base_path: [stock_audit_grp, Q4]
@@ -908,6 +991,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: les fiches de stocks insuffisants "
     warning_por: "Problema reportado: Deficiente arquivo de registo de estoque ."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [separate_pages_updated]
     comment: [separate_pages_updated_comments]
     base_path: [stock_audit_grp, Q5]
@@ -919,6 +1003,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: fiches de stocks manquantes : bouteilles/sachets vides et stocks de déchets "
     warning_por: "Problema reportado: Deficiente arquivo de registo de estoque: garrfas vazias e estoque de lixo."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [expired_insecticides_separate]
     comment: [expired_insecticides_separate_comments]
     base_path: [stock_audit_grp, Q6a]
@@ -930,6 +1015,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: les insecticides périmés ne sont pas séparés physiquement des autres insecticides dans le magasin"
     warning_por: "Problema reportado: Insecticida expirado nao esta fisicamente separado de outros."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [stock_used_cards]
     comment: [stock_used_cards_comments]
     base_path: [stock_audit_grp, Q8]
@@ -941,6 +1027,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: fiches de stock déficient: utilisation."
     warning_por: "Problema reportado: Deficiente arquivo de registo: uso."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [balance_mismatch]
     comment: [balance_mismatch_comments]
     base_path: [stock_audit_grp, Q9]
@@ -952,6 +1039,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: La balance dans du registre du magasin ne correspond pas au solde de la fiche de stock pour tous les articles en stock."
     warning_por: "Problema reportado: O balanco no livro de registo nao confere com o registo de cartoes de estoque para todos itens."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [balance_match_stock]
     comment: [balance_match_stock_comments]
     base_path: [stock_audit_grp, Q10]
@@ -963,6 +1051,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: le solde des fiches de stock ne correspond pas au résultat d'un comptage physique"
     warning_por: "Problema reportado: O balanco no cartao de estoque nao e igual ao resultado da contagem fisica do estoque para todos itens."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [reconciliation_completed]
     comment: [reconciliation_completed_comments]
     base_path: [stock_audit_grp, Q11]
@@ -974,6 +1063,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Le formulaire de rapprochement des insecticides n'est pas rempli tous les jours."
     warning_por: "Problema reportado: A ficha diaria de registo de insecticida nao e completa diariamente ."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [balance_match_opening]
     comment: [balance_match_opening_comments]
     base_path: [stock_audit_grp, Q12]
@@ -985,6 +1075,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Les registres de stocks de insecticides ne concordent pas."
     warning_por: "Problema reportado: O resgisto do balanco do insecticida nao e reconciliado."
     responsible_follow_up: "Operation Manager"
+    time_spent: [results, time_spend_storekeeper]
   - question: [number_empties_match]
     comment: [number_empties_match_comments]
     base_path: [stock_audit_grp, Q13]
@@ -996,6 +1087,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Inventaire des insecticides non conforme "
     warning_por: "Problema reportado: Inventario de Pesticida nao esta no balanco."
     responsible_follow_up: "Operation Manager"
+    time_spent: [results, time_spend_storekeeper]
   - question: [covid_practices]
     base_path: [safety_reqs_grp, Q14]
     comment: [covid_practices_comments]
@@ -1007,6 +1099,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Magasinier ne porte pas le masque approprié"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [pesticide_mishandling]
     comment: [pesticide_mishandling_comments]
     base_path: [safety_reqs_grp, Q15]
@@ -1018,6 +1111,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: le personnel manipule le insecticide sans porter masque, gants, bottes et combinaison"
     warning_por: "Problema reportado: Manuseio individual de insecticida sem o uso de mascaras , luvas, bootas and fato de trabalho."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [eating_warehouse]
     comment: [eating_warehouse_comments]
     base_path: [safety_reqs_grp, Q16]
@@ -1029,6 +1123,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: le personnel entrain de manger dans le magasin de insecticide "
     warning_por: "Problema reportado: Trabalhadores comendo dentro do armazem enquanto ha insecicida de PIDOM  em estoque."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [poisoning_symptoms]
     comment: [poisoning_symptoms_comments]
     base_path: [safety_reqs_grp, Q17]
@@ -1040,6 +1135,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: le magasinier n'est pas familier aux signes d'intoxication"
     warning_por: "Problema reportado: Fiel do armazem nao esta familiarizado com sintomas de intoxicao do insecticida em uso."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [first_aid_check]
     comment: [first_aid_check_comments]
     base_path: [safety_reqs_grp, Q18]
@@ -1053,6 +1149,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: besoins en éléments de premier secours. Manquant: {msg}"
     warning_por: "Problema reportado: necessidade de componentes do kit de primeiros socorros nesta base operacional. Em falta: {msg}"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [warehouse_spill_kit]
     comment: [warehouse_spill_kit_comments]
     base_path: [safety_reqs_grp, Q19]
@@ -1066,6 +1163,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: manquant dans le magasin de stockage: {msg}"
     warning_por: "Problema reportadoFatas no armazem: {msg}"
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [nearest_health_facility_known]
     comment: [nearest_health_facility_known_comments]
     base_path: [safety_reqs_grp, Q20]
@@ -1077,6 +1175,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: le magasinier ne sait pas où se trouve la structure de santé la plus proche"
     warning_por: "Problema reportado: Fiel do armazem nao conhece onde se localiza a unidade sanitaria mais proxima."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [antidotes_provided]
     comment: [antidotes_provided_comments]
     base_path: [safety_reqs_grp, Q21]
@@ -1088,6 +1187,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: l'antidote n'est pas disponible au niveau de la strcuture de santé la plus proche"
     warning_por: "Problema reportado: Antidotos talves nao estejam disponiveis na unidade sanitaria mais proxima."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [soap_available]
     comment: [soap_available_comments]
     base_path: [store_materials_grp, Q20]
@@ -1099,6 +1199,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: bassines d'eau non disponibles dans le magasin pour le lavage des mains "
     warning_por: "Problem reported:  Water basins not provided in storeroom for washing hands."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [msds_posted]
     comment: [msds_posted_comments]
     base_path: [store_materials_grp, Q23]
@@ -1110,6 +1211,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problem reported: Material Safety Data sheet for the current insecticide(s) not posted."
     warning_por: "Problema reportado: Ficha de Informacao de  Seguranca de Material para o pescticida(s) em uso nao postado."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [thermometer_available]
     comment: [thermometer_available_comments]
     base_path: [store_materials_grp, Q24]
@@ -1121,6 +1223,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: besoin de thermomètre dans le magasin de stockage "
     warning_por: "Problema reportado: Necessidade de termometro no armazem."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [pesticide_leakage]
     comment: [pesticide_leakage_comments]
     base_path: [pesticide_management_grp, Q25]
@@ -1132,6 +1235,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Fuite de insecticide découverte dans l'entrepôt"
     warning_por: "Problema reportado: Descoberto vazamento de pesticida no armazem."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [contaminants_separated]
     comment: [contaminants_separated_comments]
     base_path: [pesticide_management_grp, Q26]
@@ -1143,6 +1247,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Procédures d'entreposage des insecticides et des déchets contaminés déficients"
     warning_por: "Problema reportado:Prodecidmento deficientede de armazenamento de pesticida e lixo contaminado."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [pesticides_labeled]
     comment: [pesticides_labeled_comments]
     base_path: [pesticide_management_grp, Q27]
@@ -1154,6 +1259,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Étiquetage des insecticides déficient."
     warning_por: "Problema reportado: Deficiente rotulagem de  pesticida."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [insecticide_fefo]
     comment: [insecticide_fefo_comments]
     base_path: [pesticide_management_grp, Q28]
@@ -1165,6 +1271,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Système d'inventaire FEFO non utilisé "
     warning_por: "Problema reportado: Nao uso do sistema de PEPS ."
     responsible_follow_up: "Operation Manager"
+    time_spent: [results, time_spend_storekeeper]
   - question: [insecticides_expired]
     comment: [insecticides_expired_comments]
     base_path: [pesticide_management_grp, Q29]
@@ -1176,6 +1283,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: insecticides expirés dans le magasin."
     warning_por: "Problema reportado: Pesticida expirado no armazem."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [barrels_empties_labeled]
     comment: [barrels_empties_labeled_comments]
     base_path: [pesticide_management_grp, Q30]
@@ -1187,6 +1295,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "roblème signalé: Stockage et / ou étiquetage déficient des déchets dangereux"
     warning_por: "Problema reportado: Deficiente armazenamento/ rotulagem de lixo perigoso."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_storekeeper]
   - question: [pesticide_stored_high]
     comment: [pesticide_stored_high_comments]
     base_path: [pesticide_management_grp, Q31]
@@ -1198,6 +1307,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: Stockage inadéquat des insecticides: patins et / ou hauteur d'empilage"
     warning_por: "Problema reportado:Armazenamento improprio de pesticida: Paletas e/ altura de empilhamento."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
   - question: [excess_accumulated_waste]
     comment: [excess_accumulated_waste_comments]
     base_path: [pesticide_management_grp, Q32]
@@ -1209,6 +1319,7 @@ http://openrosa.org/formdesigner/FC8DCFC3-F595-40E2-955B-90721FCD246F:
     warning_fr: "Problème signalé: : Surplus de insecticide dans l'inventaire"
     warning_por: "Problema reportado: Pesticida excedente no inventario."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_storekeeper]
 
 # Module 1 Form 4: Homeowner Preparation and Spray Operator Performance
 http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
@@ -1223,6 +1334,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: Les effets personnels ne sont pas retirés de la structure."
     warning_por: "Problema reportado: Artigos nao removidos da casa."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [perso_distance]
     base_path: [household_prep_grp, Q2]
     comment: [perso_distance_comments]
@@ -1234,6 +1346,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: L'opérateur n'observe pas les distances de séparation adéquates"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [hand_washing]
     base_path: [household_prep_grp, Q3]
     comment: [hand_washing_comments]
@@ -1245,6 +1358,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: L'opérateur ne s'est pas lavé les mains avant d'aider le propriétaire"
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [furniture_covered]
     comment: [furniture_covered_comments]
     base_path: [household_prep_grp, Q4]
@@ -1256,6 +1370,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: Les articles immobiliers qui n'ont pas été déplacés vers le centre de la pièce / les articles non recouverts d'une feuille de plastique."
     warning_por: "Problema reportado: artigos que nao podem ser removidos, nao foram colocados no centro da sala/ items nao cobertos com plastico."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [items_hanging]
     comment: [items_hanging_comments]
     base_path: [household_prep_grp, Q5]
@@ -1267,6 +1382,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : Articles non retirés du mur ou du plafond"
     warning_por: "Problema reportado: Items noa removidos da parede ou teto."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [food_removed]
     comment: [food_store_rooms_comments]
     base_path: [household_prep_grp, Q6]
@@ -1278,6 +1394,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: des pièces contenant des aliments ont été pulvérisés "
     warning_por: "Problema reportado: Quartos pulverizados pelo roceador contendo comida."
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [unmovable_people]
     comment: [unmovable_people_comments]
     base_path: [household_prep_grp, Q7]
@@ -1289,6 +1406,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé:  Une maison a été aspergée avec des malades, de personnes âgées ou de bébés à la maison."
     warning_por: "Problema reportado: Casa pulverisada com pessoas doentes, idosos or bebes dentro."
     responsible_follow_up: "ECO"
+    time_spent: [results, time_spend_home_sub1]
   - question: [sop_wash_bf_glove]
     base_path: [household_prep_grp, Q8]
     comment: [sop_wash_bf_glove_comments]
@@ -1300,6 +1418,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: Un opérateur ne s'est pas lavé les mains avant de remettre les gants "
     warning_por: "Problema reportado: "
     responsible_follow_up: "District Coordinator"
+    time_spent: [results, time_spend_home_sub1]
   - question: [sop_full_ppe]
     comment: [sop_full_ppe_comments]
     base_path: [insecticide_prep_grp, Q9]
@@ -1313,6 +1432,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: l'opérateur n'a pas porté l'EPI au complet"
     warning_por: "Problema reportado:  roceador não esta completamente equipado com EPI."
     responsible_follow_up: "District Coordinator"
+    time_spent: [insecticide_prep_grp, results, time_spend_home_sub2]
   - question: [triple_rinse]
     comment: [pesticide_packaged_comments]
     base_path: [insecticide_prep_grp, Q10]
@@ -1324,6 +1444,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : L'opérateur de pulvérisation ne respecte pas la procédure de  triple rinçage de la bouteille."
     warning_por: "Problema reportado: Roceador nao observou o procedimento de enxaguamento triplo da garrafa."
     responsible_follow_up: "District Coordinator"
+    time_spent: [insecticide_prep_grp, results, time_spend_home_sub2]
   - question: [tank_volume]
     comment: [tank_volume_comments]
     base_path: [insecticide_prep_grp, Q11]
@@ -1335,6 +1456,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: Le réservoir n'a pas la bonne quantité d'eau et d'insecticide."
     warning_por: "Problema reportado: A bomba nao tem a quantidade correcta de agua e insecticida."
     responsible_follow_up: "District Coordinator"
+    time_spent: [insecticide_prep_grp, results, time_spend_home_sub2]
   - question: [tank_shaken]
     comment: [tank_shaken_comments]
     base_path: [insecticide_prep_grp, Q12]
@@ -1346,6 +1468,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problem reported: Spray operator not properly mixing insecticide before pressurizing tank."
     warning_por: "Problema reportado: Roceador nao fez a mistura apropriada de insecticida antes de agitar o tanque."
     responsible_follow_up: "District Coordinator"
+    time_spent: [insecticide_prep_grp, results, time_spend_home_sub2]
   - question: [pump_pressurized]
     comment: [pump_pressurized_comments]
     base_path: [insecticide_prep_grp, Q13]
@@ -1357,6 +1480,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: La pompe n'est pas correctement pressurisée"
     warning_por: "Problema reportado: roceador não pressurizou correctamente o tanque antes de pulverizar."
     responsible_follow_up: "District Coordinator"
+    time_spent: [insecticide_prep_grp, results, time_spend_home_sub2]
   - question: [sop_full_ppe]
     comment: [sop_full_ppe_comments]
     base_path: [spray_observe_grp, Q14]
@@ -1370,6 +1494,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: l'opérateur n'a pas porté l'EPI au complet"
     warning_por: "Problema reportado:  roceador não esta completamente equipado com EPI."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [sop_eating_during_spray]
     comment: [sop_eating_during_spray_comments]
     base_path: [spray_observe_grp, Q15]
@@ -1384,6 +1509,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: l'Operateur de pulvérisation {msg} est entrain de fumer ou manger pendant la préparation des pièces des bénéficiaires ou la pulverisation"
     warning_por: "Problema reportado: roceador {msg} fumando ou comendo durante a prepração do agregado ou pulverizando."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [sop_drinking_during_spray]
     comment: [sop_drinking_during_spray_comments]
     base_path: [spray_observe_grp, Q16]
@@ -1398,6 +1524,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: l'Operateur de pulvérisation {msg} est entrain de boire pendant la préparation des pièces des bénéficiaires ou la pulverisation"
     warning_por: "Problema reportado: roceador {msg} bebendo durante a prepração do agregado ou pulverizando."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [items_moved]
     comment: [items_moved_comments]
     base_path: [spray_observe_grp, Q17]
@@ -1409,6 +1536,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les affaires qui ne peuvent être déplacés ne sont  pas déplacés/couvert au centre de la pièce avant la pulvérisation "
     warning_por: "Problema reportado: Items que não podem ser tirados para fora nao movidos para o centro da sala/ cobertos antes da pulverização"
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [loose_items_removed]
     comment: [loose_items_removed_comments]
     base_path: [spray_observe_grp, Q18]
@@ -1420,6 +1548,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: Les objets en vrac (vêtements, moustiquaires, photos / affiches) ne sont pas retirés de la maison avant d'être pulvérisés"
     warning_por: "Problema reportado: items soltos (roupa, rede mosquiteiras, fotografias/cartazes) não removidos da casa antes da pulverização"
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [pump_leaks]
     comment: [pump_leaks_comments]
     base_path: [spray_observe_grp, Q19]
@@ -1431,6 +1560,8 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : Des fuites proviennent de la pompe"
     warning_por: "Problema reportado: vazamentos da bomba."
     responsible_follow_up: "District Coordinator"
+    description: [briefly_describe_the_situation]
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [pump_serviced]
     comment: [pump_leaks_comments]
     base_path: [spray_observe_grp, Q19]
@@ -1442,6 +1573,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: L'opérateur de pulvérisation n'a pas immédiatement réparé la pompe qui fuit."
     warning_por: "Problema reportado: Roceador não fez a manutenção imdiata da bomba."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [nozzle_tip]
     comment: [nozzle_tip_comments]
     base_path: [spray_observe_grp, Q20]
@@ -1453,6 +1585,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: L'operateur de pulverisation n'a pas respecté la bonne distance à partir du support  "
     warning_por: "Problema reportado: Roceador não pulverizou pulverizou a uma distância correcta da superficie."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [spray_speed]
     comment: [spray_speed_comments]
     base_path: [spray_observe_grp, Q21]
@@ -1464,6 +1597,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : L’opérateur de pulvérisation ne pulvérise pas à la vitesse correcte. "
     warning_por: "Problema reportado: Roceador não pulverizou com a velocidade de correcta."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [swath_overlap]
     comment: [swath_overlap_comments]
     base_path: [spray_observe_grp, swath_grp, Q22]
@@ -1475,6 +1609,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : Il n’y a pas de chevauchement de 5 cm d’une couche à l’autre. "
     warning_por: "Problema reportado: Não ha sobreposição sucessiva de 5 cm."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [swath_overlap]
     comment: [swath_overlap_comments]
     base_path: [spray_observe_grp, swath_grp_zim, Q22Z]
@@ -1486,6 +1621,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : Il n’y a pas de chevauchement de 2 cm d’une couche à l’autre. "
     warning_por: "Problema reportado: Não ha sobreposição sucessiva de 2 cm."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [surfaces_sprayed]
     comment: [surfaces_sprayed_comments]
     base_path: [spray_observe_grp, Q23]
@@ -1497,6 +1633,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : L’opérateur de pulvérisation ne pulvérise pas toutes les surfaces recommandées"
     warning_por: "Problema reportado: Roceador não pulverizou as superficies recomendadas."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [surfaces_sprayed_incorrect]
     comment: [surfaces_sprayed_incorrect_comments]
     base_path: [spray_observe_grp, Q24]
@@ -1508,6 +1645,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Probleme signalé: l'opérateur de pulvérisation pulvérise les mauvaises surfaces "
     warning_por: "Problema reportada: Roceador pulverizou superficies erradas."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [pump_re_pressurized]
     comment: [pump_re_pressurized_comments]
     base_path: [spray_observe_grp, Q25]
@@ -1519,6 +1657,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé : l'opérateur de pulvérisation n'a pas représsurisé la pompe "
     warning_por: "Problema reportado: Roceador nao re-pressurizou o tanque como se requere."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [items_removed]
     comment: [eaves_sprayed_comments]
     base_path: [spray_observe_grp, Q26]
@@ -1530,6 +1669,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: Les articles ménagers ne sont pas retirés de la zone avant la pulvérisation des avant-toits."
     warning_por: "Problema reportado: Os pertences do agregado nao foram removidos das abas antes da pulverização."
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [house_marked]
     comment: [house_marked_comments]
     base_path: [spray_observe_grp, Q27]
@@ -1541,6 +1681,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: l'opérateur de pulvérisation n'a pas correctement le marquage "
     warning_por: "Problema reportado: Roceador nao fez a marcação correcta da casa"
     responsible_follow_up: "District Coordinator"
+    time_spent: [spray_observe_grp, results, time_spend_home_sub3]
   - question: [resident_informed]
     comment: [resident_informed_comments]
     base_path: [sbcc_grp, Q28]
@@ -1552,6 +1693,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les bénificiaires n'ont pas été informés de l'activité de pulvérisation "
     warning_por: "Problema reportado: O residente nao foi informado sobre as actividades de pulverização."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [resident_informed_dist]
     comment: [resident_informed_dist_comments]
     base_path: [sbcc_grp, Q29]
@@ -1563,6 +1705,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les bénificiaires n'ont pas été informés de l'activité de pulvérisation "
     warning_por: "Problema reportado: O residente nao foi informado que deveria manter  distância."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [resident_instructed]
     comment: [resident_instructed_comments]
     base_path: [sbcc_grp, Q30]
@@ -1574,6 +1717,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les bénéficiaires ne sont pas informés de ne pas entrer pendant 2 h avant d'ouvrir portes et fenêtre 30 min pour aérer avant de remettre les effets personnels, les aliments, et les animaux/personnes malades "
     warning_por: "Problema reportado: Residente nao foi  informado sobre os procedimentos pos pulverização."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [resident_instructed_animals]
     comment: [resident_instructed_animals_comments]
     base_path: [sbcc_grp, Q31]
@@ -1585,6 +1729,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les résidents ne sont informés des mesures de sécurité par rapport aux animaux "
     warning_por: "Problema reportado: Residente não informado sobre o protocolo com os animais."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [resident_instructed_insect_removal]
     comment: [resident_instructed_insect_removal_comments]
     base_path: [sbcc_grp, Q32]
@@ -1596,6 +1741,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les résidents ne sont pas informés des mesures du protocole à suivre après la pulvérisation "
     warning_por: "Problema reportado: Residente não foi  informado sobre o protocolo pós pulverização"
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [resident_instructed_surfaces]
     comment: [resident_instructed_surfaces_comments]
     base_path: [sbcc_grp, Q33]
@@ -1607,6 +1753,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les résidents ne sont pas informés des mesures du protocole à suivre après la pulvérisation "
     warning_por: "Problema reportado: Residente nao foi informado sobre o protocolo pós pulverização."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [resident_instructed_health]
     comment: [resident_instructed_health_comments]
     base_path: [sbcc_grp, Q34]
@@ -1618,6 +1765,7 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: les residents ne sont pas informés du protocole en cas d'exposition"
     warning_por: "Problema reportado: Residente não foi informado do protocolo de potencial exposição."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
   - question: [sop_data]
     comment: [sop_data_comments]
     base_path: [sbcc_grp, Q35]
@@ -1629,3 +1777,4 @@ http://openrosa.org/formdesigner/898DACE2-0BFF-47BA-B6A8-BF09ABE8B2D1:
     warning_fr: "Problème signalé: l'opérateur de pulvérisation ne remplit pas correctement les données "
     warning_por: "Problema reportado: Roceador não registou os dados correctamente."
     responsible_follow_up: "District Coordinator"
+    time_spent: [sbcc_grp, results, time_spend_home_sub4]
diff --git a/custom/abt/reports/supervisory_report_v2020.json b/custom/abt/reports/supervisory_report_v2020.json
index 428593ef4d66..88d3a0337baf 100644
--- a/custom/abt/reports/supervisory_report_v2020.json
+++ b/custom/abt/reports/supervisory_report_v2020.json
@@ -485,6 +485,48 @@
                     "por": "Coment\u00E1rio"
                 },
                 "aggregation": "simple"
+            },
+            {
+                "description": null,
+                "field": "description",
+                "format": "default",
+                "transform": {
+
+                },
+                "column_id": "description",
+                "alias": null,
+                "calculate_total": false,
+                "type": "field",
+                "display": {
+                    "fra": "Description",
+                    "frm": "Description",
+                    "en": "Description",
+                    "sw": "Maelezo",
+                    "kin": "Description",
+                    "por": "Descrição"
+                },
+                "aggregation": "simple"
+            },
+            {
+                "description": null,
+                "field": "time_spent",
+                "format": "default",
+                "transform": {
+
+                },
+                "column_id": "time_spent",
+                "alias": null,
+                "calculate_total": false,
+                "type": "field",
+                "display": {
+                    "fra": "Temps passé",
+                    "frm": "Temps passé",
+                    "en": "Time spent",
+                    "sw": "Muda uliotumika",
+                    "kin": "Time spent",
+                    "por": "Tempo gasto"
+                },
+                "aggregation": "simple"
             }
         ]
     }
diff --git a/custom/abt/reports/tests/test_flagspecs.py b/custom/abt/reports/tests/test_flagspecs.py
index 5504a69f4068..ccc529281647 100644
--- a/custom/abt/reports/tests/test_flagspecs.py
+++ b/custom/abt/reports/tests/test_flagspecs.py
@@ -1,15 +1,14 @@
-from glob import glob
+from pathlib import Path
 
+import pytest
 from yaml import load, Loader, parser
 
+REPORTS_DIR = Path(__file__).parent.parent
 
-def test_yaml_formatting():
-    for filename in glob('custom/abt/reports/*.yaml'):
-        yield check_yaml_file, filename
 
-
-def check_yaml_file(filename):
-    with open(filename, 'r') as f:
+@pytest.mark.parametrize("filename", [p.name for p in REPORTS_DIR.glob('*.yml')])
+def test_yaml_formatting(filename):
+    with open(REPORTS_DIR / filename, 'r') as f:
         try:
             load(f.read(), Loader=Loader)
         except parser.ParserError:
diff --git a/custom/abt/reports/views.py b/custom/abt/reports/views.py
index be16936b7d6e..940959c63547 100644
--- a/custom/abt/reports/views.py
+++ b/custom/abt/reports/views.py
@@ -1,7 +1,6 @@
 import io
-import json
 
-from django.http import HttpResponse
+from django.http import JsonResponse
 from memoized import memoized
 
 import openpyxl
@@ -112,9 +111,9 @@ def percentile_fill(start_column, start_row, end_column, end_row,
 
     @property
     def email_response(self):
-        return HttpResponse(json.dumps({
+        return JsonResponse({
             'report': '',
-        }))
+        })
 
 
 class UniqueSOPSumDataSource(SqlData):
diff --git a/custom/champ/tests/test_champ_cameroon.py b/custom/champ/tests/test_champ_cameroon.py
index 78573f4b0826..a8a4297d7f3a 100644
--- a/custom/champ/tests/test_champ_cameroon.py
+++ b/custom/champ/tests/test_champ_cameroon.py
@@ -2,17 +2,21 @@
 
 from corehq.apps.userreports.specs import EvaluationContext
 from corehq.apps.users.tests.util import patch_user_data_db_layer
+from corehq.tests.util.context import add_context
 from custom.champ.tests.utils import TestDataSourceExpressions
 from custom.champ.utils import POST_TEST_XMLNS, ACCOMPAGNEMENT_XMLNS, SUIVI_MEDICAL_XMLNS
 
 CHAMP_CAMEROON_DATA_SOURCE = 'champ_cameroon.json'
 
 
-@patch_user_data_db_layer()
 class TestEnhancedPeerMobilization(TestDataSourceExpressions):
 
     data_source_name = CHAMP_CAMEROON_DATA_SOURCE
 
+    def setUp(self):
+        super().setUp()
+        add_context(patch_user_data_db_layer(), self)
+
     def test_champ_cametoon_properties_for_post_test_xmlns(self):
         form = {
             'id': 'form_id',
@@ -57,6 +61,7 @@ def test_champ_cametoon_properties_for_post_test_xmlns(self):
         }
 
         user = {
+            'doc_type': 'CommCareUser',
             'id': 'user_id',
             'domain': 'champ_cameroon',
             'location_id': 'test_location_id'
@@ -179,6 +184,7 @@ def test_champ_cametoon_properties_for_accompagnement_xmlns(self):
         }
 
         user = {
+            'doc_type': 'CommCareUser',
             'id': 'user_id',
             'domain': 'champ_cameroon',
             'location_id': 'test_location_id'
@@ -303,6 +309,7 @@ def test_champ_cametoon_properties_for_survi_medical_xmlns(self):
         }
 
         user = {
+            'doc_type': 'CommCareUser',
             'id': 'user_id',
             'domain': 'champ_cameroon',
             'location_id': 'test_location_id'
diff --git a/custom/champ/tests/test_enhanced_peer_mobilization.py b/custom/champ/tests/test_enhanced_peer_mobilization.py
index f3165abb3654..fe96e94d96d2 100644
--- a/custom/champ/tests/test_enhanced_peer_mobilization.py
+++ b/custom/champ/tests/test_enhanced_peer_mobilization.py
@@ -4,15 +4,19 @@
 from corehq.apps.users.tests.util import patch_user_data_db_layer
 from custom.champ.tests.utils import TestDataSourceExpressions
 from custom.champ.utils import PREVENTION_XMLNS, TARGET_XMLNS
+from corehq.tests.util.context import add_context
 
 ENHANCED_PEER_MOBILIZATION_DATA_SOURCE = 'enhanced_peer_mobilization.json'
 
 
-@patch_user_data_db_layer()
 class TestEnhancedPeerMobilization(TestDataSourceExpressions):
 
     data_source_name = ENHANCED_PEER_MOBILIZATION_DATA_SOURCE
 
+    def setUp(self):
+        super().setUp()
+        add_context(patch_user_data_db_layer(), self)
+
     def test_achievement_form_property(self):
         form = {
             'id': 'form_id',
@@ -37,6 +41,7 @@ def test_achievement_form_property(self):
 
         user = {
             'id': 'user_id',
+            'doc_type': 'CommCareUser',
             'domain': 'champ_cameroon',
             'location_id': 'test_location_id'
         }
diff --git a/custom/onse/README.rst b/custom/onse/README.rst
index 7f41e67de069..59f377d7605b 100644
--- a/custom/onse/README.rst
+++ b/custom/onse/README.rst
@@ -1,3 +1,30 @@
+How to enable this module
+=========================
+
+The ``custom.onse`` module is a custom Django app for the self-hosted
+ONSE ISS project.
+
+Follow these steps to enable this module for the ONSE ISS project:
+
+1. In CommCare Cloud, edit the **public.yml** file for your environment.
+   You will find an entry named "localsettings" in the file. Inside the
+   "localsettings" entry, add a key named "LOCAL_APPS" and set its value
+   as follows:
+
+   .. code-block:: yaml
+
+      localsettings:
+        LOCAL_APPS:
+          - host: "all"
+            name: "custom.onse"
+
+2. Deploy the updated configuration to your environment:
+
+   .. code-block:: bash
+
+      $ commcare-cloud <env> update-config
+
+
 Importing aggregated data from DHIS2
 ====================================
 
diff --git a/docker/files/Dockerfile.es.5 b/docker/files/Dockerfile.es.5
index 5d92f6dda41b..a330a0ce3aed 100644
--- a/docker/files/Dockerfile.es.5
+++ b/docker/files/Dockerfile.es.5
@@ -1,3 +1,3 @@
 FROM docker.io/elasticsearch:5.6.16
 
-RUN bin/elasticsearch-plugin install analysis-phonetic
+RUN bin/elasticsearch-plugin install --silent analysis-phonetic
diff --git a/docker/run.sh b/docker/run.sh
index b0b9cebcad54..85bf0d6724fd 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -138,6 +138,9 @@ function run_tests {
         su cchq -c "/bin/bash ../run_tests $argv_str" 2>&1
         log_group_end  # only log group end on success (notice: `set -e`)
         if [ "$TEST" == "python-sharded-and-javascript" ]; then
+            logmsg INFO "Building Webpack"
+            chown -R cchq:cchq ./webpack
+            su cchq -c "yarn build"
             su cchq -c scripts/test-prod-entrypoints.sh
             scripts/test-make-requirements.sh
             scripts/test-serializer-pickle-files.sh
diff --git a/docs/case_search_query_language.rst b/docs/case_search_query_language.rst
index eb81b096ed8c..42709b0c3875 100644
--- a/docs/case_search_query_language.rst
+++ b/docs/case_search_query_language.rst
@@ -184,6 +184,19 @@ The following functions are supported:
 .. _Fuzzy Query: https://www.elastic.co/guide/en/elasticsearch/reference/8.11/query-dsl-fuzzy-query.html
 .. _Levenshtein distance: https://en.wikipedia.org/wiki/Levenshtein_distance
 
+``fuzzy-date``
+---------------
+* **Behavior**: Determines if a given date is a fuzzy match for a given case property.
+* **Return**: True if that particular date or any of the generated permutations matches the case property.
+  Otherwise False.
+* **Arguments**:  Two arguments: the case property and the date to check.
+* **Usage**: ``fuzzy-date(dob, "2012-12-03")``
+
+.. note::
+   ``fuzzy-date`` generates a list of dates that might be the result of a typo in the date like switching
+   day and month field or reversing the digits in either day, month or the decade part of the year. Only
+   combinations of these that are valid dates will be check against.
+
 ``phonetic-match``
 ------------------
 * **Behavior**: Match cases if a given value "sounds like" (using `Soundex`_) the value of a given
diff --git a/docs/fhir/fhir_import_config.rst b/docs/fhir/fhir_import_config.rst
index 305cbb013abf..abf6816617c2 100644
--- a/docs/fhir/fhir_import_config.rst
+++ b/docs/fhir/fhir_import_config.rst
@@ -31,58 +31,33 @@ Configuring a FHIRImportConfig
 Currently, all configuration is managed via Django Admin (except for
 adding Connection Settings).
 
-.. warning::
-    Django Admin cannot filter select box values by domain. Name your
-    Connection Setting with the name of your domain so that typing the
-    domain name in the select box will find it fast.
-
-    .. TODO: Is this definitely true? Is there no way to filter select
-             box values by domain?
-
 In Django Admin, navigate to FHIR > FHIR Import Configs. If you have any
 FHIRImportConfig instances, they will be listed there, and you can
 filter by domain. To add a new one, click "Add FHIR Import Config +".
 
-The form is quite straight forward. You will need to provide the ID of a
-mobile worker in the "Owner ID" field. All cases that are imported will
-be assigned to this user.
-
-This workflow will not scale for large projects. When such a project
-comes up, we have planned for two approaches, and will implement one or
-both based on the project's requirements:
-
-1. Set the owner to a user, group or location.
-2. Assign a FHIRImportConfig to a CommCare location, and set ownership
-   to the mobile worker at that location.
+The form is quite straightforward. You will need to provide the ID of a
+mobile worker, location, or group in the "Owner ID" field. All imported
+cases will be assigned to this ID.
 
 
 Mapping imported FHIR resource properties
 -----------------------------------------
 
-Resource properties are mapped via the Admin interface using
-ValueSource definitions, similar to :ref:`admin-interface-mapping` for
-data forwarding and the FHIR API. But there are a few important
-differences:
+Resource properties are mapped via the Admin interface using ValueSource
+definitions, similar to :ref:`admin-interface-mapping` for data
+forwarding and the FHIR API. But there are a few important differences:
 
 The first difference is that FHIRRepeater and the FHIR API use
 FHIRResourceType instances (rendered as "FHIR Resource Types" in Django
 Admin) to configure mapping; FHIRImportConfig uses
 FHIRImportResourceType instances ("FHIR Import Resource Types").
 
-To see what this looks like, navigate to FHIR > FHIR Importer Resource
-Types, and click "Add FHIR Importer Resource Type".
+To see what this looks like, navigate to FHIR > FHIR Import Resource
+Types, and click "Add FHIR Import Resource Type".
 
 Select the FHIR Import Config, set the name of the FHIR resource type,
 and select the case type.
 
-.. note::
-    The resource types you can import are not limited to the resource
-    types that can be managed using the Data Dictionary. But if you want
-    to send the same resources back to FHIR when they are modified in
-    CommCare, then you will either need to stick to the Data Dictionary
-    FHIR resource types limitation, or add the resource type you want to
-    the list in `corehq/motech/fhir/const.py`_.)
-
 The "Import related only" checkbox controls that third import strategy
 mentioned earlier.
 
@@ -105,14 +80,14 @@ Patient's phone number. They might look like this:
 .. code:: javascript
 
     {
-      "jsonpath":"$.telecom[0].system",
+      "jsonpath": "$.telecom[0].system",
       "value": "phone"
     }
 
 .. code:: javascript
 
     {
-      "jsonpath":"$.telecom[0].value",
+      "jsonpath": "$.telecom[0].value",
       "case_property": "phone_number"
     }
 
@@ -124,7 +99,7 @@ item whose "system" is set to "phone". That is defined like this:
 .. code:: javascript
 
     {
-      "jsonpath":"$.telecom[?system='phone'].value",
+      "jsonpath": "$.telecom[?system='phone'].value",
       "case_property": "phone_number"
     }
 
@@ -135,37 +110,49 @@ some of the imported values before overwriting existing values on the
 case. It is wise to confirm with the delivery team how to treat case
 properties that can be edited.
 
-
-.. _corehq/motech/fhir/const.py: https://github.com/dimagi/commcare-hq/blob/master/corehq/motech/fhir/const.py#L35
 .. _Patient search parameters: https://www.hl7.org/fhir/patient.html#search
 
 
 Configuring related resources
 -----------------------------
 
-If a FHIR Importer resource type has "Import related only" checked, we
+If a FHIR Import resource type has "Import related only" checked, we
 need to configure how the resource type is related.
 
-Navigate to FHIR > JSON Path to resource types, and click "Add JSON Path
-to resource type".
+For example, Patient resources may have associated ServiceRequests, which you
+may want to import. To achieve this, you'd set up a FHIRImportResourceType for
+ServiceRequests, with "import related only" checked, so only those associated
+with patients in the import are fetched.
+
+Navigate to FHIR > "Resource type relationships", and click "Add
+resource type relationship".
+
+Relationships are configured on the child resource type, with a
+reference to their parent, just like a typical foreign key relationship.
+Options available in this config are:
 
-A ServiceRequest.subject is a reference to the Patient it is referring.
+* Resource type - the type of the child or descendant resource.
+* Jsonpath - the path used to identify the parent or ancestor resource.
+* Related resource type - the type of the parent or ancestor resource.
+* Related resource is parent - checkbox indicating whether CommCare
+  should set up a parent/child index between the two cases.
 
-Set "Resource type" to "ServiceRequest".
+.. admonition:: Example: Adding a patient service request
 
-Set "JSONPath" to "$.subject.reference".
+    First set up a ServiceRequest resource type as described in the previous
+    section. Check "import related only" to only fetch those linked to patients
+    in the import. Then navigate to the "Add resource type relationship" page.
 
-Set "Related resource type" to "Patient".
+    ``ServiceRequest.subject`` references the Patient it is referring.
+    To set up this relationship:
 
-If the "Related resource is parent" checkbox is not checked, then
-CommCare will just create a case for the Patient. If it is checked, then
-CommCare will also create an index on the case for the ServiceRequest as
-a child case, and link it to the case for the Patient as its parent
-case.
+    * Set "Resource type" to "ServiceRequest".
+    * Set "Jsonpath" to ``$.subject.reference``.
+    * Set "Related resource type" to "Patient".
 
-The child-to-parent relationship will follow the direction of the
-reference. So if a Foo resource has a reference to a Bar resource,
-then in CommCare the "foo" case will be the child of the "bar" case.
+    If the "Related resource is parent" checkbox is checked, then CommCare will
+    create an index on the ServiceRequest case, making the Patient case its
+    parent.
 
 
 Testing FHIRImportConfig configuration
diff --git a/docs/index.rst b/docs/index.rst
index 4ae9d2f4abdc..6fde437205f6 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -65,7 +65,6 @@ Data is transmitted from the phone to the server (and vis-a-versa) over a secure
     :maxdepth: 1
 
     reporting
-    maps
     exports
     change_feeds
     pillows
diff --git a/docs/js-guide/README.rst b/docs/js-guide/README.rst
index 743c2a2d4e92..d772c42fcb7f 100644
--- a/docs/js-guide/README.rst
+++ b/docs/js-guide/README.rst
@@ -15,6 +15,7 @@ Table of contents
     :maxdepth: 1
 
     code-organization
+    static-files
 
 .. toctree::
     :caption: Dependencies
@@ -22,17 +23,23 @@ Table of contents
 
     dependencies
     module-history
-    migrating
     libraries
     external-packages
 
+.. toctree::
+    :caption: Migrations
+    :maxdepth: 1
+
+    migrating
+    requirejs-to-webpack
+    amd-to-esm
+
 .. toctree::
     :caption: Best practices
     :maxdepth: 1
 
     integration-patterns
     security
-    static-files
     inheritance
     code-review
 
diff --git a/docs/js-guide/amd-to-esm.rst b/docs/js-guide/amd-to-esm.rst
new file mode 100644
index 000000000000..fb0503b3aeab
--- /dev/null
+++ b/docs/js-guide/amd-to-esm.rst
@@ -0,0 +1,194 @@
+Updating Module Syntax from AMD to ESM
+======================================
+
+Most entry points for legacy modules that have recently been migrated from RequireJS to
+Webpack as part of the `RequireJS to Webpack Migration
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__
+are eligible for this update.
+
+See the `Historical Background on Module Patterns
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/module-history.rst>`__
+for a more detailed discussion of module types. As a quick refresher, here are some definitions:
+
+Modified AMD (Asynchronous Module Definition)
+    The legacy module type used for older JavaScript modules on HQ, identified by having an ``hqDefine``
+    statement near the top of the file. AMD was the only module type compatible with RequireJS,
+    our first JavaScript bundler. It is still needed as a format for modules required by No-Bundler pages.
+
+ESM (ES Modules)
+    The newest module type with updated powerful import and export syntax. This is the module
+    format that you will see referenced by documentation in modern javascript frameworks.
+    This is quickly identified by the ``import`` statements at the top used for including dependencies.
+
+The different types of modules you will encounter are:
+
+Entry Point Modules
+    Modules that are included directly on a page using a bundler template tag, like
+    ``js_entry``. These are the modules that the bundler (Webpack) uses to build
+    a dependency graph so that it knows what bundle of javascript dependencies and
+    page-specific code is needed to render that page / entry point.
+
+Dependency Modules
+    These are modules that are never referenced by ``js_entry`` and are only
+    in the list of dependencies for other modules. Often these modules are used as utility modules
+    or a way to organize JavaScript for a page that is very front-end heavy.
+
+
+Step 1: Determine if the Module is Eligible for a Syntax Update
+---------------------------------------------------------------
+
+The HQ AMD-style module will look something like:
+
+::
+
+    hqDefine('hqwebapp/js/my_module', [
+        'jquery',
+        'knockout',
+        'underscore',
+        'hqwebapp/js/initial_page_data',
+        'hqwebapp/js/assert_properties',
+        'hqwebapp/js/bootstrap5/knockout_bindings.ko',
+        'commcarehq',
+    ], function (
+        $,
+        ko,
+        _,
+        initialPageData,
+        assertProperties
+    ) {
+        ...
+    });
+
+
+Entry Points
+~~~~~~~~~~~~
+
+If this module is a webpack entry point, then it is eligible for an update. In the example above, you would find
+``hqwebapp/js/my_module`` used on a page with the following:
+
+::
+
+    {% js_entry "hqwebapp/js/my_module %}
+
+The entry point can also be specified with ``js_entry_b3`` if the module is part of the Bootstrap 3 build
+of Webpack.
+
+If this module is inside a ``requirejs_main`` or ``requirejs_main_b5`` tag, then it is NOT eligible for an update.
+Instead, please first
+`migrate this module from RequireJS to Webpack <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__
+
+Dependency Modules
+~~~~~~~~~~~~~~~~~~
+
+If this module is a dependency of any modules that are ``requirejs_main`` entry points,
+then this module is not eligible for migration. If a module's syntax is updated when it's still
+required by RequireJS modules, then it will result in a RequireJS build failure on deploy.
+
+You can check the status of a dependency module's RequireJS usage by looking at the
+`Bootstrap 3 <https://www.commcarehq.org/static/build.b3.txt>`__ and
+`Bootstrap 5 <https://www.commcarehq.org/static/build.b5.txt>`__ module list.
+
+If this module is referenced by any ``hqImport`` calls (for instance ``hqImport('hqwebapp/js/my_module')``),
+then this module is NOT yet eligible, and must continue using the older AMD-style syntax until
+the ``hqImport`` statements are no longer needed. See the
+`JS Bundler Migration Guide <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/migrating.rst>`__ for
+how to proceed in this case.
+
+Slightly Different Syntax
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If the AMD-style module looks a bit different than the syntax above--for instance, the list of dependencies are missing or
+``hqImport`` and/or global variables can be found in the main body of the module--then this module must be
+`migrated to use a JS Bundler <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/migrating.rst>`__.
+
+
+Step 2: Update the Module Syntax
+--------------------------------
+
+Key Points
+~~~~~~~~~~
+
+-   ESM no longer needs to define the module name within the module itself. Instead, Webpack (our bundler) is configured
+    to know how to reference this module by its filename and relative path within an application.
+-   By default, you can use the same dependency names with the ``import`` syntax. If the ``import`` statement results
+    in a Webpack Build error, look at ``webpack.common.js`` because it might require an alias. If you still have
+    a problem, check ``requirejs_config.js``, because there might have been an alias defined there that hasn't
+    been added to ``webpack.common.js``.
+
+
+Example Structural Change
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This is a rough example of what the changes will look like:
+
+::
+
+    hqDefine('hqwebapp/js/my_module', [
+        'jquery',
+        'knockout',
+        'underscore',
+        'hqwebapp/js/initial_page_data',
+        'hqwebapp/js/assert_properties',
+        'hqwebapp/js/bootstrap5/knockout_bindings.ko',
+        'commcarehq',
+    ], function (
+        $,
+        ko,
+        _,
+        initialPageData,
+        assertProperties
+    ) {
+        ...
+    });
+
+to
+
+::
+
+    import "commcarehq";  // Note: moved to top
+
+    // named yarn/npm dependencies
+    import $ from "jquery";
+    import ko from "knockout";
+    import _ from "underscore";
+
+    // named internal dependencies:
+    import initialPageData from "hqwebapp/js/initial_page_data";
+    import assertProperties from "hqwebapp/js/assert_properties";
+
+    // unnamed internal dependencies:
+    import "hqwebapp/js/bootstrap3/knockout_bindings.ko";
+
+    // module specific code...
+    ...
+
+Note that ``import "commcarehq";`` has been moved to the top of the file. The ordering is
+for consistency purposes, but it's important that either ``import "commcarehq";`` or
+``import "commcarehq_b3";`` (for Bootstrap 3 / ``js_entry_b3``) is present in the list
+of imports for Webpack Entry Point modules. If this import is not present in an entry point,
+then site-wide navigation, notifications, modals, and other global widgets will not
+work on that page.
+
+Remember, an Entry Point is any module that is included directly on a page using the
+``js_entry`` or ``js_entry_b3`` template tags.
+
+Modules that are not entry points are not required to have this import. If you are updating the
+syntax of a dependency (non-entry point) module, do not worry about including this import if
+it is not already present.
+
+
+Step 4: Other Code Updates
+--------------------------
+
+If this module is an entry point, then the rest of the module-specific code can remain as is,
+with the indentation level updated. However, some entry points are also dependencies of other
+entry points. If that's the case, proceed to the next part.
+
+If this module is a dependency module, meaning it is referenced by other modules,
+then the ``return`` line at the end of the module should follow the appropriate ``export`` syntax
+needed by the modules that depend on this module.
+
+The most likely change is to replace ``return`` with ``export`` and leave everything else as is.
+Otherwise, see the
+`export documentation <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export>`__
+for details and inspiration in case you want to do some additional refactoring.
diff --git a/docs/js-guide/code-organization.rst b/docs/js-guide/code-organization.rst
index a46bf0370ef9..337055443e84 100644
--- a/docs/js-guide/code-organization.rst
+++ b/docs/js-guide/code-organization.rst
@@ -2,7 +2,8 @@ Static Files Organization
 -------------------------
 
 All\* JavaScript code should be in a .js file and encapsulated as a
-module using ``hqDefine``.
+module either using the ES Module syntax or modified-AMD syntax in
+legacy code using using ``hqDefine``.
 
 JavaScript files belong in the ``static`` directory of a Django app,
 which we structure as follows:
@@ -15,15 +16,17 @@ which we structure as follows:
        font/
        images/
        js/       <= JavaScript
-       less/
+       scss/
        lib/      <= Third-party code: This should be rare, since most third-party code should be coming from yarn
        spec/     <= JavaScript tests
        ...       <= May contain other directories for data files, i.e., `json/`
      templates/myapp/
        mytemplate.html
 
-\* There are a few places we do intentionally use script blocks, such as
-configuring less.js in CommCare HQ’s main template,
-``hqwebapp/base.html``. These are places where there are just a few
-lines of code that are truly independent of the rest of the site’s
-JavaScript. They are rare.
+To develop with javascript locally, make sure you run ``yarn dev`` and
+restart ``yarn dev`` whenever you add a new Webpack Entry Point.
+
+\* There are a few places we do intentionally use script blocks.
+These are places where there are just a few lines of code that are
+truly independent of the rest of the site's JavaScript. They are rare.
+For instance, third-party analytics script blocks are an example.
diff --git a/docs/js-guide/dependencies.rst b/docs/js-guide/dependencies.rst
index ecc32325a621..75e6703a1299 100644
--- a/docs/js-guide/dependencies.rst
+++ b/docs/js-guide/dependencies.rst
@@ -1,72 +1,154 @@
 Managing Dependencies
 =====================
 
-HQ’s JavaScript is being gradually migrated from a legacy, unstructured
-coding style the relies on the ordering of script tags to instead use
-RequireJS for dependency management. This means that dependencies are
-managed differently depending on which area of the code you’re working
-in. This page is a developer’s guide to understanding which area you’re
-working in and what that means for your code.
+Front-end dependencies are managed using ``yarn`` and are defined in ``package.json`` at the
+root of the ``commcare-hq`` repository.
 
-My python tests are failing because of javascript
--------------------------------------------------
-`TestRequireJS
-<https://github.com/dimagi/commcare-hq/blob/0acf35279639c695b943784704a9f74ce6a86465/corehq/apps/hqwebapp/tests/test_requirejs.py#L10>`__
-reads all of our javascript files, checking for common errors.
+Most JavaScript on HQ is included on a page via a JavaScript bundle.
+These bundles are created by Webpack. Webpack is given a list of "entry points"
+(or pages) and builds a dependency graph of modules to determine what
+code is needed for a page, combining related code into bundles.
+These bundles are split along ``vendor`` (npm modules),
+``common`` (all of hq), and application (like ``hqwebapp`` or ``domain``).
 
-These tests are naive. They don't parse JavaScript, they just run regexes based on expected coding patterns.
-They use `this method <#how-do-i-know-whether-or-not-im-working-with-requirejs>`__ to determine if a file is
-using RequireJS. This is one reason not to add dependency lists in areas of HQ that don't yet use RequireJS.
+For legacy code, RequireJS creates bundles around Django applications.
+These bundles are created during deploy with the ``build_requirejs`` management
+command, and are typically not created during development. Here
+are the production bundles split along Bootstrap versions for RequireJS:
 
-**test_requirejs_disallows_hqimport**
+- `Bootstrap 3 <https://www.commcarehq.org/static/build.b3.txt>`__
+- `Bootstrap 5 <https://www.commcarehq.org/static/build.b5.txt>`__
 
-``hqImport`` only works in non-RequireJS contexts. In RequireJS files, dependencies should be included in the
-module's ``hqDefine`` call, as described `here <#how-do-i-know-whether-or-not-im-working-with-requirejs>`__.
+By bundling code, we can make fewer round-trip requests to fetch all of a page's JavaScript.
+Additionally, the bundler minifies each bundle to reduce its overall size. You can learn
+more about bundlers in `the Static Files Overview
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/static-files.rst#why-use-a-javascript-bundler>`__
 
-Occasionally, this does not work due to a circular dependency. This will manifest as the module being undefined.
-`hqRequire <https://github.com/dimagi/commcare-hq/commit/15b436f77875f57d1e3d8d6db9b990720fa5dd6f#diff-73c73327e873d0e5f5f4e17c3251a1ceR100>`__
-exists for this purpose, to require the necessary module at the point where it’s used. ``hqRequire`` defines
-a new module, which can be fragile, so limit the code using it. As in python, best practice is to include
-dependencies at the module level, at the top of the file.
+HQ is transitioning from RequireJS (our original JavaScript bundler, which is no longer maintained)
+to Webpack. Portions of this documentation that reference RequireJS will remain until RequireJS
+has been fully removed from the codebase. See the `RequireJS to Webpack Migration Guide
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__
+for more information about this migration.
 
+A few areas of our codebase are also undergoing a migration toward using a bundler.
+You can read more about this migration in the `JS Bundler Migration Guide
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/migration.rst>`__
 
-**test_files_match_modules**
+Before adopting a bundler, HQ's javascript followed a more legacy, unstructured coding style
+that relied on ordering script tags on a page. This approach required more individual
+requests to fetch each dependency separately. "Bundles" were created manually by grouping
+script tags inside the ``compress`` template tag managed by Django Compressor.
 
-RequireJS requires that a module's name is the same as the file containing it. Rename your module.
+If you are modifying code inside a section that still follows this structure, the way you
+import external modules/dependencies for use in that page's code will differ from the module
+approach on pages using either Webpack or RequireJS. We will address this legacy approach
+at the end of this chapter.
 
-My deploy is failing because of javascript
-------------------------------------------
 
-This manifests as an error during static files handling, referencing
-optimization, minification, or parsing.
-Sometimes this is due to strictness in the requirejs parsing.
-Most often this is a trailing comma in a list of function parameters.
+How do I create a new page with JavaScript?
+-------------------------------------------
 
-Errors also pop up due to certain syntax, including
-`spread syntax <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax>`__ and
-`optional chaining <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Optional_chaining>`__.
-This is the result of requirejs depending on a version of uglify that depends on an old version of
-esprima. See `here <https://github.com/requirejs/r.js/issues/971>`__.
-In third party libraries that are already minified, we can work around this by using ``empty:`` to
-skip optimization (docs). This is done for Sentry `here <https://github.com/dimagi/commcare-hq/blob/0d3badffdfe65bdbab554a1e1aed518398fcb53e/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml#L12-L14>`__.
-For our own code, we have a `babel plugin for requirejs <https://www.npmjs.com/package/requirejs-babel7>`__.
-See `here <https://github.com/dimagi/commcare-hq/pull/33083>`__.
+New code should be written using the ES Module (ESM) format and bundled using Webpack. This approach
+is oriented around a single "entry point" per page (with some pages sharing the same entry point).
+This entry point contains the page-level logic needed for that page and imports other modules for shared logic.
+
+A typical new module structure will look something like:
+
+::
 
-How do I know whether or not I’m working with RequireJS?
---------------------------------------------------------
+    import "commcarehq";  // REQUIRED at the top of every "entry point"
+                          // This loads site-wide dependencies needed to run global navigation, modals, notifications, etc.
 
-You are likely working with RequireJS, as most of HQ has been migrated.
-However, several major areas have **not** been migrated: app manager,
-reports, and web apps. Test code also does not currently use RequireJS;
-see
-`Testing <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/testing.rst>`__
-for working with tests.
+    // Common third-party dependencies
+    import $ from "jquery";                     // Ideally, new pages should move away from jQuery and use native
+                                                // javascript. But this is here as an example.
+    import ko from "knockout";
+    import "hqwebapp/js/knockout_bindings.ko";  // This one doesn't need a named parameter because it only adds
+                                                // knockout bindings and is not referenced in this file
+    import _ from "underscore";
 
-To tell for sure, look at your module’s ``hqDefine`` call, at the top of
-the file.
+    // A commonly used internal module for passing server-side data to the front end
+    import initialPageData from "hqwebapp/js/initial_page_data";
 
-RequireJS modules look like this, with all dependencies loaded as part
-of ``hqDefine``:
+    /* page-level entry point logic begins here */
+
+
+
+To register your module as a Webpack entry point, add the ``js_entry`` template tag to your HTML template,
+near the top and outside of any other block:
+
+::
+
+   {% js_entry 'prototype/js/example' %}
+
+Some pages don't have any unique logic but do rely on other modules.
+These are usually pages that use some common widgets but don't have custom UI interactions.
+
+If your page only relies on a single JavaScript module, you can use that as that
+page's entry point:
+
+::
+
+   {% js_entry 'locations/js/widgets' %}
+
+If your page relies on multiple modules, it still needs one entry point.
+You can handle this by making a module that only imports other modules.
+For instance an entry point located at ``prototype/js/combined_example.js``
+might look like:
+
+::
+
+    import "commcarehq";  // always at the top
+
+    import "hqwebapp/js/crud_paginated_list_init";
+    import "hqwebapp/js/bootstrap5/widgets";
+
+    // No page-specific logic, just need to collect the dependencies above
+
+Then in your HTML page:
+
+::
+
+   {% js_entry 'prototype/js/combined_example' %}
+
+The exception to the above is if your page inherits from a legacy page that
+doesn't use a JavaScript bundler, like reports and app manager. This is rare,
+but one example would be adding a new page to app manager that inherits
+from ``managed_app.html``.
+
+
+Why is old code formatted differently?
+--------------------------------------
+
+You may notice that older JavaScript code on HQ is written in a modified AMD
+(Asynchronous Module Definition) format. AMD was the only module format compatible
+with our previous bundler, RequireJS. Most older entry points are written in this
+modified AMD style and should eventually be migrated to an ESM format
+once these entry points `are migrated to Webpack
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__.
+
+However, be careful when migrating modified AMD modules that aren't entry points, as some of these modules,
+like ``hqwebapp/js/initial_page_data``, are still being referenced by pages not using a JavaScript bundler.
+These pages still require this modified AMD approach until they transition to using Webpack.
+
+We will cover what common modified AMD modules look like in this section, but you can read more
+about this choice of module format in the `Historical Background on Module Patterns
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/module-history.rst>`__
+
+The process of migrating a module from AMD to ESM is very straightforward. To learn more,
+please see `Migrating Modules from AMD to ESM
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/amd-to-esm.rst>`__
+
+
+Modified AMD Legacy Modules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Modified AMD-style modules are used both on bundler pages and no-bundler pages.
+
+To differentiate between the two, look at the module's ``hqDefine`` call at the top of the file.
+
+Modules in this format used with Webpack (or RequireJS) will look like the following,
+with all dependencies loaded as part of ``hqDefine``:
 
 ::
 
@@ -81,10 +163,10 @@ of ``hqDefine``:
        ...
    });
 
-Non-RequireJS modules look like this, with no list and no function
-parameters. HQ modules are loaded using ``hqImport`` in the body, and
-third party libraries aren’t declared at all, instead relying on
-globals:
+In no-bundler areas of the codebase, "transition" AMD modules look like the following,
+having no dependency list and no function parameters.
+Additionally, HQ modules are loaded using ``hqImport`` in the body, and third-party libraries aren't declared at all,
+instead relying on globals like ``ko`` (for Knockout.js) in the example below.
 
 ::
 
@@ -93,102 +175,80 @@ globals:
        ...
    });
 
-How do I write a new page?
---------------------------
 
-New code should be written in RequireJS, which is oriented around a
-single “entry point” into the page.
+How do I know whether I’m working with Webpack or RequireJS?
+------------------------------------------------------------
 
-Most pages have some amount of logic only relevant to that page, so they
-have a file that includes that logic and then depends on other modules
-for shared logic.
+You are likely working with either Webpack or RequireJS, as most of HQ has been migrated to use a bundler.
+However, two major areas have **not** been migrated: app manager and reports.
 
-`data_dictionary.js <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/data_dictionary/static/data_dictionary/js/data_dictionary.js>`__
-fits this common pattern:
+The easiest way to determine if a page is using either Webpack or RequireJS is to
+open the JavaScript console on that page and type ``window.USE_WEBPACK``, which will return
+``true`` if the page is using Webpack, or ``window.USE_REQUIREJS``, which will return
+``true`` if the page is using RequireJS. If neither are ``true``, then the page is
+a no-bundler page.
 
-::
+ES Modules (ESM)
+~~~~~~~~~~~~~~~~
 
-   hqDefine("data_dictionary/js/data_dictionary", [    // Module name must match filename
-       "jquery",                                       // Common third-party dependencies
-       "knockout",
-       "underscore",
-       "hqwebapp/js/initial_page_data",                // Dependencies on HQ files always match the file's path
-       "hqwebapp/js/main",
-       "analytix/js/google",
-       "hqwebapp/js/knockout_bindings.ko",             // This one doesn't need a named parameter because it only adds
-                                                       // knockout bindings and is not referenced in this file
-   ], function (
-       $,                                              // These common dependencies use these names for compatibility
-       ko,                                             // with non-requirejs pages, which rely on globals
-       _,
-       initialPageData,                                // Any dependency that will be referenced in this file needs a name.
-       hqMain,
-       googleAnalytics
-   ) {
-       /* Function definitions, knockout model definitions, etc. */
+If your page is using ESM, it is using Webpack, as RequireJS and no-bundler pages do
+not use this module format.
 
-       var dataUrl = initialPageData.reverse('data_dictionary_json');  // Refer to dependencies by their named parameter
-       ...
+ESM can quickly be identified by scanning the file for ``import`` statements like this:
 
-       $(function () {
-           /* Logic to run on documentready */
-       });
+::
 
-       // Other code isn't going to depend on this module, so it doesn't return anything or returns 1
-   });
+    import myDependency from "hqwebapp/js/my_dependency";
 
-To register your module as the RequireJS entry point, add the
-``requirejs_main`` template tag to your HTML page, near the top but
-outside of any other block:
+    import { Modal } from "bootstrap5";
 
-::
 
-   {% requirejs_main 'data_dictionary/js/data_dictionary' %}
+How do I add a new internal module or external dependency to an existing page?
+------------------------------------------------------------------------------
 
-Some pages don’t have any unique logic but do rely on other modules.
-These are usually pages that use some common widgets but don’t have
-custom UI interactions.
+Webpack supports multiple module formats, with ES Modules (ESM) being the preferred format.
+New modules should be written in the ESM format.
 
-If your page only relies on a single js module, you can use that as the
-module’s entry point:
+That being said, a lot of legacy code on HQ is written in a modified AMD format.
+If you are adding a lot of new code to such a module, it is recommended that you
+`migrate this module to ESM format
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/amd-to-esm.rst>`__.
+However, not every modified AMD module is ready to be migrated to ESM immediately,
+so it's worth familiarizing yourself with working in that format.
 
-::
+The format of the module you add a dependency to will determine how you include that dependency.
 
-   {% requirejs_main 'locations/js/widgets' %}
+ESM Module
+~~~~~~~~~~
 
-If your page relies on multiple modules, it still needs one entry point.
-You can handle this by making a module that has no body, just a set of
-dependencies, like in
-`gateway_list.js <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/sms/static/sms/js/gateway_list.js>`__:
+ESM modules provide an extensive and flexible away of managing and naming imports from dependencies.
 
 ::
 
-   hqDefine("sms/js/gateway_list", [
-       "hqwebapp/js/crud_paginated_list_init",
-       "hqwebapp/js/bootstrap3/widgets",
-   ], function () {
-       // No page-specific logic, just need to collect the dependencies above
-   });
+    import myDependency from "hqwebapp/js/my_new_dependency";
+    myDependency.myFunction();
 
-Then in your HTML page:
+    // using only portions of an dependency
+    import { Modal } from "bootstrap5";
+    const myModal = new Modal(document.getElementById('#myModal'));
 
-::
+    // this also works
+    import bootstrap from "bootstrap5";
+    const myOtherModal = new bootstrap.Modal(document.getElementById('#myOtherModal'));
 
-   {% requirejs_main 'sms/js/gateway_list' %}
+    // you can also alias imports
+    import * as myAliasedDep from "hqwebapp/js/my_other_dependency";
 
-The exception to the above is if your page inherits from a page that
-doesn’t use RequireJS. This is rare, but one example would be adding a
-new page to app manager that inherits from ``managed_app.html``.
 
-How do I add a new dependency to an existing page?
---------------------------------------------------
+Modified AMD (previously "RequireJS")
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-RequireJS
-~~~~~~~~~
+.. warning::
+    RequireJS is being replaced by Webpack. You should NOT create NEW modules with this style.
 
-Add the new module to your module’s ``hqDefine`` list of dependencies.
-If the new dependency will be directly referenced in the body of the
-module, also add a parameter to the ``hqDefine`` callback:
+To use your new module/dependency, add it your module’s ``hqDefine`` list of dependencies.
+If the new dependency will be directly referenced in the body of the module, also add a
+parameter to the ``hqDefine`` callback:
 
 ::
 
@@ -203,8 +263,21 @@ module, also add a parameter to the ``hqDefine`` callback:
        myDependency.myFunction();
    });
 
-Non-RequireJS
-~~~~~~~~~~~~~
+
+No-Bundler Pages
+~~~~~~~~~~~~~~~~
+
+.. note::
+
+    No-Bundler pages are pages that do not have a Webpack (or RequireJS) entry point.
+    New pages should never be created without a ``js_entry`` entry point.
+
+    Eventually, the remaining pages in this category will be modularized properly to integrate with Webpack
+    as part of the `JS Bundler Migration
+    <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/migrating.rst>`__.
+
+    Also note that these pages are **only** compatible with legacy modified AMD modules. ESM modules
+    do not work here.
 
 In your HTML template, add a script tag to your new dependency. Your
 template likely already has scripts included in a ``js`` block:
@@ -227,13 +300,94 @@ dependency:
        myDependency.myFunction();
    });
 
-Do **not** add the RequireJS-style dependency list and parameters. It’s
+Do **not** add the dependency list and parameters from the modified AMD style or
+use `hqImport` on ESM formatted modules. It's
 easy to introduce bugs that won’t be visible until the module is
 actually migrated, and migrations are harder when they have pre-existing
-bugs. See the `troubleshooting section of the RequireJS Migration
+bugs. See the `troubleshooting section of the JS Bundler Migration
 Guide <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/migrating.rst#troubleshooting>`__
 if you’re curious about the kinds of issues that crop up.
 
+
+My python tests are failing because of javascript
+-------------------------------------------------
+
+Failures after "Building Webpack"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The JavaScript tests run in Github Actions ``yarn build`` to check that ``webpack`` is building
+without errors. You can run ``yarn build`` locally to simulate any errors encountered by these tests.
+
+Since you are likely developing using ``yarn dev``, you should have already encountered the
+build errors during development. However, if the development build of Webpack is running
+without failures, please check the ``webpack/webpack.prod.js`` configuration for possible
+issues if the error messages don't yield anything useful.
+
+
+RequireJS Test Failures
+~~~~~~~~~~~~~~~~~~~~~~~
+
+`TestRequireJS
+<https://github.com/dimagi/commcare-hq/blob/0acf35279639c695b943784704a9f74ce6a86465/corehq/apps/hqwebapp/tests/test_requirejs.py#L10>`__
+reads all of our javascript files, checking for common errors.
+
+These tests are naive. They don't parse JavaScript, they just run regexes based on expected coding patterns.
+They use `this method <#amd-style-legacy-modules>`__ to determine if a file is using an AMD module compatible
+with a bundler (originally, RequireJS). This is one reason not to add dependency lists in areas of HQ
+that don't yet use a bundler.
+
+**test_requirejs_disallows_hqimport**
+
+``hqImport`` only works in non-bundled contexts. In modules (Webpack or RequireJS), dependencies should be
+included using ESM ``imports`` or listed module's ``hqDefine`` call, as described `here <#amd-style-legacy-modules>`__.
+
+Occasionally, this does not work due to a circular dependency. This will manifest as the module being undefined.
+`hqRequire <https://github.com/dimagi/commcare-hq/commit/15b436f77875f57d1e3d8d6db9b990720fa5dd6f#diff-73c73327e873d0e5f5f4e17c3251a1ceR100>`__
+exists for this purpose, to require the necessary module at the point where it’s used. ``hqRequire`` defines
+a new module, which can be fragile, so limit the code using it. As in python, best practice is to include
+dependencies at the module level, at the top of the file.
+
+
+**test_files_match_modules**
+
+RequireJS requires that a module's name is the same as the file containing it. Rename your module.
+
+
+My deploy is failing because of javascript
+------------------------------------------
+
+Webpack Failures
+~~~~~~~~~~~~~~~~
+
+Webpack failures during deploy should be rare if you were able to run ``yarn dev`` successfully
+locally during development. However, if these failures do occur, it is likely due to
+issues with supporting deployment infrastructure.
+
+Is the version of ``npm`` and ``yarn`` up-to-date on the deploy machines? Are the supporting scripts
+outlined in the staticfiles_collect tasks for `Webpack
+<https://github.com/dimagi/commcare-cloud/blob/master/src/commcare_cloud/ansible/roles/deploy_hq/tasks/staticfiles_collect.yml>`__
+configured properly?
+
+
+RequireJS Failures
+~~~~~~~~~~~~~~~~~~
+
+This manifests as an error during static files handling, referencing
+optimization, minification, or parsing.
+Sometimes this is due to strictness in the requirejs parsing.
+Most often this is a trailing comma in a list of function parameters.
+
+Errors also pop up due to certain syntax, including
+`spread syntax <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Spread_syntax>`__ and
+`optional chaining <https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Optional_chaining>`__.
+This is the result of requirejs depending on a version of uglify that depends on an old version of
+esprima. See `here <https://github.com/requirejs/r.js/issues/971>`__.
+In third party libraries that are already minified, we can work around this by using ``empty:`` to
+skip optimization (docs). This is done for Sentry `here <https://github.com/dimagi/commcare-hq/blob/0d3badffdfe65bdbab554a1e1aed518398fcb53e/corehq/apps/hqwebapp/static/hqwebapp/yaml/bootstrap3/requirejs.yml#L12-L14>`__.
+For our own code, we have a `babel plugin for requirejs <https://www.npmjs.com/package/requirejs-babel7>`__.
+See `here <https://github.com/dimagi/commcare-hq/pull/33083>`__.
+
+
 How close are we to a world where we’ll just have one set of conventions?
 -------------------------------------------------------------------------
 
@@ -242,24 +396,14 @@ significant complexity.
 
 `hqDefine.sh <https://github.com/dimagi/commcare-hq/blob/master/scripts/codechecks/hqDefine.sh>`__
 generates metrics for the current status of the migration and locates
-umigrated files. At the time of writing:
+un-migrated files. At the time of writing:
 
 ::
 
-   $ ./scripts/codechecks/hqDefine.sh
-
-   97%     (1040/1081) of HTML files are free of inline scripts
-   93%     (501/539) of JS files use hqDefine
-   64%     (342/539) of JS files specify their dependencies
-   93%     (995/1080) of HTML files are free of script tags
-
-Why aren’t we using something more fully-featured, more modern, or cooler than RequireJS?
------------------------------------------------------------------------------------------
-
-RequireJS is now `deprecated <https://github.com/requirejs/requirejs/issues/1817>`__.
+    $ ./scripts/codechecks/hqDefine.sh
 
-This migration began quite a while ago. At the time, the team discussed
-options and selected RequireJS. The majority of the work done to move to
-RequireJS has been around reorganizing code into modules and explicitly
-declaring dependencies, which is necessary for any kind of modern
-dependency management.
+    97%	(1209/1254) of HTML files are free of inline scripts
+    94%	(553/594) of non-ESM JS files use hqDefine
+    75%	(443/594) of non-ESM JS files specify their dependencies
+    93%	(1162/1254) of HTML files are free of script tags
+    1%	(3/597) of JS files use ESM format
diff --git a/docs/js-guide/migrating.rst b/docs/js-guide/migrating.rst
index 945df0b5691c..1d4618e10d0a 100644
--- a/docs/js-guide/migrating.rst
+++ b/docs/js-guide/migrating.rst
@@ -1,8 +1,11 @@
+JS Bundler Migration Guide
+===========================
 
-RequireJS Migration Guide
-=========================
+This page is a guide to upgrading legacy code in HQ to use Webpack, a modern JavaScript bundler.
+Previously, we were migrating legacy code to RequireJS, an older JavaScript bundler which has since been
+deprecated. If you wish to migrate a RequireJS page to Webpack, please see the `RequireJS to Webpack Migration Guide
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__
 
-This page is a guide to upgrading legacy code in HQ to use RequireJS.
 For information on how to work within existing code, see `Managing
 Dependencies <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/dependencies.rst>`__.
 Both that page and `Historical Background on Module
@@ -16,20 +19,22 @@ are useful background for this guide.
 Background: modules and pages
 -----------------------------
 
-The RequireJS migration deals with both **pages** (HTML) and **modules**
+The JS Bundler migration deals with both **pages** (HTML) and **modules**
 (JavaScript). Any individual page is either migrated or not. Individual
 modules are also migrated or not, but a “migrated” module may be used on
-both RequireJS and non-RequireJS pages.
-
-Logic in ``hqModules.js`` determines whether or not we’re in a RequireJS
-environment and changes the behavior of ``hqDefine`` accordingly. In a
-RequireJS environment, ``hqDefine`` just passes through to RequireJS’s
-``define``. Once all pages have been migrated, we’ll be able to delete
+both bundled (Webpack and RequireJS) and non-bundled pages.
+
+Logic in ``hqModules.js`` determines whether or not we’re in a bundler
+environment (Webpack or RequireJS) and changes the behavior of
+``hqDefine`` accordingly. In a bundler environment, ``hqDefine`` just passes
+through to the standard AMD Module ``define``, which is understood by
+both Webpack and RequireJS as a module and bundled accordingly.
+Once all pages have been migrated, we’ll be able to delete
 ``hqModules.js`` altogether and switch all of the ``hqDefine`` calls to
-``define``.
+``define``--or better, switch to using ES Modules (ESM).
 
 These docs walk through the process of migrating a single page to
-RequireJS.
+from not using a JavaScript bundler to using Webpack.
 
 Basic Migration Process
 -----------------------
@@ -41,66 +46,77 @@ in HQ. Pages that are not descendants of
 `hqwebapp/base.html <https://github.com/dimagi/commcare-hq/tree/master/corehq/apps/hqwebapp/templates/hqwebapp/base.html>`__,
 which are rare, cannot yet be migrated.
 
-Once these conditions are met, migrating to RequireJS is essentially the
+Once these conditions are met, migrating to Webpack is essentially the
 process of explicitly adding each module’s dependencies to the module’s
 definition, and also updating each HTML page to reference a single
 “main” module rather than including a bunch of ``<script>`` tags: 1. Add
-``requirejs_main`` tag and remove ``<script>`` tags 1. Add dependencies
+``js_entry`` tag and remove ``<script>`` tags 1. Add dependencies
 1. Test
 
-Sample PRs: - `RequireJS migration:
+.. note::
+    The sample PRs below were created when we were still using RequireJS.
+    You can read the sample PRs and substitute ``js_entry`` where you see
+    ``requirejs_main``. Additionally, you should be sure to include the ``commcarehq``
+    module in the list of dependencies of the final ``hqDefine`` entry point.
+
+    See the `RequireJS to Webpack Migration Guide
+    <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__
+    for additional guidance.
+
+
+Sample PRs: - `Bundler migration (RequireJS):
 dashboard <https://github.com/dimagi/commcare-hq/pull/19182/>`__ is an
 example of an easy migration, where all dependencies are already
-migrated - `RequireJS proof of
-concept <https://github.com/dimagi/commcare-hq/pull/18116>`__ migrates a
+migrated - `Bundler proof of
+concept (with RequireJS) <https://github.com/dimagi/commcare-hq/pull/18116>`__ migrates a
 few pages (lookup tables, data dictionary) and many of our commonly-used
 modules (analytics, ``hq.helpers.js``, etc.). This also contains the
 changes to ``hqModules.js`` that make ``hqDefine`` support both migrated
 and unmigrated pages.
 
-Add ``requirejs_main`` tag and remove ``<script>`` tags
+Add ``js_entry`` tag and remove ``<script>`` tags
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The ``requirejs_main`` tag is what indicates that a page should use
-RequireJS. The page should have one “main” module. Most of our pages are
-already set up like this: they might include a bunch of scripts, but
-there’s one in particular that handles the event handlers, bindings,
-etc. that are specific to that page.
+The ``js_entry`` tag is what indicates that a page should use
+Webpack. The page should have one "main" module, referred to as an Entry Point.
+Most of our pages are already set up like this: they might include a bunch of scripts, but
+there's one in particular that handles the event handlers, bindings,
+etc. that are specific to that page. That script is the Entry Point.
 
-Considerations when choosing or creating a main module
+Considerations when choosing or creating an Entry Point
 
-- Most often, there’s already a single script that’s only included on the page you’re
-  migrating, which you can use as the main module.
-- It’s fine for multiple pages to use the same main module
+- Most often, there's already a single script that's only included on the page you're
+  migrating, which you can use as the entry point.
+- It's fine for multiple pages to use the same entry point
   - this may make sense for closely related pages.
 - Sometimes a page will have some dependencies
-  but no page-specific logic, so you can make a main module with an empty body, as in
+  but no page-specific logic, so you can make an entry point with an empty body, as in
   `invoice_main.js <https://github.com/dimagi/commcare-hq/commit/d14ba14f13d7d44e3a96940d2c72d2a1b918534d#diff-b81a32d5fee6a9c8af07b189c6a5693e>`__.
 - Sometimes you can add a dependency or two to an existing module and
-  then use it as your main module. This can work fine, but be cautious of
+  then use it as your entry point. This can work fine, but be cautious of
   adding bloat or creating dependencies between django apps. There’s a
   loose hierarchy:
 
   - Major third-party libraries: jQuery, knockout, underscore
   - hqwebapp
   - analytics
-  - app-specific reusable modules like `accounting/js/widgets <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/accounting/static/accounting/js/widgets.js>`__, which are also sometimes used as main modules
+  - app-specific reusable modules like `accounting/js/widgets <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/accounting/static/accounting/js/widgets.js>`__, which are also sometimes used as entry points
   - page-specific modules like `accounting/js/subscriptions_main <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/accounting/static/accounting/js/subscriptions_main.js>`__
-- There’s a growing convention of using the suffix ``_main`` for main modules - more specifically, for any module that runs logic in a document ready handler.
-- HTML files that are only used as the base for other templates don’t need to have a main module or a ``requirejs_main`` tag.
+- There's a growing convention of using the suffix ``_main`` for entry points - more specifically, for any module that runs logic in a document ready handler.
+- HTML files that are only used as the base for other templates don't need to have a entry point or a ``js_entry`` tag.
 
-Add ``{% requirejs_main 'myApp/js/myModule' %}`` near the top of the
+Add ``{% js_entry "myApp/js/my_module" %}`` near the top of the
 template: it can go after ``load`` and ``extends`` but should appear
 before content blocks. Note that it’s a module name, not a file name, so
 it doesn’t include ``.js``.
 
 Remove other ``<script>`` tags from the file. You’ll be adding these as
-dependencies to the main module.
+dependencies to the entry point.
 
 Add dependencies
 ~~~~~~~~~~~~~~~~
 
-In your main module, add any dependent modules. Pre-RequireJS, a module
+In your entry point, add any dependent modules. Pre-bundler, a module
 definition looks like this:
 
 ::
@@ -119,7 +135,9 @@ module’s encompassing function:
 
    hqDefine("app/js/utils", [
       "jquery",
-      "otherApp/js/utils"
+      "otherApp/js/utils",
+      "commcarehq"  // REQUIRED: always list this module that imports all site-level dependencies
+                    // This can be at the end of the list. Use ``commcarehq_b3`` for Bootstrap 3 pages.
    ], function(
       $,
       otherUtils
@@ -137,16 +155,16 @@ To declare dependencies:
 - If you removed any ``<script>`` tags from the template
   and haven’t yet added them to the dependency list, do that.
 - Check the template’s parent template
-    - If the parent has a ``requirejs_main`` module, the template you’re migrating should include a dependency on that module.
+    - If the parent has a ``js_entry`` module, the template you’re migrating should include a dependency on that module.
        - If the parent still has ``<script>`` tags, the template
          you’re migrating should include those as dependencies. It’s usually
          convenient to migrate the parent and any “sibling” templates at the same
          time so you can remove the ``<script>`` tags altogether. If that isn’t
          possible, make the parent check before including script tags:
-         ``{% if requirejs_main %}<script ...></script>{% endif %}``
+         ``{% if js_entry %}<script ...></script>{% endif %}``
        - Also check the parent’s parent template, etc. Stop once you get to
-         ``hqwebapp/base.html``, ``hqwebapp/bootstrap3/two_column.html``, or
-         ``hqwebapp/bootstrap3/base_section.html``, which already support requirejs.
+         ``hqwebapp/base.html``, ``hqwebapp/bootstrap5/two_column.html``, or
+         ``hqwebapp/bootstrap5/base_section.html``, which already support a bundler.
 -  Check the view for any `hqwebapp
    decorators <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/hqwebapp/decorators.py>`__
    like ``use_jquery_ui`` which are used to include many common yet not
@@ -158,7 +176,7 @@ To declare dependencies:
    a dependency and also add the global to ``thirdPartyGlobals`` in
    `hqModules.js <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/hqwebapp/static/hqwebapp/js/hqModules.js>`__
    which prevents errors on pages that use your module but are not yet
-   migrated to requirejs.
+   migrated to Webpack.
 
 Dependencies that aren’t directly referenced as modules **don’t** need
 to be added as function parameters, but they **do** need to be in the
@@ -178,9 +196,9 @@ based on the changes you made:
 - If you replaced any ``hqImport`` calls
   that were inside of event handlers or other callbacks, verify that those
   areas still work correctly. When a migrated module is used on an
-  unmigrated page, its dependencies need to be available at the time the
+  un-migrated page, its dependencies need to be available at the time the
   module is defined. This is a change from previous behavior, where the
-  dependencies didn’t need to be defined until ``hqImport`` first called
+  dependencies didn't need to be defined until ``hqImport`` first called
   them. We do not currently have a construct to require dependencies after
   a module is defined.
 - The most likely missing dependencies are the
@@ -188,8 +206,9 @@ based on the changes you made:
   often don’t error but will look substantially different on the page if
   they haven’t been initialized.
 - If your page depends on any third-party
-  modules that might not yet be used on any RequireJS pages, test them.
-  Third-party modules sometimes need to be upgraded to be compatible with RequireJS.
+  modules that might not yet be used on any Webpack pages, test them.
+  Third-party modules sometimes need to be upgraded to be compatible with Webpack
+  or "shimmed" using Webpack's ``exports-loader``.
 - If your page touched any javascript modules that are used
   by pages that haven’t yet been migrated, test at least one of those
   non-migrated pages.
@@ -201,11 +220,13 @@ Troubleshooting
 Troubleshooting migration issues
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-When debugging RequireJS issues, the first question is whether or not
+When debugging Webpack issues, the first question is whether or not
 the page you’re on has been migrated. You can find out by checking the
-value of ``window.USE_REQUIREJS`` in the browser console.
+value of ``window.USE_WEBPACK`` in the browser console or ``window.USE_REQUIREJS``
+if the page is still using RequireJS. If neither values return ``true``, then
+the page has not been migrated yet.
 
-Common issues on RequireJS pages:
+Common issues on Webpack pages:
 
 - JS error like
   ``$(...).something is not a function``: this indicates there’s a missing
@@ -215,34 +236,30 @@ Common issues on RequireJS pages:
 - Missing functionality, but no error: this
   usually indicates a missing knockout binding. To fix, add the file
   containing the binding to the module that applies that binding, which
-  usually means adding ``hqwebapp/js/knockout_bindings.ko`` to the page’s main module.
+  usually means adding ``hqwebapp/js/knockout_bindings.ko`` to the page’s entry point.
 - JS error like ``something is not defined`` where
   ``something`` is one of the parameters in the module’s main function:
   this can indicate a circular dependency. This is rare in HQ. Track down
   the circular dependency and see if it makes sense to eliminate it by
-  reorganizing code. If it doesn’t, you can use
+  reorganizing code. If it doesn’t work, you can use
   `hqRequire <https://github.com/dimagi/commcare-hq/commit/15b436f77875f57d1e3d8d6db9b990720fa5dd6f#diff-73c73327e873d0e5f5f4e17c3251a1ceR100>`__
   to require the necessary module at the point where it’s used rather than
   at the top of the module using it.
 - JS error like ``x is not defined``
   where ``x`` is a third-party module, which is the dependency of another
-  third party module ``y`` and both of them are non RequireJs modules. You
+  third party module ``y`` and both of them are not modules. You
   may get this intermittent error when you want to use ``y`` in the
-  migrated module and ``x`` and ``y`` does not support
-  `AMD <https://requirejs.org/docs/whyamd.html>`__. You can fix this using
-  `shim <https://www.devbridge.com/articles/understanding-amd-requirejs#To-shim-or-not-to-shim>`__
-  or
-  `hqRequire <https://github.com/dimagi/commcare-hq/commit/15b436f77875f57d1e3d8d6db9b990720fa5dd6f#diff-73c73327e873d0e5f5f4e17c3251a1ceR100>`__.
-  `Example <https://github.com/dimagi/commcare-hq/pull/21604/files#diff-cf0be09b7db821551ac73dc3a9829e5eR24>`__
-  of this could be ``d3`` and ``nvd3``
+  migrated module and ``x`` and ``y`` is not formatted as a recognizable JavaScript module that
+  Webpack recognizes (AMD, ESM, CommonJS are supported formats). You can fix this by adding
+  an ``exports-loader`` ``rule`` `like this example <https://github.com/dimagi/commcare-hq/blob/e0b722c61e63b5878759d545282178ae374695e9/webpack/webpack.common.js#L70-L80>`__.
 
-Common issues on non-RequireJS pages:
+Common issues on non-Bundled pages:
 
 - JS error like
   ``something is not defined`` where ``something`` is a third-party
-  module: this can happen if a non-RequireJS page uses a RequireJS module
+  module: this can happen if a non-Bundled page uses a Bundled module
   which uses a third party module based on a global variable. There’s some
-  code that mimicks RequireJS in this situation, but it needs to know
+  code that mimics AMD modules in this situation, but it needs to know
   about all of the third party libraries. To fix, add the third party
   module’s global to `thirdPartyMap in
   hqModules.js <https://github.com/dimagi/commcare-hq/commit/85286460a8b08812f82d6709c161b259e77165c4#diff-73c73327e873d0e5f5f4e17c3251a1ceR57>`__.
@@ -251,7 +268,7 @@ Common issues on non-RequireJS pages:
   appears before one of its dependencies. This can happen to migrated
   modules because one of the effects of the migration is to typically
   import all of a module’s dependencies at the time the module is defined,
-  which in a non-RequireJS context means all of the dependencies’ script
+  which in a non-bundled context means all of the dependencies’ script
   tags must appear before the script tags that depend on them. Previously,
   dependencies were not imported until ``hqImport`` was called, which
   could be later on, possibly in an event handler or some other code that
@@ -262,6 +279,10 @@ Common issues on non-RequireJS pages:
 Troubleshooting the RequireJS build process
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. note::
+    This is here for informational purposes only and will be removed once
+    all of the RequireJS code is moved to Webpack.
+
 Tactics that can help track down problems with the RequireJS build
 process, which usually manifest as errors that happen on staging but not
 locally:
diff --git a/docs/js-guide/module-history.rst b/docs/js-guide/module-history.rst
index b7409b6dc699..6f6f04da3eda 100644
--- a/docs/js-guide/module-history.rst
+++ b/docs/js-guide/module-history.rst
@@ -7,30 +7,44 @@ Dependencies <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/de
 
 We talk about JavaScript modules, but (at least pre-ES6) JavaScript has
 no built in support for modules. It’s easy to say that, but think about
-how crazy that is. If this were Python, it would mean your program’s
+how crazy that is. If this were Python, it would mean your program's
 main file has to directly list all of the files that will be needed, in
 the correct order, and then the files share state through global
-variables. That’s insane.
+variables. That's insane.
 
-And it’s also JavaScript. Fortunately, there are things you can do to
+And it's also JavaScript. Fortunately, there are things you can do to
 enforce and respect the boundaries that keep us sane by following one of
 a number of patterns.
 
-We’re in the process of migrating to
-`RequireJS <https://requirejs.org/>`__. Part of this process has
-included developing a lighter-weight alternative module system called
-``hqDefine``.
+We're in the process of migrating to
+`Webpack <https://webpack.js.org/>`__. Prior to the migration to Webpack,
+we were migrating No-Bundler pages to RequireJS, which has since become deprecated.
+Part of this ongoing process has included developing a lighter-weight
+alternative module system called ``hqDefine``, that is based on the AMD (Asynchronous
+Module Definition) format. This ``hqDefine`` variant of AMD is relevant even for
+Webpack bundles, as it serves as the "transition" module format between pages using
+a bundler and pages not using a bundler (Legacy Pages).
 
 ``hqDefine`` serves as a stepping stone between legacy code and
-requirejs modules: it adds encapsulation but not full-blown dependency
-management. New code is written in RequireJS, but ``hqDefine`` exists to
-support legacy code that does not yet use RequireJS.
+bundled code: it adds encapsulation but not full-blown dependency
+management. New code is written in Webpack, but ``hqDefine`` exists to
+support legacy code that does not yet use Webpack.
 
 Before diving into ``hqDefine``, I want to talk first about the status
-quo convention for sanity with no module system. As we’ll describe, it’s
+quo convention for sanity with no module system. As we'll describe, it's
 a step down from our current preferred choice, but it’s still miles
 ahead of having no convention at all.
 
+Creating a Brand New Page?
+--------------------------
+
+If you are creating new pages with Webpack, then you can skip this
+discussion for now. All **new** Webpack entry points should be written using
+the new ES Module (ESM) format. This is the modern module format you will
+see referenced in most modern JavaScript library documentation. ``hqDefine``
+(aka Modified AMD) should eventually only be used for transition points
+between legacy code and bundled code.
+
 The Crockford Pattern
 ---------------------
 
@@ -127,7 +141,7 @@ hqDefine
 
 There are many great module systems out there, so why did we write our
 own? The answer’s pretty simple: while it’s great to start with
-require.js or system.js, with a code base HQ’s size, getting from here
+Webpack, with a code base HQ’s size, getting from here
 to there is nearly impossible without an intermediate step.
 
 Using the above example again, using ``hqDefine``, you’d write your file
@@ -164,8 +178,9 @@ function itself is exactly the same. It’s just being passed to
 ``hqDefine`` instead of being called directly.
 
 ``hqDefine`` is an intermediate step on the way to full support for AMD
-modules, which in HQ is implemented using RequireJS. ``hqDefine`` checks
-whether or not it is on a page that uses AMD modules and then behaves in
+modules, which is supported by Webpack as well as our previous bundler RequireJS.
+
+``hqDefine`` checks whether or not it is on a page that uses AMD modules and then behaves in
 one of two ways: \* If the page has been migrated, meaning it uses AMD
 modules, ``hqDefine`` just delegates to ``define``. \* If the page has
 not been migrated, ``hqDefine`` acts as a thin wrapper around the
@@ -173,7 +188,7 @@ Crockford module pattern. ``hqDefine`` takes a function, calls it
 immediately, and puts it in a namespaced global; ``hqImport`` then looks
 up the module in that global.
 
-In the first case, by handing control over to RequireJS,
+In the first case, by handing control over to Webpack,
 ``hqDefine``/``hqImport`` also act as a module *loader*. But in the
 second case, they work only as a module *dereferencer*, so in order to
 use a module, it still needs to be included as a ``<script>`` on your
@@ -186,11 +201,12 @@ html page:
 Note that in the example above, the module name matches the end of the
 filename, the same name used to identify the file when using the
 ``static`` tag, but without the ``js`` extension. This is necessary for
-RequireJS to work properly. For consistency, all modules, regardless of
-whether or not they are yet compatible with RequireJS, should be named
+Webpack to work properly. For consistency, all modules, regardless of
+whether or not they are yet compatible with Webpack, should be named
 to match their filename.
 
 ``hqDefine`` and ``hqImport`` provide a consistent interface for both
 migrated and unmigrated pages, and that interface is also consistent
-with RequireJS, making it easy to eventually “flip the switch” and
-remove them altogether once all code is compatible with RequireJS.
+with AMD Modules (supported by Webpack, and previously RequireJS),
+making it easy to eventually  “flip the switch” and remove them altogether
+once all code is compatible with Webpack.
diff --git a/docs/js-guide/requirejs-to-webpack.rst b/docs/js-guide/requirejs-to-webpack.rst
new file mode 100644
index 000000000000..15b69c114773
--- /dev/null
+++ b/docs/js-guide/requirejs-to-webpack.rst
@@ -0,0 +1,153 @@
+Migrating RequireJS to Webpack
+==============================
+
+RequireJS `reached its end of life <https://github.com/requirejs/requirejs/issues/1816#issuecomment-707503323>`__
+in September of 2020. Since then, it has been increasingly difficult to work with as more modern libraries
+no longer provide AMD modules (the preferred module format of RequireJS), and use modern JavaScript
+syntax that is no longer compatible with RequireJS's build process. We decided to use Webpack as our
+replacement for RequireJS in September of 2024. We expect the migration to be brief and straightforward.
+
+
+Overview of the Process
+-----------------------
+
+The following steps outline the migration process on a per entry point basis.
+
+As a reminder, Entry Points are modules that are included directly on a page using a bundler template tag,
+like the ones listed below. We want to migrate the RequireJS entry points to Webpack entry points:
+
+ - ``requirejs_main_b5`` to ``js_entry``
+ - ``requirejs_main`` to ``js_entry_b3``
+
+Entry points are the modules that the bundler (RequireJS or Webpack) uses to build a dependency graph so
+that it knows what bundle of javascript dependencies and page-specific code is needed to render that page.
+See `the Static Files Overview <https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/static-files.rst>`__
+for a more detailed explanation.
+
+.. note::
+
+    If new ``exports-loader`` statements are added, it is recommended to test the changes on staging to ensure
+    the functionality is maintained between production and staging.
+
+Step 0: Decide What to Migrate
+------------------------------
+
+How do you know what areas have and have not been migrated? Because all pages that bundle javascript use a template
+tag to specify the entry point, this template tag is an easy way to tell if a page uses Webpack or RequireJS.
+
+If looking for areas that **need** to be migrated, grepping for ``requirejs_main`` will identify all unmigrated
+pages.
+
+
+Step 1: Update the Template Tag and Add Global ``commcarehq`` Dependency
+------------------------------------------------------------------------
+
+First, find either the ``requirejs_main`` tag (Bootstrap 3 pages) or the ``requirejs_main_b5`` tag
+(Bootstrap 5 pages) that references the entry point you want to migrate.
+
+The migration of an entry point from RequireJS to Webpack will involve updating the template tag
+used to define the entry point and then adding the ``commcarehq`` global dependency to the list of dependencies.
+Two examples are below.
+
+Bootstrap 5 Entry Points
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the ``case_importer/js/main`` example from Step 1, we can update the ``requirejs_main_b5`` template tag
+to ``js_entry``, so that the final usage looks like:
+
+::
+
+    {% js_entry "case_importer/js/main" %}
+
+Then, in the file itself, we add the ``commcarehq`` dependency to the list of dependencies:
+
+::
+
+    hqDefine("case_importer/js/main", [
+        'jquery',
+        'underscore',
+        'hqwebapp/js/initial_page_data',
+        'case_importer/js/import_history',
+        'case_importer/js/excel_fields',
+        'hqwebapp/js/bootstrap5/widgets',
+        'commcarehq',  // <--- dependency added for webpack
+    ], function (
+        $,
+        _,
+        initialPageData,
+        importHistory,
+        excelFieldsModule
+    ) {
+        ...
+
+
+Bootstrap 3 Entry Points
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+In the ``domain/js/my_project_settings`` example from Step 1, we can update the ``requirejs_main``
+tag to ``js_entry_b3``, so that the final usage looks like:
+
+::
+
+    {% js_entry_b3 "domain/js/my_project_settings" %}
+
+Then, in the file itself, we add the ``commcarehq_b3`` dependency to the list of dependencies:
+
+::
+
+    hqDefine("domain/js/my_project_settings", [
+        'jquery',
+        'knockout',
+        'hqwebapp/js/initial_page_data',
+        'commcarehq_b3',  // <--- dependency added for webpack
+    ], function (
+        $,
+        ko,
+        initialPageData
+    ) {
+        ...
+
+
+Step 2: Verify Webpack Build
+----------------------------
+
+The next step is to ensure that the Webpack build succeeds with the newly-added
+entry point. To do this, restart or run ``yarn dev`` locally. If the build fails,
+it is likely due to a missing alias or application folder path.
+
+If it is a missing alias for a ``yarn`` dependency, first check to if the
+dependency being referenced is using the ``npm`` package name (or ``npm_modules`` filepath)
+or if it referring to an alias previously specified in the ``requirejs_config`` files.
+Ideally, try to use the ``npm`` package/path and update the references for the dependency (if possible).
+If not, you can add the alias in ``webpack/webpack.common.js``.
+
+If an application path is missing, for instance it can't find a path to a dependency
+that is under ``<app_name>/js/<path>``, then it might be that there are no entry points
+in that app yet. If this is the case, add the ``<app_name>`` to the
+``alwaysIncludeApps`` list in ``webpack/generateDetails.js``. Eventually, this list
+won't be necessary once everything is migrated, but for now that's the best workaround.
+
+Once these points are updated, please restart ``yarn dev``. If more build errors persist,
+please see the troubleshooting guide below. If there is no help there, please reach out
+the lead developers in charge of this migration for assistance. Please add troubleshooting
+guidance afterward.
+
+Once the build succeeds, please commit all the changes for that entry point.
+
+
+Step 3: Verify Page Loads Without JavaScript Errors
+---------------------------------------------------
+
+The final step is to ensure that the page with the Entry Point loads without
+JavaScript errors. Most of the time, entry points should load without errors if
+the build succeeds.
+
+If there are JavaScript errors, the mostly likely issue is due to ``undefined`` errors
+when referencing a module/dependency. The most likely cause of this is a missing
+``exports-loader`` statement for a dependency that was previously shimmed in the
+``requirejs_config`` files. See the `documentation for exports-loader
+<https://webpack.js.org/loaders/exports-loader/>`__ on how to do this, or follow
+existing patterns of ``exports-loader`` statements for dependencies that were shimmed
+in ``requirejs_config`` similarly to the dependency you are having issues with now.
+
+Please add any additional guidance here as the migration continues.
diff --git a/docs/js-guide/static-files.rst b/docs/js-guide/static-files.rst
index 13b610e576f6..fa91d5597455 100644
--- a/docs/js-guide/static-files.rst
+++ b/docs/js-guide/static-files.rst
@@ -1,19 +1,103 @@
-Static Files
-============
+Overview of Static Files and JavaScript Bundlers
+================================================
+
+What are Static Files?
+----------------------
 
 Static files include any ``css``, ``js``, and image files that are not
 dynamically generated during runtime. ``css`` is typically compiled from
-``less`` and minified prior to server runtime. ``js`` files are
-collected, combined, and minified prior to server runtime. As of this
-writing we don’t compile our JavaScript from a higher level scripting
-language. Image files generally stay as-is. The only ‘dynamic’ images
+``scss`` (or ``less`` on Bootstrap 3 pages) and minified before server
+runtime.
+
+``js`` files are collected, combined, and minified using Webpack
+or RequireJS, called JavaScript bundlers. We are currently
+transitioning from RequireJS (deprecated) to Webpack. Some pages do
+not use a bundler or any structured JavaScript module format,
+referred to as No-Bundler Pages. No-Bundler Pages are rare and are being transitioned
+to using Webpack as part of the `JS Bundler Migration
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/migrating.rst>`__.`
+
+Image files generally stay as-is. The only "dynamic" images
 come from file attachments in our database.
 
-Due to their static natures, the primary objective for static files is
-to make as few requests to them during page load, meaning that our goal
-is to combine static files into one larger, minified file when possible.
-An additional goal is to ensure that the browser caches the static files
-it is served to make subsequent page loads faster.
+Due to their static natures, the primary objective when working with static files is
+to make as few requests as possible to them during page load. We aim to combine
+static files into one larger, minified file whenever possible.
+Another goal is to ensure that the browser caches the static files when possible
+to make subsequent page loads faster.
+
+
+Why use a javascript bundler?
+-----------------------------
+
+We use a bundler for our javascript files to reduce the amount of separate
+network requests tags needed for any page load. A bundler, like Webpack,
+not only combines the necessary javascript, it minifies the javascript to reduce
+its overall size. Additionally, Webpack employs code splitting to split commonly referenced
+"chunks" of code into separate collective bundles:
+
+    - ``vendor``: common code that comes ``yarn`` dependencies
+    - ``common``: native HQ javascript that is referenced across the whole site
+    - "app" bundles: shared code across entry points inside a specific app, e.g. ``hqwebapp``, ``domain``, etc.
+
+This code splitting allows chunks of code shared across entry points to be cached in the browser
+once, making subsequent page loads much faster.
+
+What is an entry point?
+~~~~~~~~~~~~~~~~~~~~~~~
+
+An "entry point" is the starting point or root file for a given page that Webpack (or RequireJS) uses to
+build the dependency graph and generate the output bundle(s).
+
+There is only **one** entry point per page. Multiple pages may share the same entry points; however, there
+should never be more than one entry point on a single page.
+
+
+How do I develop with a JavaScript bundler?
+-------------------------------------------
+
+To build Webpack locally for continuous development, run the ``yarn dev`` command.
+
+This command first runs
+``webpack/generateDetails.js`` to scan all template files for ``js_entry`` template tags,
+identifying Webpack entry points. It then builds Webpack bundles based on the ``webpack/webpack.dev.js``
+configuration.
+
+``yarn dev`` can be left running, as it will watch existing entry points for any changes and rebuild
+Webpack bundles as needed.
+
+When adding new entry points, please remember to restart ``yarn dev``.
+
+When deploying CommCare HQ, ``yarn build`` is used instead of ``yarn dev``. The primary differences are:
+
+- minification of bundles
+- a different algorithm for source maps that is better with minified files but takes longer to generate
+- appending filenames with content hashes of files for cache busting purposes
+
+To troubleshoot production-related Webpack issues, you can run ``yarn build`` locally.
+
+Developing on No-Bundle pages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are still some very old sections of the codebase that are not under the jurisdiction of a JavaScript bundler.
+These pages can be developed without needing ``yarn dev`` to run in the background. However, you should pay special
+attention to your ``localsettings`` setup for Django Compressor, which is explained in the `Compression
+<#compression>`__
+section below.
+
+Developing with RequireJS page
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you are developing a RequireJS page, consider `migrating it to Webpack first
+<https://github.com/dimagi/commcare-hq/blob/master/docs/js-guide/requirejs-to-webpack.rst>`__.
+The majority of migrations are relatively quick and straightforward.
+
+Otherwise, these pages can be developed without running ``yarn dev`` in the background.
+
+When a production deploy happens, RequireJS production bundles are built using the ``build_requirejs`` management
+command. This build step is often the point where people see build failures due to using unsupported es6 syntax in
+RequireJS bundles. If you see that, consider it a sign that the module throwing that error should be moved to Webpack.
+
 
 Collectstatic
 -------------
@@ -49,13 +133,14 @@ static files. First run:
    manage.py fix_less_imports_collectstatic
    manage.py compilejsi18n
 
+
 Compression
 -----------
 
 `Django
 Compressor <https://django-compressor.readthedocs.org/en/latest/>`__ is
-the library we use to handle compilation of ``less`` files and the
-minification of ``js`` and compiled ``css`` files.
+the library we use to handle compilation of ``scss`` (and ``less``) files and the
+minification of no-bundler ``js`` and compiled ``css`` files.
 
 Compressor blocks are defined inside the
 ``{% compress css %}{% endcompress %}`` or
@@ -69,7 +154,7 @@ requests made per page.
 
 There are three ways of utilizing Django Compressor’s features:
 
-1. Dev Setup: Server-side on the fly ``less`` compilation
+1. Dev Setup: Server-side on the fly ``scss`` compilation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This does not combine any files in compress blocks, and as no effect on
@@ -182,3 +267,14 @@ Note that this cache busting is irrelevant to files that are contained
 within a ``compress`` block. Each compressed block generated a file that
 contains a hash in the filename, so there’s no need for the URL
 parameter.
+
+A Note on Webpack and Cache Busting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Webpack has its own built-in Cache Busting capabilities which are activated
+with the ``webapck/webpack.prod.js`` configuration. This is run during
+``yarn build``. Bundles generated by Webpack are then appended with that file's
+content cache in order to bust the cache.
+
+In order to run build Webpack locally in the same way as you would in a production
+environment, you can run ``yarn build`` instead of ``yarn dev``.
diff --git a/docs/js-guide/testing.rst b/docs/js-guide/testing.rst
index 47ee6363101e..ff2643850cdf 100644
--- a/docs/js-guide/testing.rst
+++ b/docs/js-guide/testing.rst
@@ -57,12 +57,6 @@ tests will be in
 defined in ``Gruntfile.js`` as ``<app_name>/<config_name>``, e.g.,
 ``cloudcare/form_entry``.
 
-Dependency Management
----------------------
-
-Tests are one of the few areas of HQ’s JavaScript that do not use
-RequireJS. Instead, dependencies are included in the relevant HTML
-template as script tags.
 
 Running tests from the command line
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/maps.rst b/docs/maps.rst
deleted file mode 100644
index d9f114abbb5c..000000000000
--- a/docs/maps.rst
+++ /dev/null
@@ -1,257 +0,0 @@
-=====================
-Reporting: Maps in HQ
-=====================
-
-What is the "Maps Report"?
-==========================
-
-We now have map-based reports in HQ.
-The "maps report" is not really a report, in the sense that it does not query or calculate any data on its own.
-Rather, it's a generic front-end visualization tool that consumes data from some other place... other places such as another (tabular) report, or case/form data (work in progress).
-
-To create a map-based report, you must configure the `map report template`_ with specific parameters.
-These are:
-
-.. _map report template: https://github.com/dimagi/commcare-hq/blob/8af9177910fa3ae5642a68d8085071e91c1356f6/corehq/apps/reports/standard/inspect.py#L685
-
-* ``data_source`` -- the backend data source which will power the report (required)
-* ``display_config`` -- customizations to the display/behavior of the map itself (optional, but suggested for anything other than quick prototyping)
-
-This is how this configuration actually takes place:
-
-* subclass the map report to provide/generate the config parameters.
-  You should **not** need to subclass any code functionality.
-  This is useful for making a more permanent map configuration, and when the configuration needs to be dynamically generated based on other data or domain config (e.g., for `CommTrack`_)
-
-.. _CommTrack: https://github.com/dimagi/commcare-hq/blob/8af9177910fa3ae5642a68d8085071e91c1356f6/corehq/apps/reports/commtrack/maps.py#L7
-
-Orientation
-===========
-
-Abstractly, the map report consumes a table of data from some source.
-Each row of the table is a geographical feature (point or region).
-One column is identified as containing the geographical data for the feature.
-All other columns are arbitrary attributes of that feature that can be visualized on the map.
-Another column may indicate the name of the feature.
-
-The map report contains, obviously, a map.
-Features are displayed on the map, and may be styled in a number of ways based on feature attributes.
-The map also contains a legend generated for the current styling.
-Below the map is a table showing the raw data.
-Clicking on a feature or its corresponding row in the table will open a detail popup.
-The columns shown in the table and the detail popup can be customized.
-
-Attribute data is generally treated as either being numeric data or enumerated data (i.e., belonging to a number of discrete categories).
-Strings are inherently treated as enum data.
-Numeric data can be treated as enum data be specifying thresholds: numbers will be mapped to enum 'buckets' between consecutive thresholds (e.g, thresholds of ``10``, ``20`` will create enum categories: ``< 10``, ``10-20``, ``> 20``).
-
-.. _styling:
-
-Styling
-=======
-
-Different aspects of a feature's marker on the map can be styled based on its attributes.
-Currently supported visualizations (you may see these referred to in the code as "display axes" or "display dimensions") are:
-
-* varying the size (numeric data only)
-* varying the color/intensity (numeric data (color scale) or enum data (fixed color palette))
-* selecting an icon (enum data only)
-
-Size and color may be used concurrently, so one attribute could vary size while another varies the color... this is useful when the size represents an absolute magnitude (e.g., # of pregnancies) while the color represents a ratio (% with complications).
-Region features (as opposed to point features) only support varying color.
-
-A particular configuration of visualizations (which attributes are mapped to which display axes, and associated styling like scaling, colors, icons, thresholds, etc.) is called a `metric`.
-A map report can be configured with many different metrics.
-The user selects one metric at a time for viewing.
-*Metrics may not correspond to table columns one-to-one*, as a single column may be visualized multiple ways, or in combination with other columns, or not at all (shown in detail popup only).
-If no metrics are specified, they will be auto-generated from best guesses based on the available columns and data feeding the report.
-
-There are several sample reports that comprehensively demo the potential styling options:
-
-* `Demo 1`_
-* `Demo 2`_
-
-.. _Demo 1: https://www.commcarehq.org/a/commtrack-public-demo/reports/maps_demo/
-.. _Demo 2: https://www.commcarehq.org/a/commtrack-public-demo/reports/maps_demo2/
-
-See :ref:`display_config`
-
-Data Sources
-============
-
-Set this config on the ``data_source`` property.
-It should be a ``dict`` with the following properties:
-
-* ``geo_column`` -- the column in the returned data that contains the geo point (default: ``"geo"``)
-* ``adapter`` -- which data adapter to use (one of the choices below)
-* extra arguments specific to each data adapter
-
-Note that any report filters in the map report are passed on verbatim to the backing data source.
-
-One column of the data returned by the data source must be the geodata (in ``geo_column``).
-For point features, this can be in the format of a geopoint xform question (e.g, ``42.366 -71.104``).
-The geodata format for region features is outside the scope of the document.
-
-``report``
-----------
-
-Retrieve data from a ``ReportDataSource`` (the abstract data provider of Simon's new reporting framework -- see :ref:`report_api`)
-
-Parameters:
-
-* ``report`` -- fully qualified name of ``ReportDataSource`` class
-* ``report_params`` -- ``dict`` of static config parameters for the ``ReportDataSource`` (optional)
-
-``legacyreport``
-----------------
-
-Retrieve data from a ``GenericTabularReport`` which has not yet been refactored to use Simon's new framework.
-*Not ideal* and should only be used for backwards compatibility.
-Tabular reports tend to return pre-formatted data, while the maps report works best with raw data (for example, it won't know ``4%`` or ``30 mg`` are numeric data, and will instead treat them as text enum values). `Read more`_.
-
-Parameters:
-
-* ``report`` -- fully qualified name of tabular report view class (descends from ``GenericTabularReport``)
-* ``report_params`` -- ``dict`` of static config parameters for the ``ReportDataSource`` (optional)
-
-``case``
---------
-
-Pull case data similar to the Case List.
-
-*(In the current implementation, you must use the same report filters as on the regular Case List report)*
-
-Parameters:
-
-* ``geo_fetch`` -- a mapping of case types to directives of how to pull geo data for a case of that type. Supported directives:
-
-  - name of case property containing the ``geopoint`` data
-  - ``"link:xxx"`` where ``xxx`` is the case type of a linked case; the adapter will then serach that linked case for geo-data based on the directive of the linked case type *(not supported yet)*
-
-  In the absence of any directive, the adapter will first search any linked ``Location`` record *(not supported yet)*, then try the ``gps`` case property.
-
-``csv`` and ``geojson``
------------------------
-
-Retrieve static data from a csv or geojson file on the server (only useful for testing/demo-- this powers the demo reports, for example).
-
-.. _display_config:
-
-Display Configuration
-=====================
-
-Set this config on the ``display_config`` property.
-It should be a ``dict`` with the following properties:
-
-*(Whenever 'column' is mentioned, it refers to a column slug as returned by the data adapter)*
-
-**All properties are optional. The map will attempt sensible defaults.**
-
-* ``name_column`` -- column containing the name of the row; used as the header of the detail popup
-
-* ``column_titles`` -- a mapping of columns to display titles for each column
-
-* ``detail_columns`` -- a list of columns to display in the detail popup
-
-* ``table_columns`` -- a list of columns to display in the data table below the map
-
-* ``enum_captions`` -- display captions for enumerated values.
-  A ``dict`` where each key is a column and each value is another ``dict`` mapping enum values to display captions.
-  These enum values reflect the results of any transformations from ``metrics`` (including ``_other``, ``_null``, and ``-``).
-
-* ``numeric_format`` -- a mapping of columns to functions that apply the appropriate numerical formatting for that column.
-  Expressed as the body of a function that returns the formatted value (``return`` statement required!).
-  The unformatted value is passed to the function as the variable ``x``.
-
-* ``detail_template`` -- an underscore.js template to format the content of the detail popup
-
-* ``metrics`` -- define visualization metrics (see :ref:`styling`).
-  An array of metrics, where each metric is a ``dict`` like so:
-
-  - ``auto`` -- column.
-    Auto-generate a metric for this column with no additional manual input.
-    Uses heuristics to determine best presentation format.
-
-  *OR*
-
-  - ``title`` -- metric title in sidebar (optional)
-
-  *AND one of the following for each visualization property you want to control*
-
-  - ``size`` (static) -- set the size of the marker (radius in pixels)
-
-  - ``size`` (dynamic) -- vary the size of the marker dynamically.
-    A dict in the format:
-
-    - ``column`` -- column whose data to vary by
-
-    - ``baseline`` -- value that should correspond to a marker radius of 10px
-
-    - ``min`` -- min marker radius (optional)
-
-    - ``max`` -- max marker radius (optional)
-
-  - ``color`` (static) -- set the marker color (css color value)
-
-  - ``color`` (dynamic) -- vary the color of the marker dynamically.
-    A dict in the format:
-
-    - ``column`` -- column whose data to vary by
-
-    - ``categories`` -- for enumerated data; a mapping of enum values to css color values.
-      Mapping key may also be one of these magic values:
-
-      - ``_other``: a catch-all for any value not specified
-
-      - ``_null``: matches rows whose value is blank; if absent, such rows will be hidden
-
-    - ``colorstops`` -- for numeric data.
-      Creates a sliding color scale.
-      An array of colorstops, each of the format ``[<value>, <css color>]``.
-
-    - ``thresholds`` -- (optional) a helper to convert numerical data into enum data via "buckets".
-      Specify a list of thresholds.
-      Each bucket comprises a range from one threshold up to but not including the next threshold.
-      Values are mapped to the bucket whose range they lie in.
-      The "name" (i.e., enum value) of a bucket is its lower threshold.
-      Values below the lowest threshold are mapped to a special bucket called ``"-"``.
-
-  - ``icon`` (static) -- set the marker icon (image url)
-
-  - ``icon`` (dynamic) -- vary the icon of the marker dynamically.
-    A dict in the format:
-
-    - ``column`` -- column whose data to vary by
-
-    - ``categories`` -- as in ``color``, a mapping of enum values to icon urls
-
-    - ``thresholds`` -- as in ``color``
-
-  ``size`` and ``color`` may be combined (such as one column controlling size while another controls the color).
-  ``icon`` must be used on its own.
-
-  For date columns, any relevant number in the above config (``thresholds``, ``colorstops``, etc.) may be replaced with a date (in ISO format).
-
-.. _Read more:
-
-Raw vs. Formatted Data
-======================
-
-Consider the difference between raw and formatted data.
-Numbers may be formatted for readability (``12,345,678``, ``62.5%``, ``27 units``); enums may be converted to human-friendly captions; null values may be represented as ``--`` or ``n/a``.
-The maps report works best when it has the raw data and can perform these conversions itself.
-The main reason is so that it may generate useful legends, which requires the ability to appropriately format values that may never appear in the report data itself.
-
-There are three scenarios of how a data source may provide data:
-
-* *(worst)* only provide formatted data
-
-  Maps report cannot distinguish numbers from strings from nulls.
-  Data visualizations will not be useful.
-
-* *(sub-optimal)* provide both raw and formatted data (most likely via the ``legacyreport`` adapter)
-
-  Formatted data will be shown to the user, but maps report will not know how to format data for display in legends, nor will it know all possible values for an enum field -- only those that appear in the data.
-
-* *(best)* provide raw data, and explicitly define enum lists and formatting functions in the report config
- 
diff --git a/docs/pillows.rst b/docs/pillows.rst
index f2297f1d9bf0..5919c1ddba65 100644
--- a/docs/pillows.rst
+++ b/docs/pillows.rst
@@ -242,82 +242,3 @@ It also won't be clear what documents the pillows has and has not processed. To
 fix this the safest thing will be to force the pillow to go through all relevant
 docs. Once this process is started you can move the checkpoint for that pillow
 to the most recent offset for its topic.
-
-
-Pillows
-=======
-
-.. autofunction:: corehq.pillows.case.get_case_pillow
-
-.. autofunction:: corehq.pillows.xform.get_xform_pillow
-
-.. autofunction:: corehq.pillows.case.get_case_to_elasticsearch_pillow
-
-.. autofunction:: corehq.pillows.xform.get_xform_to_elasticsearch_pillow
-
-.. autofunction:: corehq.pillows.user.get_user_pillow
-
-.. autofunction:: corehq.pillows.user.get_user_pillow_old
-
-.. autofunction:: corehq.apps.userreports.pillow.get_location_pillow
-
-.. autofunction:: corehq.pillows.groups_to_user.get_group_pillow
-
-.. autofunction:: corehq.pillows.group.get_group_pillow_old
-
-.. autofunction:: corehq.pillows.groups_to_user.get_group_to_user_pillow
-
-.. autofunction:: corehq.pillows.ledger.get_ledger_to_elasticsearch_pillow
-
-.. autofunction:: corehq.pillows.domain.get_domain_kafka_to_elasticsearch_pillow
-
-.. autofunction:: corehq.pillows.sms.get_sql_sms_pillow
-
-.. autofunction:: corehq.apps.userreports.pillow.get_kafka_ucr_pillow
-
-.. autofunction:: corehq.apps.userreports.pillow.get_kafka_ucr_static_pillow
-
-.. autofunction:: corehq.pillows.synclog.get_user_sync_history_pillow
-
-.. autofunction:: corehq.pillows.application.get_app_to_elasticsearch_pillow
-
-.. autofunction:: corehq.pillows.app_submission_tracker.get_form_submission_metadata_tracker_pillow
-
-.. autofunction:: corehq.pillows.user.get_unknown_users_pillow
-
-.. autofunction:: corehq.messaging.pillow.get_case_messaging_sync_pillow
-
-.. autofunction:: corehq.pillows.case_search.get_case_search_to_elasticsearch_pillow
-
-.. autofunction:: corehq.pillows.cacheinvalidate._get_cache_invalidation_pillow
-
-.. autofunction:: corehq.apps.change_feed.pillow.get_change_feed_pillow_for_db
-
-Processors
-==========
-
-.. autoclass:: corehq.pillows.user.UnknownUsersProcessor
-
-.. autoclass:: corehq.apps.change_feed.pillow.KafkaProcessor
-
-.. autoclass:: corehq.pillows.groups_to_user.GroupsToUsersProcessor
-
-.. autofunction:: corehq.pillows.group.get_group_to_elasticsearch_processor
-
-.. autoclass:: corehq.pillows.ledger.LedgerProcessor
-
-.. autoclass:: corehq.pillows.cacheinvalidate.CacheInvalidateProcessor
-
-.. autoclass:: corehq.pillows.synclog.UserSyncHistoryProcessor
-
-.. autoclass:: pillowtop.processors.form.FormSubmissionMetadataTrackerProcessor
-
-.. autoclass:: corehq.apps.userreports.pillow.ConfigurableReportPillowProcessor
-
-.. autoclass:: pillowtop.processors.elastic.ElasticProcessor
-
-.. autoclass:: pillowtop.processors.elastic.BulkElasticProcessor
-
-.. autofunction:: corehq.pillows.case_search.get_case_search_processor
-
-.. autoclass:: corehq.messaging.pillow.CaseMessagingSyncProcessor
diff --git a/docs/translations.rst b/docs/translations.rst
index c83cf42ad0de..8ccbd1fcb1e8 100644
--- a/docs/translations.rst
+++ b/docs/translations.rst
@@ -266,9 +266,9 @@ JavaScript has a ``gettext`` function that works exactly the same as in python:
     gettext("Welcome to CommCare HQ")
 
 ``gettext`` is available globally in HQ, coming from `django.js <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/hqwebapp/static/hqwebapp/js/django.js>`__
-which is available via the `base RequireJS setup
-<https://github.com/dimagi/commcare-hq/blob/f922211689b39240fcf16efe36d9dc13382977b8/corehq/apps/hqwebapp/templates/hqwebapp/partials/requirejs.html#L28>`__,
-so it doesn't need to be added as a dependency to modules that use it.
+which is part of the imports within the `commcarehq module
+<https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/commcarehq.js>`__,
+that is included within any ``js_entry`` entry point.
 
 For translations with interpolated variables, use Underscore's `_.template <https://underscorejs.org/#template>`__
 function similarly to python's string formatting, calling ``gettext`` on the template and __then__ interpolating
diff --git a/docs/web_apps.rst b/docs/web_apps.rst
index 5960abb863df..0e3c42c9b476 100644
--- a/docs/web_apps.rst
+++ b/docs/web_apps.rst
@@ -241,7 +241,7 @@ This contains logic specific to app preview.
 
 There isn't much here: some initialization code and a plugin that lets you scroll by grabbing and dragging the app preview screen.
 
-The app preview and web apps UIs are largely identical, but a few places do distinguish between them, using the ``environment`` attribute of the current user. Search for the constants ``PREVIEW_APP_ENVIRONMENT`` and ``WEB_APPS_ENVIRONMENT`` for examples.
+The app preview and web apps UIs are largely identical, but a few places do distinguish between them, using the ``environment`` attribute of the current user. Search for the constants ``PREVIEW_APP_ENVIRONMENT`` and ``WEB_APPS_ENVIRONMENT`` for examples.  You may also reference ``user.isAppPreview`` for convenience.
 
 `hq_events.js <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/cloudcare/static/cloudcare/js/formplayer/hq_events.js>`_, although not in this directory, is only really relevant to app preview. It controls the ability to communicate with HQ, which is used for the "phone icons" on app preview: back, refresh, and switching between the standard "phone" mode and the larger "tablet" mode.
 
diff --git a/local_dev_guide.rst b/local_dev_guide.rst
new file mode 100644
index 000000000000..cf3c44cdb804
--- /dev/null
+++ b/local_dev_guide.rst
@@ -0,0 +1,70 @@
+End-to-End Developer Guide
+==============================================
+  
+Audience and Intent
+-------------
+The audience for this guide is software developers who are seeking to be able to run a full end-to-end software environment for CommCare, including both the CommCare HQ backend and the CommCare Android mobile applicaiton.
+
+Following these steps will allow a developer to replicate full end-to-end functionality of the tools to support addressing issues or creating new functionality. 
+  
+Prerequisites
+-------------
+
+- You have followed the `CommCare HQ "Getting Started" guide <https://github.com/dimagi/commcare-hq/blob/master/DEV_SETUP.md>`_ to set up and run a local instance of CommCare HQ. 
+- You have followed the `CommCare Android "Getting Started" guide <https://github.com/dimagi/commcare-android/blob/master/README.md>`_ to set up and succesfully build CommCare Android
+- You have an Android Device (or emulator) with a deployed version of CommCare Android from your local development environment
+- Your Android Device and CommCareHQ Server are on the same local network
+
+1. Expose CommCare HQ on your local network
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To allow your Android device to communicate with the local CommCare HQ instance, you need to make sure it is exposed and accessible to the local network, which you can configure using nginx. For detailed instructions and advanced tips on exposing your local environment, refer to the `detailed instructions and advanced tips <https://github.com/dimagi/commcare-hq/blob/master/corehq/apps/builds/README.rst>`_.
+
+- Install Nginx
+- Add the CommCare HQ Nginx config to your Nginx config file:
+
+  - Edit ``/etc/nginx/nginx.conf``
+  - At the bottom of the ``http{}`` block, add: ``include /path/to/commcarehq/deployment/nginx/cchq_local_nginx.conf;``
+
+- Start Nginx: ``sudo nginx``
+- Set ``BASE_ADDRESS`` in ``localsettings.py`` to your local IP.
+- Modify ``cchq_local_nginx.conf`` to use your IP as the ``server_name``
+- Reload Nginx config: ``sudo nginx -s reload``
+
+**Confirming Success**
+
+After completing these steps, you should navigate to the local IP address and port for your server on the Android Web Browser. You should see the CommCareHQ login page. If not, your server isn't accessible on the local network, you may need to ensure that ports are open or forwarded in firewalls or network layers. 
+
+**Note on static IP Addresses**
+
+In a local network instalation, your installed applications will be hardcoded to the IP address of the HQ server at the time that the application is built and installed. 
+
+When practical it's recommended to establishing a static internal IP for the HQ server rather than a DHCP assigned address to prevent issues. If your IP address changes, you will need to be ready to create new app builds and perform manual `uninstall/re-installs <https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143946239/Installing+CommCare+on+Android+Devices#Uninstall-Your-Application>`_ of the applicaiton on the mobile device. 
+
+2. Create a Mobile Worker and a Test Applicaiton
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You will need an App and Mobile User in a local project space in order to test the mobile application functionality. Detailed information about your first app can be found in CommCare's `Getting Started Guide <https://dimagi.atlassian.net/wiki/spaces/commcarepublic/pages/2143954300/Get+Started>`_, but the main steps are highlighted below.
+  
+**Creating a mobile user account**
+- Login to your local CommCare HQ instance, and the default project space you created during server setup
+- Go to Users -> Mobile Workers -> Create Mobile Worker
+- Enter a username and password for the new mobile worker
+
+**Create and Build a New Application**
+- Go to Applications -> New Application
+- Click on the Pencil button next to the "Untitled Application" title and give your app a name
+- In the left hand pane click "Add..." and choose "Survey" for a basic form module
+- Add a Text question to the form and save it
+- Click on the App Name to navigate to the release manager 
+- Make a new version and Publish your release
+
+3. Install App on CommCare and Test Form Submission
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- On the Android device, open CommCare and scan the QR code to install the app you built in the previous step
+- Login to the app using the Mobile Worker credentials you created 
+- Press Start, and fill out and submit the form
+- Data should be submitted to your local CommCare HQ instance
+
+You've now completed a basic "hello world" form submission workflow with CommCare HQ! You can continue your learning through the `CommCare fundamentals documentation <https://academy.dimagi.com/store>`_ to learn more about app building and data management.
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index af1a6d5773a8..5afa79ade013 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -24,8 +24,11 @@ msgstr ""
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -137,7 +140,8 @@ msgstr ""
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -446,7 +450,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -455,14 +460,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -501,19 +505,7 @@ msgid "Message"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
+msgid "Submit Request"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
@@ -541,14 +533,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -921,7 +907,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -930,6 +917,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -964,7 +952,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -977,14 +964,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1042,6 +1036,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2096,8 +2091,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2744,12 +2739,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2770,6 +2759,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2822,7 +2817,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -2949,14 +2943,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -2990,7 +2983,8 @@ msgid "Generating Report..."
 msgstr ""
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3058,7 +3052,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr ""
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3096,15 +3090,7 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr ""
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
+msgid "Form-Submitting Mobile Workers"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
@@ -3443,6 +3429,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3631,8 +3625,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3650,7 +3646,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3680,7 +3676,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3712,7 +3707,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr ""
 
@@ -3963,7 +3961,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4060,7 +4059,8 @@ msgstr ""
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4121,7 +4121,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4549,6 +4548,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4853,7 +4853,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4881,7 +4882,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5096,8 +5098,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5108,7 +5112,9 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5575,8 +5581,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5768,6 +5776,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -5981,12 +5990,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6274,8 +6285,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6310,7 +6323,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6321,16 +6333,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6346,6 +6362,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7225,7 +7242,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7449,8 +7467,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7624,7 +7644,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7634,7 +7655,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7836,7 +7858,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8063,7 +8084,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9184,6 +9206,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr ""
@@ -9403,7 +9426,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9415,6 +9439,7 @@ msgstr ""
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9664,45 +9689,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9724,15 +9710,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10000,7 +9977,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10235,6 +10213,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10400,36 +10379,6 @@ msgstr ""
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10469,7 +10418,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr ""
 
@@ -11160,15 +11110,6 @@ msgid ""
 "referencetype/property. For example: location:outlet:state/name"
 msgstr ""
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11589,7 +11530,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11648,6 +11590,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11706,7 +11657,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11759,7 +11711,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12100,6 +12052,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12263,6 +12220,15 @@ msgstr ""
 msgid "Show Full Menu"
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12348,6 +12314,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12638,6 +12608,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr ""
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12706,21 +12683,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr ""
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13201,6 +13186,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr ""
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13219,7 +13217,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13299,7 +13298,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13337,11 +13340,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13777,8 +13780,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr ""
@@ -13997,6 +14001,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14148,7 +14153,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14163,7 +14169,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14546,6 +14553,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr ""
 
@@ -14569,7 +14577,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14636,10 +14644,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15130,6 +15146,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15149,6 +15169,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15256,6 +15280,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15275,17 +15303,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16376,6 +16416,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr ""
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16538,6 +16583,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17315,45 +17361,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18009,10 +18016,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18022,6 +18025,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18031,9 +18040,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18534,7 +18541,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18549,6 +18556,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18612,7 +18631,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18628,7 +18648,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18794,6 +18815,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18854,6 +18879,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19718,35 +19747,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19756,7 +19758,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19765,15 +19768,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19784,7 +19790,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19796,7 +19803,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19807,11 +19815,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19823,16 +19833,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19845,7 +19859,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19857,19 +19872,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19883,7 +19902,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19897,31 +19917,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -19929,15 +19956,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -19946,12 +19976,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -19960,19 +20061,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19980,11 +20082,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19992,11 +20096,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20005,7 +20111,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20013,7 +20120,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20022,7 +20130,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20030,45 +20139,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20078,7 +20196,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20088,20 +20207,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20143,98 +20267,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20243,33 +20326,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20278,7 +20368,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20290,7 +20381,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20298,17 +20390,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20319,29 +20413,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20349,7 +20449,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20357,7 +20458,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20368,7 +20469,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20379,11 +20481,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20391,100 +20495,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20492,7 +20564,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20500,7 +20573,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20508,7 +20582,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20516,7 +20591,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20524,84 +20600,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20611,80 +20706,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20692,7 +20803,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20701,7 +20813,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20711,39 +20824,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20755,7 +20877,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20766,15 +20888,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20782,14 +20906,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20797,11 +20923,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20810,7 +20938,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20818,7 +20947,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20826,11 +20956,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20838,7 +20970,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20846,30 +20979,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20883,33 +21021,165 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21073,8 +21343,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr ""
 
@@ -21117,10 +21386,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21166,6 +21431,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21187,7 +21456,7 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
+msgid "Select feed type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
@@ -21284,6 +21553,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21452,16 +21726,12 @@ msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22039,6 +22309,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22138,6 +22418,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr ""
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22205,6 +22489,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22213,6 +22602,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22381,114 +22834,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23313,6 +23727,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23332,10 +23750,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23460,135 +23874,149 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23620,6 +24048,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23663,18 +24095,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23708,39 +24128,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23765,59 +24152,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -23868,6 +24216,36 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia files"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Bulk Upload Multimedia Status"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24453,6 +24831,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25027,7 +25409,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25045,7 +25427,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25068,8 +25450,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25474,6 +25856,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25564,10 +25947,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25597,11 +25976,7 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
+msgid "Enable in Web Apps"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25619,7 +25994,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25627,11 +26002,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25648,11 +26019,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26706,14 +27072,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27333,11 +27691,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -27866,10 +28219,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -27965,6 +28314,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29563,10 +29916,6 @@ msgstr ""
 msgid "CommTrack"
 msgstr "CommCare Supply"
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30195,6 +30544,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30203,10 +30563,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32162,21 +32536,6 @@ msgstr ""
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32761,6 +33120,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35264,6 +35627,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36145,6 +36509,40 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "contains"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is empty"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36288,10 +36686,6 @@ msgstr "Google Authenticator"
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36385,6 +36779,29 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+msgid "Edit Value"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Add Item"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36593,7 +37010,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -36854,20 +37271,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -36948,7 +37365,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -36981,33 +37398,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37015,11 +37432,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37027,34 +37444,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37370,10 +37787,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37633,6 +38046,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38355,6 +38783,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38673,6 +39125,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -39875,11 +40333,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41040,10 +41498,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41474,6 +41928,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr ""
@@ -42131,7 +42595,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42162,6 +42630,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -42821,7 +43293,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43563,10 +44036,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -43834,6 +44303,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44276,6 +44761,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44292,21 +44782,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44472,11 +45023,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44563,6 +45109,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44595,6 +45145,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44611,10 +45167,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44695,6 +45247,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44727,6 +45287,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/en/LC_MESSAGES/djangojs.po b/locale/en/LC_MESSAGES/djangojs.po
index 4000ead86582..09f0f6950b65 100644
--- a/locale/en/LC_MESSAGES/djangojs.po
+++ b/locale/en/LC_MESSAGES/djangojs.po
@@ -332,7 +332,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr ""
 
@@ -493,6 +494,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -853,10 +858,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1166,6 +1167,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1585,7 +1587,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2199,6 +2202,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2386,6 +2405,7 @@ msgstr ""
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2454,7 +2474,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr ""
 
@@ -2490,50 +2511,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2693,6 +2670,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3171,6 +3152,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3216,140 +3220,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3367,6 +3392,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr ""
 
@@ -3392,57 +3418,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3469,6 +3496,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3599,6 +3642,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3628,6 +3679,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3704,10 +3759,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3787,6 +3838,21 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3925,11 +3991,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr ""
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4268,16 +4340,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr ""
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4346,6 +4408,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr ""
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 0deae9f6b71c..e331f1d3a51d 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -33,8 +33,11 @@ msgstr "Tipo de cuenta"
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -146,7 +149,8 @@ msgstr "Mostrar Solo las Suscripciones de Prueba"
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -465,7 +469,8 @@ msgstr "Se requiere un nombre para este nuevo rol."
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -474,14 +479,13 @@ msgstr "Se requiere un nombre para este nuevo rol."
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -520,20 +524,8 @@ msgid "Message"
 msgstr "Mensaje"
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr "Seleccione un plan diferente"
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr "Solicite una Cotización "
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
-msgstr "Ingresar"
+msgid "Submit Request"
+msgstr ""
 
 #: corehq/apps/accounting/forms.py
 #, python-format
@@ -561,15 +553,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -1018,7 +1003,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -1027,6 +1013,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -1061,7 +1048,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -1074,14 +1060,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1139,6 +1132,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2299,8 +2293,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2986,14 +2980,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-"Nota: Al seleccionar este plan se realizarán los siguientes cambios a su "
-"proyecto."
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -3014,6 +3000,14 @@ msgstr "Tarifa de Función"
 msgid "Balance"
 msgstr "Saldo"
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+"Nota: Al seleccionar este plan se realizarán los siguientes cambios a su "
+"proyecto."
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr "Ir a Todas las Facturas para este Espacio del Proyecto"
@@ -3066,7 +3060,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -3193,14 +3186,13 @@ msgstr "Razón de \"No Facturar\""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -3234,7 +3226,8 @@ msgid "Generating Report..."
 msgstr "Generando Reporte..."
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3302,7 +3295,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr "Empresa"
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3340,16 +3333,8 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr "Usuarios Móviles"
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
-msgstr "SMS"
+msgid "Form-Submitting Mobile Workers"
+msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
 #: corehq/messaging/scheduling/forms.py corehq/motech/const.py
@@ -3689,6 +3674,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3877,8 +3870,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3896,7 +3891,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3926,7 +3921,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr "Detalles"
@@ -3958,7 +3952,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr "Error"
 
@@ -4230,7 +4227,8 @@ msgstr "Caso"
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4331,7 +4329,8 @@ msgstr "Aplicaciones"
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4392,7 +4391,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr "Actual"
 
@@ -4838,6 +4836,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -5046,22 +5045,12 @@ msgid "Automatic"
 msgstr "Automático"
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid ""
-#| "Automatically resizes images within forms. Follow <a href='https://"
-#| "confluence.dimagi.com/display/commcarepublic/Auto-"
-#| "Resize+Images+on+Android'> the instructions here</a> to determine which "
-#| "value to use."
 msgid ""
 "Automatically resizes images within forms. Follow <a href='https://dimagi."
 "atlassian.net/wiki/spaces/commcarepublic/pages/2143946731/"
 "Images+in+CommCare#Auto-Resize-Images-on-Android'> the instructions here</a> "
 "to determine which value to use."
 msgstr ""
-"Ajusta automáticamente el tamaño de las imágenes dentro de formularios. Siga "
-"<a href='https://confluence.dimagi.com/display/commcarepublic/Auto-"
-"Resize+Images+on+Android'> las instrucciones aquí </a> para determinar qué "
-"valor utilizar."
 
 #: corehq/apps/app_manager/static_strings.py
 msgid "Automatically trigger a two-way sync on a regular schedule"
@@ -5178,7 +5167,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr "Deshabilitar"
@@ -5209,7 +5199,8 @@ msgstr "Habilitar Configuración de Visualización de Menú por Módulo"
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr "Habilitar"
@@ -5436,8 +5427,10 @@ msgstr "No Validación"
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5448,7 +5441,9 @@ msgstr "No"
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5853,14 +5848,6 @@ msgid "What the 'Extra Key' (# on Nokia Phones) does when pressed"
 msgstr "Qué hace la 'Tecla Extra' (# en Teléfonos Nokia) al presionarla"
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid ""
-#| "When a value is selected, this feature controls the display size of any "
-#| "user-provided image such that it will be consistent with the size of the "
-#| "original image file, and consistent across devices. Follow <a "
-#| "href='https://confluence.dimagi.com/display/commcarepublic/"
-#| "Image+Sizing+with+Multiple+Android+Device+Models'> the instructions here</"
-#| "a> to determine which value to use."
 msgid ""
 "When a value is selected, this feature controls the display size of any user-"
 "provided image such that it will be consistent with the size of the original "
@@ -5870,12 +5857,6 @@ msgid ""
 "Android-Device-Models'> the instructions here</a> to determine which value "
 "to use."
 msgstr ""
-"Cuando se selecciona un valor, esta función controla el tamaño de "
-"visualización de cualquier imagen provista por el usuario que sea "
-"consistente con el tamaño del archivo de imagen original, y consistente "
-"entre dispositivos. Siga <a href='https://confluence.dimagi.com/display/"
-"commcarepublic/Image+Sizing+with+Multiple+Android+Device+Models'>las "
-"instrucciones aquí </a>para determinar qué valor desea utilizar. "
 
 #: corehq/apps/app_manager/static_strings.py
 msgid ""
@@ -5998,8 +5979,10 @@ msgstr "Densidad XXX-Alta"
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -6197,6 +6180,7 @@ msgid "Releases"
 msgstr "Publicaciones"
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -6413,12 +6397,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr "Valor"
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6720,8 +6706,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6756,7 +6744,6 @@ msgstr "Instale CommCare"
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6767,16 +6754,20 @@ msgstr "Instale CommCare"
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6792,6 +6783,7 @@ msgstr "Instale CommCare"
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7671,7 +7663,8 @@ msgid "Form Changes"
 msgstr "Cambios en el Formulario"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr "Visualización"
 
@@ -7899,8 +7892,10 @@ msgstr "Etiqueta del Caso"
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -8077,7 +8072,8 @@ msgstr "Cargar las siguientes propiedades a las preguntas del formulario"
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -8087,7 +8083,8 @@ msgid "Property"
 msgstr "Propiedad"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -8294,7 +8291,6 @@ msgstr "XForm"
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8531,7 +8527,8 @@ msgid "Disable manual linking"
 msgstr "Deshabilitar enlace manual "
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr "Actualizar"
 
@@ -9694,6 +9691,7 @@ msgstr "Mensaje de Validación"
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr "Listo"
@@ -9924,7 +9922,8 @@ msgstr "Reporte"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9936,6 +9935,7 @@ msgstr "Reporte"
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -10197,45 +10197,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr "No hay Multimedia"
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr "Subir Imagen de Íncono"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr "Seleccione Imagen de Ícono"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr "Seleccione"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr "Ícono actual"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr "Empiece a Cargar"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr "Cargar Menú de Audio"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr "Seleccione Menú de Audio"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr "Audio actual"
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -10257,15 +10218,6 @@ msgstr "Reemplazar"
 msgid "Set Path"
 msgstr "Establecer Ruta"
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10535,7 +10487,8 @@ msgid "Send to phone via SMS"
 msgstr "Envíar al teléfono vía SMS"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr "Descargar Multimedia"
 
@@ -10771,6 +10724,7 @@ msgid "Replace Logo"
 msgstr "Reemplazar Logo"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr "Subir Logo"
 
@@ -10944,36 +10898,6 @@ msgstr "Sincronizar"
 msgid "This application currently does not contain any multimedia references."
 msgstr "Esta aplicación no contiene actualmente ninguna referencia multimedia"
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr "Establecer Contraseña"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr "Las contraseñas no coinciden. Por favor intente de nuevo."
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr "Por favor ingrese una contraseña o cancele."
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr "Contraseña"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr "Repita su Contraseña"
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -11013,7 +10937,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr "Seleccionar Todos"
 
@@ -11763,15 +11688,6 @@ msgstr ""
 "loacation:mytype:referencetype/property. Por ejemplo: location:outlet:state/"
 "name"
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr "Vista de Auditoría"
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr "Cambios de modelo de auditoría"
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr "Nombre de Desarrollo"
@@ -12212,7 +12128,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr "Regresar"
@@ -12271,6 +12188,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -12329,7 +12255,8 @@ msgstr "Empezando para iniciar"
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -12382,7 +12309,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12725,6 +12652,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12892,6 +12824,15 @@ msgstr "Aplicaciones Web"
 msgid "Show Full Menu"
 msgstr "Mostrar el Menú Completo"
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr "Seleccione"
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12977,6 +12918,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -13271,6 +13216,13 @@ msgstr "Configuraciones de Consumo"
 msgid "Phone Settings"
 msgstr "Configuraciones del Teléfono"
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr "Ingresar"
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -13344,10 +13296,22 @@ msgstr "Consumo"
 msgid "Default consumption values updated"
 msgstr "Valores predeterminados de consumo actualizados"
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr "SMS"
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr "Seleccione uno"
 
+#: corehq/apps/custom_data_fields/edit_entity.py
+msgid "Additional Information"
+msgstr "Información Adicional"
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 #: corehq/apps/registration/forms.py
 msgid "Invalid profile selected. Please select a valid profile."
@@ -13357,10 +13321,6 @@ msgstr ""
 msgid "Select a profile"
 msgstr ""
 
-#: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
-msgstr "Información Adicional"
-
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Unrecognized Information"
 msgstr "Información no Reconocida"
@@ -13841,6 +13801,19 @@ msgstr "Opción Multiple"
 msgid "GPS"
 msgstr "GPS"
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr "Contraseña"
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13859,7 +13832,8 @@ msgstr "Diccionario de Datos"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13939,7 +13913,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13977,11 +13955,11 @@ msgstr "Agregar Propiedad del Caso"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -14421,8 +14399,9 @@ msgstr "Reasignar"
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr "Nombre del Caso"
@@ -14649,6 +14628,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr "Tipo de Coincidencia"
 
@@ -14800,7 +14780,8 @@ msgstr "Agregue Expresión"
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14815,7 +14796,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -15198,6 +15180,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
 
@@ -15221,7 +15204,7 @@ msgstr "Fecha propiedad de caso (avanzado)"
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -15288,10 +15271,18 @@ msgstr "La fecha actual"
 msgid "greater than"
 msgstr "Mas de"
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr "Menos de"
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr "La fecha en la propiedad del caso"
@@ -15792,6 +15783,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr "Eliminar Logo"
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr "Eliminar su logo personalizado y utilizar el estándar."
@@ -15811,6 +15806,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr "Aplicación de Centro de Llamadas"
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15927,6 +15926,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15946,17 +15949,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
-msgstr "Editar Información Básica"
+msgid "Use elasticsearch when fetching apps for exports"
+msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
-msgstr "Actualice la Información Básica"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
+msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr "Zona horaria por defecto"
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr "Editar Información Básica"
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr "Actualice la Información Básica"
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -17085,6 +17100,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr "Seleccione un plan diferente"
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -17247,6 +17267,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -18044,45 +18065,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr "Tarjetas de Crédito Guardadas"
@@ -18762,10 +18744,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr "Contáctenos"
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18775,6 +18753,12 @@ msgstr "1. Seleccione un Plan %(edition_name)s"
 msgid "Contact Dimagi"
 msgstr "Contactar a Dimagi"
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr "2. Contactar a Dimagi"
@@ -18784,12 +18768,8 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
-"Su solicitud fue enviada a Dimagi. Haremos nuestro mejor esfuerzo por darle "
-"el seguimiento oportuno."
 
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Subscription"
@@ -19302,7 +19282,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -19317,6 +19297,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -19380,7 +19372,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -19396,7 +19389,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -19562,6 +19556,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -19622,6 +19620,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -20502,35 +20504,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -20540,7 +20515,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -20549,15 +20525,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr "Más información"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr "Tipo de archivo predeterminado"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20568,7 +20547,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -20580,7 +20560,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -20591,11 +20572,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr "Crear una Exportación Guardada Diariamente"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20607,16 +20590,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -20629,7 +20616,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20641,19 +20629,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr "Incluir duplicados y otros formularios no procesados"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr "Expandir Preguntas de Casillas"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20667,7 +20659,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20681,33 +20674,40 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr "Agregar configuración personalizada de tablas"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr "Configuración de Privacidad"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr "Publicar como Anónimo"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 "Marque esto si esta exportación se ha hecho anónima de forma completa y "
 "segura."
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr "Permítame marcar datos confidenciales"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr "Guardando"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -20715,15 +20715,18 @@ msgstr "Guardando"
 msgid "Try Again"
 msgstr "Intente de nuevo"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr "¡Guardado!"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -20732,7 +20735,8 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
@@ -20740,6 +20744,76 @@ msgstr ""
 "Hay errores en su configuración. Por favor arréglelos antes de crear la "
 "exportación."
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr "No hay ingresos disponibles."
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -20748,19 +20822,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20768,11 +20843,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20780,11 +20857,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20793,7 +20872,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20801,7 +20881,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20810,7 +20891,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20818,45 +20900,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr "Mostrar Preguntas Eliminadas"
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr "Mostrar Propiedades Eliminadas"
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20866,7 +20957,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20876,22 +20968,27 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 "No fue posible procesar las aplicaciones. Por favor reporte un problema si "
 "este persiste."
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr "Proceso"
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr "Mostrar Propiedades Obsoletas"
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20933,98 +21030,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr "No hay ingresos disponibles."
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr "Exportación General"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr "Los filtros están inactivos mientras la descarga está en progreso."
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr "Preparar Exportación"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr "Preparando Exportación"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr "Preparar Multimedia"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr "Preparando Multimedia"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -21033,33 +21089,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr "Recopilando Datos"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr "Recopilando Multimedia"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr "¡Algo salió mal!"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr "Actualizar Filtros"
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -21068,7 +21131,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -21080,7 +21144,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -21088,17 +21153,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr "Cargando Formulario"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -21109,15 +21176,18 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr "Etiquetado erróneo"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr "Sugerencias"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
@@ -21125,15 +21195,18 @@ msgstr ""
 "Estos ingresos de formulario están etiquetados como si pertenecieran a una "
 "aplicación que no existe."
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr "Estos ingresos podrían pertenecer a uno de los siguientes formularios:"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr "La aplicación fue eliminada."
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21141,7 +21214,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -21149,7 +21223,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -21160,7 +21234,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21171,11 +21246,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr "Cómo Crear y Lanzar una Aplicación CommCare"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21183,100 +21260,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr "Filtrar Ingreso"
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr "Esta exportación está limitada a las siguientes ubicaciones:"
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr "Guardar filtros"
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr "eliminada"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr "Nombre de la Hoja"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr "Ruta Personalizada"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -21284,7 +21329,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -21292,7 +21338,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -21300,7 +21347,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -21308,7 +21356,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -21316,84 +21365,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr "Seleccionar Ninguno"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr "Mostrar Preguntas Avanzadas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr "Ocultar Preguntas Avanzadas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr "Ocultar Preguntas Eliminadas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr "Ocultar Propiedades Eliminadas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr "Ocultar Propiedades Obsoletas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr "Utilice etiquetas de preguntas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr "Utilizar ids de preguntas"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr "Dividir datos de selección múltiple"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr "Confidencial"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr "Agregar propiedad de exportación personalizada"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr "Mostrar Opciones"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr "Ocultar Opciones"
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21403,80 +21471,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr "o"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr "Editar Columnas"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr "Anónimo"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr "Formulario:"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -21484,7 +21568,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -21493,7 +21578,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -21503,39 +21589,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr "Última Actualización:"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr "Actualizar Datos"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr "Actualizando Datos. Por favor, espere..."
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr "Copiar Enlace de Ingreso de Tablero"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -21547,7 +21642,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -21558,15 +21653,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -21574,14 +21671,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -21589,11 +21688,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -21602,7 +21703,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -21610,7 +21712,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -21618,11 +21721,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr "Confirmar actualizaciones de datos."
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -21630,7 +21735,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -21638,30 +21744,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -21675,33 +21786,179 @@ msgstr ""
 msgid "View"
 msgstr "Vista"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                            Snapshot of %(snap_name)s\n"
+#| "                        "
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+"\n"
+"Captura Instantánea de  %(snap_name)s"
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                            Snapshot of %(snap_name)s\n"
+#| "                        "
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+"\n"
+"Captura Instantánea de  %(snap_name)s"
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr "Compartir Datos Diarios con Excel y Otros Sistemas"
@@ -21867,8 +22124,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr "Exportación"
 
@@ -21913,10 +22169,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr "Exportar Casos Anónimos"
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21962,6 +22214,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr "Exportar las Exportaciones Anónimas Guardadas Diariamente"
@@ -21983,8 +22239,10 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
-msgstr ""
+#, fuzzy
+#| msgid "Select model type"
+msgid "Select feed type"
+msgstr "Seleccionar tipo de modelo"
 
 #: corehq/apps/export/views/list.py
 msgid "Select Feed Type"
@@ -22080,6 +22338,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr "Crear Ingreso del Tablero"
@@ -22254,16 +22517,12 @@ msgstr "Incluir en Descarga"
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr "todo"
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr "ninguno"
@@ -22865,6 +23124,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22964,6 +23233,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -23031,6 +23304,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr "Ocultar Opciones de Filtro"
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr "Mostrar Opciones de Filtro"
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -23039,6 +23417,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr "Mostrar Todo"
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr "Finalice"
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -23207,114 +23649,77 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
-msgstr "Ocultar Opciones de Filtro"
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
-msgstr "Mostrar Opciones de Filtro"
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
-msgstr ""
+#: corehq/apps/geospatial/views.py
+#, fuzzy
+#| msgid "Please specify a case property name."
+msgid "Please specify a name for the GeoPolygon area."
+msgstr "Por favor especifique el nombre de una propiedad del caso."
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -24167,6 +24572,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -24188,10 +24597,6 @@ msgstr ""
 "Se encontró un error al procesar el Archivo Zip. El archivo parece no ser "
 "válido."
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr "zip"
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr "imagen"
@@ -24318,138 +24723,156 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
 "would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
 "\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
-msgstr ""
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
-msgstr "Seleccionar Archivos"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
+msgstr "No se Encontraron Coincidencias"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
-msgstr "Cola de Archivos para Carga General "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
+msgstr "No hay Coincidencias"
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
+msgstr "Imágenes Coincidentes"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
-msgstr "Nombre de archivo"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
+msgstr "Actualizado"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
-msgstr "Tamaño"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
+msgstr "Ver Imagen Completa"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
-msgstr "Avance de Carga"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
+msgstr "Audio Coincidente"
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
+msgstr ""
+"El reproducir audio directamente en esta página no es soportado actualmente."
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
-msgstr "Estado de Coincidencia"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, fuzzy
+#| msgid "Matched Videos"
+msgid "Matched Video"
+msgstr "Videos Coincidentes"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
-msgstr "Archivos en Cola"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
+msgstr ""
+"Ver videos directamente en esta página no es soportado. Abre una nueva "
+"pestaña."
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
-msgstr "Seleccione archivos de arriba para agregar a la fila."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
+msgstr "Ver Video"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
-msgstr "Procesando la Carga"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
-msgstr "Archivos Cargados"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
+msgstr "Subir Imagen de Íncono"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
-msgstr "Opciones de Compartir Multimedia"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
-msgstr "Licencia"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
-msgstr "Atribución de Creative Commons, No Comercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
-msgstr "Atribución de Creative Commons, Sin Derivadas (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
+msgstr "Seleccione Imagen de Ícono"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
-msgstr "Atribución de Creative Commons (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
+msgstr "Seleccione Menú de Audio"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
-"Atribución de Creative Commons, No Comercial, y Compartir Igual (CC BY-NC-SA)"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
-"Atribución de Creative Commons, No Comercial, y Sin Derivadas (CC BY-NC-ND)"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
-msgstr "Atribución de Creative Commons, Compartir Igual (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
+msgstr "Seleccione Archivo"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
-msgstr "Autor"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
+msgstr "Ícono actual"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
-msgstr "Ingrese el nombre del autor"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
+msgstr "Audio actual"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
-msgstr "Notas de Atribución"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
-msgstr "Seleccione uno Nuevo"
+msgid "Current File"
+msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
-msgstr "Seleccione Archivo"
+msgid "Begin Upload"
+msgstr "Empiece a Cargar"
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
 msgid ""
@@ -24480,6 +24903,10 @@ msgstr "Descargar ZIP"
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr "Tamaño"
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr "Ruta en Aplicación"
@@ -24523,18 +24950,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr "Ver Video"
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -24568,42 +24983,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr "No hay Coincidencias"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr "Imágenes Coincidentes"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr "Ver Imagen Completa"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr "Actualizado"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr "Audio Coincidente"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-"El reproducir audio directamente en esta página no es soportado actualmente."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr "Videos Coincidentes"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-"Ver videos directamente en esta página no es soportado. Abre una nueva "
-"pestaña."
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr "Se encontraron errores"
@@ -24628,64 +25007,23 @@ msgstr "Nueva Imagen Cargada Exitosamente"
 msgid "New Video Uploaded Successfully"
 msgstr "Nuevo Video Cargado Exitosamente"
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-"Agregado a la cola. Haga clic en<strong>Iniciar Carga</strong>arriba para "
-"iniciar."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr "Agregado a la cola para procesar. Por favor, espere."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr "Archivos"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr "Procesando carga, por favor espere."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr "Carga Finalizada"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr "Hubo errores"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr "Eliminar de la cola"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
-msgstr "Cancelar Carga"
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 "Listo para cargar. Haga clic en<strong>Iniciar Carga</strong>abajo para "
 "empezar."
 
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "There were errors"
+msgstr "Hubo errores"
+
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr "Seleccione otro archivo"
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr "Se encontró 1 Coincidencia"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
-msgstr "No se Encontraron Coincidencias"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
+msgstr "Cancelar Carga"
 
 #: corehq/apps/hqmedia/view_helpers.py
 #, python-brace-format
@@ -24735,6 +25073,48 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr "Sitio de Ayuda de CommCare"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia"
+msgid "multimedia"
+msgstr "Multimedia"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia"
+msgid "multimedia files"
+msgstr "Multimedia"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Bulk Upload File Queue"
+msgid "Bulk Upload Multimedia Status"
+msgstr "Cola de Archivos para Carga General "
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Importing your data. This may take some time..."
+msgid "Importing your multimedia. This may take some time..."
+msgstr "Importando sus datos; esto puede llevar un tiempo..."
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+"¡Ocurrió un problema al importar datos! Por favor intente otra vez o reporte "
+"un problema."
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia Reference Checker"
+msgid "Return to multimedia reference checker"
+msgstr "Verificador de Referencias Multimedia"
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -25329,6 +25709,10 @@ msgstr ""
 msgid "Errors"
 msgstr "Errores"
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25938,7 +26322,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25956,7 +26340,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25979,8 +26363,8 @@ msgstr "Actualice el archivo descargado."
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -26387,6 +26771,7 @@ msgid "You have no items."
 msgstr "No tiene ningún ítem."
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr "Cargando..."
@@ -26477,10 +26862,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -26510,12 +26891,10 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
-msgstr ""
+#, fuzzy
+#| msgid "Web Apps"
+msgid "Enable in Web Apps"
+msgstr "Aplicaciones Web"
 
 #: corehq/apps/integration/forms.py
 msgid "External Callout URL"
@@ -26532,7 +26911,7 @@ msgid "API Key"
 msgstr "Clave API"
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -26540,11 +26919,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -26561,11 +26936,6 @@ msgstr "ID de Proyecto"
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -27647,14 +28017,6 @@ msgstr "Sincronizar el fixture de ubicación plano (recomendado)."
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr "Sincronizar el fixture de ubicación jerárquica (formato legado)"
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr "Mostrar Todo"
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -28325,13 +28687,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr "Estado de Importación de la Estructura de la Organización"
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-"¡Ocurrió un problema al importar datos! Por favor intente otra vez o reporte "
-"un problema."
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr "Cargar Estructura de la Organización Desde Excel"
@@ -28888,10 +29243,6 @@ msgstr "Crear Su Cuenta"
 msgid "Name Your First Project"
 msgstr "Dele un Nombre a Su Primer Proyecto"
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr "Finalice"
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -28989,6 +29340,10 @@ msgstr ""
 "Un usuario con este correo electrónico ya está en este proyecto o tiene una "
 "invitación pendiente."
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -30610,10 +30965,6 @@ msgstr "Administrar Lanzamientos"
 msgid "CommTrack"
 msgstr "CommCare Suministros"
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr "Estado de Existencias  (mapa)"
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr "Estado de Existencias por Producto"
@@ -31277,6 +31628,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -31285,10 +31647,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -33301,21 +33677,6 @@ msgstr "Filtro de Fecha"
 msgid "Default Date Range"
 msgstr "Rango de Fecha Predeterminado"
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr "Añadir a Exportación General"
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr "anónimo"
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr "No Disponible"
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -33915,6 +34276,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -36521,6 +36886,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -37400,6 +37766,46 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "Domains"
+msgid "contains"
+msgstr "Dominios"
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "List is empty."
+msgid "is empty"
+msgstr "La lista está vacía."
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+#, fuzzy
+#| msgid "New Items:"
+msgid "New Item"
+msgstr "Ítems Nuevos:"
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -37541,10 +37947,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -37638,6 +38040,35 @@ msgstr ""
 msgid "Examples"
 msgstr "Ejemplos"
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+#, fuzzy
+#| msgid "Edit Table"
+msgid "Edit Value"
+msgstr "Editar Tabla"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Add filter"
+msgid "Add Item"
+msgstr "Agregar filtro"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Generic Error"
+msgid "Trigger Error"
+msgstr "Error Genérico"
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -37846,7 +38277,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -38107,20 +38538,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -38201,7 +38632,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -38234,33 +38665,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -38268,11 +38699,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -38280,34 +38711,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr "Casos IRA Tratados"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr "Módulo"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr "Texto de Visualización Predeterminado"
 
@@ -38639,10 +39070,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr "{0} tipo de filtro debe incluir una lista de \"filtros\" "
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr "Problema creando filtro de spec:  {}, el mensaje es {}"
@@ -38926,6 +39353,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -39673,6 +40115,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -40014,6 +40480,12 @@ msgstr "Fuente de datos creada para '{}' "
 msgid "Data source \"{}\" saved!"
 msgstr "¡Fuente de datos \"{}\" guardada!"
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -40372,10 +40844,8 @@ msgstr ""
 "ubicaciones de arriba "
 
 #: corehq/apps/users/forms.py
-#, fuzzy
-#| msgid "One or more of the locations was not found."
 msgid "One or more of the locations you specified cannot have users assigned."
-msgstr "Una o más de las ubicaciones no fueron encontradas."
+msgstr ""
 
 #: corehq/apps/users/forms.py
 msgid "You do not have permissions to assign one of those locations."
@@ -41249,11 +41719,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -42442,10 +42912,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr "Sitio de Ayuda de CommCare"
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr "Carga General de Usuarios Móviles"
@@ -42900,6 +43366,16 @@ msgstr ""
 "Esta configuración le permite que los usuarios dividan preguntas de "
 "selección múltiple en varias columnas en casos de exportación."
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr "Centro de Llamadas"
@@ -43571,7 +44047,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -43602,6 +44082,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -44261,7 +44745,8 @@ msgstr "Parámetro de Número de Teléfono"
 msgid "Include '+' in Phone Number"
 msgstr "Incluir  '+' en Número de Teléfono"
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr "Método de Solicitur HTTP"
 
@@ -45007,10 +45492,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -45278,6 +45759,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr "Alcance"
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -45720,6 +46217,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -45736,21 +46238,83 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, fuzzy, python-brace-format
+#| msgid "This field is required."
+msgid "This field is required for {request_method} requests."
+msgstr "Este campo es obligatorio."
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr "Empezar Reenvío"
@@ -45920,11 +46484,6 @@ msgstr ""
 msgid "Payload"
 msgstr "Carga útil"
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr "Error de Carga útil"
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -46014,6 +46573,10 @@ msgstr ""
 msgid "Failure"
 msgstr "Falla"
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -46046,6 +46609,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr "Reenviar Datos"
@@ -46062,10 +46631,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -46146,6 +46711,14 @@ msgstr ""
 msgid "Response body"
 msgstr "Cuerpo de la respuesta"
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -46178,6 +46751,10 @@ msgstr ""
 msgid "Used By"
 msgstr "Utilizado Por"
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
@@ -47586,8 +48163,52 @@ msgstr ""
 msgid "Enter valid JSON"
 msgstr ""
 
-#~ msgid "Sync to Dropbox"
-#~ msgstr "Sincronizar al Dropbox"
+#~ msgid "zip"
+#~ msgstr "zip"
+
+#~ msgid "Select Files"
+#~ msgstr "Seleccionar Archivos"
+
+#~ msgid "Filename"
+#~ msgstr "Nombre de archivo"
+
+#~ msgid "Upload Progress"
+#~ msgstr "Avance de Carga"
+
+#~ msgid "Match Status"
+#~ msgstr "Estado de Coincidencia"
+
+#~ msgid "Queued Files"
+#~ msgstr "Archivos en Cola"
+
+#~ msgid "Select files above to add to the queue."
+#~ msgstr "Seleccione archivos de arriba para agregar a la fila."
+
+#~ msgid "Processing Upload"
+#~ msgstr "Procesando la Carga"
+
+#~ msgid "Uploaded Files"
+#~ msgstr "Archivos Cargados"
+
+#~ msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
+#~ msgstr ""
+#~ "Agregado a la cola. Haga clic en<strong>Iniciar Carga</strong>arriba para "
+#~ "iniciar."
+
+#~ msgid "Queued for processing. Please wait."
+#~ msgstr "Agregado a la cola para procesar. Por favor, espere."
+
+#~ msgid "Files"
+#~ msgstr "Archivos"
+
+#~ msgid "Processing upload, please wait."
+#~ msgstr "Procesando carga, por favor espere."
+
+#~ msgid "Upload Finished"
+#~ msgstr "Carga Finalizada"
+
+#~ msgid "Remove from queue"
+#~ msgstr "Eliminar de la cola"
 
-#~ msgid "Unicel Settings"
-#~ msgstr "Configuraciones Unicel"
+#~ msgid "1 Match Found"
+#~ msgstr "Se encontró 1 Coincidencia"
diff --git a/locale/es/LC_MESSAGES/djangojs.po b/locale/es/LC_MESSAGES/djangojs.po
index 61a3025a1091..7572ca7ba6f8 100644
--- a/locale/es/LC_MESSAGES/djangojs.po
+++ b/locale/es/LC_MESSAGES/djangojs.po
@@ -343,7 +343,8 @@ msgstr ""
 "cambios en la configuración del gráfico de su reporte."
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr "Ninguna"
 
@@ -505,6 +506,10 @@ msgstr "Ícono"
 msgid "Conditional ID Mapping"
 msgstr "Mapeo de ID Condicional"
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -874,10 +879,6 @@ msgstr "Tiene configuraciones sin guardar."
 msgid "Settings"
 msgstr "Configuración"
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr "Reiniciar"
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1189,6 +1190,7 @@ msgid "no formatting"
 msgstr "sin formato"
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -1642,7 +1644,8 @@ msgid "Add Expression"
 msgstr "Agregue Expresión"
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2323,6 +2326,22 @@ msgstr "Mensaje de Ayuda"
 msgid "Help Itext ID"
 msgstr "Ayuda de Identificación Itext"
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr "Agregar Otro Contenido"
@@ -2522,6 +2541,7 @@ msgstr "Tipo de Caso"
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr "ID del Caso"
 
@@ -2590,7 +2610,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr "Los adjuntos en línea deben tener un nombre del adjunto"
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr "Crear"
 
@@ -2626,50 +2647,6 @@ msgstr "Seleccionar Archivo"
 msgid "Current"
 msgstr "Actual"
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr "Opciones de Compartir Multimedia"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr "Licencia"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr "Atribución de Creative Commons, No Comercial "
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr "Atribución de Creative Commons, Sin Derivadas "
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr "Atribución de Creative Commons"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr "Atribución de Creative Commons, No Comerciales, y Compartir Igual "
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr "Atribución de Creative Commons, No Comerciales, y Sin Derivadas "
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr "Atribución de Creative Commons, Compartir Igual"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr "Autor"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr "Ingrese el nombre del autor."
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr "Notas de Atribución"
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr "Iniciar Carga"
@@ -2832,6 +2809,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr "Opción no válida"
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3317,6 +3298,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr "Últimos 30 Días"
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3362,141 +3366,162 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr "Registro de Usuario"
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr "Hay un problema de comunicación con el servidor en este momento."
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr "Copiar a portapapeles: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr "El archivo de datos URL fue copiado al portapapeles."
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr "Archivo de datos borrado."
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 "Servicio de mantenimiento en curso. Por favor intente de nuevo más tarde. "
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr "Ocurrió un error al descargar su exportación."
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr "Descarga Solicitada"
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr "Formato de fecha inválido"
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr "Ocurrió un problema al guardar filtros de alimentación del tablero"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr "Proceso"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr "Procesando..."
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr "Actualizar la página"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr "Página Web (Tablero de Excel)"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr "CSV (archivo Zip)"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr "Excel (versiones antiguas)"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr "La ruta de la tabla debe terminar con []"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr "ID Confidencial"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr "Fecha Confidencial"
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr "Registro de Usuario"
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr "Hay un problema de comunicación con el servidor en este momento."
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr "Copiar a portapapeles: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr "El archivo de datos URL fue copiado al portapapeles."
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr "Archivo de datos borrado."
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3514,6 +3539,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr "Nombre del Caso"
 
@@ -3539,60 +3565,57 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
-#, fuzzy
-#| msgid "Could not clear user data. Please report an issue if this persists."
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
-"No es posible borrar los datos del usuario. Por favor reporte un problema si "
-"esto continúa."
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
@@ -3620,6 +3643,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3754,6 +3793,14 @@ msgstr ""
 msgid "Clear"
 msgstr "Borrar"
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3785,6 +3832,10 @@ msgstr ""
 "Ocurrió un problema al comunicarnos con el servidor. Por favor inténtelo más "
 "tarde."
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr "para"
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3861,10 +3912,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3944,6 +3991,21 @@ msgstr "Agregar Clave, Mapeo de Valor"
 msgid "Key"
 msgstr "Clave"
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -4084,11 +4146,17 @@ msgid "Choose a primary location"
 msgstr "Elegir una ubicación principal"
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr "sí"
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4453,16 +4521,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr "No pudimos cargar el reporte:"
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr "Mis Reportes Agendados"
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4533,6 +4591,14 @@ msgstr "Que tengan números de teléfono"
 msgid "That do not have phone numbers"
 msgstr "Que no tengan números de teléfono"
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr "Mis Reportes Agendados"
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index e954d129d7d6..47e0975f0282 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -25,8 +25,11 @@ msgstr ""
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -138,7 +141,8 @@ msgstr ""
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -447,7 +451,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -456,14 +461,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -502,19 +506,7 @@ msgid "Message"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
+msgid "Submit Request"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
@@ -542,14 +534,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -922,7 +908,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -931,6 +918,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -965,7 +953,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -978,14 +965,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1043,6 +1037,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2097,8 +2092,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2745,12 +2740,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2771,6 +2760,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2823,7 +2818,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -2950,14 +2944,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -2991,7 +2984,8 @@ msgid "Generating Report..."
 msgstr ""
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3059,7 +3053,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr ""
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3097,15 +3091,7 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr ""
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
+msgid "Form-Submitting Mobile Workers"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
@@ -3444,6 +3430,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3632,8 +3626,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3651,7 +3647,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3681,7 +3677,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3713,7 +3708,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr ""
 
@@ -3964,7 +3962,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4061,7 +4060,8 @@ msgstr ""
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4122,7 +4122,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4550,6 +4549,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4854,7 +4854,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4882,7 +4883,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5097,8 +5099,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5109,7 +5113,9 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5576,8 +5582,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5769,6 +5777,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -5982,12 +5991,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6275,8 +6286,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6311,7 +6324,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6322,16 +6334,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6347,6 +6363,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7226,7 +7243,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7450,8 +7468,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7625,7 +7645,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7635,7 +7656,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7837,7 +7859,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8064,7 +8085,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9185,6 +9207,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr ""
@@ -9404,7 +9427,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9416,6 +9440,7 @@ msgstr ""
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9665,45 +9690,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9725,15 +9711,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10001,7 +9978,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10236,6 +10214,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10401,36 +10380,6 @@ msgstr ""
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10470,7 +10419,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr ""
 
@@ -11161,15 +11111,6 @@ msgid ""
 "referencetype/property. For example: location:outlet:state/name"
 msgstr ""
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11590,7 +11531,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11649,6 +11591,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11707,7 +11658,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11760,7 +11712,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12101,6 +12053,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12264,6 +12221,15 @@ msgstr ""
 msgid "Show Full Menu"
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12349,6 +12315,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12639,6 +12609,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr ""
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12707,21 +12684,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr ""
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13202,6 +13187,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr ""
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13220,7 +13218,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13300,7 +13299,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13338,11 +13341,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13778,8 +13781,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr ""
@@ -13998,6 +14002,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14149,7 +14154,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14164,7 +14170,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14547,6 +14554,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr ""
 
@@ -14570,7 +14578,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14637,10 +14645,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15131,6 +15147,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15150,6 +15170,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15257,6 +15281,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15276,17 +15304,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16377,6 +16417,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr ""
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16539,6 +16584,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17316,45 +17362,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18010,10 +18017,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18023,6 +18026,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18032,9 +18041,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18535,7 +18542,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18550,6 +18557,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18613,7 +18632,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18629,7 +18649,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18795,6 +18816,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18855,6 +18880,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19719,35 +19748,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19757,7 +19759,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19766,15 +19769,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19785,7 +19791,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19797,7 +19804,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19808,11 +19816,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19824,16 +19834,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19846,7 +19860,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19858,19 +19873,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19884,7 +19903,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19898,31 +19918,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -19930,15 +19957,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -19947,12 +19977,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -19961,19 +20062,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19981,11 +20083,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19993,11 +20097,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20006,7 +20112,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20014,7 +20121,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20023,7 +20131,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20031,45 +20140,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20079,7 +20197,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20089,20 +20208,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20144,98 +20268,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20244,33 +20327,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20279,7 +20369,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20291,7 +20382,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20299,17 +20391,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20320,29 +20414,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20350,7 +20450,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20358,7 +20459,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20369,7 +20470,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20380,11 +20482,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20392,100 +20496,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20493,7 +20565,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20501,7 +20574,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20509,7 +20583,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20517,7 +20592,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20525,84 +20601,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20612,80 +20707,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20693,7 +20804,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20702,7 +20814,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20712,39 +20825,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20756,7 +20878,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20767,15 +20889,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20783,14 +20907,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20798,11 +20924,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20811,7 +20939,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20819,7 +20948,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20827,11 +20957,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20839,7 +20971,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20847,30 +20980,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20884,33 +21022,165 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21074,8 +21344,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr ""
 
@@ -21118,10 +21387,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21167,6 +21432,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21188,7 +21457,7 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
+msgid "Select feed type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
@@ -21285,6 +21554,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21453,16 +21727,12 @@ msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22040,6 +22310,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22139,6 +22419,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr ""
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22206,6 +22490,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22214,6 +22603,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22382,114 +22835,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23314,6 +23728,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23333,10 +23751,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23461,135 +23875,149 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23621,6 +24049,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23664,18 +24096,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23709,39 +24129,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23766,59 +24153,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -23869,6 +24217,36 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia files"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Bulk Upload Multimedia Status"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24454,6 +24832,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25028,7 +25410,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25046,7 +25428,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25069,8 +25451,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25475,6 +25857,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25565,10 +25948,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25598,11 +25977,7 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
+msgid "Enable in Web Apps"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25620,7 +25995,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25628,11 +26003,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25649,11 +26020,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26707,14 +27073,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27334,11 +27692,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -27867,10 +28220,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -27966,6 +28315,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29564,10 +29917,6 @@ msgstr ""
 msgid "CommTrack"
 msgstr ""
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30196,6 +30545,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30204,10 +30564,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32163,21 +32537,6 @@ msgstr ""
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32762,6 +33121,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35265,6 +35628,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36144,6 +36508,40 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "contains"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is empty"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36285,10 +36683,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36382,6 +36776,29 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+msgid "Edit Value"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Add Item"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36590,7 +37007,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -36851,20 +37268,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -36945,7 +37362,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -36978,33 +37395,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37012,11 +37429,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37024,34 +37441,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37367,10 +37784,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37630,6 +38043,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38352,6 +38780,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38670,6 +39122,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -39872,11 +40330,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41037,10 +41495,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41471,6 +41925,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr ""
@@ -42128,7 +42592,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42159,6 +42627,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -42818,7 +43290,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43560,10 +44033,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -43831,6 +44300,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44273,6 +44758,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44289,21 +44779,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44469,11 +45020,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44560,6 +45106,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44592,6 +45142,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44608,10 +45164,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44692,6 +45244,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44724,6 +45284,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po
index 29c61862c7f1..9cfa9b94e92d 100644
--- a/locale/fr/LC_MESSAGES/djangojs.po
+++ b/locale/fr/LC_MESSAGES/djangojs.po
@@ -333,7 +333,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr ""
 
@@ -494,6 +495,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -854,10 +859,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1167,6 +1168,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1586,7 +1588,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2200,6 +2203,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2387,6 +2406,7 @@ msgstr ""
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2455,7 +2475,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr ""
 
@@ -2491,50 +2512,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2694,6 +2671,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3172,6 +3153,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3217,140 +3221,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3368,6 +3393,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr ""
 
@@ -3393,57 +3419,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3470,6 +3497,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3600,6 +3643,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3629,6 +3680,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3705,10 +3760,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3788,6 +3839,21 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3926,11 +3992,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr ""
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4269,16 +4341,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr ""
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4347,6 +4409,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr ""
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/fra/LC_MESSAGES/django.po b/locale/fra/LC_MESSAGES/django.po
index fe6a3fab0095..1a6fa48c8016 100644
--- a/locale/fra/LC_MESSAGES/django.po
+++ b/locale/fra/LC_MESSAGES/django.po
@@ -57,8 +57,11 @@ msgstr "Type de Compte"
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -170,7 +173,8 @@ msgstr "Afficher seulement les inscriptions en versions d'essai"
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -489,7 +493,8 @@ msgstr "Un nom est requis pour ce nouveau rôle."
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -498,14 +503,13 @@ msgstr "Un nom est requis pour ce nouveau rôle."
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -544,20 +548,8 @@ msgid "Message"
 msgstr "Message"
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr "Sélectionnez différents plans"
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr "Requête de devis"
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
-msgstr "Soumettre"
+msgid "Submit Request"
+msgstr "Soumettre la demande"
 
 #: corehq/apps/accounting/forms.py
 #, python-format
@@ -585,15 +577,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -1038,7 +1023,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -1047,6 +1033,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -1081,7 +1068,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -1094,14 +1080,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1159,6 +1152,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2314,8 +2308,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -3002,14 +2996,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-"Remarque: La sélection de ce plan apportera les changements suivants à votre "
-"projet."
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -3030,6 +3016,14 @@ msgstr "Caractéristique de Tarif"
 msgid "Balance"
 msgstr "Solde / Qté. restante"
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+"Remarque: La sélection de ce plan apportera les changements suivants à votre "
+"projet."
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr "Allez sur la page des Factures pour cet espace de projet"
@@ -3082,7 +3076,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -3209,14 +3202,13 @@ msgstr "Raison de \"Non Facturation\""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -3250,7 +3242,8 @@ msgid "Generating Report..."
 msgstr "Émission de rapport..."
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3318,7 +3311,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr "Entreprise"
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3356,16 +3349,8 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr "Utilisateurs Mobile"
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
-msgstr "SMS"
+msgid "Form-Submitting Mobile Workers"
+msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
 #: corehq/messaging/scheduling/forms.py corehq/motech/const.py
@@ -3707,6 +3692,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3895,8 +3888,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3914,7 +3909,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3944,7 +3939,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr "Détails"
@@ -3976,7 +3970,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr "Erreur"
 
@@ -4237,7 +4234,8 @@ msgstr "Dossier"
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4336,7 +4334,8 @@ msgstr "Applications"
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4397,7 +4396,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr "Actuel"
 
@@ -4844,6 +4842,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -5050,22 +5049,12 @@ msgid "Automatic"
 msgstr "Automatique"
 
 #: corehq/apps/app_manager/static_strings.py
-#, fuzzy
-#| msgid ""
-#| "Automatically resizes images within forms. Follow <a href='https://"
-#| "confluence.dimagi.com/display/commcarepublic/Auto-"
-#| "Resize+Images+on+Android'> the instructions here</a> to determine which "
-#| "value to use."
 msgid ""
 "Automatically resizes images within forms. Follow <a href='https://dimagi."
 "atlassian.net/wiki/spaces/commcarepublic/pages/2143946731/"
 "Images+in+CommCare#Auto-Resize-Images-on-Android'> the instructions here</a> "
 "to determine which value to use."
 msgstr ""
-"Redimensionne automatiquement les images dans les formulaires. Suivez <a "
-"href='https://confluence.dimagi.com/display/commcarepublic/Auto-"
-"Resize+Images+on+Android'>les instructions ici</a> afin de déterminer la "
-"valeur à utiliser. "
 
 #: corehq/apps/app_manager/static_strings.py
 msgid "Automatically trigger a two-way sync on a regular schedule"
@@ -5177,7 +5166,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr "Désactiver"
@@ -5205,7 +5195,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr "Permettre"
@@ -5420,8 +5411,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5432,7 +5425,9 @@ msgstr "Non"
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5899,8 +5894,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -6102,6 +6099,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -6318,12 +6316,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr "Valeur"
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6632,8 +6632,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6668,7 +6670,6 @@ msgstr "Installer CommCare"
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6679,16 +6680,20 @@ msgstr "Installer CommCare"
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6704,6 +6709,7 @@ msgstr "Installer CommCare"
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7583,7 +7589,8 @@ msgid "Form Changes"
 msgstr "Modifications de formulaire"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr "Afficher"
 
@@ -7809,8 +7816,10 @@ msgstr "Étiquette de dossier"
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7987,7 +7996,8 @@ msgstr "Charger les propriétés suivantes dans les questions de formulaire"
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7997,7 +8007,8 @@ msgid "Property"
 msgstr "Propriété"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -8204,7 +8215,6 @@ msgstr "XFormulaire"
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8443,7 +8453,8 @@ msgid "Disable manual linking"
 msgstr "Désactiver la liaison manuelle"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr "Reactualiser"
 
@@ -9608,6 +9619,7 @@ msgstr "Message de validation"
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr "Terminé"
@@ -9839,7 +9851,8 @@ msgstr "Rapport"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9851,6 +9864,7 @@ msgstr "Rapport"
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -10112,45 +10126,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr "Aucun document multimédia"
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr "Télécharger l'image de l'icône "
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr "Sélectionnez l'image icône "
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr "Sélectionner"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr "L'icône courant"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr "Démarrer le chargement"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr "Téléchargez Fichier du Audio pour le Menu"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr "Sélectionnez le Fichier Audio pour le Menu"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr "Fichier Audio Actuel"
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -10172,15 +10147,6 @@ msgstr "Remplacer"
 msgid "Set Path"
 msgstr "Définir un chemin"
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10452,7 +10418,8 @@ msgid "Send to phone via SMS"
 msgstr "Envoyer au téléphone via SMS"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr "Télécharger multimédia"
 
@@ -10689,6 +10656,7 @@ msgid "Replace Logo"
 msgstr "Remplacer le logo"
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr "Uploader le Logo"
 
@@ -10859,36 +10827,6 @@ msgid "This application currently does not contain any multimedia references."
 msgstr ""
 "Cette application ne contient pas de références multimédia actuellement."
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr "Définir un mot de passe"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr "Les mots de passe ne correspondent pas. Veuillez réessayer."
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr "Veuillez entrer un mot de passe ou annuler."
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr "Mot de passe"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr "Répéter le mot de passe"
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10928,7 +10866,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr "Tout sélectionner"
 
@@ -11666,15 +11605,6 @@ msgstr ""
 "loacation:mytype:referencetype/property. Par exemple: location:outlet:state/"
 "name"
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr "Audit Viewer"
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr "Vérifié modifications de modèle"
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr "Numéro de construction"
@@ -12115,7 +12045,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr "Retour"
@@ -12174,6 +12105,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -12232,7 +12172,8 @@ msgstr "Attente du démarrage"
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -12285,7 +12226,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12628,6 +12569,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12797,6 +12743,15 @@ msgstr "Applications web"
 msgid "Show Full Menu"
 msgstr "Montrer tout le menu"
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr "Sélectionner"
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12882,6 +12837,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -13176,6 +13135,13 @@ msgstr "Paramètres de consommation"
 msgid "Phone Settings"
 msgstr "Paramètres de téléphone"
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr "Soumettre"
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -13250,10 +13216,22 @@ msgstr "Consommation"
 msgid "Default consumption values updated"
 msgstr "Consommation par défaut mis à jour"
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr "SMS"
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr "Sélectionner un"
 
+#: corehq/apps/custom_data_fields/edit_entity.py
+msgid "Additional Information"
+msgstr "Information Additionnelle "
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 #: corehq/apps/registration/forms.py
 msgid "Invalid profile selected. Please select a valid profile."
@@ -13263,10 +13241,6 @@ msgstr ""
 msgid "Select a profile"
 msgstr ""
 
-#: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
-msgstr "Information Additionnelle "
-
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Unrecognized Information"
 msgstr "Information non reconnue "
@@ -13745,6 +13719,19 @@ msgstr "Choix multiple"
 msgid "GPS"
 msgstr "GPS"
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr "Mot de passe"
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13763,7 +13750,8 @@ msgstr "Dictionnaire de données"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13843,7 +13831,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13881,11 +13873,11 @@ msgstr "Ajouter une propriété de dossier"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -14325,8 +14317,9 @@ msgstr "Transférer"
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr "Nom de dossier"
@@ -14554,6 +14547,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr "Type de correspondance"
 
@@ -14705,7 +14699,8 @@ msgstr "Ajouter expression"
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14720,7 +14715,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -15103,6 +15099,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
 
@@ -15126,7 +15123,7 @@ msgstr "Date de la propriété de dossier (avancé)"
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -15193,10 +15190,18 @@ msgstr "Quand la date actuelle est"
 msgid "greater than"
 msgstr "supérieur à"
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr "inférieur à"
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr "la date dans la propriété de dossier"
@@ -15696,6 +15701,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr "Supprimer le logo"
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr "Supprimer votre logo personnalisé et utiliser un logo standard."
@@ -15715,6 +15724,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr "Application de centre d'appel"
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15832,6 +15845,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15851,17 +15868,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
-msgstr "Modifier les informations de base"
+msgid "Use elasticsearch when fetching apps for exports"
+msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
-msgstr "Mettre à jour les infos de base"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
+msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr "Fuseau horaire par défaut"
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr "Modifier les informations de base"
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr "Mettre à jour les infos de base"
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16992,6 +17021,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr "Sélectionnez différents plans"
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -17154,6 +17188,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17955,45 +17990,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr "Cartes de crédit enregistrées"
@@ -18677,10 +18673,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr "Contactez nous"
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18690,6 +18682,12 @@ msgstr "1. Choisir un plan%(edition_name)s"
 msgid "Contact Dimagi"
 msgstr "Contacter Dimagi"
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr "2. Contacter Dimagi"
@@ -18699,12 +18697,8 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
-"Votre requête a été envoyée à Dimagi. On fera de notre mieux pour la traiter "
-"dans les meilleurs délais."
 
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Subscription"
@@ -19219,7 +19213,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -19234,6 +19228,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -19297,7 +19303,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -19313,7 +19320,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -19479,6 +19487,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -19539,6 +19551,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -20414,35 +20430,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -20452,7 +20441,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -20461,15 +20451,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr "En savoir plus"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr "Type de fichier par défaut"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20480,7 +20473,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -20492,7 +20486,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -20503,11 +20498,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr "Creer un Enregistrement de Téléchargement Journalière"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20519,16 +20516,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -20541,7 +20542,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20553,19 +20555,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr "Inclut des doublons et autres formulaires non traités"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr "Développer les questions avec case à cocher"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20579,7 +20585,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -20593,33 +20600,40 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr "Ajouter configuration personnalisée de tableau"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr "Paramètres de confidentialité"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr "Publier anonymement"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 "Vérifiez uniquement si cette exportation a été anonymisée complètement et en "
 "toute sécurité."
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr "Me permettre d'identifier les données sensibles"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr "Enregistrement"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -20627,15 +20641,18 @@ msgstr "Enregistrement"
 msgid "Try Again"
 msgstr "Essayer de nouveau"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr "Sauvegardé!"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -20644,7 +20661,8 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
@@ -20652,6 +20670,76 @@ msgstr ""
 "Il y des erreurs dans votre configuration. Veuillez les réparer avant de "
 "procéder à l'exportation. "
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr "Aucune soumission disponible"
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -20660,19 +20748,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20680,11 +20769,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20692,11 +20783,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20705,7 +20798,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20713,7 +20807,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20722,7 +20817,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20730,45 +20826,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr "Afficher les questions supprimées"
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr "Afficher les propriétés supprimées"
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20778,7 +20883,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20788,22 +20894,27 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 "Impossible de traiter les applications. Veuillez signaler un problème si "
 "cela persiste"
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr "Processus"
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr "Afficher les propriétés obsolètes"
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20845,98 +20956,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr "Aucune soumission disponible"
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr "Téléchargement en bloc"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr "Les filtres sont inactifs pendant le téléchargement."
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr "Préparer le téléchargement"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr "Préparation du téléchargement en cours"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr "Préparer le multimédia"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr "Préparation de multimédia en cours"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20945,33 +21015,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr "Collection de données"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr "Collection de multimédia"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr "Il y a eu un problème!"
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr "Mettre à jour les filtres"
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20980,7 +21057,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20992,7 +21070,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -21000,17 +21079,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr "Chargement du formulaire"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -21021,15 +21102,18 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr "Mal étiqueté"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr "Suggestions "
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
@@ -21037,15 +21121,18 @@ msgstr ""
 "Ces soumissions de formulaires sont étiquetées comme si elles appartenaient "
 "à une application qui n'existe pas."
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr "Ces soumissions pourraient appartenir à un des formulaires suivants :"
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr "L'application a été supprimée."
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21053,7 +21140,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -21061,7 +21149,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -21072,7 +21160,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21083,11 +21172,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr "Comment créer et utiliser une application CommCare."
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21095,100 +21186,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr "Filtrer le fil"
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr "Ce téléchargement est limité aux sites suivants:"
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr "Enregistrer les filtres"
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr "En train d'enregistrer"
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr "supprimé"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr "Nom de feuille"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr "Chemin personnalisé"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -21196,7 +21255,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -21204,7 +21264,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -21212,7 +21273,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -21220,7 +21282,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -21228,84 +21291,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr "Sélectionner aucun"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr "Afficher les questions avancées"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr "Masquer les questions avancées"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr "Masquer les questions supprimées"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr "Masquer les propriétés supprimées"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr "Masquer les propriétés obsolètes"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr "Utiliser des étiquettes de questions"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr "Utiliser des identifiants de questions"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr "Séparer données venant de questions à choix multiples. "
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr "Niveau de confidentialité"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr "Ajouter une propriété personnalisée d'exportation"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr "Montrer les options"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr "Masquer les options"
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -21315,80 +21397,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr "ou"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr "Modifier les colonnes"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr "Anonymisé"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr "Formulaire: "
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -21396,7 +21494,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -21405,7 +21504,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -21415,39 +21515,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr "Taille:"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr "Dernière mise à jour"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr "Mise à jour de Données"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr "Mise à jour des données, veuillez patienter..."
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr "Copier le lien du fil du tableau de bord"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -21459,7 +21568,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -21470,15 +21579,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -21486,14 +21597,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -21501,11 +21614,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -21514,7 +21629,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -21522,7 +21638,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -21530,11 +21647,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr "Confirmez les mises à jour des données."
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -21542,7 +21661,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -21550,30 +21670,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr "Modifier les filtres"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -21587,33 +21712,179 @@ msgstr ""
 msgid "View"
 msgstr "Visualiser"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                            Snapshot of %(snap_name)s\n"
+#| "                        "
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+"\n"
+"                            Instantané de %(snap_name)s"
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "                            Snapshot of %(snap_name)s\n"
+#| "                        "
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+"\n"
+"                            Instantané de %(snap_name)s"
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr "Partager les données journalières avec Excel et d'autres systèmes"
@@ -21779,8 +22050,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr "Télécharger"
 
@@ -21823,10 +22093,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr "Exporter les dossiers anonymisés "
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21872,6 +22138,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr "Exporter un Enregistrement de Téléchargement Journalière Anonymisée"
@@ -21893,8 +22163,10 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
-msgstr ""
+#, fuzzy
+#| msgid "Select model type"
+msgid "Select feed type"
+msgstr "Choisir le type de modèle"
 
 #: corehq/apps/export/views/list.py
 msgid "Select Feed Type"
@@ -21990,6 +22262,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr "Créer un fil du tableau de bord"
@@ -22161,16 +22438,12 @@ msgstr "Inclure dans le Téléchargement"
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr "tous"
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr "aucun"
@@ -22775,6 +23048,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22874,6 +23157,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22941,6 +23228,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr "Afficher tous les groupes"
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr "Masquer les options de filtre"
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr "Options de filtre d'affichage"
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22949,6 +23341,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr "Afficher tous"
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr "Fin"
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -23117,114 +23573,77 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
-msgstr "Masquer les options de filtre"
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
-msgstr "Options de filtre d'affichage"
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
-msgstr ""
+#: corehq/apps/geospatial/views.py
+#, fuzzy
+#| msgid "Please specify a case property name."
+msgid "Please specify a name for the GeoPolygon area."
+msgstr "Veuillez spécifier un nom de la propriété de dossier."
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -24083,6 +24502,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -24108,10 +24531,6 @@ msgstr ""
 "Une erreur est survenue lors du traitement du fichier zip. Le fichier ne "
 "semble pas être valide."
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr "zip"
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr "image"
@@ -24240,138 +24659,157 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
 "would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
 "\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
-msgstr ""
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
-msgstr "Sélectionner des fichiers"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
+msgstr "Aucune correspondance trouvée"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
-msgstr "File d'attente de fichier de téléversement en bloc"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
+msgstr "Aucune correspondance"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
-msgstr "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
+msgstr "Images correspondantes"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
-msgstr "Taille"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
+msgstr "Mis à jour"
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
+msgstr "Visualiser l'image complète"
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
+msgstr "Audio correspondant"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
-msgstr "Progression du téléversement"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
+msgstr ""
+"La lecture de l'audio directement à partir de cette page n'est pas prise en "
+"charge actuellement."
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
-msgstr "État de correspondance"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, fuzzy
+#| msgid "Matched Videos"
+msgid "Matched Video"
+msgstr "Vidéos correspondants"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
-msgstr "Fichiers dans la file d'attente"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
+msgstr ""
+"La visualisation de la vidéo directement à partir de cette page n'est pas "
+"prise en charge. Ouvre un nouvel onglet."
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
-msgstr "Sélectionnez les fichiers ci-haut à ajouter à la file d'attente."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
+msgstr "Visualiser la vidéo"
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
-msgstr "Traitement du téléversement"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
-msgstr "Fichiers téléversés"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
+msgstr "Télécharger l'image de l'icône "
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
-msgstr "Options de partage multimédia"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
-msgstr "Licence"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
-msgstr "Creative Commons Attribution, Non-Commerciale (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
-msgstr "Creative Commons Attribution, Aucun Dérivé (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
+msgstr "Sélectionnez l'image icône "
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
-msgstr "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
+msgstr "Sélectionnez le Fichier Audio pour le Menu"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
-"Creative Commons Attribution, Non-Commerciale, et de Partage (CC BY-NC)"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
-"Creative Commons Attribution, Non-Commerciale, et Aucun Dérivé (CC BY-NC)"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
-msgstr "Creative Commons Attribution,  de Partage (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
+msgstr "Sélectionner un fichier"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
-msgstr "Auteur"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
+msgstr "L'icône courant"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
-msgstr "Entrez le nom de l'auteur"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
+msgstr "Fichier Audio Actuel"
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
-msgstr "Notes d'attribution"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
+msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
-msgstr "Sélectionner un élément nouveau"
+msgid "Current File"
+msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
-msgstr "Sélectionner un fichier"
+msgid "Begin Upload"
+msgstr "Démarrer le chargement"
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
 msgid ""
@@ -24402,6 +24840,10 @@ msgstr "Télécharger le fichier ZIP"
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr "Taille"
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr "Chemin dans l'application"
@@ -24445,18 +24887,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr "Visualiser la vidéo"
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -24490,43 +24920,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr "Aucune correspondance"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr "Images correspondantes"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr "Visualiser l'image complète"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr "Mis à jour"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr "Audio correspondant"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-"La lecture de l'audio directement à partir de cette page n'est pas prise en "
-"charge actuellement."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr "Vidéos correspondants"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-"La visualisation de la vidéo directement à partir de cette page n'est pas "
-"prise en charge. Ouvre un nouvel onglet."
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr "Erreurs trouvées"
@@ -24551,64 +24944,23 @@ msgstr "Téléversement d'une nouvelle image réussi"
 msgid "New Video Uploaded Successfully"
 msgstr "Téléversement d'une nouvelle vidéo réussi"
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-"Ajouté à la file d'attente. Cliquez sur <strong>Démarrer le téléversement</"
-"strong> ci-dessus pour démarrer."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr "Ajouté à la file d'attente pour être traité. Veuillez patienter."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr "Fichier"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr "Traitement du téléversement, veuillez patienter."
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr "Téléversement terminé"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr "Des erreurs sont survenues"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr "Retirer de la file d'attente"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
-msgstr "Annuler le téléversement"
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 "Prêt à uploader. Cliquez sur <strong>Démarrer le chargement </strong> ci-"
 "dessous pour démarrer."
 
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "There were errors"
+msgstr "Des erreurs sont survenues"
+
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr "Sélectionner un autre fichier"
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr "1 correspondance trouvée"
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
-msgstr "Aucune correspondance trouvée"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
+msgstr "Annuler le téléversement"
 
 #: corehq/apps/hqmedia/view_helpers.py
 #, python-brace-format
@@ -24658,6 +25010,47 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr "Site d'aide de CommCare"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia"
+msgid "multimedia"
+msgstr "Multimédia"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia"
+msgid "multimedia files"
+msgstr "Multimédia"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Bulk Upload File Queue"
+msgid "Bulk Upload Multimedia Status"
+msgstr "File d'attente de fichier de téléversement en bloc"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Importing your data. This may take some time..."
+msgid "Importing your multimedia. This may take some time..."
+msgstr "Importation de vos données. Cela pourrait prendre un moment..."
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+"Problème d'importation des données! Veuillez réessayer ou faire un rapport."
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia Reference Checker"
+msgid "Return to multimedia reference checker"
+msgstr "Vérificateur de référence multimédia"
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -25251,6 +25644,10 @@ msgstr ""
 msgid "Errors"
 msgstr "Erreurs"
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25858,7 +26255,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25876,7 +26273,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25899,8 +26296,8 @@ msgstr "Mettre-à-jour le fichier télécharger."
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -26307,6 +26704,7 @@ msgid "You have no items."
 msgstr "Vous n'avez aucun élément."
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr "Téléchargement en cours..."
@@ -26398,10 +26796,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -26431,12 +26825,10 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
-msgstr ""
+#, fuzzy
+#| msgid "Web Apps"
+msgid "Enable in Web Apps"
+msgstr "Applications web"
 
 #: corehq/apps/integration/forms.py
 msgid "External Callout URL"
@@ -26453,7 +26845,7 @@ msgid "API Key"
 msgstr "Clé API"
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -26461,11 +26853,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -26482,11 +26870,6 @@ msgstr "Identifiant de projet"
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -27564,14 +27947,6 @@ msgstr "Synchronisation complète du tableau des sites (recommandé)."
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr "Synchronisez le \"fixture\" de site hiérarchique (format hérité)."
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr "Afficher tous"
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -28251,12 +28626,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr "Statut d'importation de la hiérarchie géographique"
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-"Problème d'importation des données! Veuillez réessayer ou faire un rapport."
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr "Télécharger la hiérarchie géographique à partir d'Excel"
@@ -28811,10 +29180,6 @@ msgstr "Créer votre compte"
 msgid "Name Your First Project"
 msgstr "Nommer votre premier projet"
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr "Fin"
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -28912,6 +29277,10 @@ msgstr ""
 "L'utilisateur correspondant à cette adresse de courrier électronique est "
 "déjà inclus dans ce projet ou son invitation est en attente."
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -30562,10 +30931,6 @@ msgstr "Gérer les déploiements"
 msgid "CommTrack"
 msgstr "CommCare Supply"
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr "Niveau de stock (carte)"
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr "Niveau de stock par produit"
@@ -31225,6 +31590,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -31233,10 +31609,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -33254,21 +33644,6 @@ msgstr "Filtrer par date"
 msgid "Default Date Range"
 msgstr "Plage de dates par défaut"
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr "Ajouter au téléchargement en bloc"
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr "Désidentifier"
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr "Non disponible"
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -33868,6 +34243,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -36483,6 +36862,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -37362,6 +37742,46 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "Domains"
+msgid "contains"
+msgstr "Domaines"
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "List is empty."
+msgid "is empty"
+msgstr "La liste est vide."
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+#, fuzzy
+#| msgid "New Items:"
+msgid "New Item"
+msgstr "Nouveaux éléments :"
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -37503,10 +37923,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -37600,6 +38016,35 @@ msgstr ""
 msgid "Examples"
 msgstr "Exemples"
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+#, fuzzy
+#| msgid "Edit Table"
+msgid "Edit Value"
+msgstr "Editer tableau"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Add filter"
+msgid "Add Item"
+msgstr "Ajouter un filtrage"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Generic Error"
+msgid "Trigger Error"
+msgstr "Erreur générique"
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -37808,7 +38253,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -38069,20 +38514,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -38163,7 +38608,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -38196,33 +38641,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -38230,11 +38675,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -38242,34 +38687,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr "Casos IRA Tratados"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr "Module"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr "Texte affiché par défaut"
 
@@ -38602,10 +39047,6 @@ msgstr "Type de filtre complexe {0} doit être un des choix suivants ({1})"
 msgid "{0} filter type must include a \"filters\" list"
 msgstr "{0} le type de filtre doit inclure une liste de \"filtres\""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -38892,6 +39333,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -39624,6 +40080,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -39967,6 +40447,12 @@ msgstr "Source de Données créer par '{}' "
 msgid "Data source \"{}\" saved!"
 msgstr "Source de Données \"{}\" enregistrée!"
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -40323,10 +40809,8 @@ msgstr ""
 "Le site principal doit toujours être réglé sur l'un des sites ci-dessus"
 
 #: corehq/apps/users/forms.py
-#, fuzzy
-#| msgid "One or more of the locations was not found."
 msgid "One or more of the locations you specified cannot have users assigned."
-msgstr "Un ou plusieurs sites n'ont pas été trouvé(s)."
+msgstr ""
 
 #: corehq/apps/users/forms.py
 msgid "You do not have permissions to assign one of those locations."
@@ -41199,11 +41683,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -42395,10 +42879,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr "Site d'aide de CommCare"
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr "Téléversement en bloc des utilisateurs mobiles"
@@ -42855,6 +43335,16 @@ msgstr ""
 "Ce paramètre permet aux utilisateurs de séparer les questions à choix "
 "multiples dans plusieurs colonnes dans l'exportation de dossiers."
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr "Centre d'appel"
@@ -43523,7 +44013,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -43554,6 +44048,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -44213,7 +44711,8 @@ msgstr "Paramètre de numéro de téléphone"
 msgid "Include '+' in Phone Number"
 msgstr "Inclure '+' dans le numéro de téléphone"
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr "Méthode de demande HTTP"
 
@@ -44959,10 +45458,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -45230,6 +45725,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr "Scope"
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -45672,6 +46183,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr "Annulé"
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -45688,21 +46204,83 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, fuzzy, python-brace-format
+#| msgid "This field is required."
+msgid "This field is required for {request_method} requests."
+msgstr "Ce champ est requis."
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr "Démarrer le transfert"
@@ -45872,11 +46450,6 @@ msgstr ""
 msgid "Payload"
 msgstr "Charge utile"
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr "Erreur de charge utile"
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -45965,6 +46538,10 @@ msgstr ""
 msgid "Failure"
 msgstr "Echec"
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -45997,6 +46574,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr "Transférer les données"
@@ -46013,10 +46596,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -46097,6 +46676,14 @@ msgstr ""
 msgid "Response body"
 msgstr "Organe de réponse"
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -46129,6 +46716,10 @@ msgstr ""
 msgid "Used By"
 msgstr "Utilisé par"
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
@@ -47573,8 +48164,52 @@ msgstr "Le Score à la Fonctionnalité"
 msgid "Enter valid JSON"
 msgstr "Saisir un JSON valide"
 
-#~ msgid "Sync to Dropbox"
-#~ msgstr "Synchroniser avec Dropbox"
+#~ msgid "zip"
+#~ msgstr "zip"
+
+#~ msgid "Select Files"
+#~ msgstr "Sélectionner des fichiers"
+
+#~ msgid "Filename"
+#~ msgstr "Filename"
+
+#~ msgid "Upload Progress"
+#~ msgstr "Progression du téléversement"
+
+#~ msgid "Match Status"
+#~ msgstr "État de correspondance"
+
+#~ msgid "Queued Files"
+#~ msgstr "Fichiers dans la file d'attente"
+
+#~ msgid "Select files above to add to the queue."
+#~ msgstr "Sélectionnez les fichiers ci-haut à ajouter à la file d'attente."
+
+#~ msgid "Processing Upload"
+#~ msgstr "Traitement du téléversement"
+
+#~ msgid "Uploaded Files"
+#~ msgstr "Fichiers téléversés"
+
+#~ msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
+#~ msgstr ""
+#~ "Ajouté à la file d'attente. Cliquez sur <strong>Démarrer le "
+#~ "téléversement</strong> ci-dessus pour démarrer."
+
+#~ msgid "Queued for processing. Please wait."
+#~ msgstr "Ajouté à la file d'attente pour être traité. Veuillez patienter."
+
+#~ msgid "Files"
+#~ msgstr "Fichier"
+
+#~ msgid "Processing upload, please wait."
+#~ msgstr "Traitement du téléversement, veuillez patienter."
+
+#~ msgid "Upload Finished"
+#~ msgstr "Téléversement terminé"
+
+#~ msgid "Remove from queue"
+#~ msgstr "Retirer de la file d'attente"
 
-#~ msgid "Unicel Settings"
-#~ msgstr "Paramètres d'Unicel"
+#~ msgid "1 Match Found"
+#~ msgstr "1 correspondance trouvée"
diff --git a/locale/fra/LC_MESSAGES/djangojs.po b/locale/fra/LC_MESSAGES/djangojs.po
index fe78b5af49de..32b9eeeba882 100644
--- a/locale/fra/LC_MESSAGES/djangojs.po
+++ b/locale/fra/LC_MESSAGES/djangojs.po
@@ -8,7 +8,6 @@
 # Saket Kanth <skanth@dimagi.com>, 2018
 # Abdel Nasser Iro <abdel.nasser.iro.gigo@millenniumpromise.org>, 2018
 # Kelly Adediha <kadediha@dimagi.com>, 2018
-# Claire_Cravero <ccravero@dimagi.com>, 2018
 # Sarah Sagan <ssagan@dimagi.com>, 2020
 # Rowena Luk <rluk@dimagi.com>, 2021
 # Dimagi Dev <devops@dimagi.com>, 2021
@@ -18,6 +17,7 @@
 # patrick keating <pkeating@dimagi.com>, 2023
 # Tyler Wymer <twymer@dimagi.com>, 2024
 # Aissetou Sawadogo <ais107@hotmail.com>, 2024
+# Claire_Cravero <ccravero@dimagi.com>, 2024
 #
 #, fuzzy
 msgid ""
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-07-19 15:34+0000\n"
-"Last-Translator: Aissetou Sawadogo <ais107@hotmail.com>, 2024\n"
+"Last-Translator: Claire_Cravero <ccravero@dimagi.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/dimagi/teams/9388/fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -352,7 +352,8 @@ msgstr ""
 "la configuration du graphique de votre rapport ne seront pas reflétés ici."
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr "Aucun"
 
@@ -515,6 +516,10 @@ msgstr "Icône"
 msgid "Conditional ID Mapping"
 msgstr "Mappage d'identifiant conditionnel"
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -887,10 +892,6 @@ msgstr "Vous avez des paramètres non sauvegardées."
 msgid "Settings"
 msgstr "Paramètres"
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr "Réinitialiser"
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1204,6 +1205,7 @@ msgid "no formatting"
 msgstr "pas de formatage"
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr "Peronnaliser"
 
@@ -1626,7 +1628,8 @@ msgid "Add Expression"
 msgstr "Ajouter expression"
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2240,6 +2243,22 @@ msgstr "Message d'aide"
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr "Ajouter un autre contenu"
@@ -2427,6 +2446,7 @@ msgstr "Type de Dossier"
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr "Identifiant de dossier"
 
@@ -2495,7 +2515,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr "Créer"
 
@@ -2531,50 +2552,6 @@ msgstr "Sélectionner un fichier"
 msgid "Current"
 msgstr "Actuel"
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr "Options de partage multimédia"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr "Licence"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr "Auteur"
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr "Notes d'attribution"
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr "Démarrer le chargement"
@@ -2734,6 +2711,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3212,6 +3193,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr "30 derniers jours"
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3257,140 +3261,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr "Inscription de l'utilisateur"
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr "Problème de communication avec le serveur en ce moment."
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr "Maintenance du serveur en cours. Veuillez réessayer plus tard."
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr "Il y avait une erreur avec votre téléchargement"
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr "Format de date non valide"
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr "Processus"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr "Reactualiser la page"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr "Page Web (Tableau de bord Excel)"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr "CSV (fichier Zip)"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr "Excel (versions plus anciennes)"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr "Identifiant sensible"
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr "Date sensible"
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr "Inscription de l'utilisateur"
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr "Problème de communication avec le serveur en ce moment."
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3408,6 +3433,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr "Nom de dossier"
 
@@ -3433,57 +3459,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3510,6 +3537,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3642,6 +3685,14 @@ msgstr ""
 msgid "Clear"
 msgstr "Effacer"
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3671,6 +3722,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr "à"
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3747,10 +3802,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3830,6 +3881,21 @@ msgstr ""
 msgid "Key"
 msgstr "Clef"
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3970,11 +4036,17 @@ msgid "Choose a primary location"
 msgstr "Choisir un site principal"
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr "oui"
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4320,16 +4392,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr "Mes rapports planifiés"
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4400,6 +4462,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr "Mes rapports planifiés"
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/hi/LC_MESSAGES/django.po b/locale/hi/LC_MESSAGES/django.po
index c23e4fc5d42b..46a18264a7f9 100644
--- a/locale/hi/LC_MESSAGES/django.po
+++ b/locale/hi/LC_MESSAGES/django.po
@@ -25,8 +25,11 @@ msgstr ""
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -138,7 +141,8 @@ msgstr ""
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -447,7 +451,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -456,14 +461,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -502,19 +506,7 @@ msgid "Message"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
+msgid "Submit Request"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
@@ -542,14 +534,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -922,7 +908,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -931,6 +918,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -965,7 +953,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -978,14 +965,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1043,6 +1037,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2097,8 +2092,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2745,12 +2740,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2771,6 +2760,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2823,7 +2818,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -2950,14 +2944,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -2991,7 +2984,8 @@ msgid "Generating Report..."
 msgstr ""
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3059,7 +3053,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr ""
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3097,15 +3091,7 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr ""
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
+msgid "Form-Submitting Mobile Workers"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
@@ -3444,6 +3430,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3632,8 +3626,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3651,7 +3647,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3681,7 +3677,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3713,7 +3708,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr ""
 
@@ -3964,7 +3962,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4061,7 +4060,8 @@ msgstr ""
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4122,7 +4122,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4550,6 +4549,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4854,7 +4854,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4882,7 +4883,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5097,8 +5099,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5109,7 +5113,9 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5576,8 +5582,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5769,6 +5777,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -5982,12 +5991,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6275,8 +6286,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6311,7 +6324,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6322,16 +6334,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6347,6 +6363,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7226,7 +7243,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7450,8 +7468,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7625,7 +7645,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7635,7 +7656,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7837,7 +7859,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8064,7 +8085,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9185,6 +9207,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr ""
@@ -9404,7 +9427,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9416,6 +9440,7 @@ msgstr ""
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9665,45 +9690,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9725,15 +9711,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10001,7 +9978,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10236,6 +10214,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10401,36 +10380,6 @@ msgstr ""
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10470,7 +10419,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr ""
 
@@ -11161,15 +11111,6 @@ msgid ""
 "referencetype/property. For example: location:outlet:state/name"
 msgstr ""
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11590,7 +11531,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11649,6 +11591,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11707,7 +11658,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11760,7 +11712,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12101,6 +12053,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12264,6 +12221,15 @@ msgstr ""
 msgid "Show Full Menu"
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12349,6 +12315,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12639,6 +12609,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr ""
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12707,21 +12684,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr ""
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13202,6 +13187,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr ""
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13220,7 +13218,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13300,7 +13299,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13338,11 +13341,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13778,8 +13781,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr ""
@@ -13998,6 +14002,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14149,7 +14154,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14164,7 +14170,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14547,6 +14554,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr ""
 
@@ -14570,7 +14578,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14637,10 +14645,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15131,6 +15147,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15150,6 +15170,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15257,6 +15281,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15276,17 +15304,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16377,6 +16417,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr ""
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16539,6 +16584,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17316,45 +17362,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18010,10 +18017,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18023,6 +18026,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18032,9 +18041,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18535,7 +18542,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18550,6 +18557,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18613,7 +18632,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18629,7 +18649,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18795,6 +18816,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18855,6 +18880,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19719,35 +19748,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19757,7 +19759,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19766,15 +19769,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19785,7 +19791,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19797,7 +19804,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19808,11 +19816,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19824,16 +19834,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19846,7 +19860,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19858,19 +19873,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19884,7 +19903,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19898,31 +19918,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -19930,15 +19957,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -19947,12 +19977,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -19961,19 +20062,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19981,11 +20083,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19993,11 +20097,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20006,7 +20112,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20014,7 +20121,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20023,7 +20131,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20031,45 +20140,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20079,7 +20197,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20089,20 +20208,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20144,98 +20268,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20244,33 +20327,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20279,7 +20369,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20291,7 +20382,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20299,17 +20391,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20320,29 +20414,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20350,7 +20450,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20358,7 +20459,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20369,7 +20470,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20380,11 +20482,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20392,100 +20496,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20493,7 +20565,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20501,7 +20574,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20509,7 +20583,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20517,7 +20592,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20525,84 +20601,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20612,80 +20707,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20693,7 +20804,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20702,7 +20814,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20712,39 +20825,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20756,7 +20878,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20767,15 +20889,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20783,14 +20907,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20798,11 +20924,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20811,7 +20939,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20819,7 +20948,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20827,11 +20957,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20839,7 +20971,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20847,30 +20980,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20884,33 +21022,165 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21074,8 +21344,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr ""
 
@@ -21118,10 +21387,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21167,6 +21432,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21188,7 +21457,7 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
+msgid "Select feed type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
@@ -21285,6 +21554,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21453,16 +21727,12 @@ msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22040,6 +22310,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22139,6 +22419,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr ""
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22206,6 +22490,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22214,6 +22603,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22382,114 +22835,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23314,6 +23728,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23333,10 +23751,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23461,135 +23875,149 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23621,6 +24049,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23664,18 +24096,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23709,39 +24129,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23766,59 +24153,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -23869,6 +24217,36 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia files"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Bulk Upload Multimedia Status"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24454,6 +24832,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25028,7 +25410,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25046,7 +25428,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25069,8 +25451,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25475,6 +25857,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25565,10 +25948,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25598,11 +25977,7 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
+msgid "Enable in Web Apps"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25620,7 +25995,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25628,11 +26003,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25649,11 +26020,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26707,14 +27073,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27334,11 +27692,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -27867,10 +28220,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -27966,6 +28315,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29564,10 +29917,6 @@ msgstr ""
 msgid "CommTrack"
 msgstr ""
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30196,6 +30545,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30204,10 +30564,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32163,21 +32537,6 @@ msgstr ""
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32762,6 +33121,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35265,6 +35628,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36144,6 +36508,40 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "contains"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is empty"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36285,10 +36683,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36382,6 +36776,29 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+msgid "Edit Value"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Add Item"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36590,7 +37007,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -36851,20 +37268,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -36945,7 +37362,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -36978,33 +37395,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37012,11 +37429,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37024,34 +37441,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37367,10 +37784,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37630,6 +38043,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38352,6 +38780,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38670,6 +39122,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -39872,11 +40330,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41037,10 +41495,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41471,6 +41925,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr ""
@@ -42128,7 +42592,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42159,6 +42627,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -42818,7 +43290,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43560,10 +44033,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -43831,6 +44300,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44273,6 +44758,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44289,21 +44779,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44469,11 +45020,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44560,6 +45106,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44592,6 +45142,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44608,10 +45164,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44692,6 +45244,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44724,6 +45284,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/hi/LC_MESSAGES/djangojs.po b/locale/hi/LC_MESSAGES/djangojs.po
index ae7049098fbf..e37ca2ecd49e 100644
--- a/locale/hi/LC_MESSAGES/djangojs.po
+++ b/locale/hi/LC_MESSAGES/djangojs.po
@@ -333,7 +333,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr ""
 
@@ -494,6 +495,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -854,10 +859,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1167,6 +1168,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1586,7 +1588,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2200,6 +2203,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2387,6 +2406,7 @@ msgstr ""
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2455,7 +2475,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr ""
 
@@ -2491,50 +2512,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2694,6 +2671,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3172,6 +3153,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3217,140 +3221,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3368,6 +3393,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr ""
 
@@ -3393,57 +3419,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3470,6 +3497,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3600,6 +3643,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3629,6 +3680,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3705,10 +3760,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3788,6 +3839,21 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3926,11 +3992,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr ""
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4269,16 +4341,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr ""
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4347,6 +4409,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr ""
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/hin/LC_MESSAGES/django.po b/locale/hin/LC_MESSAGES/django.po
index 0f97060fdb5e..ea5d0114d982 100644
--- a/locale/hin/LC_MESSAGES/django.po
+++ b/locale/hin/LC_MESSAGES/django.po
@@ -39,8 +39,11 @@ msgstr ""
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -152,7 +155,8 @@ msgstr ""
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -461,7 +465,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -470,14 +475,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -516,19 +520,7 @@ msgid "Message"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
+msgid "Submit Request"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
@@ -556,14 +548,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -936,7 +922,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -945,6 +932,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -979,7 +967,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -992,14 +979,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1057,6 +1051,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2111,8 +2106,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2759,12 +2754,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2785,6 +2774,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2837,7 +2832,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -2964,14 +2958,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -3005,7 +2998,8 @@ msgid "Generating Report..."
 msgstr ""
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3073,7 +3067,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr ""
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3111,15 +3105,7 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr ""
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
+msgid "Form-Submitting Mobile Workers"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
@@ -3458,6 +3444,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3646,8 +3640,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3665,7 +3661,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3695,7 +3691,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3727,7 +3722,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr ""
 
@@ -3978,7 +3976,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4075,7 +4074,8 @@ msgstr ""
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4136,7 +4136,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4564,6 +4563,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4868,7 +4868,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4896,7 +4897,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5111,8 +5113,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5123,7 +5127,9 @@ msgstr "नहीं"
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5590,8 +5596,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5783,6 +5791,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -5996,12 +6005,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6289,8 +6300,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6325,7 +6338,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6336,16 +6348,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6361,6 +6377,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7240,7 +7257,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7464,8 +7482,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7639,7 +7659,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7649,7 +7670,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7851,7 +7873,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8078,7 +8099,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9199,6 +9221,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr "समाप्त"
@@ -9418,7 +9441,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9430,6 +9454,7 @@ msgstr ""
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9679,45 +9704,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9739,15 +9725,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10015,7 +9992,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10250,6 +10228,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10415,36 +10394,6 @@ msgstr ""
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10484,7 +10433,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr ""
 
@@ -11175,15 +11125,6 @@ msgid ""
 "referencetype/property. For example: location:outlet:state/name"
 msgstr ""
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11604,7 +11545,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11663,6 +11605,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11721,7 +11672,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11774,7 +11726,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12115,6 +12067,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12278,6 +12235,15 @@ msgstr ""
 msgid "Show Full Menu"
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12363,6 +12329,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12653,6 +12623,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr ""
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12721,21 +12698,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr ""
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13216,6 +13201,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr ""
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13234,7 +13232,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13314,7 +13313,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13352,11 +13355,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13792,8 +13795,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr ""
@@ -14012,6 +14016,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14163,7 +14168,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14178,7 +14184,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14561,6 +14568,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
 
@@ -14584,7 +14592,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14651,10 +14659,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15145,6 +15161,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15164,6 +15184,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15271,6 +15295,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15290,17 +15318,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16391,6 +16431,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr ""
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16553,6 +16598,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17330,45 +17376,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18024,10 +18031,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18037,6 +18040,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18046,9 +18055,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18549,7 +18556,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18564,6 +18571,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18627,7 +18646,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18643,7 +18663,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18809,6 +18830,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18869,6 +18894,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19733,35 +19762,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19771,7 +19773,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19780,15 +19783,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19799,7 +19805,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19811,7 +19818,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19822,11 +19830,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19838,16 +19848,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19860,7 +19874,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19872,19 +19887,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19898,7 +19917,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19912,31 +19932,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -19944,15 +19971,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -19961,12 +19991,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -19975,19 +20076,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19995,11 +20097,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20007,11 +20111,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20020,7 +20126,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20028,7 +20135,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20037,7 +20145,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20045,45 +20154,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20093,7 +20211,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20103,20 +20222,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20158,98 +20282,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20258,33 +20341,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20293,7 +20383,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20305,7 +20396,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20313,17 +20405,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20334,29 +20428,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20364,7 +20464,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20372,7 +20473,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20383,7 +20484,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20394,11 +20496,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20406,100 +20510,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20507,7 +20579,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20515,7 +20588,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20523,7 +20597,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20531,7 +20606,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20539,84 +20615,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20626,80 +20721,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20707,7 +20818,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20716,7 +20828,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20726,39 +20839,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20770,7 +20892,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20781,15 +20903,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20797,14 +20921,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20812,11 +20938,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20825,7 +20953,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20833,7 +20962,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20841,11 +20971,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20853,7 +20985,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20861,30 +20994,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20898,33 +21036,165 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21088,8 +21358,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr ""
 
@@ -21132,10 +21401,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21181,6 +21446,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21202,7 +21471,7 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
+msgid "Select feed type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
@@ -21299,6 +21568,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21467,16 +21741,12 @@ msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22054,6 +22324,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22153,6 +22433,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22220,6 +22504,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22228,6 +22617,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22396,114 +22849,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23328,6 +23742,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23347,10 +23765,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23475,135 +23889,149 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23635,6 +24063,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23678,18 +24110,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23723,39 +24143,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23780,59 +24167,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -23883,6 +24231,36 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia files"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Bulk Upload Multimedia Status"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24468,6 +24846,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25042,7 +25424,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25060,7 +25442,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25083,8 +25465,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25489,6 +25871,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25579,10 +25962,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25612,11 +25991,7 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
+msgid "Enable in Web Apps"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25634,7 +26009,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25642,11 +26017,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25663,11 +26034,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26721,14 +27087,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27348,11 +27706,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -27881,10 +28234,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -27980,6 +28329,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29578,10 +29931,6 @@ msgstr ""
 msgid "CommTrack"
 msgstr ""
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30210,6 +30559,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30218,10 +30578,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32177,21 +32551,6 @@ msgstr ""
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32776,6 +33135,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35279,6 +35642,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36158,6 +36522,42 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "contains"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "Empty"
+msgid "is empty"
+msgstr "Manejo de Casos"
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36299,10 +36699,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36396,6 +36792,31 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+msgid "Edit Value"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Add Filter"
+msgid "Add Item"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36604,7 +37025,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -36865,20 +37286,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -36959,7 +37380,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -36992,33 +37413,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37026,11 +37447,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37038,34 +37459,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr "Casos IRA Tratados"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37381,10 +37802,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37644,6 +38061,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38366,6 +38798,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38684,6 +39140,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -39886,11 +40348,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41051,10 +41513,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41485,6 +41943,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr ""
@@ -42142,7 +42610,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42173,6 +42645,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -42832,7 +43308,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43574,10 +44051,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -43845,6 +44318,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44287,6 +44776,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44303,21 +44797,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44483,11 +45038,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44574,6 +45124,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44606,6 +45160,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44622,10 +45182,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44706,6 +45262,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44738,6 +45302,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/hin/LC_MESSAGES/djangojs.po b/locale/hin/LC_MESSAGES/djangojs.po
index e8cf23ff881f..a47bfdccf015 100644
--- a/locale/hin/LC_MESSAGES/djangojs.po
+++ b/locale/hin/LC_MESSAGES/djangojs.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Dimagi Dev <devops@dimagi.com>, 2021
+# Dimagi Dev <devops@dimagi.com>, 2024
 #
 #, fuzzy
 msgid ""
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-07-19 15:34+0000\n"
-"Last-Translator: Dimagi Dev <devops@dimagi.com>, 2021\n"
+"Last-Translator: Dimagi Dev <devops@dimagi.com>, 2024\n"
 "Language-Team: Hindi (https://app.transifex.com/dimagi/teams/9388/hi/)\n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
@@ -336,7 +336,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr ""
 
@@ -497,6 +498,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -857,10 +862,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1170,6 +1171,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1589,7 +1591,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2203,6 +2206,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2390,6 +2409,7 @@ msgstr ""
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2458,7 +2478,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr ""
 
@@ -2494,50 +2515,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2697,6 +2674,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3175,6 +3156,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3220,140 +3224,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3371,6 +3396,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr ""
 
@@ -3396,57 +3422,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3473,6 +3500,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3603,6 +3646,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3632,6 +3683,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3708,10 +3763,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3791,6 +3842,21 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3929,11 +3995,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr "हॉ"
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4272,16 +4344,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr ""
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4350,6 +4412,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr ""
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/por/LC_MESSAGES/django.po b/locale/por/LC_MESSAGES/django.po
index 6bc2f0a69fd9..6efceaff5bf1 100644
--- a/locale/por/LC_MESSAGES/django.po
+++ b/locale/por/LC_MESSAGES/django.po
@@ -56,8 +56,11 @@ msgstr "Tipo de Conta"
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -169,7 +172,8 @@ msgstr "Mostrar somente as Subscrições de Ensaio"
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -482,7 +486,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -491,14 +496,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -537,20 +541,8 @@ msgid "Message"
 msgstr "Mensagem"
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr "Selecionar plano diferente"
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr "Requisitar cotação"
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
-msgstr "Submeter"
+msgid "Submit Request"
+msgstr ""
 
 #: corehq/apps/accounting/forms.py
 #, python-format
@@ -578,15 +570,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -982,7 +967,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -991,6 +977,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -1025,7 +1012,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -1038,14 +1024,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1103,6 +1096,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2157,8 +2151,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2805,12 +2799,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2831,6 +2819,12 @@ msgstr "Taxa de Feição"
 msgid "Balance"
 msgstr "Saldo"
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2883,7 +2877,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -3010,14 +3003,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -3051,7 +3043,8 @@ msgid "Generating Report..."
 msgstr "Gerando relatório"
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3119,7 +3112,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr "Enterprise"
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3157,16 +3150,8 @@ msgid "Web Users"
 msgstr "Usuários da Web"
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr "Usuários Móveis"
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
-msgstr "SMS"
+msgid "Form-Submitting Mobile Workers"
+msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
 #: corehq/messaging/scheduling/forms.py corehq/motech/const.py
@@ -3504,6 +3489,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3692,8 +3685,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3711,7 +3706,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3741,7 +3736,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3773,7 +3767,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr "Erro"
 
@@ -4024,7 +4021,8 @@ msgstr "Caso"
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4123,7 +4121,8 @@ msgstr "Aplicações"
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4184,7 +4183,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4616,6 +4614,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4920,7 +4919,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4948,7 +4948,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5163,8 +5164,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5175,7 +5178,9 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5642,8 +5647,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5835,6 +5842,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -6048,12 +6056,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6344,8 +6354,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6380,7 +6392,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6391,16 +6402,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6416,6 +6431,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7295,7 +7311,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7519,8 +7536,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7694,7 +7713,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7704,7 +7724,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7906,7 +7927,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8133,7 +8153,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9254,6 +9275,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr ""
@@ -9473,7 +9495,8 @@ msgstr "Relatório"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9485,6 +9508,7 @@ msgstr "Relatório"
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9734,45 +9758,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9794,15 +9779,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10070,7 +10046,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10305,6 +10282,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10470,36 +10448,6 @@ msgstr "Sincronizar"
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr "Palavra-passe"
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10539,7 +10487,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr "Selecionar tudo"
 
@@ -11241,15 +11190,6 @@ msgstr ""
 "A propriedade não formatado corretamente. Deve ser formatado como: loacation:"
 "mytype:referencetype/property. Por exemplo: location:outlet:state/name"
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11670,7 +11610,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11729,6 +11670,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11787,7 +11737,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11840,7 +11791,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12181,6 +12132,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12345,6 +12301,15 @@ msgstr "Aplicações Web"
 msgid "Show Full Menu"
 msgstr "Mostrar Menu Completo"
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12430,6 +12395,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12720,6 +12689,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr "Submeter"
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12788,21 +12764,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr "SMS"
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13283,6 +13267,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr "Palavra-passe"
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13301,7 +13298,8 @@ msgstr "Dicionário de Dados"
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13381,7 +13379,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13419,11 +13421,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13859,8 +13861,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr "Nome do Caso"
@@ -14079,6 +14082,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14230,7 +14234,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14245,7 +14250,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14628,6 +14634,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
 
@@ -14651,7 +14658,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14718,10 +14725,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15212,6 +15227,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15231,6 +15250,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15338,6 +15361,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15357,17 +15384,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16458,6 +16497,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr "Selecionar plano diferente"
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16620,6 +16664,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17397,45 +17442,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18092,10 +18098,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18105,6 +18107,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18114,9 +18122,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18617,7 +18623,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18632,6 +18638,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18695,7 +18713,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18711,7 +18730,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18877,6 +18897,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18937,6 +18961,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19801,35 +19829,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19839,7 +19840,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19848,15 +19850,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19867,7 +19872,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19879,7 +19885,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19890,11 +19897,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19906,16 +19915,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19928,7 +19941,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19940,19 +19954,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19966,7 +19984,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19980,31 +19999,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -20012,15 +20038,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr "Salvo!"
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -20029,12 +20058,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -20043,19 +20143,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20063,11 +20164,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -20075,11 +20178,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20088,7 +20193,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20096,7 +20202,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20105,7 +20212,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20113,45 +20221,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20161,7 +20278,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20171,20 +20289,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20226,98 +20349,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr "Exportar em massa"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr "Preparar Exportação"
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20326,33 +20408,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20361,7 +20450,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20373,7 +20463,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20381,17 +20472,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20402,29 +20495,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20432,7 +20531,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20440,7 +20540,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20451,7 +20551,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20462,11 +20563,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20474,100 +20577,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20575,7 +20646,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20583,7 +20655,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20591,7 +20664,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20599,7 +20673,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20607,84 +20682,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr "Selecionar Nenhum"
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20694,80 +20788,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr "ou"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr "Introduza a descrição aqui"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20775,7 +20885,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20784,7 +20895,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20794,39 +20906,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20838,7 +20959,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20849,15 +20970,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20865,14 +20988,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20880,11 +21005,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20893,7 +21020,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20901,7 +21029,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20909,11 +21038,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20921,7 +21052,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20929,30 +21061,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20966,33 +21103,172 @@ msgstr ""
 msgid "View"
 msgstr "Visualizar"
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "          Upload Lookup Tables\n"
+#| "        "
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+"\n"
+"Carregar Tabelas de Pesquisa"
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21160,8 +21436,7 @@ msgid "Export Form Data"
 msgstr "Exportar Dados do Formulário"
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr "Exportar"
 
@@ -21204,10 +21479,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr "Exportar Dados do Caso"
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21253,6 +21524,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21274,8 +21549,10 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
-msgstr ""
+#, fuzzy
+#| msgid "Select different plan"
+msgid "Select feed type"
+msgstr "Selecionar plano diferente"
 
 #: corehq/apps/export/views/list.py
 msgid "Select Feed Type"
@@ -21384,6 +21661,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21564,16 +21846,12 @@ msgstr "Incluir no Descarregamento"
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22161,6 +22439,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22260,6 +22548,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22327,6 +22619,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr "Ocultar Opções de Filtro"
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22335,6 +22732,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22503,114 +22964,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
-msgstr "Ocultar Opções de Filtro"
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23448,6 +23870,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23467,10 +23893,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23595,135 +24017,150 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23755,6 +24192,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23798,18 +24239,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23843,39 +24272,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23900,59 +24296,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -24003,6 +24360,42 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia"
+msgid "multimedia"
+msgstr "Multimídia"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Multimedia"
+msgid "multimedia files"
+msgstr "Multimídia"
+
+#: corehq/apps/hqmedia/views.py
+#, fuzzy
+#| msgid "Download Multimedia Zip"
+msgid "Bulk Upload Multimedia Status"
+msgstr "Descarregar Multimedia Zip"
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24590,6 +24983,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25164,7 +25561,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25179,12 +25576,18 @@ msgstr ""
 
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/bulk_upload.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/bulk_upload.html
-#, python-format
+#, fuzzy, python-format
+#| msgid ""
+#| "\n"
+#| "          Upload Lookup Tables\n"
+#| "        "
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
+"\n"
+"Carregar Tabelas de Pesquisa"
 
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/bulk_upload.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/bulk_upload.html
@@ -25205,8 +25608,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25611,6 +26014,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25701,10 +26105,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25734,12 +26134,10 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
-msgstr ""
+#, fuzzy
+#| msgid "Web Apps"
+msgid "Enable in Web Apps"
+msgstr "Aplicações Web"
 
 #: corehq/apps/integration/forms.py
 msgid "External Callout URL"
@@ -25756,7 +26154,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25764,11 +26162,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25785,11 +26179,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26843,14 +27232,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27487,11 +27868,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -28021,10 +28397,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -28120,6 +28492,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29719,10 +30095,6 @@ msgstr "Gerir os aplicativos lançados"
 msgid "CommTrack"
 msgstr "CommTrack"
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30354,6 +30726,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30362,10 +30745,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32340,21 +32737,6 @@ msgstr "Filtro de Data"
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32943,6 +33325,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35453,6 +35839,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36332,6 +36719,44 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "Domains"
+msgid "contains"
+msgstr "Domínio"
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "Empty"
+msgid "is empty"
+msgstr "Manejo de Casos"
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36473,10 +36898,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36570,6 +36991,33 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+#, fuzzy
+#| msgid "Edit Role"
+msgid "Edit Value"
+msgstr "Editar Função"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Add Filter"
+msgid "Add Item"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36778,7 +37226,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -37039,20 +37487,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -37133,7 +37581,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -37166,33 +37614,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37200,11 +37648,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37212,34 +37660,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr "Casos IRA Tratados"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr "Módulo"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37555,10 +38003,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37820,6 +38264,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38542,6 +39001,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38860,6 +39343,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -40073,11 +40562,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41245,10 +41734,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41684,6 +42169,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr "Centro de Chamadas"
@@ -42346,7 +42841,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42377,6 +42876,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -43036,7 +43539,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43778,10 +44282,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -44049,6 +44549,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44491,6 +45007,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44507,21 +45028,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44687,11 +45269,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44778,6 +45355,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44810,6 +45391,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44826,10 +45413,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44910,6 +45493,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44942,6 +45533,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/por/LC_MESSAGES/djangojs.po b/locale/por/LC_MESSAGES/djangojs.po
index 72d48552810f..729e2aec1a83 100644
--- a/locale/por/LC_MESSAGES/djangojs.po
+++ b/locale/por/LC_MESSAGES/djangojs.po
@@ -340,7 +340,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr "Nenhum"
 
@@ -501,6 +502,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -861,10 +866,6 @@ msgstr ""
 msgid "Settings"
 msgstr "Definições"
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1174,6 +1175,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1594,7 +1596,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2208,6 +2211,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2395,6 +2414,7 @@ msgstr "Tipo de Caso"
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2463,7 +2483,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr "Criar"
 
@@ -2499,50 +2520,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2702,6 +2679,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3180,6 +3161,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3225,140 +3229,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr "Registro de Usuário"
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr "Registro de Usuário"
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3376,6 +3401,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr "Nome do Caso"
 
@@ -3401,57 +3427,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3478,6 +3505,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3608,6 +3651,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3637,6 +3688,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3713,10 +3768,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3796,6 +3847,21 @@ msgstr ""
 msgid "Key"
 msgstr "chave"
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3934,11 +4000,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr ""
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4281,16 +4353,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr "Meus Relatórios Agendados"
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4359,6 +4421,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr "Meus Relatórios Agendados"
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po
index c23e4fc5d42b..46a18264a7f9 100644
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -25,8 +25,11 @@ msgstr ""
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -138,7 +141,8 @@ msgstr ""
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -447,7 +451,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -456,14 +461,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -502,19 +506,7 @@ msgid "Message"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
+msgid "Submit Request"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
@@ -542,14 +534,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -922,7 +908,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -931,6 +918,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -965,7 +953,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -978,14 +965,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1043,6 +1037,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2097,8 +2092,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2745,12 +2740,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2771,6 +2760,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2823,7 +2818,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -2950,14 +2944,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -2991,7 +2984,8 @@ msgid "Generating Report..."
 msgstr ""
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3059,7 +3053,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr ""
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3097,15 +3091,7 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr ""
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
+msgid "Form-Submitting Mobile Workers"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
@@ -3444,6 +3430,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3632,8 +3626,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3651,7 +3647,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3681,7 +3677,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3713,7 +3708,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr ""
 
@@ -3964,7 +3962,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4061,7 +4060,8 @@ msgstr ""
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4122,7 +4122,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4550,6 +4549,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4854,7 +4854,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4882,7 +4883,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5097,8 +5099,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5109,7 +5113,9 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5576,8 +5582,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5769,6 +5777,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -5982,12 +5991,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6275,8 +6286,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6311,7 +6324,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6322,16 +6334,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6347,6 +6363,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7226,7 +7243,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7450,8 +7468,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7625,7 +7645,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7635,7 +7656,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7837,7 +7859,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8064,7 +8085,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9185,6 +9207,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr ""
@@ -9404,7 +9427,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9416,6 +9440,7 @@ msgstr ""
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9665,45 +9690,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9725,15 +9711,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10001,7 +9978,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10236,6 +10214,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10401,36 +10380,6 @@ msgstr ""
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10470,7 +10419,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr ""
 
@@ -11161,15 +11111,6 @@ msgid ""
 "referencetype/property. For example: location:outlet:state/name"
 msgstr ""
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11590,7 +11531,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11649,6 +11591,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11707,7 +11658,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11760,7 +11712,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12101,6 +12053,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12264,6 +12221,15 @@ msgstr ""
 msgid "Show Full Menu"
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12349,6 +12315,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12639,6 +12609,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr ""
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12707,21 +12684,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr ""
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13202,6 +13187,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr ""
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13220,7 +13218,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13300,7 +13299,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13338,11 +13341,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13778,8 +13781,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr ""
@@ -13998,6 +14002,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14149,7 +14154,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14164,7 +14170,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14547,6 +14554,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr ""
 
@@ -14570,7 +14578,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14637,10 +14645,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15131,6 +15147,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15150,6 +15170,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15257,6 +15281,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15276,17 +15304,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16377,6 +16417,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr ""
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16539,6 +16584,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17316,45 +17362,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18010,10 +18017,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18023,6 +18026,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18032,9 +18041,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18535,7 +18542,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18550,6 +18557,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18613,7 +18632,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18629,7 +18649,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18795,6 +18816,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18855,6 +18880,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19719,35 +19748,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19757,7 +19759,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19766,15 +19769,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19785,7 +19791,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19797,7 +19804,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19808,11 +19816,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19824,16 +19834,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19846,7 +19860,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19858,19 +19873,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19884,7 +19903,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19898,31 +19918,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -19930,15 +19957,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -19947,12 +19977,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -19961,19 +20062,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19981,11 +20083,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19993,11 +20097,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20006,7 +20112,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20014,7 +20121,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20023,7 +20131,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20031,45 +20140,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20079,7 +20197,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20089,20 +20208,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20144,98 +20268,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20244,33 +20327,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20279,7 +20369,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20291,7 +20382,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20299,17 +20391,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20320,29 +20414,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20350,7 +20450,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20358,7 +20459,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20369,7 +20470,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20380,11 +20482,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20392,100 +20496,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20493,7 +20565,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20501,7 +20574,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20509,7 +20583,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20517,7 +20592,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20525,84 +20601,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20612,80 +20707,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20693,7 +20804,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20702,7 +20814,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20712,39 +20825,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20756,7 +20878,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20767,15 +20889,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20783,14 +20907,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20798,11 +20924,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20811,7 +20939,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20819,7 +20948,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20827,11 +20957,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20839,7 +20971,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20847,30 +20980,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20884,33 +21022,165 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21074,8 +21344,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr ""
 
@@ -21118,10 +21387,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21167,6 +21432,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21188,7 +21457,7 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
+msgid "Select feed type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
@@ -21285,6 +21554,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21453,16 +21727,12 @@ msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22040,6 +22310,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22139,6 +22419,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr ""
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22206,6 +22490,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22214,6 +22603,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22382,114 +22835,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23314,6 +23728,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23333,10 +23751,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23461,135 +23875,149 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23621,6 +24049,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23664,18 +24096,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23709,39 +24129,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23766,59 +24153,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -23869,6 +24217,36 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia files"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Bulk Upload Multimedia Status"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24454,6 +24832,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25028,7 +25410,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25046,7 +25428,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25069,8 +25451,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25475,6 +25857,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25565,10 +25948,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25598,11 +25977,7 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
+msgid "Enable in Web Apps"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25620,7 +25995,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25628,11 +26003,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25649,11 +26020,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26707,14 +27073,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27334,11 +27692,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -27867,10 +28220,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -27966,6 +28315,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29564,10 +29917,6 @@ msgstr ""
 msgid "CommTrack"
 msgstr ""
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30196,6 +30545,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30204,10 +30564,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32163,21 +32537,6 @@ msgstr ""
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32762,6 +33121,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35265,6 +35628,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36144,6 +36508,40 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "contains"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is empty"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36285,10 +36683,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36382,6 +36776,29 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+msgid "Edit Value"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Add Item"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36590,7 +37007,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -36851,20 +37268,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -36945,7 +37362,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -36978,33 +37395,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37012,11 +37429,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37024,34 +37441,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37367,10 +37784,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37630,6 +38043,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38352,6 +38780,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38670,6 +39122,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -39872,11 +40330,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41037,10 +41495,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41471,6 +41925,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr ""
@@ -42128,7 +42592,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42159,6 +42627,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -42818,7 +43290,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43560,10 +44033,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -43831,6 +44300,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44273,6 +44758,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44289,21 +44779,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44469,11 +45020,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44560,6 +45106,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44592,6 +45142,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44608,10 +45164,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44692,6 +45244,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44724,6 +45284,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/pt/LC_MESSAGES/djangojs.po b/locale/pt/LC_MESSAGES/djangojs.po
index ae7049098fbf..e37ca2ecd49e 100644
--- a/locale/pt/LC_MESSAGES/djangojs.po
+++ b/locale/pt/LC_MESSAGES/djangojs.po
@@ -333,7 +333,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr ""
 
@@ -494,6 +495,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -854,10 +859,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1167,6 +1168,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1586,7 +1588,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2200,6 +2203,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2387,6 +2406,7 @@ msgstr ""
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2455,7 +2475,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr ""
 
@@ -2491,50 +2512,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2694,6 +2671,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3172,6 +3153,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3217,140 +3221,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3368,6 +3393,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr ""
 
@@ -3393,57 +3419,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3470,6 +3497,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3600,6 +3643,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3629,6 +3680,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3705,10 +3760,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3788,6 +3839,21 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3926,11 +3992,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr ""
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4269,16 +4341,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr ""
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4347,6 +4409,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr ""
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/locale/sw/LC_MESSAGES/django.po b/locale/sw/LC_MESSAGES/django.po
index 4b68470b9cd6..592d31c639f1 100644
--- a/locale/sw/LC_MESSAGES/django.po
+++ b/locale/sw/LC_MESSAGES/django.po
@@ -29,8 +29,11 @@ msgstr ""
 #: corehq/apps/accounting/filters.py
 #: corehq/apps/app_manager/templates/app_manager/partials/bulk_upload_app_translations.html
 #: corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/geospatial/filters.py corehq/apps/linked_domain/filters.py
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/filters.py
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/linked_domain/filters.py
 #: corehq/apps/reports/filters/commtrack.py
 #: corehq/apps/reports/filters/users.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
@@ -142,7 +145,8 @@ msgstr ""
 
 #: corehq/apps/accounting/filters.py corehq/apps/accounting/forms.py
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/filter_configs.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/notifications/forms.py corehq/apps/reports/standard/sms.py
@@ -451,7 +455,8 @@ msgstr ""
 #: corehq/apps/enterprise/enterprise.py corehq/apps/events/forms.py
 #: corehq/apps/events/templates/event_attendees.html
 #: corehq/apps/events/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/locations/forms.py
@@ -460,14 +465,13 @@ msgstr ""
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
 #: corehq/apps/reports/standard/cases/basic.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap3/user_details.html
 #: corehq/apps/reports/templates/reports/project_health/bootstrap5/user_details.html
 #: corehq/apps/settings/views.py corehq/apps/sms/forms.py
 #: corehq/apps/sso/forms.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/toggle_ui/templates/toggle/flags.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -506,19 +510,7 @@ msgid "Message"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
-#: corehq/apps/domain/templates/domain/confirm_plan.html
-msgid "Select different plan"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py
-msgid "Request Quote"
-msgstr ""
-
-#: corehq/apps/accounting/forms.py corehq/apps/commtrack/forms.py
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
-#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
-#: corehq/apps/translations/forms.py
-msgid "Submit"
+msgid "Submit Request"
 msgstr ""
 
 #: corehq/apps/accounting/forms.py
@@ -546,14 +538,8 @@ msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
-msgid ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user} with plan above."
-"{prorated_notice}"
-msgid_plural ""
-"Per-{user} fee exceeding limit of {monthly_limit} {user}s with plan above."
-"{prorated_notice}"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Fee for each {user} exceeding the plan limit of {monthly_limit}."
+msgstr ""
 
 #: corehq/apps/accounting/invoicing.py
 #, python-brace-format
@@ -926,7 +912,8 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/manage_case_groups.html
 #: corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/partials/manage_downstream_domains.html
 #: corehq/apps/locations/templates/locations/location_types.html
 #: corehq/apps/registry/templates/registry/registry_edit.html
@@ -935,6 +922,7 @@ msgstr ""
 #: corehq/apps/sms/templates/sms/add_gateway.html
 #: corehq/apps/sms/templates/sms/backend_map.html
 #: corehq/apps/sms/templates/sms/partials/day_time_windows.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dhis2_entity_config.html
 #: corehq/motech/openmrs/templates/openmrs/partials/openmrs_importer_template.html
 msgid "Remove"
@@ -969,7 +957,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/menu/module_link.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/modal_delete.html
@@ -982,14 +969,21 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/partials/payment_modal.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
 #: corehq/apps/events/templates/edit_attendee.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/groups/templates/groups/group_members.html
@@ -1047,6 +1041,7 @@ msgstr ""
 #: corehq/apps/userreports/templates/userreports/edit_data_source.html
 #: corehq/apps/userreports/templates/userreports/partials/delete_report_button.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/apps/users/templates/users/edit_commcare_user.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
@@ -2101,8 +2096,8 @@ msgstr ""
 #: corehq/apps/accounting/views.py corehq/apps/app_execution/forms.py
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/enterprise/enterprise.py
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/hqadmin/reports.py
 #: corehq/apps/hqadmin/templates/hqadmin/offboarding_list.html
 #: corehq/apps/hqadmin/templates/hqadmin/superuser_management.html
@@ -2749,12 +2744,6 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/accounting/templates/accounting/partials/confirm_plan_summary.html
-msgid ""
-"Note: Selecting this plan will result in the following changes to your "
-"project."
-msgstr ""
-
 #: corehq/apps/accounting/templates/accounting/partials/credits_tab.html
 #: corehq/apps/accounting/templates/accounting/subscriptions.html
 #: corehq/tabs/tabclasses.py
@@ -2775,6 +2764,12 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
+#: corehq/apps/accounting/templates/accounting/partials/downgrade_messages.html
+msgid ""
+"Note: Selecting this plan will result in the following changes to your "
+"project."
+msgstr ""
+
 #: corehq/apps/accounting/templates/accounting/partials/invoice_table.html
 msgid "Go to All Invoices page for this Project Space"
 msgstr ""
@@ -2827,7 +2822,6 @@ msgstr ""
 #: corehq/apps/accounting/templates/accounting/partials/new_stripe_card_template.html
 #: corehq/apps/app_execution/forms.py
 #: corehq/apps/app_manager/templates/app_manager/form_designer.html
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/custom_data_fields.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/case_rule.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
@@ -2954,14 +2948,13 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/components/title_bar.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/templates/reports/bootstrap3/reports_home.html
 #: corehq/apps/reports/templates/reports/bootstrap5/reports_home.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 #: corehq/apps/reports/views.py
 #: corehq/apps/sso/templates/sso/enterprise_admin/manage_sso.html
@@ -2995,7 +2988,8 @@ msgid "Generating Report..."
 msgstr ""
 
 #: corehq/apps/accounting/templates/accounting/report_filter_actions.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/filter_panel.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/filter_panel.html
 #: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
@@ -3063,7 +3057,7 @@ msgstr ""
 msgid "Enterprise"
 msgstr ""
 
-#: corehq/apps/accounting/user_text.py corehq/apps/domain/views/accounting.py
+#: corehq/apps/accounting/user_text.py
 msgid ""
 "For organizations that need a sustainable path to scale mobile data "
 "collection and service delivery across multiple teams, programs, or "
@@ -3101,15 +3095,7 @@ msgid "Web Users"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py
-msgid "Mobile Users"
-msgstr ""
-
-#: corehq/apps/accounting/user_text.py corehq/apps/commtrack/views.py
-#: corehq/apps/domain/forms.py corehq/apps/reminders/forms.py
-#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
-#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
-#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
-msgid "SMS"
+msgid "Form-Submitting Mobile Workers"
 msgstr ""
 
 #: corehq/apps/accounting/user_text.py corehq/apps/reports/forms.py
@@ -3448,6 +3434,14 @@ msgstr ""
 msgid "There are multiple roles with the name '{}' in the domain '{}'"
 msgstr ""
 
+#: corehq/apps/api/user_updates.py
+msgid "Both primary_location and locations must be provided together."
+msgstr ""
+
+#: corehq/apps/api/user_updates.py
+msgid "Primary location must be included in the list of locations."
+msgstr ""
+
 #: corehq/apps/api/util.py
 #, python-format
 msgid "Could not find %(doc_type)s with id %(id)s"
@@ -3636,8 +3630,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/domain/templates/domain/admin/manage_alerts.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/groups/templates/groups/group_members.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
@@ -3655,7 +3651,7 @@ msgstr ""
 #: corehq/apps/settings/templates/settings/user_api_keys.html
 #: corehq/apps/sms/templates/sms/gateway_list.html
 #: corehq/apps/sms/templates/sms/global_gateway_list.html
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 #: corehq/apps/users/models.py
 #: corehq/apps/users/templates/users/partials/bootstrap3/basic_info_modals.html
 #: corehq/apps/users/templates/users/partials/bootstrap3/manage_my_numbers.html
@@ -3685,7 +3681,6 @@ msgstr ""
 #: corehq/apps/app_execution/templates/app_execution/workflow_log.html
 #: corehq/apps/app_execution/templates/app_execution/workflow_log_list.html
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
 #: corehq/motech/generic_inbound/reports.py
 msgid "Details"
 msgstr ""
@@ -3717,7 +3712,10 @@ msgstr ""
 #: corehq/apps/linked_domain/templates/linked_domain/partials/pull_content.html
 #: corehq/apps/reports/standard/monitoring.py corehq/apps/sms/filters.py
 #: corehq/apps/sms/models.py corehq/messaging/scheduling/views.py
-#: corehq/motech/generic_inbound/models.py corehq/motech/views.py
+#: corehq/motech/generic_inbound/models.py
+#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
+#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
+#: corehq/motech/views.py
 msgid "Error"
 msgstr ""
 
@@ -3968,7 +3966,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/managed_app.html
 #: corehq/apps/app_manager/templates/app_manager/partials/custom_icon.html
 #: corehq/apps/data_interfaces/interfaces.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/views/list.py corehq/apps/hqwebapp/doc_info.py
 #: corehq/apps/reports/filters/forms.py corehq/apps/reports/standard/inspect.py
 #: corehq/apps/reports/templates/reports/reportdata/bootstrap3/case_data.html
@@ -4065,7 +4064,8 @@ msgstr ""
 #: corehq/apps/app_manager/fields.py
 #: corehq/apps/app_manager/views/app_summary.py
 #: corehq/apps/export/models/new.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/linked_domain/views.py
 #: corehq/apps/reports/standard/deployments.py
 #: corehq/apps/reports/standard/message_event_display.py
@@ -4126,7 +4126,6 @@ msgid "Copy version"
 msgstr ""
 
 #: corehq/apps/app_manager/forms.py
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Current"
 msgstr ""
 
@@ -4554,6 +4553,7 @@ msgstr ""
 #: corehq/apps/reports/standard/users/reports.py
 #: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
 #: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
 #: corehq/motech/dhis2/templates/dhis2/dataset_map_list.html
 #: corehq/motech/templates/motech/connection_settings.html
 #: corehq/tabs/tabclasses.py
@@ -4858,7 +4858,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Disable"
 msgstr ""
@@ -4886,7 +4887,8 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqadmin/forms.py
 msgid "Enable"
 msgstr ""
@@ -5101,8 +5103,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5113,7 +5117,9 @@ msgstr ""
 #: corehq/apps/app_manager/static_strings.py
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
 #: corehq/apps/domain/views/accounting.py corehq/apps/enterprise/views.py
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/reports/standard/monitoring.py
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
@@ -5580,8 +5586,10 @@ msgstr ""
 
 #: corehq/apps/app_manager/static_strings.py corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/confirm_plan.html
-#: corehq/apps/reports/standard/sms.py corehq/apps/smsbillables/filters.py
-#: corehq/messaging/scheduling/forms.py
+#: corehq/apps/reports/standard/sms.py
+#: corehq/apps/reports/templates/reports/bootstrap3/tableau_visualization.html
+#: corehq/apps/reports/templates/reports/bootstrap5/tableau_visualization.html
+#: corehq/apps/smsbillables/filters.py corehq/messaging/scheduling/forms.py
 #: corehq/messaging/smsbackends/telerivet/forms.py
 #: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
 #: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
@@ -5773,6 +5781,7 @@ msgid "Releases"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+#: corehq/apps/domain/forms.py
 msgid "Release Mode"
 msgstr ""
 
@@ -5986,12 +5995,14 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/reminders/templates/reminders/partials/record_list_widget.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Value"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/form_summary_base.html
 #: corehq/apps/builds/templates/builds/edit_menu.html
 #: corehq/apps/custom_data_fields/templates/custom_data_fields/partials/fields_tab.html
+#: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -6279,8 +6290,10 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/domain/templates/domain/billing_statements.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/single_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/single_form.html
@@ -6315,7 +6328,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_module_overwrite.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/style_configuration_modal.html
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/app_diff_modal.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/query/list.html
@@ -6326,16 +6338,20 @@ msgstr ""
 #: corehq/apps/domain/templates/domain/select_plan.html
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 #: corehq/apps/events/templates/event_attendees.html
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqadmin/templates/hqadmin/partials/pillow-operation-modal.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_30_day_trial.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_report_issue.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/modal_solutions_feature_request.html
@@ -6351,6 +6367,7 @@ msgstr ""
 #: corehq/apps/reports/forms.py
 #: corehq/apps/reports/templates/reports/standard/bootstrap3/submission_error_report.html
 #: corehq/apps/reports/templates/reports/standard/bootstrap5/submission_error_report.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/users/templates/users/mobile_workers.html
 #: corehq/apps/users/templates/users/partials/edit_role_modal.html
@@ -7230,7 +7247,8 @@ msgid "Form Changes"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/form_summary_header.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Display"
 msgstr ""
 
@@ -7454,8 +7472,10 @@ msgstr ""
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_run_history.html
 #: corehq/apps/data_interfaces/views.py
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/geospatial/templates/gps_capture.html
 #: corehq/apps/reports/filters/select.py
 #: corehq/apps/reports/standard/cases/basic.py
@@ -7629,7 +7649,8 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/add_property_button.html
 #: corehq/apps/app_manager/templates/app_manager/partials/modules/case_list_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
@@ -7639,7 +7660,8 @@ msgid "Property"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/case_config_ko_templates.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap3/readable_form.html
 #: corehq/apps/reports/templates/reports/form/partials/bootstrap5/readable_form.html
 msgid "Question"
@@ -7841,7 +7863,6 @@ msgstr ""
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_tab_advanced.html
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_view_modals.html
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/key_value_mapping.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/key_value_mapping.html
@@ -8068,7 +8089,8 @@ msgid "Disable manual linking"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/forms/form_workflow.html
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid "Refresh"
 msgstr ""
 
@@ -9189,6 +9211,7 @@ msgstr ""
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/inactivity_modal.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/get_demo_modals.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/get_demo_modals.html
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
 #: corehq/apps/users/views/mobile/users.py
 msgid "Done"
 msgstr ""
@@ -9408,7 +9431,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_dictionary/views.py
 #: corehq/apps/domain/templates/domain/admin/feature_previews.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/export/templates/export/download_data_files.html
 #: corehq/apps/fixtures/templates/fixtures/partials/edit_table_modal.html
 #: corehq/apps/products/templates/products/manage/products.html
@@ -9420,6 +9444,7 @@ msgstr ""
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/save_reports_modal.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/save_reports_modal.html
 #: corehq/apps/sms/forms.py corehq/apps/sms/views.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 #: corehq/apps/userreports/templates/userreports/partials/filter_panel.html
 #: corehq/apps/userreports/templates/userreports/ucr_expression.html
 #: corehq/apps/userreports/views.py corehq/motech/dhis2/forms.py
@@ -9669,45 +9694,6 @@ msgstr ""
 msgid "No Multimedia"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Icon Image"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
-#: corehq/apps/export/templates/export/partials/table.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-#: corehq/motech/repeaters/views/repeat_records.py
-msgid "Select"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Icon"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Begin Upload"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Upload Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Select Menu Audio"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_modals.html
-msgid "Current Audio"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_table.html
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/commcare_settings.html
@@ -9729,15 +9715,6 @@ msgstr ""
 msgid "Set Path"
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
-msgid ""
-"\n"
-"            To hear audio on Java Phones, you must be in CommCare Sense\n"
-"            mode or Numeric Selection Mode. (On Android it will always "
-"work.)\n"
-"          "
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/nav_menu_media_single_type.html
 #, python-format
 msgid ""
@@ -10005,7 +9982,8 @@ msgid "Send to phone via SMS"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Download Multimedia"
 msgstr ""
 
@@ -10240,6 +10218,7 @@ msgid "Replace Logo"
 msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/app_settings.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
 msgid "Upload Logo"
 msgstr ""
 
@@ -10405,36 +10384,6 @@ msgstr ""
 msgid "This application currently does not contain any multimedia references."
 msgstr ""
 
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Set Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "The passwords don't match. Please try again."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Please enter a password or cancel."
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
-#: corehq/apps/hqwebapp/forms.py
-#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
-#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
-#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
-#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
-#: corehq/messaging/smsbackends/mach/forms.py
-#: corehq/messaging/smsbackends/push/forms.py
-#: corehq/messaging/smsbackends/start_enterprise/forms.py
-#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
-msgid "Password"
-msgstr ""
-
-#: corehq/apps/app_manager/templates/app_manager/partials/settings/password_setter_modal.html
-msgid "Repeat Password"
-msgstr ""
-
 #: corehq/apps/app_manager/templates/app_manager/partials/settings/supported_languages.html
 msgid "Set as default"
 msgstr ""
@@ -10474,7 +10423,8 @@ msgstr ""
 
 #: corehq/apps/app_manager/templates/app_manager/partials/toggle_diff_modal.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/search_controls.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select All"
 msgstr ""
 
@@ -11165,15 +11115,6 @@ msgid ""
 "referencetype/property. For example: location:outlet:state/name"
 msgstr ""
 
-#: corehq/apps/auditcare/templates/auditcare/audit_views.html
-#: corehq/apps/auditcare/templates/auditcare/index.html
-msgid "Audit Viewer"
-msgstr ""
-
-#: corehq/apps/auditcare/templates/auditcare/partials/model_property_change.html
-msgid "Audited Model Changes"
-msgstr ""
-
 #: corehq/apps/builds/templates/builds/all.html
 msgid "Build Number"
 msgstr ""
@@ -11594,7 +11535,8 @@ msgstr ""
 #: corehq/apps/domain/templates/error.html
 #: corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
 #: corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/registration/forms.py corehq/apps/settings/forms.py
 msgid "Back"
 msgstr ""
@@ -11653,6 +11595,15 @@ msgid ""
 "        "
 msgstr ""
 
+#: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
+msgid ""
+"\n"
+"          Importing a system property may have unexpected results such as\n"
+"          adding a duplicate field to case exports. Consider using a\n"
+"          different property name.\n"
+"        "
+msgstr ""
+
 #: corehq/apps/case_importer/templates/case_importer/partials/excel_field_rows.html
 msgid "blank"
 msgstr ""
@@ -11711,7 +11662,8 @@ msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_history.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form_navigation.html
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 #: corehq/ex-submodules/soil/templates/soil/partials/download_in_progress.html
 #: corehq/messaging/smsbackends/telerivet/templates/telerivet/partials/finish.html
 msgid "Complete"
@@ -11764,7 +11716,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
-msgid "Row(s):"
+msgid "Toggle Affected Row(s)"
 msgstr ""
 
 #: corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -12105,6 +12057,11 @@ msgid ""
 "join(DISTANCE_UNITS)}"
 msgstr ""
 
+#: corehq/apps/case_search/xpath_functions/query_functions.py
+#, python-brace-format
+msgid "'{value}' is not a valid date. Expected 'YYYY-MM-DD"
+msgstr ""
+
 #: corehq/apps/case_search/xpath_functions/query_functions.py
 #, python-brace-format
 msgid "The first argument to '{node.name}' must be a valid case property name"
@@ -12268,6 +12225,15 @@ msgstr ""
 msgid "Show Full Menu"
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/case_detail.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid "Select"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/detail.html
 #: corehq/apps/cloudcare/templates/cloudcare/partials/case_list/no_items_text.html
 msgid "List is empty."
@@ -12353,6 +12319,10 @@ msgid ""
 "          "
 msgstr ""
 
+#: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/entry_unsupported.html
+msgid "OK"
+msgstr ""
+
 #: corehq/apps/cloudcare/templates/cloudcare/partials/form_entry/form.html
 msgid ""
 "\n"
@@ -12643,6 +12613,13 @@ msgstr ""
 msgid "Phone Settings"
 msgstr ""
 
+#: corehq/apps/commtrack/forms.py
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap3/form_list_form.html
+#: corehq/apps/hqwebapp/templates/hqwebapp/partials/bootstrap5/form_list_form.html
+#: corehq/apps/translations/forms.py
+msgid "Submit"
+msgstr ""
+
 #: corehq/apps/commtrack/forms.py
 #, python-brace-format
 msgid ""
@@ -12711,21 +12688,29 @@ msgstr ""
 msgid "Default consumption values updated"
 msgstr ""
 
+#: corehq/apps/commtrack/views.py corehq/apps/domain/forms.py
+#: corehq/apps/reminders/forms.py
+#: corehq/apps/reports/templates/reports/messaging/bootstrap3/survey_detail.html
+#: corehq/apps/reports/templates/reports/messaging/bootstrap5/survey_detail.html
+#: corehq/apps/sms/models.py corehq/messaging/scheduling/forms.py
+msgid "SMS"
+msgstr ""
+
 #: corehq/apps/custom_data_fields/edit_entity.py
 msgid "Select one"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-#: corehq/apps/registration/forms.py
-msgid "Invalid profile selected. Please select a valid profile."
+msgid "Additional Information"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Select a profile"
+#: corehq/apps/registration/forms.py
+msgid "Invalid profile selected. Please select a valid profile."
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
-msgid "Additional Information"
+msgid "Select a profile"
 msgstr ""
 
 #: corehq/apps/custom_data_fields/edit_entity.py
@@ -13206,6 +13191,19 @@ msgstr ""
 msgid "GPS"
 msgstr ""
 
+#: corehq/apps/data_dictionary/models.py corehq/apps/email/forms.py
+#: corehq/apps/hqwebapp/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/crispy_forms_knockout_validation.py
+#: corehq/apps/styleguide/examples/simple_crispy_form/forms.py
+#: corehq/apps/users/forms.py corehq/messaging/smsbackends/airtel_tcl/forms.py
+#: corehq/messaging/smsbackends/ivory_coast_mtn/forms.py
+#: corehq/messaging/smsbackends/mach/forms.py
+#: corehq/messaging/smsbackends/push/forms.py
+#: corehq/messaging/smsbackends/start_enterprise/forms.py
+#: corehq/motech/forms.py corehq/motech/openmrs/forms.py
+msgid "Password"
+msgstr ""
+
 #: corehq/apps/data_dictionary/models.py
 msgid "No Type Currently Selected"
 msgstr ""
@@ -13224,7 +13222,8 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/list_deduplication_rules.html
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/auto_update_rule_list.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "deprecated"
 msgstr ""
 
@@ -13304,7 +13303,11 @@ msgid "FHIR Resource Property Path"
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
-msgid "group's properties will be moved to"
+msgid ""
+"\n"
+"            <b data-bind=\"text: name()\"></b> group's properties will be "
+"moved to <b>No Group</b>\n"
+"            "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13342,11 +13345,11 @@ msgstr ""
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
 msgid ""
 "\n"
-"                  A case property with this name already exists.\n"
-"                  If you don’t see it on the page, please click ‘Show "
+"                        A case property with this name already exists.\n"
+"                        If you don’t see it on the page, please click ‘Show "
 "Deprecated’ button to reveal deprecated\n"
-"                  properties.\n"
-"                "
+"                        properties.\n"
+"                      "
 msgstr ""
 
 #: corehq/apps/data_dictionary/templates/data_dictionary/base.html
@@ -13782,8 +13785,9 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/interfaces.py
 #: corehq/apps/data_interfaces/views.py corehq/apps/geospatial/reports.py
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 #: corehq/apps/geospatial/templates/gps_capture.html
-#: corehq/apps/geospatial/templates/map_visualization.html
 #: corehq/apps/reports/v2/reports/explore_case_data.py
 msgid "Case Name"
 msgstr ""
@@ -14002,6 +14006,7 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/edit_deduplication_rule.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Match Type"
 msgstr ""
 
@@ -14153,7 +14158,8 @@ msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
 #: corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/linked_domain/templates/linked_domain/domain_links.html
 #: corehq/apps/translations/forms.py
 msgid "Add"
@@ -14168,7 +14174,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/explore_case_data.html
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid "Ok"
 msgstr ""
 
@@ -14551,6 +14558,7 @@ msgid "Requires System Admin"
 msgstr ""
 
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Add Filter"
 msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
 
@@ -14574,7 +14582,7 @@ msgstr ""
 #: corehq/apps/domain/forms.py
 #: corehq/apps/domain/templates/domain/manage_releases_by_location.html
 #: corehq/apps/events/forms.py corehq/apps/events/views.py
-#: corehq/apps/geospatial/templates/map_visualization.html
+#: corehq/apps/geospatial/templates/case_management.html
 #: corehq/apps/hqwebapp/doc_info.py corehq/apps/locations/forms.py
 #: corehq/apps/locations/templates/locations/manage/location.html
 #: corehq/apps/locations/templates/locations/manage/locations.html
@@ -14641,10 +14649,18 @@ msgstr ""
 msgid "greater than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "greater than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "less than"
 msgstr ""
 
+#: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
+msgid "less than or equal"
+msgstr ""
+
 #: corehq/apps/data_interfaces/templates/data_interfaces/partials/case_rule_criteria.html
 msgid "the date in case property"
 msgstr ""
@@ -15135,6 +15151,10 @@ msgstr ""
 msgid "Delete Logo"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Delete Logo after Submitting this Form"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Delete your custom logo and use the standard one."
 msgstr ""
@@ -15154,6 +15174,10 @@ msgstr ""
 msgid "Call Center Application"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Enable Call Center Application"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid ""
 "Call Center mode is a CommCare HQ module for managing call center workflows. "
@@ -15261,6 +15285,10 @@ msgid ""
 "            "
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Orphan Case Alerts"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Show Orphan Case Alerts on Mobile Worker Edit Page"
 msgstr ""
@@ -15280,17 +15308,29 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Edit Basic Information"
+msgid "Use elasticsearch when fetching apps for exports"
 msgstr ""
 
 #: corehq/apps/domain/forms.py
-msgid "Update Basic Info"
+msgid ""
+"\n"
+"            (Internal) Fetches apps using elasticsearch instead of couch in "
+"exports\n"
+"            "
 msgstr ""
 
 #: corehq/apps/domain/forms.py
 msgid "Default timezone"
 msgstr ""
 
+#: corehq/apps/domain/forms.py
+msgid "Edit Basic Information"
+msgstr ""
+
+#: corehq/apps/domain/forms.py
+msgid "Update Basic Info"
+msgstr ""
+
 #: corehq/apps/domain/forms.py
 msgid "Logo exceeds {} MB size limit"
 msgstr ""
@@ -16381,6 +16421,11 @@ msgstr ""
 msgid "Select different option"
 msgstr ""
 
+#: corehq/apps/domain/templates/domain/confirm_plan.html
+#: corehq/apps/domain/views/accounting.py
+msgid "Select different plan"
+msgstr ""
+
 #: corehq/apps/domain/templates/domain/confirm_plan.html
 #: corehq/apps/domain/views/accounting.py
 msgid "Confirm Pause"
@@ -16543,6 +16588,7 @@ msgid "Got questions about your plan?"
 msgstr ""
 
 #: corehq/apps/domain/templates/domain/current_subscription.html
+#: corehq/apps/domain/templates/domain/renew_plan.html
 #: corehq/apps/domain/templates/domain/select_plan.html
 msgid "Talk to Sales"
 msgstr ""
@@ -17320,45 +17366,6 @@ msgstr ""
 msgid "Dismiss"
 msgstr ""
 
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-msgid ""
-"\n"
-"        Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"        Please submit the following form if you would like to sign up for "
-"or\n"
-"        have questions regarding an Enterprise plan. Our sales team will be "
-"in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form if you would like to sign up for or "
-"have questions regarding your\n"
-"        annual %(e)s Plan. Our sales team will be in touch shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_annual_plan.html
-#, python-format
-msgid ""
-"\n"
-"        Please submit the following form to request your project space be "
-"set up for an <strong>annual %(e)s Plan</strong>.<br/>\n"
-"        Our sales team will reach out shortly.\n"
-"      "
-msgstr ""
-
-#: corehq/apps/domain/templates/domain/selected_enterprise_plan.html
-msgid ""
-"\n"
-"      Dimagi handles Enterprise plans on a case-by-case basis. <br />\n"
-"      Please fill out your information below to request a quote.\n"
-"    "
-msgstr ""
-
 #: corehq/apps/domain/templates/domain/stripe_cards.html
 msgid "Saved Credit Cards"
 msgstr ""
@@ -18014,10 +18021,6 @@ msgid ""
 "analytics."
 msgstr ""
 
-#: corehq/apps/domain/views/accounting.py
-msgid "Contact Us"
-msgstr ""
-
 #: corehq/apps/domain/views/accounting.py
 #, python-format
 msgid "1. Select a Plan%(edition_name)s"
@@ -18027,6 +18030,12 @@ msgstr ""
 msgid "Contact Dimagi"
 msgstr ""
 
+#: corehq/apps/domain/views/accounting.py
+msgid ""
+"Please submit the following form and a member of our sales team will be in "
+"touch shortly about your plan."
+msgstr ""
+
 #: corehq/apps/domain/views/accounting.py
 msgid "2. Contact Dimagi"
 msgstr ""
@@ -18036,9 +18045,7 @@ msgid "Your request was sent to Dimagi. We will follow up shortly."
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
-msgid ""
-"Your request was sent to Dimagi. We will try our best to follow up in a "
-"timely manner."
+msgid "Back to my Subscription"
 msgstr ""
 
 #: corehq/apps/domain/views/accounting.py
@@ -18539,7 +18546,7 @@ msgid "past {} days"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
-msgid "Date ranges with more than 90 days are not supported"
+msgid "Date ranges with more than {} days are not supported"
 msgstr ""
 
 #: corehq/apps/enterprise/enterprise.py
@@ -18554,6 +18561,18 @@ msgstr ""
 msgid "Mobile User"
 msgstr ""
 
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid "Domain {name} has too many users. Maximum allowed is: {amount}"
+msgstr ""
+
+#: corehq/apps/enterprise/enterprise.py
+#, python-brace-format
+msgid ""
+"{name} contains too many rows. Maximum allowed is: {amount}. Please narrow "
+"the date range to fetch a smaller amount of data"
+msgstr ""
+
 #: corehq/apps/enterprise/enterprise.py
 msgid "Unnamed"
 msgstr ""
@@ -18617,7 +18636,8 @@ msgid "Excel Date & Multimedia Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically convert dates and multimedia links for Excel"
 msgstr ""
 
@@ -18633,7 +18653,8 @@ msgid "Excel Cell Format"
 msgstr ""
 
 #: corehq/apps/enterprise/forms.py
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Automatically format cells for Excel 2007+"
 msgstr ""
 
@@ -18799,6 +18820,10 @@ msgstr ""
 msgid "Please check form for errors."
 msgstr ""
 
+#: corehq/apps/enterprise/tasks.py
+msgid "Enterprise Dashboard Error: {}"
+msgstr ""
+
 #: corehq/apps/enterprise/tasks.py
 msgid "Enterprise Dashboard: {}"
 msgstr ""
@@ -18859,6 +18884,10 @@ msgid ""
 "permissions in the following project spaces."
 msgstr ""
 
+#: corehq/apps/enterprise/templates/enterprise/partials/date_range_modal.html
+msgid "Customize Mobile Form Submissions Date Range"
+msgstr ""
+
 #: corehq/apps/enterprise/templates/enterprise/partials/enterprise_permissions_table.html
 msgid "No project spaces found."
 msgstr ""
@@ -19723,35 +19752,8 @@ msgstr ""
 msgid "Link to this case"
 msgstr ""
 
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#: corehq/apps/export/views/list.py
-#: corehq/apps/users/templates/users/partials/edit_role_modal.html
-msgid "CommCare Analytics"
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-msgid ""
-"\n"
-"    CommCare Analytics is a Superset based tool that allows data exploration "
-"and data visualization.\n"
-"<!-- Add link to public docs here when the docs are ready -->\n"
-"<!--    For more information on Superset and how to get started, read the--"
-">\n"
-"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/commcare_analytics.html
-#, python-format
-msgid ""
-"\n"
-"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
-"    Navigate to Superset\n"
-"  </a>\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          These options allow you to configure how CommCare exports data "
@@ -19761,7 +19763,8 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "          Each item that is selected in the select list will appear as a "
@@ -19770,15 +19773,18 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "More info"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Default file type"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19789,7 +19795,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    Leaving this checked will ensure dates appear in excel "
@@ -19801,7 +19808,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                    If this setting is not selected, your export will be in "
@@ -19812,11 +19820,13 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Create a Daily Saved Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19828,16 +19838,20 @@ msgid ""
 "                                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Generate a Data Export Tool config file"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Download a Data Export Tool configuration file for this export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                                    <p>Checking this will add a button to "
@@ -19850,7 +19864,8 @@ msgid ""
 "                                   "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19862,19 +19877,23 @@ msgid ""
 "                                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Include duplicates and other unprocessed forms"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Expand Checkbox Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Sharing"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19888,7 +19907,8 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #, python-format
 msgid ""
 "\n"
@@ -19902,31 +19922,38 @@ msgid ""
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Add custom table configuration "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Privacy Settings"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Publish as De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Check only if this export has been fully and safely de-identified."
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Allow me to mark sensitive data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saving"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 #: corehq/apps/reports/templates/reports/async/bootstrap3/default.html
 #: corehq/apps/reports/templates/reports/async/bootstrap5/default.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/data_corrections_modal.html
@@ -19934,15 +19961,18 @@ msgstr ""
 msgid "Try Again"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Saved!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid "Copy this Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "\n"
 "                  Column labels must be unique. '<span data-bind=\"text: "
@@ -19951,12 +19981,83 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap3/customize_export_new.html
+#: corehq/apps/export/templates/export/bootstrap5/customize_export_new.html
 msgid ""
 "There are errors with your configuration. Please fix them before creating "
 "the export."
 msgstr ""
 
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"          You are downloading the following exports:\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid "No submissions available."
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            It seems your project doesn't have any submissions\n"
+"            from its applications. Please submit data before\n"
+"            using the export tool.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/bootstrap3/download_export.html
+#: corehq/apps/export/templates/export/bootstrap5/download_export.html
+msgid ""
+"\n"
+"            To get started, please\n"
+"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
+"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
+"               target=\"_blank\">deploy</a>\n"
+"            your application and submit data from a phone. You may also\n"
+"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
+"Web+Apps\"\n"
+"               target=\"_blank\">submit data via Web Apps\n"
+"            </a>\n"
+"            , depending on your project's\n"
+"            <a href=\"https://www.commcarehq.org/pricing/\" "
+"target=\"_blank\">plan level</a>.\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#: corehq/apps/export/views/list.py
+#: corehq/apps/users/templates/users/partials/edit_role_modal.html
+msgid "CommCare Analytics"
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+msgid ""
+"\n"
+"    CommCare Analytics is a Superset based tool that allows data exploration "
+"and data visualization.\n"
+"<!-- Add link to public docs here when the docs are ready -->\n"
+"<!--    For more information on Superset and how to get started, read the--"
+">\n"
+"<!--    <a href=\"\" target=\"_blank\">documentation</a>.-->\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/commcare_analytics.html
+#, python-format
+msgid ""
+"\n"
+"  <a href=\"%(analytics_redirect_url)s\" target=\"_blank\">\n"
+"    Navigate to Superset\n"
+"  </a>\n"
+"  "
+msgstr ""
+
 #: corehq/apps/export/templates/export/datasource_export_view.html
 #: corehq/apps/export/views/download.py
 msgid "Export Data Source Data"
@@ -19965,19 +20066,20 @@ msgstr ""
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"    Generate a query file for the Data Export Tool from any of the project's "
-"data sources.\n"
+"      Generate a query file for the Data Export Tool from any of the "
+"project's data sources.\n"
 "    "
 msgstr ""
 
 #: corehq/apps/export/templates/export/datasource_export_view.html
 msgid ""
 "\n"
-"      The project has no data sources configured.\n"
+"        The project has no data sources configured.\n"
 "      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19985,11 +20087,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Delete <!-- ko text: bulkExportDownloadCount() --><!-- /ko --"
@@ -19997,11 +20101,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid "Delete 1 Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20010,7 +20116,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20018,7 +20125,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete these "
@@ -20027,7 +20135,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/bulk_delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/bulk_delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to permanently delete this <strong>1 "
@@ -20035,45 +20144,54 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Feed for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "              Delete Export for \"<!-- ko text: name --><!-- /ko -->\"?\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this feed?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/delete_custom_export_dialog.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/delete_custom_export_dialog.html
 msgid ""
 "\n"
 "                Are you sure you want to delete this export?\n"
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted questions, we need to "
@@ -20083,7 +20201,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid ""
 "\n"
 "              In order to show you your deleted properties, we need to "
@@ -20093,20 +20212,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Unable to process applications. Please report an issue if this persists"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deleted_questions.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deleted_questions.html
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/dialogs/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap3/process_deprecated_properties.html
+#: corehq/apps/export/templates/export/dialogs/bootstrap5/process_deprecated_properties.html
 msgid ""
 "\n"
 "            In order to show you your deprecated properties, we need to "
@@ -20148,98 +20272,57 @@ msgstr ""
 msgid "3 days"
 msgstr ""
 
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"          You are downloading the following exports:\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid "No submissions available."
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            It seems your project doesn't have any submissions\n"
-"            from its applications. Please submit data before\n"
-"            using the export tool.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/download_export.html
-msgid ""
-"\n"
-"            To get started, please\n"
-"            <a href=\"https://dimagi.atlassian.net/wiki/spaces/"
-"commcarepublic/pages/2143947269/Publish+Your+Application\"\n"
-"               target=\"_blank\">deploy</a>\n"
-"            your application and submit data from a phone. You may also\n"
-"            <a href=\"https://help.commcarehq.org/display/commcarepublic/"
-"Web+Apps\"\n"
-"               target=\"_blank\">submit data via Web Apps\n"
-"            </a>\n"
-"            , depending on your project's\n"
-"            <a href=\"https://www.commcarehq.org/pricing/\" "
-"target=\"_blank\">plan level</a>.\n"
-"          "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/customize_export_header.html
-#, python-format
-msgid ""
-"\n"
-"          Case history exports are no longer available.\n"
-"          They will be removed when you save this export.\n"
-"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
-"project\n"
-"        "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Exports"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/delete_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/delete_bulk_notice.html
 msgid "Delete Selected Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_bulk_notice.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_bulk_notice.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
 msgid "Bulk Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Filters inactive while download in progress. "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Export"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Prepare Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_prepare.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_prepare.html
 msgid "Preparing Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
 msgid ""
 "\n"
 "                If the problem persists, please\n"
@@ -20248,33 +20331,40 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Collecting Multimedia"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid ""
 "For exports that may take a while to prepare, email a link when download is "
 "ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Email me when ready"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Something went wrong!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_download_progress.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
 msgid "Update Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20283,7 +20373,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20295,7 +20386,8 @@ msgid ""
 "    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_controller.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_controller.html
 #, python-format
 msgid ""
 "\n"
@@ -20303,17 +20395,19 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Loading Form"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "If this problem persists, please <a href=\"#modalReportIssue\" data-"
 "toggle=\"modal\">Report an Issue</a>."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              This application does not appear to be using\n"
@@ -20324,29 +20418,35 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Mislabeled"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "Suggestions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "These form submissions are tagged as if they belong to an application that "
 "doesn't exist."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "These submissions could belong to one of the following forms:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "App was deleted."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20354,7 +20454,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              Please note that this may take several minutes.\n"
@@ -20362,7 +20463,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
 msgid ""
 "\n"
 "              If this problem persists, please <a "
@@ -20373,7 +20474,8 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20384,11 +20486,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 msgid "How to Create and Deploy a CommCare Application."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/export_list_create_export_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20396,100 +20500,68 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Filter Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Location-Limited Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "This export is limited to the following locations:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "There was an unknown error saving the filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 msgid "Save filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/feed_filter_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/feed_filter_modal.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 msgid "Saving..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid ""
-"\n"
-"    Problem loading exports. Please refresh the page, or report an issue if "
-"the problem persists.\n"
-"  "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Loading exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feeds..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting feed..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting exports..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-msgid "Deleting export..."
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No De-Identified %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/loading_exports.html
-#, python-format
-msgid ""
-"\n"
-"      No %(export_type_caps_plural)s to display\n"
-"    "
-msgstr ""
-
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/locations/views.py
 msgid "deleted"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Sheet Name"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Custom Path"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select geo property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "              You can drag and drop fields to reorder them.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To drag multiple fields, select by clicking while holding\n"
@@ -20497,7 +20569,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To select a range of fields hold the Shift key and select\n"
@@ -20505,7 +20578,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                To unselect a field hold the CTRL key on a PC, or the\n"
@@ -20513,7 +20587,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the headers\n"
@@ -20521,7 +20596,8 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid ""
 "\n"
 "                You can also rename fields, which will update the column\n"
@@ -20529,84 +20605,103 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Include?"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Select None"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Bottom"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Send to Top"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Advanced Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Questions"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deleted Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Deprecated Properties"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question labels"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Use question ids"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Split multi-select data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/sensitive_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/sensitive_columns.html
 msgid "Sensitivity"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Add custom export property"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Required for OData"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Show Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/new_customize_export_templates.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/new_customize_export_templates.html
 msgid "Hide Options"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 msgid ""
 "\n"
 "            Maximum number of OData feeds reached.\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/odata_feed_limit_reached_modal.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/odata_feed_limit_reached_modal.html
 #, python-format
 msgid ""
 "\n"
@@ -20616,80 +20711,96 @@ msgid ""
 "        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/users/templates/users/accept_invite.html
 msgid "or"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Filters and Files"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable/Disable"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap3/explorer_columns.html
 #: corehq/apps/reports/templates/reports/filters/bootstrap5/explorer_columns.html
 msgid "Edit Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "            Copy &amp; Edit Feed\n"
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Share"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Shared By"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter name here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "De-Identified"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Form:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enter description here"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "              This export is filtered to data you don't have access to.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy OData Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for Repeat Group data."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Show additional feeds for linking Parent and Child Cases."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Additional Feeds"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for <strong>Repeat Group</"
@@ -20697,7 +20808,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        Click to copy feeds for linking <strong>Parent</"
@@ -20706,7 +20818,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20716,39 +20829,48 @@ msgid ""
 "          "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Size:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Updated:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Just now"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Downloaded:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Last Build Duration:"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Update Data"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Updating Data, please wait..."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Copy Dashboard Feed Link"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20760,7 +20882,7 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 #, python-format
 msgid ""
 "\n"
@@ -20771,15 +20893,17 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update complete"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Data update failed!"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                If this problem persists, please <a "
@@ -20787,14 +20911,16 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                  No data is available yet.\n"
 "                "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                Please click 'update data' if the automatic scheduler hasn't "
@@ -20802,11 +20928,13 @@ msgid ""
 "              "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                      To renew daily updates, click the Update Data button "
@@ -20815,7 +20943,8 @@ msgid ""
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                          Once the data is updated, a data refresh should\n"
@@ -20823,7 +20952,8 @@ msgid ""
 "                        "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        To download data now, please click the Export button "
@@ -20831,11 +20961,13 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Confirm data updates."
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will enable the daily automatic updates of this "
@@ -20843,7 +20975,8 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid ""
 "\n"
 "                        This will disable the daily automatic updates of "
@@ -20851,30 +20984,35 @@ msgid ""
 "                      "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Disable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Enable auto update"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit Filters"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "DET Config"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                      Copy &amp; Edit Feed\n"
 "                    "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/manage/location_template.html
 #: corehq/apps/reports/standard/monitoring.py
@@ -20888,33 +21026,165 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Columns"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "View Feed"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
 msgid ""
 "\n"
 "                    Copy &amp; Edit Feed\n"
 "                  "
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/templates/export/partials/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap3/table.html
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
 msgid "Edit & Export"
 msgstr ""
 
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_bulk_notice.html
+msgid ""
+"All of the selected exports will be collected for download to a single Excel "
+"file, with each export as a separate sheet."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_download_progress.html
+msgid ""
+"\n"
+"                If the problem persists, please\n"
+"                <a href=\"#modalReportIssue\" data-bs-toggle=\"modal\"> "
+"Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"If this problem persists, please <a href=\"#modalReportIssue\" data-bs-"
+"toggle=\"modal\">Report an Issue</a>."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/export_list_create_export_modal.html
+msgid ""
+"\n"
+"              If this problem persists, please <a "
+"href=\"#modalReportIssue\"\n"
+"                                                  data-bs-"
+"toggle=\"modal\">Report an Issue</a> and include this error\n"
+"              message in the description.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"            Copy &amp; Edit\n"
+"          "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+#, python-format
+msgid ""
+"\n"
+"                Your export exceeds the limit of %(max_rows)s rows. Please "
+"see <a href=\"https://dimagi.atlassian.net/wiki/spaces/commcarepublic/"
+"pages/2337669143/Setting+up+a+Data+Pipeline+via+CommCare\" data-bs-"
+"toggle=\"modal\">documentation</a> for more information.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                If this problem persists, please <a "
+"href=\"#modalReportIssue\" data-bs-toggle=\"modal\">Report an Issue</a>.\n"
+"              "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                      Copy &amp; Edit\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/bootstrap5/table.html
+msgid ""
+"\n"
+"                    Copy &amp; Edit\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/customize_export_header.html
+#, python-format
+msgid ""
+"\n"
+"          Case history exports are no longer available.\n"
+"          They will be removed when you save this export.\n"
+"          Please contact %(SUPPORT_EMAIL)s if this change is affecting your "
+"project\n"
+"        "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid ""
+"\n"
+"    Problem loading exports. Please refresh the page, or report an issue if "
+"the problem persists.\n"
+"  "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Loading exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feeds..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting feed..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting exports..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+msgid "Deleting export..."
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No De-Identified %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
+#: corehq/apps/export/templates/export/partials/loading_exports.html
+#, python-format
+msgid ""
+"\n"
+"      No %(export_type_caps_plural)s to display\n"
+"    "
+msgstr ""
+
 #: corehq/apps/export/templates/export/paywall.html
 msgid "Share Daily Data with Excel and Other Systems"
 msgstr ""
@@ -21078,8 +21348,7 @@ msgid "Export Form Data"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
 msgid "Export"
 msgstr ""
 
@@ -21122,10 +21391,6 @@ msgstr ""
 msgid "Export Case Data"
 msgstr ""
 
-#: corehq/apps/export/views/list.py
-msgid "Export De-Identified Cases"
-msgstr ""
-
 #: corehq/apps/export/views/list.py
 msgid "Populating tables for <strong>{}</strong>. ({}%)"
 msgstr ""
@@ -21171,6 +21436,10 @@ msgstr ""
 msgid "Export De-Identified Form Data"
 msgstr ""
 
+#: corehq/apps/export/views/list.py
+msgid "Export De-Identified Case Data"
+msgstr ""
+
 #: corehq/apps/export/views/list.py
 msgid "Export De-Identified Daily Saved Exports"
 msgstr ""
@@ -21192,7 +21461,7 @@ msgid "Feed Type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
-msgid "Select field type"
+msgid "Select feed type"
 msgstr ""
 
 #: corehq/apps/export/views/list.py
@@ -21289,6 +21558,11 @@ msgstr ""
 msgid "Create Case Data Export"
 msgstr ""
 
+#: corehq/apps/export/views/new.py
+#, python-brace-format
+msgid "Case type '{case_type}' does not exist for this project."
+msgstr ""
+
 #: corehq/apps/export/views/new.py
 msgid "Create Dashboard Feed"
 msgstr ""
@@ -21457,16 +21731,12 @@ msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "all"
 msgstr ""
 
 #: corehq/apps/fixtures/templates/fixtures/manage_tables.html
 #: corehq/apps/locations/templates/locations/location_types.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
 #: corehq/motech/repeaters/views/repeat_records.py
 msgid "none"
 msgstr ""
@@ -22044,6 +22314,16 @@ msgid ""
 "configured for use of the Mapbox Matrix API."
 msgstr ""
 
+#: corehq/apps/geospatial/forms.py
+msgid "Flag assigned cases"
+msgstr ""
+
+#: corehq/apps/geospatial/forms.py
+msgid ""
+"When enabled, cases that are assigned through disbursement from the Case "
+"Management page will include a case property '{}' with value as True."
+msgstr ""
+
 #: corehq/apps/geospatial/forms.py
 msgid "Case Grouping Parameters"
 msgstr ""
@@ -22143,6 +22423,10 @@ msgstr ""
 msgid "link"
 msgstr ""
 
+#: corehq/apps/geospatial/reports.py
+msgid "name"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
 #: corehq/apps/geospatial/reports.py
 msgid "Case Grouping"
 msgstr ""
@@ -22210,6 +22494,111 @@ msgstr ""
 msgid "Show All Groups"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Worker Filters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                <strong>There was an issue retrieving mobile workers from "
+"the server.</strong>\n"
+"                If this problem continues, please\n"
+"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
+"an issue</a>.\n"
+"            "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Show mobile workers on the map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"                            Only users at this location will be shown on the "
+"map.\n"
+"                        "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Hide Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
+#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
+msgid "Show Filter Options"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Running disbursement algorithm..."
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"    We couldn't match every case to a user with the current disbursement "
+"settings.\n"
+"    Please follow any of the below steps to rectify this.\n"
+"    <ul>\n"
+"      <li>Ensure that your settings are correct</li>\n"
+"      <li>Allocate more users to the area</li>\n"
+"      <li>Use filtered areas to reduce the number of cases such that the "
+"algorithm can ensure all cases are assigned.</li>\n"
+"    </ul>\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid ""
+"\n"
+"        Previous disbursement was cleared.\n"
+"    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Disbursement parameters"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Layers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Review Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Accept Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Mobile Workers"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Mobile Workers on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Selected Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "Cases on Map"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/case_management.html
+msgid "All Cases on Map"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/delete_saved_area_modal.html
 msgid "Are you sure you want to delete this saved area?"
 msgstr ""
@@ -22218,6 +22607,70 @@ msgstr ""
 msgid "You are about to delete this saved area"
 msgstr ""
 
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Review Assignment Results"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid ""
+"\n"
+"                        All potential cases for each mobile worker will be "
+"pre-selected and de-selecting a case will\n"
+"                        remove it from final assignments once the \"Assign\" "
+"button is clicked.\n"
+"                    "
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assignment Status"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
+#: corehq/apps/reports_core/filters.py
+#: corehq/apps/userreports/reports/filters/choice_providers.py
+#: corehq/apps/userreports/tests/test_choice_provider.py
+#: corehq/apps/users/forms.py
+msgid "Show All"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassigned Only"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Select mobile worker for case assignment"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Potential Mobile Worker"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Mobile Worker Primary Location"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Include related cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Assign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+msgid "Unassign Cases"
+msgstr ""
+
+#: corehq/apps/geospatial/templates/geospatial/partials/review_assignment_modal.html
+#: corehq/apps/registration/forms.py
+msgid "Finish"
+msgstr ""
+
 #: corehq/apps/geospatial/templates/geospatial/partials/saved_polygon_filter.html
 msgid "Filter by Saved Area"
 msgstr ""
@@ -22386,114 +22839,75 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Worker Filters"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                <strong>There was an issue retrieving mobile workers from "
-"the server.</strong>\n"
-"                If this problem continues, please\n"
-"                <a href=\"#modalReportIssue\" data-toggle=\"modal\">report "
-"an issue</a>.\n"
-"            "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Show mobile workers on the map"
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"                            Only users at this location will be shown on the "
-"map.\n"
-"                        "
-msgstr ""
-
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Hide Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json in {\"geo_json\": <geo_json>} format"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap3/filter_panel.html
-#: corehq/apps/reports/templates/reports/standard/partials/bootstrap5/filter_panel.html
-msgid "Show Filter Options"
+#: corehq/apps/geospatial/views.py
+msgid "Empty geo_json POST field"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Running disbursement algorithm..."
+#: corehq/apps/geospatial/views.py
+msgid "Invalid GeoJSON, geo_json must be a FeatureCollection of Polygons"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"    We couldn't match every case to a user with the current disbursement "
-"settings.\n"
-"    Please follow any of the below steps to rectify this.\n"
-"    <ul>\n"
-"      <li>Ensure that your settings are correct</li>\n"
-"      <li>Allocate more users to the area</li>\n"
-"      <li>Use filtered areas to reduce the number of cases such that the "
-"algorithm can ensure all cases are assigned.</li>\n"
-"    </ul>\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "Please specify a name for the GeoPolygon area."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid ""
-"\n"
-"        Previous disbursement was cleared.\n"
-"    "
+#: corehq/apps/geospatial/views.py
+msgid "GeoPolygon with given name already exists! Please use a different name."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Disbursement parameters"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Saved area '{polygon_name}' has been successfully deleted."
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Layers"
+#: corehq/apps/geospatial/views.py
+msgid "Configuration Settings"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Mobile Workers"
+#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
+msgid "Manage GPS Data"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "POST Body must be a valid json"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Mobile Workers on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Cases were reassigned successfully"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Selected Cases"
+#: corehq/apps/geospatial/views.py
+#, python-brace-format
+msgid "Maximum number of cases that can be reassigned is {limit}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Case ids in request are invalid: {}"
 msgstr ""
 
-#: corehq/apps/geospatial/templates/map_visualization.html
-msgid "All Cases on Map"
+#: corehq/apps/geospatial/views.py
+msgid "Following Owner ids in request are invalid: {}"
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-#, python-brace-format
-msgid "Saved area '{polygon_name}' has been successfully deleted."
+msgid ""
+"Case reassignment limit exceeded. Please select fewer cases to update or "
+"consider deselecting 'include related cases'. Reach out to support if you "
+"still need assistance."
 msgstr ""
 
 #: corehq/apps/geospatial/views.py
-msgid "Configuration Settings"
+msgid "Case reassignment is currently in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/geospatial/views.py corehq/tabs/tabclasses.py
-msgid "Manage GPS Data"
+#: corehq/apps/geospatial/views.py
+msgid ""
+"Case reassignment request has been accepted and will be completed in some "
+"time"
 msgstr ""
 
 #: corehq/apps/groups/templates/groups/all_groups.html
@@ -23318,6 +23732,10 @@ msgstr ""
 msgid "DHIS2 Integration"
 msgstr ""
 
+#: corehq/apps/hqcase/utils.py
+msgid "Data Forwarding Response"
+msgstr ""
+
 #: corehq/apps/hqmedia/cache.py
 #, python-format
 msgid "Not a bulk-upload supported CommCareMedia type: %s"
@@ -23337,10 +23755,6 @@ msgstr ""
 msgid "Error encountered processing Zip File. File doesn't look valid."
 msgstr ""
 
-#: corehq/apps/hqmedia/controller.py
-msgid "zip"
-msgstr ""
-
 #: corehq/apps/hqmedia/controller.py
 msgid "image"
 msgstr ""
@@ -23465,135 +23879,149 @@ msgstr ""
 msgid "Transifex"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload.html
 msgid ""
-"Use this tool to upload ZIP files of your multimedia, so you don't have to\n"
-"    upload each file one-by-one."
+"\n"
+"    <p>\n"
+"      Use this tool to upload ZIP files of your multimedia.\n"
+"      The bulk uploader will compare the file paths in your form with the "
+"file paths\n"
+"      in your zip to find a matching file.\n"
+"    </p>\n"
+"    <p>\n"
+"      For example, <code>jr://file/commcare/images/hin/image.jpg</code> and "
+"your zip's\n"
+"      <code>commcare/images/hin/image.jpg</code> file would match, but it "
+"would <strong>not</strong> match\n"
+"      <code>commcare/images/image.jpg</code>.\n"
+"    </p>\n"
+"  "
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#, python-format
 msgid ""
-"The bulk uploader will compare the file paths in your form with the file "
-"paths\n"
-"    in your zip to find a matching file."
+"\n"
+"        One match found.\n"
+"      "
+msgid_plural ""
+"\n"
+"        %(matched_count)s matches found.\n"
+"      "
+msgstr[0] ""
+msgstr[1] ""
+
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches Found"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"For example, <code>jr://file/commcare/images/hin/image.jpg</code> and your "
-"zip's\n"
-"    <code>commcare/images/hin/image.jpg</code> file would match, but it "
-"would <strong>not</strong> match\n"
-"    <code>commcare/images/image.jpg</code>."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "No Matches"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid ""
-"\n"
-"          Your browser does not support this uploader.\n"
-"          We recommend <a href=\"https://www.google.com/intl/en/chrome/"
-"browser/\">Google Chrome</a>.\n"
-"        "
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Images"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/reports/standard/users/reports.py
+msgid "Updated"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Bulk Upload File Queue"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "View Full Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Filename"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
-msgid "Size"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Playing audio directly on this page is currently not supported."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Upload Progress"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
+msgid "Listen to Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Match Status"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Matched Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Queued Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+msgid "Watching video directly on this page is not supported. Opens a new tab."
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Select files above to add to the queue."
+#: corehq/apps/hqmedia/templates/hqmedia/partials/bulk_upload_status.html
+#: corehq/apps/hqmedia/templates/hqmedia/references.html
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
+msgid "Watch Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Processing Upload"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
+msgid "Include only paths where the multimedia file is missing?"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
-msgid "Uploaded Files"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Multimedia Sharing Options"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "License"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Non-Commercial (CC BY-NC)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Upload File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, No Derivatives (CC BY-ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Icon Image"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution (CC BY)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Menu Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and Share Alike (CC BY-NC-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid ""
-"Creative Commons Attribution, Non-Commercial, and No Derivatives (CC BY-NC-"
-"ND)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select Logo"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Creative Commons Attribution, Share Alike (CC BY-SA)"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Select File"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Icon"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Enter the name of the author"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Audio"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/hqm_upload_form.html
-msgid "Attribution Notes"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Video"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/partials/manage_paths.html
-msgid "Include only paths where the multimedia file is missing?"
+#: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
+msgid "Current Logo"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select New"
+msgid "Current File"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_uploader.html
-msgid "Select File"
+msgid "Begin Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/partials/multimedia_zip_notice.html
@@ -23625,6 +24053,10 @@ msgstr ""
 msgid "Menu or Form"
 msgstr ""
 
+#: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
+msgid "Size"
+msgstr ""
+
 #: corehq/apps/hqmedia/templates/hqmedia/partials/reference_table.html
 msgid "Path in Application"
 msgstr ""
@@ -23668,18 +24100,6 @@ msgstr ""
 msgid "Open file in new tab"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_audio_single.html
-msgid "Listen to Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/references.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/preview_video_single.html
-msgid "Watch Video"
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
 #, python-format
 msgid ""
@@ -23713,39 +24133,6 @@ msgstr ""
 msgid "Check for missing media"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "No Matches"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Images"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "View Full Image"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-#: corehq/apps/reports/standard/users/reports.py
-msgid "Updated"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Audio"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Playing audio directly on this page is currently not supported."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Matched Videos"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/details_multi.html
-msgid "Watching video directly on this page is not supported. Opens a new tab."
-msgstr ""
-
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/errors.html
 msgid "Errors found"
 msgstr ""
@@ -23770,59 +24157,20 @@ msgstr ""
 msgid "New Video Uploaded Successfully"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Added to queue. Click <strong>Begin Upload</strong> above to start."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Queued for processing. Please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Files"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Processing upload, please wait."
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Upload Finished"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "There were errors"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-msgid "Remove from queue"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_multi.html
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Cancel Upload"
+msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
-msgid "Ready to upload. Click <strong>Begin Upload</strong> below to start."
+msgid "There were errors"
 msgstr ""
 
 #: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
 msgid "Select another file"
 msgstr ""
 
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "1 Match Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-#, python-format
-msgid "<%%- num %%> Matches Found"
-msgstr ""
-
-#: corehq/apps/hqmedia/templates/hqmedia/uploader/status_multi.html
-msgid "No Matches Found"
+#: corehq/apps/hqmedia/templates/hqmedia/uploader/queue_single.html
+msgid "Cancel Upload"
 msgstr ""
 
 #: corehq/apps/hqmedia/view_helpers.py
@@ -23873,6 +24221,36 @@ msgstr ""
 msgid "Bulk Upload Multimedia"
 msgstr ""
 
+#: corehq/apps/hqmedia/views.py corehq/apps/users/views/mobile/users.py
+msgid "CommCare Help Site"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "multimedia files"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Bulk Upload Multimedia Status"
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Importing your multimedia. This may take some time..."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py corehq/apps/locations/views.py
+#: corehq/apps/products/views.py corehq/apps/users/views/__init__.py
+#: corehq/apps/users/views/mobile/users.py
+msgid "Problem importing data! Please try again or report an issue."
+msgstr ""
+
+#: corehq/apps/hqmedia/views.py
+msgid "Return to multimedia reference checker"
+msgstr ""
+
 #: corehq/apps/hqmedia/views.py
 msgid "Manage Multimedia Paths"
 msgstr ""
@@ -24458,6 +24836,10 @@ msgstr ""
 msgid "Errors"
 msgstr ""
 
+#: corehq/apps/hqwebapp/templates/hqwebapp/htmx/error_modal.html
+msgid "Server Error Encountered"
+msgstr ""
+
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap3/domain_list_dropdown.html
 #: corehq/apps/hqwebapp/templates/hqwebapp/includes/bootstrap5/domain_list_dropdown.html
 msgid "Change Project"
@@ -25032,7 +25414,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"      %(plural_noun)s using Excel\n"
+"      %(plural_noun)s\n"
 "    "
 msgstr ""
 
@@ -25050,7 +25432,7 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"          Download your current %(adjective)s Excel file.\n"
+"          Download your current %(adjective)s file.\n"
 "        "
 msgstr ""
 
@@ -25073,8 +25455,8 @@ msgstr ""
 #, python-format
 msgid ""
 "\n"
-"              Check the <a href=\"%(address)s\">%(name)s</a> for "
-"instructions.\n"
+"              Check the <a target=\"_blank\" href=\"%(address)s\">%(name)s</"
+"a> for instructions.\n"
 "            "
 msgstr ""
 
@@ -25479,6 +25861,7 @@ msgid "You have no items."
 msgstr ""
 
 #: corehq/apps/hqwebapp/views.py
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/main.html
 #: corehq/messaging/scheduling/templates/scheduling/dashboard.html
 msgid "Loading..."
 msgstr ""
@@ -25569,10 +25952,6 @@ msgstr ""
 msgid "A subtitle for the Dialer Page header"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-msgid "Telephony Services"
-msgstr ""
-
 #: corehq/apps/integration/forms.py
 msgid "Enable GAEN OTP server integration"
 msgstr ""
@@ -25602,11 +25981,7 @@ msgid "Server Auth Token"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "OTP Callouts"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Enable Signed Callout in Web Apps"
+msgid "Enable in Web Apps"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25624,7 +25999,7 @@ msgid "API Key"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Key for CommCare in the external System"
+msgid "API Key for CommCare in the external system"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25632,11 +26007,7 @@ msgid "API Secret"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
-msgid "API Secret for message Signing"
-msgstr ""
-
-#: corehq/apps/integration/forms.py
-msgid "Signed Callout Config"
+msgid "API secret for message signing"
 msgstr ""
 
 #: corehq/apps/integration/forms.py
@@ -25653,11 +26024,6 @@ msgstr ""
 msgid "Module ID"
 msgstr ""
 
-#: corehq/apps/integration/forms.py
-#: corehq/apps/integration/templates/integration/biometric.html
-msgid "Simprints Integration"
-msgstr ""
-
 #: corehq/apps/integration/templates/integration/web_app_dialer.html
 msgid "Dialer"
 msgstr ""
@@ -26711,14 +27077,6 @@ msgstr ""
 msgid "Sync the hierarchicial location fixture (legacy format)."
 msgstr ""
 
-#: corehq/apps/locations/forms.py corehq/apps/reports/filters/select.py
-#: corehq/apps/reports_core/filters.py
-#: corehq/apps/userreports/reports/filters/choice_providers.py
-#: corehq/apps/userreports/tests/test_choice_provider.py
-#: corehq/apps/users/forms.py
-msgid "Show All"
-msgstr ""
-
 #: corehq/apps/locations/forms.py corehq/apps/users/forms.py
 msgid "Only Active"
 msgstr ""
@@ -27338,11 +27696,6 @@ msgstr ""
 msgid "Organization Structure Import Status"
 msgstr ""
 
-#: corehq/apps/locations/views.py corehq/apps/products/views.py
-#: corehq/apps/users/views/__init__.py corehq/apps/users/views/mobile/users.py
-msgid "Problem importing data! Please try again or report an issue."
-msgstr ""
-
 #: corehq/apps/locations/views.py
 msgid "Upload Organization Structure From Excel"
 msgstr ""
@@ -27871,10 +28224,6 @@ msgstr ""
 msgid "Name Your First Project"
 msgstr ""
 
-#: corehq/apps/registration/forms.py
-msgid "Finish"
-msgstr ""
-
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 #, python-format
 msgid "%s is an invalid phone number."
@@ -27970,6 +28319,10 @@ msgid ""
 "invitation."
 msgstr ""
 
+#: corehq/apps/registration/forms.py
+msgid "A user with this email address is deactivated. "
+msgstr ""
+
 #: corehq/apps/registration/forms.py corehq/apps/users/forms.py
 msgid "You do not have permission to edit Tableau Configuraion."
 msgstr ""
@@ -29568,10 +29921,6 @@ msgstr ""
 msgid "CommTrack"
 msgstr ""
 
-#: corehq/apps/reports/commtrack/maps.py
-msgid "Stock Status (map)"
-msgstr ""
-
 #: corehq/apps/reports/commtrack/standard.py
 msgid "Stock Status by Product"
 msgstr ""
@@ -30200,6 +30549,17 @@ msgstr ""
 msgid "Target Site"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Get Tableau reports using role name"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, CommCareHQ will request embedded reports from Tableau Server "
+"using the user's role name instead of the user's username (e.g. \"HQ/Field "
+"Implementer\" instead of \"HQ/Leandra@dimagi.com\")"
+msgstr ""
+
 #: corehq/apps/reports/forms.py
 msgid "Allowed Tableau Groups"
 msgstr ""
@@ -30208,10 +30568,24 @@ msgstr ""
 msgid "View URL"
 msgstr ""
 
+#: corehq/apps/reports/forms.py
+msgid "Visible to location-restricted users"
+msgstr ""
+
+#: corehq/apps/reports/forms.py
+msgid ""
+"If checked, the visualization will be visible to users with roles that do "
+"not have \"Full Organization Access\""
+msgstr ""
+
 #: corehq/apps/reports/generic.py
 msgid "This report has been deprecated."
 msgstr ""
 
+#: corehq/apps/reports/generic.py
+msgid "Row count is too large"
+msgstr ""
+
 #: corehq/apps/reports/models.py
 msgid "Active Mobile Workers"
 msgstr ""
@@ -32167,21 +32541,6 @@ msgstr ""
 msgid "Default Date Range"
 msgstr ""
 
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Add to Bulk Export"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "de-identified"
-msgstr ""
-
-#: corehq/apps/reports/templates/reports/partials/bootstrap3/saved_exports.html
-#: corehq/apps/reports/templates/reports/partials/bootstrap5/saved_exports.html
-msgid "Not Available"
-msgstr ""
-
 #: corehq/apps/reports/templates/reports/partials/bootstrap3/scheduled_reports_table.html
 #: corehq/apps/reports/templates/reports/partials/bootstrap5/scheduled_reports_table.html
 msgid "Bulk Actions"
@@ -32766,6 +33125,10 @@ msgstr ""
 msgid "Could not update Tableau Server Settings"
 msgstr ""
 
+#: corehq/apps/reports/views.py
+msgid "Visible to Location-Restricted Users"
+msgstr ""
+
 #: corehq/apps/reports/views.py
 msgid "Tableau Visualization"
 msgstr ""
@@ -35269,6 +35632,7 @@ msgid "This certificate has already expired!"
 msgstr ""
 
 #: corehq/apps/sso/forms.py
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
 msgid "Please specify a value."
 msgstr ""
 
@@ -36148,6 +36512,42 @@ msgstr ""
 msgid "Examples of Readonly Fields"
 msgstr ""
 
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is exactly"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "is not"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "contains"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#, fuzzy
+#| msgid "Empty"
+msgid "is empty"
+msgstr "Manejo de Casos"
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
+msgid "Column"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
+msgid "Color"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_alpine_form_demo.py
+msgid "Hint: select 'is empty' to watch the Value field below disappear"
+msgstr ""
+
+#: corehq/apps/styleguide/examples/bootstrap5/htmx_hq_hx_action.py
+msgid "New Item"
+msgstr ""
+
 #: corehq/apps/styleguide/examples/bootstrap5/multiselect_form.py
 msgid "Team"
 msgstr ""
@@ -36289,10 +36689,6 @@ msgstr ""
 msgid "Create Menu"
 msgstr ""
 
-#: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
-msgid "Color"
-msgstr ""
-
 #: corehq/apps/styleguide/examples/bootstrap5/select_toggle_form.py
 msgid "What is your favorite primary color"
 msgstr ""
@@ -36386,6 +36782,31 @@ msgstr ""
 msgid "Examples"
 msgstr ""
 
+#: corehq/apps/styleguide/templates/styleguide/htmx_alpine_crispy/partial_form.html
+msgid ""
+"\n"
+"        Added filter!\n"
+"      "
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/item.html
+msgid "Edit Value"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "To-Do"
+msgstr ""
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+#, fuzzy
+#| msgid "Add Filter"
+msgid "Add Item"
+msgstr "Relatorio Semanal aos Coordinadores do Distrito e os NEDs"
+
+#: corehq/apps/styleguide/templates/styleguide/htmx_todo/main.html
+msgid "Trigger Error"
+msgstr ""
+
 #: corehq/apps/styleguide/views/bootstrap5_data.py
 msgid "This username is already taken. Please try another one."
 msgstr ""
@@ -36594,7 +37015,7 @@ msgid "Error in {sheet}: {msg}"
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
-msgid "Form has no translation node present to be used as a template."
+msgid "Form has no translation element present to be used as a template."
 msgstr ""
 
 #: corehq/apps/translations/app_translations/upload_form.py
@@ -36855,20 +37276,20 @@ msgid "Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/app_translations.html
-#: corehq/apps/translations/templates/download_translations.html
-#: corehq/apps/translations/templates/migrate_project.html
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/app_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
+#: corehq/apps/translations/templates/translations/migrate_project.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 msgid "Transifex integration not set for this domain"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/convert_translations.html
+#: corehq/apps/translations/templates/translations/convert_translations.html
 msgid "Convert Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/pull_resource.html
+#: corehq/apps/translations/templates/translations/pull_resource.html
 #: corehq/tabs/tabclasses.py
 msgid "Pull Resource"
 msgstr ""
@@ -36949,7 +37370,7 @@ msgid "Delete Translations"
 msgstr ""
 
 #: corehq/apps/translations/integrations/transifex/views.py
-#: corehq/apps/translations/templates/download_translations.html
+#: corehq/apps/translations/templates/translations/download_translations.html
 #: corehq/tabs/tabclasses.py
 msgid "Download Translations"
 msgstr ""
@@ -36982,33 +37403,33 @@ msgid ""
 "Submitted request to migrate project. You should receive an email shortly."
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Set Up or Update Resource"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Create a new resource or update an existing one in Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Push Target Language"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Push translations for a target language to Transifex.\n"
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Pull App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for a selected language, which will be "
@@ -37016,11 +37437,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Backup App Translations"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "              Pull all translations for all languages in the project, which "
@@ -37028,34 +37449,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid "Delete Project Resources"
 msgstr ""
 
-#: corehq/apps/translations/templates/app_translations.html
+#: corehq/apps/translations/templates/translations/app_translations.html
 msgid ""
 "\n"
 "                Delete all resources for the selected project. Use caution!\n"
 "              "
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "App"
 msgstr "Casos IRA Tratados"
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Module"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Detail/List/UI"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Field Name"
 msgstr ""
 
-#: corehq/apps/translations/templates/blacklist_translations.html
+#: corehq/apps/translations/templates/translations/blacklist_translations.html
 msgid "Default Display Text"
 msgstr ""
 
@@ -37371,10 +37792,6 @@ msgstr ""
 msgid "{0} filter type must include a \"filters\" list"
 msgstr ""
 
-#: corehq/apps/userreports/filters/factory.py
-msgid "Couldn't find named filter with name: {}"
-msgstr ""
-
 #: corehq/apps/userreports/filters/factory.py
 msgid "Problem creating filter from spec: {}, message is {}"
 msgstr ""
@@ -37634,6 +38051,21 @@ msgstr ""
 msgid "Download Report"
 msgstr ""
 
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Recursive expression reference: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named filter not found: {name}"
+msgstr ""
+
+#: corehq/apps/userreports/specs.py
+#, python-brace-format
+msgid "Named expression not found: {name}"
+msgstr ""
+
 #: corehq/apps/userreports/sql/adapter.py
 msgid ""
 "The column \"{}\" does not exist in the report source! Please double check "
@@ -38356,6 +38788,30 @@ msgstr ""
 msgid "Update Expression"
 msgstr ""
 
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Delete expression <strong data-bind=\"text: name\"></"
+"strong>?\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid ""
+"\n"
+"                    Yes, delete the <strong data-bind=\"text: name\"></"
+"strong> expression.\n"
+"                  "
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Deleting Expression..."
+msgstr ""
+
+#: corehq/apps/userreports/templates/userreports/ucr_expressions.html
+msgid "Delete Expression"
+msgstr ""
+
 #: corehq/apps/userreports/templates/userreports/userreports_base.html
 #: corehq/tabs/tabclasses.py
 msgid "Tools"
@@ -38674,6 +39130,12 @@ msgstr ""
 msgid "Data source \"{}\" saved!"
 msgstr ""
 
+#: corehq/apps/userreports/views.py
+msgid ""
+"This data source will be built/rebuilt automatically the next time a row is "
+"added."
+msgstr ""
+
 #: corehq/apps/userreports/views.py
 msgid ""
 "Data source \"{}\" has no associated table.\n"
@@ -39876,11 +40338,11 @@ msgid "Bulk Clear Data"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Delete Users"
+msgid "Bulk Delete Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
-msgid "Bulk Lookup of Users"
+msgid "Bulk Lookup of Mobile Workers"
 msgstr ""
 
 #: corehq/apps/users/templates/users/mobile_workers.html
@@ -41041,10 +41503,6 @@ msgid ""
 "                "
 msgstr ""
 
-#: corehq/apps/users/views/mobile/users.py
-msgid "CommCare Help Site"
-msgstr ""
-
 #: corehq/apps/users/views/mobile/users.py
 msgid "Bulk Upload Mobile Workers"
 msgstr ""
@@ -41475,6 +41933,16 @@ msgid ""
 "columns in case exports."
 msgstr ""
 
+#: corehq/feature_previews.py
+msgid "Use location name"
+msgstr ""
+
+#: corehq/feature_previews.py
+msgid ""
+"This setting changes the location dropdown to display location name instead "
+"of the full location path."
+msgstr ""
+
 #: corehq/feature_previews.py
 msgid "Call Center"
 msgstr ""
@@ -42132,7 +42600,11 @@ msgid "The Case's Child Cases"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
-msgid "User Specified via Case Property"
+msgid "Username Specified via Case Property"
+msgstr ""
+
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Specified via Case Property"
 msgstr ""
 
 #: corehq/messaging/scheduling/forms.py
@@ -42163,6 +42635,10 @@ msgstr ""
 msgid "Username Case Property"
 msgstr ""
 
+#: corehq/messaging/scheduling/forms.py
+msgid "User ID Case Property"
+msgstr ""
+
 #: corehq/messaging/scheduling/forms.py
 msgid "Email Case Property"
 msgstr ""
@@ -42822,7 +43298,8 @@ msgstr ""
 msgid "Include '+' in Phone Number"
 msgstr ""
 
-#: corehq/messaging/smsbackends/http/forms.py corehq/motech/repeaters/forms.py
+#: corehq/messaging/smsbackends/http/forms.py
+#: corehq/motech/repeaters/expression/forms.py corehq/motech/repeaters/forms.py
 msgid "HTTP Request Method"
 msgstr ""
 
@@ -43564,10 +44041,6 @@ msgid ""
 "com/dimagi/commcare-hq/blob/master/corehq/motech/dhis2/README.md#datasets\" "
 msgstr ""
 
-#: corehq/motech/dhis2/forms.py corehq/motech/dhis2/views.py
-msgid "Column"
-msgstr ""
-
 #: corehq/motech/dhis2/forms.py
 msgid "Data element ID"
 msgstr ""
@@ -43835,6 +44308,22 @@ msgstr ""
 msgid "Pass credentials in Basic Auth header when requesting a token"
 msgstr ""
 
+#: corehq/motech/forms.py
+msgid "Include client ID"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Send the client ID in the body of the token request"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Scope"
+msgstr ""
+
+#: corehq/motech/forms.py
+msgid "Space-separated list of scopes e.g. \"read write\""
+msgstr ""
+
 #: corehq/motech/forms.py
 msgid "Do not use in a production environment"
 msgstr ""
@@ -44277,6 +44766,11 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+#: corehq/motech/repeaters/const.py
+#: corehq/motech/repeaters/views/repeat_record_display.py
+msgid "Invalid Payload"
+msgstr ""
+
 #: corehq/motech/repeaters/const.py
 msgid "Is enabled"
 msgstr ""
@@ -44293,21 +44787,82 @@ msgstr ""
 msgid "Can be disabled"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action filter expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid "Response case action expression"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"This expression is used to generate the request payload. It is required for "
+"POST, and PUT requests."
+msgstr ""
+
 #: corehq/motech/repeaters/expression/forms.py
 msgid ""
 "Items to add to the end of the URL. Please see the documentation for more "
 "information."
 msgstr ""
 
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to determine if the response should create or update a case. If "
+"left blank, no action will be taken. For more info see <a target=\"_blank\" "
+"href=\"https://dimagi.atlassian.net/wiki/spaces/GS/pages/2146602964/"
+"Configurable+Repeaters\">these docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+msgid ""
+"Use this to create a Case API payload which will be used to create or update "
+"a case. For more info see <a target=\"_blank\" href=\"https://dimagi."
+"atlassian.net/wiki/spaces/GS/pages/2146602964/Configurable+Repeaters\">these "
+"docs</a>"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required for {request_method} requests."
+msgstr ""
+
+#: corehq/motech/repeaters/expression/forms.py
+#, python-brace-format
+msgid "This field is required when '{other}' is provided"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/repeaters.py
 msgid "Configurable Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "Configurable ArcGIS Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/repeaters.py
+msgid "[No error message given by ArcGIS]"
+msgstr ""
+
 #: corehq/motech/repeaters/expression/views.py
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Edit Case Repeater"
 msgstr ""
 
+#: corehq/motech/repeaters/expression/views.py
+#: corehq/motech/repeaters/views/repeaters.py
+msgid "Edit Form Repeater"
+msgstr ""
+
+#: corehq/motech/repeaters/expression/views.py
+msgid "Edit ArcGIS Form Repeater"
+msgstr ""
+
 #: corehq/motech/repeaters/forms.py
 msgid "Start Forwarding"
 msgstr ""
@@ -44473,11 +45028,6 @@ msgstr ""
 msgid "Payload"
 msgstr ""
 
-#: corehq/motech/repeaters/templates/repeaters/bootstrap3/repeat_record_report.html
-#: corehq/motech/repeaters/templates/repeaters/bootstrap5/repeat_record_report.html
-msgid "Payload Error"
-msgstr ""
-
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap3/attempt_history.html
 #: corehq/motech/repeaters/templates/repeaters/partials/bootstrap5/attempt_history.html
 msgid "No attempts exist for this record."
@@ -44564,6 +45114,10 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+#: corehq/motech/repeaters/templates/repeaters/repeaters.html
+msgid "Invalid"
+msgstr ""
+
 #: corehq/motech/repeaters/templates/repeaters/repeaters.html
 msgid "You haven't configured any services to forward to yet."
 msgstr ""
@@ -44596,6 +45150,12 @@ msgstr ""
 msgid "Cancel or Requeue"
 msgstr ""
 
+#: corehq/motech/repeaters/views/repeat_records.py
+msgid ""
+"Please filter to a specific repeater or payload before attempting a bulk "
+"action."
+msgstr ""
+
 #: corehq/motech/repeaters/views/repeaters.py
 msgid "Forward Data"
 msgstr ""
@@ -44612,10 +45172,6 @@ msgstr ""
 msgid "Forwarder Successfully Updated"
 msgstr ""
 
-#: corehq/motech/repeaters/views/repeaters.py
-msgid "Edit Form Repeater"
-msgstr ""
-
 #: corehq/motech/requests.py
 msgid "Project space: {}"
 msgstr ""
@@ -44696,6 +45252,14 @@ msgstr ""
 msgid "Response body"
 msgstr ""
 
+#: corehq/motech/templates/motech/log_detail.html
+msgid "Request duration (ms)"
+msgstr ""
+
+#: corehq/motech/templates/motech/logs.html
+msgid "Duration (ms)"
+msgstr ""
+
 #: corehq/motech/templates/motech/logs.html
 msgid "No API requests have been logged."
 msgstr ""
@@ -44728,6 +45292,10 @@ msgstr ""
 msgid "Used By"
 msgstr ""
 
+#: corehq/motech/views.py
+msgid "Please enter client secret again."
+msgstr ""
+
 #: corehq/motech/views.py
 msgid "Please enter API password again."
 msgstr ""
diff --git a/locale/sw/LC_MESSAGES/djangojs.po b/locale/sw/LC_MESSAGES/djangojs.po
index e268735642f5..d4c8052b9ad2 100644
--- a/locale/sw/LC_MESSAGES/djangojs.po
+++ b/locale/sw/LC_MESSAGES/djangojs.po
@@ -336,7 +336,8 @@ msgid ""
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/details/parent_select.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "None"
 msgstr ""
 
@@ -497,6 +498,10 @@ msgstr ""
 msgid "Conditional ID Mapping"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/details/utils.js
+msgid "Translatable Text"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/details/utils.js
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Image"
@@ -857,10 +862,6 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/settings/password_setter.jquery.js
-msgid "Reset"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/source_files.js
 msgid "Please enter a version to compare"
 msgstr ""
@@ -1170,6 +1171,7 @@ msgid "no formatting"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid "Custom"
 msgstr ""
 
@@ -1589,7 +1591,8 @@ msgid "Add Expression"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/main.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/main.js
 msgid "Save"
@@ -2203,6 +2206,22 @@ msgstr ""
 msgid "Help Itext ID"
 msgstr ""
 
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add New Itext ID"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Item Button Text"
+msgstr ""
+
+#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
+msgid "Add Another Itext ID"
+msgstr ""
+
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Add Other Content"
 msgstr ""
@@ -2390,6 +2409,7 @@ msgstr ""
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 #: corehq/apps/data_interfaces/static/data_interfaces/js/find_by_id.js
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case ID"
 msgstr ""
 
@@ -2458,7 +2478,8 @@ msgid "Inlined attachments must have an attachment name"
 msgstr ""
 
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Create"
 msgstr ""
 
@@ -2494,50 +2515,6 @@ msgstr ""
 msgid "Current"
 msgstr ""
 
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Multimedia Sharing Options"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "License"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Non-Commercial, and No Derivatives"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Creative Commons Attribution, Share Alike"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Author"
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Enter the name of the author."
-msgstr ""
-
-#: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
-msgid "Attribution Notes"
-msgstr ""
-
 #: corehq/apps/app_manager/static/app_manager/js/vellum/src/main-components.js
 msgid "Begin Upload"
 msgstr ""
@@ -2697,6 +2674,10 @@ msgstr ""
 msgid "Not a valid choice"
 msgstr ""
 
+#: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
+msgid "No file selected."
+msgstr ""
+
 #: corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
 msgid "Invalid file type chosen. Please select a valid multimedia file."
 msgstr ""
@@ -3175,6 +3156,29 @@ msgid ""
 "the project space as a member in order to override your timezone."
 msgstr ""
 
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Last 30 Days"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid "Previous Month"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "Spans <%- startDate %> to <%- endDate %> (UTC)"
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid ""
+"Error updating display total, please try again or report an issue if this "
+"persists."
+msgstr ""
+
+#: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
+msgid "??"
+msgstr ""
+
 #: corehq/apps/enterprise/static/enterprise/js/enterprise_dashboard.js
 msgid ""
 "Error sending email, please try again or report an issue if this persists."
@@ -3220,140 +3224,161 @@ msgstr ""
 msgid "Search Attendance Takers"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submission available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "<%- count %> form submissions available."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "User Registration"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid ""
-"There was an issue fetching data. Please check your internet connection."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/create_export.js
-msgid "There is an issue communicating with the server at this time."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file URL copied to clipboard."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_data_files.js
-msgid "Data file deleted."
-msgstr ""
-
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Sorry, there was a problem reaching the server. Please try again."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "Server maintenance in progress. Please try again later."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap3/download_export.js
+#: corehq/apps/export/static/export/js/bootstrap5/download_export.js
 msgid "There was an error downloading your export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Download Requested"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected feeds will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid "All of the selected exports will be deleted."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
 msgid ""
 "All of the selected exports will be collected for download to a single Excel "
 "file, with each export as a separate sheet."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Invalid date format"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap3/export_list.js
+#: corehq/apps/export/static/export/js/bootstrap5/export_list.js
 msgid "Problem saving dashboard feed filters"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Process"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Processing..."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Refresh page"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Web Page (Excel Dashboards)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "CSV (Zip file)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel (older versions)"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Excel 2007+"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "GeoJSON"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Private"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Export Only"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Edit and Export"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid ""
 "<strong>Private</strong>: Only you can edit and export.<br/> <strong>Export "
 "Only</strong>: You can edit and export, other users can only export.<br/> "
 "<strong>Edit and Export</strong>: All users can edit and export."
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "The table path should end with []"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive ID"
 msgstr ""
 
-#: corehq/apps/export/static/export/js/models.js
+#: corehq/apps/export/static/export/js/bootstrap3/models.js
+#: corehq/apps/export/static/export/js/bootstrap5/models.js
 msgid "Sensitive Date"
 msgstr ""
 
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submission available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "<%- count %> form submissions available."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "User Registration"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid ""
+"There was an issue fetching data. Please check your internet connection."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/create_export.js
+msgid "There is an issue communicating with the server at this time."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Copy to clipboard: Ctrl-C, Enter (Mac: Cmd-C, Enter)"
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file URL copied to clipboard."
+msgstr ""
+
+#: corehq/apps/export/static/export/js/download_data_files.js
+msgid "Data file deleted."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
 msgid "No group"
 msgstr ""
@@ -3371,6 +3396,7 @@ msgid "Group Center Coordinates"
 msgstr ""
 
 #: corehq/apps/geospatial/static/geospatial/js/case_grouping_map.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid "Case Name"
 msgstr ""
 
@@ -3396,57 +3422,58 @@ msgid ""
 "will not be exported."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid "Token successfully verified!"
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
-msgid ""
-"Invalid API token. Please verify that the token matches the one on your "
-"Mapbox account and has the correct scope configured."
-msgstr ""
-
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Min cases per user"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max distance to case"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "minutes"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "Max travel time"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
 "Oops! Something went wrong! Please check that your geospatial settings are "
 "configured correctly or contact admin if the problem persists."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid ""
-"Please ensure that the filtered area includes both casesand mobile workers "
+"Please ensure that the filtered area includes both cases and mobile workers "
 "before attempting to run disbursement."
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
 msgid "All locations"
 msgstr ""
 
-#: corehq/apps/geospatial/static/geospatial/js/geospatial_map.js
+#: corehq/apps/geospatial/static/geospatial/js/case_management.js
+#: corehq/apps/geospatial/static/geospatial/js/models.js
 msgid ""
 "Oops! Something went wrong! Please report an issue if the problem persists."
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid "Token successfully verified!"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/geo_config.js
+msgid ""
+"Invalid API token. Please verify that the token matches the one on your "
+"Mapbox account and has the correct scope configured."
+msgstr ""
+
 #: corehq/apps/geospatial/static/geospatial/js/gps_capture.js
 msgid "current user"
 msgstr ""
@@ -3473,6 +3500,22 @@ msgstr ""
 msgid "Please enter the name for the area!"
 msgstr ""
 
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "No user selected (unassign mode)"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User ID"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned Username"
+msgstr ""
+
+#: corehq/apps/geospatial/static/geospatial/js/models.js
+msgid "Assigned User Primary Location"
+msgstr ""
+
 #: corehq/apps/groups/static/groups/js/group_members.js
 msgid "Edit Group Information"
 msgstr ""
@@ -3603,6 +3646,14 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Gateway Timeout Error. Max retries exceeded."
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/htmx_base.js
+msgid "Request timed out. Max retries exceeded."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
 msgid "Items"
 msgstr ""
@@ -3632,6 +3683,10 @@ msgid ""
 "There was an issue communicating with the server. Please try back later."
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
+msgid " to "
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Clear selection"
 msgstr ""
@@ -3708,10 +3763,6 @@ msgstr ""
 msgid "Previous Decade"
 msgstr ""
 
-#: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
-msgid "Previous Month"
-msgstr ""
-
 #: corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
 msgid "Previous Year"
 msgstr ""
@@ -3791,6 +3842,21 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "This key is already defined"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Add Key, Translation Mapping"
+msgstr ""
+
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
+#: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
+msgid "Key contains invalid characters."
+msgstr ""
+
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap3/ui-element-key-val-mapping.js
 #: corehq/apps/hqwebapp/static/hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-mapping.js
 msgid "Key is duplicated"
@@ -3929,11 +3995,17 @@ msgid "Choose a primary location"
 msgstr ""
 
 #: corehq/apps/prototype/static/prototype/js/example/knockout_pagination.js
+#: corehq/apps/prototype/static/prototype/js/webpack/knockout_pagination.js
 msgid ""
 "Could not load data. Please try again later or report an issue if this "
 "problem persists."
 msgstr ""
 
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap3_amd.js
+#: corehq/apps/prototype/static/prototype/js/webpack/bootstrap5_amd.js
+msgid "yes"
+msgstr ""
+
 #: corehq/apps/registration/static/registration/js/bootstrap3/password.js
 #: corehq/apps/registration/static/registration/js/bootstrap5/password.js
 #: corehq/apps/registration/static/registration/js/new_user.ko.js
@@ -4272,16 +4344,6 @@ msgstr ""
 msgid "We were unsuccessful loading the report:"
 msgstr ""
 
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "My Scheduled Reports"
-msgstr ""
-
-#: corehq/apps/reports/static/reports/js/bootstrap3/scheduled_reports_list.js
-#: corehq/apps/reports/static/reports/js/bootstrap5/scheduled_reports_list.js
-msgid "Other Scheduled Reports"
-msgstr ""
-
 #: corehq/apps/reports/static/reports/js/bootstrap3/single_form.js
 #: corehq/apps/reports/static/reports/js/bootstrap5/single_form.js
 msgid "Labels"
@@ -4350,6 +4412,14 @@ msgstr ""
 msgid "That do not have phone numbers"
 msgstr ""
 
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "My Scheduled Reports"
+msgstr ""
+
+#: corehq/apps/reports/static/reports/js/scheduled_reports_list.js
+msgid "Other Scheduled Reports"
+msgstr ""
+
 #: corehq/apps/reports/static/reports/js/tableau.js
 msgid ""
 "An error occured with the tableau server request, please ensure the server "
diff --git a/manage.py b/manage.py
index d48102c913bf..dd7e7e67bdd4 100755
--- a/manage.py
+++ b/manage.py
@@ -127,6 +127,7 @@ def _set_source_root(source_root):
 
 def run_patches():
     patch_jsonfield()
+    unpatch_sys_modules()
 
 
 def patch_jsonfield():
@@ -149,6 +150,14 @@ def to_python(self, value):
     JSONField.to_python = to_python
 
 
+def unpatch_sys_modules():
+    # until https://github.com/DataDog/dd-trace-py/issues/9143 is implemented
+    if os.environ.get("DD_TRACE_ENABLED") == "false":
+        from ddtrace import ModuleWatchdog
+        if isinstance(sys.modules, ModuleWatchdog):
+            sys.modules.uninstall()
+
+
 def set_default_settings_path(argv):
     if is_testing(argv):
         os.environ.setdefault('CCHQ_TESTING', '1')
diff --git a/migrations.lock b/migrations.lock
index 4d944033b36c..ae06f2036baf 100644
--- a/migrations.lock
+++ b/migrations.lock
@@ -596,6 +596,7 @@ geospatial
  0005_auto_20240202_0807
  0006_geoconfig_max_cases_per_user_and_more
  0007_geoconfig_max_case_distance_and_more
+ 0008_geoconfig_flag_assigned_cases
 hqadmin
  0001_initial
  0002_vcmmigrationaudit
@@ -709,6 +710,8 @@ motech
  0012_alter_connectionsettings_auth_type
  0013_alter_connectionsettings_auth_type
  0014_alter_connectionsettings_password
+ 0015_requestlog_duration
+ 0016_connectionsettings_include_client_id_and_more
 notifications
  0001_squashed_0003_auto_20160504_2049 (3 squashed migrations)
  0002_auto_20160505_2058
@@ -801,12 +804,14 @@ products
 project_limits
  0001_initial
  0002_ratelimitedtwofactorlog
+ 0003_pillowlaggaugedefinition
 registration
  0001_initial
  0002_alter_request_ip
  0003_populate_sqlregistrationrequest
  0004_rename_sqlregistrationrequest
  0005_asyncsignuprequest
+ 0006_selfsignupworkflow
 registry
  0001_initial
  0002_registry_slug_globally_unique
@@ -830,6 +835,8 @@ repeaters
  0010_rm_couch_artifacts
  0011_remove_obsolete_entities
  0012_formexpressionrepeater_arcgisformexpressionrepeater
+ 0013_alter_repeatrecord_state_and_more
+ 0014_alter_repeater_request_method
 reports
  0001_initial
  0002_auto_20171121_1803
@@ -850,6 +857,7 @@ reports
  0017_alter_tableauuser_tableau_user_id
  0018_alter_tableauuser_role
  0019_tableauvisualization_location_safe
+ 0020_tableauserver_get_reports_using_role
 saved_reports
  0001_initial
  0002_scheduledreportlog
@@ -1249,7 +1257,8 @@ users
  0069_alter_invitation_custom_user_data_and_more
  0070_alter_invitation_tableau_role
  0071_rm_user_data
- 0072_connectiduserlink_is_active
+ 0072_remove_invitation_supply_point
+ 0073_connectiduserlink_is_active
 util
  0001_initial
  0002_complaintbouncemeta_permanentbouncemeta_transientbounceemail
diff --git a/package.json b/package.json
index af25524f87df..bcbbfad2c0fb 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
     "description": "CommCare HQ Javascript Libraries",
     "private": true,
     "dependencies": {
+        "@babel/core": "7.25.2",
         "@babel/standalone": "^7.21.4",
         "@ckeditor/ckeditor5-alignment": "^40.1.0",
         "@ckeditor/ckeditor5-build-classic": "^40.1.0",
@@ -14,13 +15,15 @@
         "@ckeditor/ckeditor5-restricted-editing": "^40.1.0",
         "@eonasdan/tempus-dominus": "npm:@eonasdan/tempus-dominus#6.9.4",
         "@fortawesome/fontawesome-free": "npm:@fortawesome/fontawesome-free#6.5.1",
-        "@mapbox/mapbox-gl-draw": "1.4.1",
-        "@mapbox/mapbox-gl-geocoder": "5.0.1",
+        "@mapbox/mapbox-gl-draw": "1.4.3",
+        "@mapbox/mapbox-gl-geocoder": "5.0.2",
         "@popperjs/core": "npm:@popperjs/core#2.11.6",
         "At.js": "millerdev/At.js#master",
         "Caret.js": "INTELOGIE/Caret.js#0.3.1",
         "DOMPurify": "npm:dompurify#2.3.6",
         "ace-builds": "1.5.0",
+        "alpinejs": "3.14.1",
+        "babel-loader": "9.1.3",
         "babel-plugin-transform-modules-requirejs-babel": "^0.1.0",
         "backbone": "npm:backbone#~1.3.2",
         "backbone.marionette": "4.1.3",
@@ -42,14 +45,14 @@
         "datatables.net-fixedcolumns-bs5": "4.3.0",
         "detectrtc": "1.4.0",
         "eonasdan-bootstrap-datetimepicker": "4.17.49",
+        "exports-loader": "5.0.0",
         "fast-levenshtein": "2.0.6",
+        "htmx.org": "2.0.3",
         "intl-tel-input": "9.0.7",
         "jquery": "3.5.1",
-        "jquery-color": "2.2.0",
         "jquery-form": "4.2.2",
         "jquery-memoized-ajax": "0.5.0",
         "jquery-textchange": "jmalonzo/bower-jquery-textchange#0.2.3",
-        "jquery-timeago": "rmm5t/jquery-timeago#1.2.0",
         "jquery-tiny-pubsub": "cowboy/jquery-tiny-pubsub#~0.7.0",
         "jquery-treetable": "ludo/jquery-treetable#3.2.0",
         "jquery-ui": "1.13.2",
@@ -60,7 +63,7 @@
         "knockout": "3.5.1",
         "knockout-sortable": "1.2.2",
         "knockout-validation": "Knockout-Contrib/Knockout-Validation#2.0.4",
-        "leaflet": "0.7.7",
+        "leaflet": "1.9.4",
         "leaflet-fullscreen": "^1.0.2",
         "less": "3.10.3",
         "mapbox.js": "3.3.1",
@@ -79,11 +82,16 @@
         "requirejs-babel7": "^1.3.2",
         "select2": "4.1.0-rc.0",
         "signature_pad": "^4.1.6",
+        "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.93.0",
+        "webpack-cli": "5.1.4",
+        "webpack-merge": "6.0.1",
+        "webpack-modernizr-loader": "5.0.0",
         "xpath": "dimagi/js-xpath#v0.0.8",
         "zxcvbn": "4.4.2"
     },
@@ -127,6 +135,8 @@
     },
     "scripts": {
         "postinstall": "yarn run -s build:modernizr",
-        "build:modernizr": "modernizr -c modernizr-conf.json -d corehq/apps/hqwebapp/static/hqwebapp/js/lib"
+        "build:modernizr": "modernizr -c modernizr-conf.json -d corehq/apps/hqwebapp/static/hqwebapp/js/lib",
+        "dev": "node webpack/generateDetails.js && webpack --mode development --config webpack/webpack.dev.js --watch",
+        "build": "node webpack/generateDetails.js --prod && webpack --config webpack/webpack.prod.js"
     }
 }
diff --git a/requirements/Makefile b/requirements/Makefile
index 38086faa1352..1267d1b681ef 100644
--- a/requirements/Makefile
+++ b/requirements/Makefile
@@ -2,29 +2,29 @@
 
 requirements: export CUSTOM_COMPILE_COMMAND=`make requirements` or `make upgrade-requirements`
 requirements:
-	pip-compile -o requirements.txt requirements.in --allow-unsafe
-	pip-compile -o prod-requirements.txt prod-requirements.in --allow-unsafe
-	pip-compile -o test-requirements.txt test-requirements.in --allow-unsafe
-	pip-compile -o dev-requirements.txt dev-requirements.in --allow-unsafe
-	pip-compile -o docs-requirements.txt docs-requirements.in --allow-unsafe
+	pip-compile -qo requirements.txt requirements.in --allow-unsafe
+	pip-compile -qo prod-requirements.txt prod-requirements.in --allow-unsafe
+	pip-compile -qo test-requirements.txt test-requirements.in --allow-unsafe
+	pip-compile -qo dev-requirements.txt dev-requirements.in --allow-unsafe
+	pip-compile -qo docs-requirements.txt docs-requirements.in --allow-unsafe
 	python ../scripts/purge-platform-pkgs.py ./*requirements.txt
 
 upgrade-requirements: export CUSTOM_COMPILE_COMMAND=`make requirements` or `make upgrade-requirements`
 upgrade-requirements:
-	pip-compile --upgrade -o requirements.txt requirements.in --allow-unsafe
-	pip-compile --upgrade -o prod-requirements.txt prod-requirements.in --allow-unsafe
-	pip-compile --upgrade -o test-requirements.txt test-requirements.in --allow-unsafe
-	pip-compile --upgrade -o dev-requirements.txt dev-requirements.in --allow-unsafe
-	pip-compile --upgrade -o docs-requirements.txt docs-requirements.in --allow-unsafe
+	pip-compile --upgrade -qo requirements.txt requirements.in --allow-unsafe
+	pip-compile --upgrade -qo prod-requirements.txt prod-requirements.in --allow-unsafe
+	pip-compile --upgrade -qo test-requirements.txt test-requirements.in --allow-unsafe
+	pip-compile --upgrade -qo dev-requirements.txt dev-requirements.in --allow-unsafe
+	pip-compile --upgrade -qo docs-requirements.txt docs-requirements.in --allow-unsafe
 	python ../scripts/purge-platform-pkgs.py ./*requirements.txt
 
 # To upgrade a specific package to latest version use this command
 # make upgrade-package package={package_name}
 upgrade-package: export CUSTOM_COMPILE_COMMAND=`make requirements` or `make upgrade-requirements`
 upgrade-package:
-	pip-compile --upgrade-package $(package) -o requirements.txt requirements.in --allow-unsafe
-	pip-compile --upgrade-package $(package) -o prod-requirements.txt prod-requirements.in --allow-unsafe
-	pip-compile --upgrade-package $(package) -o test-requirements.txt test-requirements.in --allow-unsafe
-	pip-compile --upgrade-package $(package) -o dev-requirements.txt dev-requirements.in --allow-unsafe
-	pip-compile --upgrade-package $(package) -o docs-requirements.txt docs-requirements.in --allow-unsafe
+	pip-compile --upgrade-package $(package) -qo requirements.txt requirements.in --allow-unsafe
+	pip-compile --upgrade-package $(package) -qo prod-requirements.txt prod-requirements.in --allow-unsafe
+	pip-compile --upgrade-package $(package) -qo test-requirements.txt test-requirements.in --allow-unsafe
+	pip-compile --upgrade-package $(package) -qo dev-requirements.txt dev-requirements.in --allow-unsafe
+	pip-compile --upgrade-package $(package) -qo docs-requirements.txt docs-requirements.in --allow-unsafe
 	python ../scripts/purge-platform-pkgs.py ./*requirements.txt
diff --git a/requirements/base-requirements.in b/requirements/base-requirements.in
index d336498e39aa..e4a3608724fd 100644
--- a/requirements/base-requirements.in
+++ b/requirements/base-requirements.in
@@ -40,7 +40,7 @@ django-transfer
 django-two-factor-auth @ git+https://github.com/jazzband/django-two-factor-auth.git@16f688bf329526d897a33594ab598bcd3fc8eaae  # waiting for next release after 1.16.0
 django-user-agents
 django-websocket-redis @ https://raw.githubusercontent.com/dimagi/django-websocket-redis/0.6.0.1/releases/django_websocket_redis-0.6.0.1-py3-none-any.whl
-django>=4.2.14,<5.0
+django>=4.2.16,<5.0
 djangorestframework
 dropbox
 elasticsearch5>=5.0.0,<6.0.0
diff --git a/requirements/dev-requirements.in b/requirements/dev-requirements.in
index a328c0a53bd3..42f0f2029394 100644
--- a/requirements/dev-requirements.in
+++ b/requirements/dev-requirements.in
@@ -8,7 +8,6 @@ git-build-branch
 gnureadline
 ipython  # for nicer django shell experience
 psutil>5.1.3  # for memory profiling
-sniffer
 wheel
 
 # linting/formatting
diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt
index 55d6209d2ca1..c6b14e101dda 100644
--- a/requirements/dev-requirements.txt
+++ b/requirements/dev-requirements.txt
@@ -4,6 +4,16 @@
 #
 #    `make requirements` or `make upgrade-requirements`
 #
+aiohappyeyeballs==2.3.4
+    # via aiohttp
+aiohttp==3.10.2
+    # via
+    #   aiohttp-retry
+    #   twilio
+aiohttp-retry==2.8.3
+    # via twilio
+aiosignal==1.3.1
+    # via aiohttp
 alabaster==0.7.12
     # via sphinx
 alembic==1.7.7
@@ -19,10 +29,13 @@ asttokens==2.0.5
     #   stack-data
     #   transifex-python
 async-timeout==4.0.2
-    # via redis
+    # via
+    #   aiohttp
+    #   redis
 attrs==23.1.0
     # via
     #   -r base-requirements.in
+    #   aiohttp
     #   cattrs
     #   ddtrace
     #   jsonschema
@@ -87,9 +100,7 @@ click-repl==0.2.0
 cloudant==2.14.0
     # via jsonobject-couchdbkit
 colorama==0.4.3
-    # via
-    #   radon
-    #   sniffer
+    # via radon
 commcaretranslationchecker==0.9.7
     # via -r base-requirements.in
 contextlib2==21.6.0
@@ -138,7 +149,7 @@ diff-match-patch==20230430
     # via -r base-requirements.in
 dimagi-memoized==1.1.3
     # via -r base-requirements.in
-django==4.2.14
+django==4.2.16
     # via
     #   -r base-requirements.in
     #   crispy-bootstrap3to5
@@ -245,7 +256,7 @@ eulxml==1.1.3
     # via -r base-requirements.in
 exceptiongroup==1.1.1
     # via cattrs
-executing==2.0.0
+executing==2.0.1
     # via stack-data
 fakecouch==0.0.15
     # via -r test-requirements.in
@@ -261,6 +272,10 @@ flaky==3.7.0
     # via -r test-requirements.in
 freezegun==1.1.0
     # via -r test-requirements.in
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
 future==0.18.3
     # via
     #   pyjwkest
@@ -341,7 +356,9 @@ httplib2==0.20.4
     #   google-api-python-client
     #   google-auth-httplib2
 idna==3.7
-    # via requests
+    # via
+    #   requests
+    #   yarl
 imagesize==1.4.1
     # via sphinx
 importlib-metadata==6.0.0
@@ -391,7 +408,7 @@ kombu==5.2.4
     # via celery
 looseversion==1.0.3
     # via -r base-requirements.in
-lxml==4.9.1
+lxml==5.3.0
     # via
     #   -r base-requirements.in
     #   eulxml
@@ -426,6 +443,10 @@ msal==1.26.0
     # via -r sso-requirements.in
 msgpack==1.0.5
     # via cachecontrol
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
 myst-parser==2.0.0
     # via -r docs-requirements.in
 nose==1.3.7
@@ -433,7 +454,6 @@ nose==1.3.7
     #   -r test-requirements.in
     #   django-nose
     #   nose-exclude
-    #   sniffer
 nose-exclude==0.5.0
     # via -r test-requirements.in
 oauthlib==3.1.0
@@ -575,8 +595,6 @@ python-magic==0.4.27
     # via -r base-requirements.in
 python-mimeparse==1.6.0
     # via django-tastypie
-python-termstyle==0.1.10
-    # via sniffer
 python3-saml==1.12.0
     # via -r sso-requirements.in
 pytz==2024.1
@@ -584,7 +602,6 @@ pytz==2024.1
     #   -r base-requirements.in
     #   babel
     #   celery
-    #   twilio
 pyyaml==6.0
     # via
     #   -r base-requirements.in
@@ -692,8 +709,6 @@ six==1.16.0
     #   requests-mock
     #   sqlalchemy-postgres-copy
     #   stone
-sniffer==0.4.1
-    # via -r dev-requirements.in
 snowballstemmer==2.0.0
     # via sphinx
 socketpool==0.5.3
@@ -771,7 +786,7 @@ tropo-webapi-python==0.1.3
     # via -r base-requirements.in
 turn-python==0.0.1
     # via -r base-requirements.in
-twilio==7.12.0
+twilio==9.2.3
     # via -r base-requirements.in
 typing-extensions==4.8.0
     # via
@@ -826,12 +841,14 @@ xlrd==2.0.1
     # via -r base-requirements.in
 xlwt==1.3.0
     # via -r base-requirements.in
-xmlsec==1.3.12
+xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
 yapf==0.31.0
     # via -r dev-requirements.in
+yarl==1.9.4
+    # via aiohttp
 zipp==3.19.1
     # via importlib-metadata
 zope-event==5.0
@@ -847,6 +864,5 @@ setuptools==72.1.0
     #   django-websocket-redis
     #   opentelemetry-api
     #   pip-tools
-    #   python-termstyle
     #   zope-event
     #   zope-interface
diff --git a/requirements/docs-requirements.txt b/requirements/docs-requirements.txt
index 8945d8de1498..2492471294a7 100644
--- a/requirements/docs-requirements.txt
+++ b/requirements/docs-requirements.txt
@@ -4,6 +4,16 @@
 #
 #    `make requirements` or `make upgrade-requirements`
 #
+aiohappyeyeballs==2.3.4
+    # via aiohttp
+aiohttp==3.10.2
+    # via
+    #   aiohttp-retry
+    #   twilio
+aiohttp-retry==2.8.3
+    # via twilio
+aiosignal==1.3.1
+    # via aiohttp
 alabaster==0.7.12
     # via sphinx
 alembic==1.7.7
@@ -17,10 +27,13 @@ asgiref==3.7.2
 asttokens==2.4.1
     # via transifex-python
 async-timeout==4.0.2
-    # via redis
+    # via
+    #   aiohttp
+    #   redis
 attrs==23.1.0
     # via
     #   -r base-requirements.in
+    #   aiohttp
     #   cattrs
     #   ddtrace
     #   jsonschema
@@ -118,7 +131,7 @@ diff-match-patch==20230430
     # via -r base-requirements.in
 dimagi-memoized==1.1.3
     # via -r base-requirements.in
-django==4.2.14
+django==4.2.16
     # via
     #   -r base-requirements.in
     #   crispy-bootstrap3to5
@@ -223,6 +236,10 @@ exceptiongroup==1.1.1
     # via cattrs
 firebase-admin==6.1.0
     # via -r base-requirements.in
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
 future==0.18.3
     # via
     #   pyjwkest
@@ -298,7 +315,9 @@ httplib2==0.20.4
     #   google-api-python-client
     #   google-auth-httplib2
 idna==3.7
-    # via requests
+    # via
+    #   requests
+    #   yarl
 imagesize==1.4.1
     # via sphinx
 importlib-metadata==6.0.0
@@ -339,7 +358,7 @@ kombu==5.2.4
     # via celery
 looseversion==1.0.3
     # via -r base-requirements.in
-lxml==4.9.1
+lxml==5.3.0
     # via
     #   -r base-requirements.in
     #   eulxml
@@ -364,6 +383,10 @@ mdurl==0.1.2
     # via markdown-it-py
 msgpack==1.0.5
     # via cachecontrol
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
 myst-parser==2.0.0
     # via -r docs-requirements.in
 oauthlib==3.1.0
@@ -480,7 +503,6 @@ pytz==2024.1
     #   -r base-requirements.in
     #   babel
     #   celery
-    #   twilio
 pyyaml==6.0
     # via
     #   -r base-requirements.in
@@ -632,7 +654,7 @@ tropo-webapi-python==0.1.3
     # via -r base-requirements.in
 turn-python==0.0.1
     # via -r base-requirements.in
-twilio==7.12.0
+twilio==9.2.3
     # via -r base-requirements.in
 typing-extensions==4.8.0
     # via
@@ -683,6 +705,8 @@ xlwt==1.3.0
     # via -r base-requirements.in
 xmltodict==0.13.0
     # via ddtrace
+yarl==1.9.4
+    # via aiohttp
 zipp==3.19.1
     # via importlib-metadata
 zope-event==5.0
diff --git a/requirements/prod-requirements.txt b/requirements/prod-requirements.txt
index df6f289b9ebc..a7af483f5d37 100644
--- a/requirements/prod-requirements.txt
+++ b/requirements/prod-requirements.txt
@@ -4,6 +4,16 @@
 #
 #    `make requirements` or `make upgrade-requirements`
 #
+aiohappyeyeballs==2.3.4
+    # via aiohttp
+aiohttp==3.10.2
+    # via
+    #   aiohttp-retry
+    #   twilio
+aiohttp-retry==2.8.3
+    # via twilio
+aiosignal==1.3.1
+    # via aiohttp
 alembic==1.7.7
     # via -r base-requirements.in
 amqp==5.1.1
@@ -17,10 +27,13 @@ asttokens==2.0.5
     #   stack-data
     #   transifex-python
 async-timeout==4.0.2
-    # via redis
+    # via
+    #   aiohttp
+    #   redis
 attrs==23.1.0
     # via
     #   -r base-requirements.in
+    #   aiohttp
     #   cattrs
     #   ddtrace
     #   jsonschema
@@ -121,7 +134,7 @@ diff-match-patch==20230430
     # via -r base-requirements.in
 dimagi-memoized==1.1.3
     # via -r base-requirements.in
-django==4.2.14
+django==4.2.16
     # via
     #   -r base-requirements.in
     #   crispy-bootstrap3to5
@@ -215,12 +228,16 @@ eulxml==1.1.3
     # via -r base-requirements.in
 exceptiongroup==1.1.1
     # via cattrs
-executing==2.0.0
+executing==2.0.1
     # via stack-data
 firebase-admin==6.1.0
     # via -r base-requirements.in
 flower==2.0.0
     # via -r prod-requirements.in
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
 future==0.18.3
     # via
     #   pyjwkest
@@ -301,6 +318,7 @@ idna==3.7
     # via
     #   -r prod-requirements.in
     #   requests
+    #   yarl
 importlib-metadata==6.0.0
     # via
     #   markdown
@@ -341,7 +359,7 @@ kombu==5.2.4
     # via celery
 looseversion==1.0.3
     # via -r base-requirements.in
-lxml==4.9.1
+lxml==5.3.0
     # via
     #   -r base-requirements.in
     #   eulxml
@@ -364,6 +382,10 @@ msal==1.26.0
     # via -r sso-requirements.in
 msgpack==1.0.5
     # via cachecontrol
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
 oauthlib==3.1.0
     # via
     #   django-oauth-toolkit
@@ -490,7 +512,6 @@ pytz==2024.1
     #   -r base-requirements.in
     #   celery
     #   flower
-    #   twilio
 pyyaml==6.0
     # via -r base-requirements.in
 pyzxcvbn==0.8.0
@@ -624,7 +645,7 @@ tropo-webapi-python==0.1.3
     # via -r base-requirements.in
 turn-python==0.0.1
     # via -r base-requirements.in
-twilio==7.12.0
+twilio==9.2.3
     # via -r base-requirements.in
 typing-extensions==4.8.0
     # via
@@ -674,10 +695,12 @@ xlrd==2.0.1
     # via -r base-requirements.in
 xlwt==1.3.0
     # via -r base-requirements.in
-xmlsec==1.3.12
+xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
+yarl==1.9.4
+    # via aiohttp
 zipp==3.19.1
     # via importlib-metadata
 zope-event==5.0
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 693845723576..aff824de4a3e 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -4,6 +4,16 @@
 #
 #    `make requirements` or `make upgrade-requirements`
 #
+aiohappyeyeballs==2.3.4
+    # via aiohttp
+aiohttp==3.10.2
+    # via
+    #   aiohttp-retry
+    #   twilio
+aiohttp-retry==2.8.3
+    # via twilio
+aiosignal==1.3.1
+    # via aiohttp
 alembic==1.7.7
     # via -r base-requirements.in
 amqp==5.1.1
@@ -15,10 +25,13 @@ asgiref==3.7.2
 asttokens==2.4.1
     # via transifex-python
 async-timeout==4.0.2
-    # via redis
+    # via
+    #   aiohttp
+    #   redis
 attrs==23.1.0
     # via
     #   -r base-requirements.in
+    #   aiohttp
     #   cattrs
     #   ddtrace
     #   jsonschema
@@ -114,7 +127,7 @@ diff-match-patch==20230430
     # via -r base-requirements.in
 dimagi-memoized==1.1.3
     # via -r base-requirements.in
-django==4.2.14
+django==4.2.16
     # via
     #   -r base-requirements.in
     #   crispy-bootstrap3to5
@@ -210,6 +223,10 @@ exceptiongroup==1.1.1
     # via cattrs
 firebase-admin==6.1.0
     # via -r base-requirements.in
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
 future==0.18.3
     # via
     #   pyjwkest
@@ -285,7 +302,9 @@ httplib2==0.20.4
     #   google-api-python-client
     #   google-auth-httplib2
 idna==3.7
-    # via requests
+    # via
+    #   requests
+    #   yarl
 importlib-metadata==6.0.0
     # via
     #   markdown
@@ -322,7 +341,7 @@ kombu==5.2.4
     # via celery
 looseversion==1.0.3
     # via -r base-requirements.in
-lxml==4.9.1
+lxml==5.3.0
     # via
     #   -r base-requirements.in
     #   eulxml
@@ -343,6 +362,10 @@ msal==1.26.0
     # via -r sso-requirements.in
 msgpack==1.0.5
     # via cachecontrol
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
 oauthlib==3.1.0
     # via
     #   django-oauth-toolkit
@@ -452,7 +475,6 @@ pytz==2024.1
     # via
     #   -r base-requirements.in
     #   celery
-    #   twilio
 pyyaml==6.0
     # via -r base-requirements.in
 pyzxcvbn==0.8.0
@@ -576,7 +598,7 @@ tropo-webapi-python==0.1.3
     # via -r base-requirements.in
 turn-python==0.0.1
     # via -r base-requirements.in
-twilio==7.12.0
+twilio==9.2.3
     # via -r base-requirements.in
 typing-extensions==4.8.0
     # via
@@ -624,10 +646,12 @@ xlrd==2.0.1
     # via -r base-requirements.in
 xlwt==1.3.0
     # via -r base-requirements.in
-xmlsec==1.3.12
+xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
+yarl==1.9.4
+    # via aiohttp
 zipp==3.19.1
     # via importlib-metadata
 zope-event==5.0
diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt
index da0dd7682293..6cc74b6f4039 100644
--- a/requirements/test-requirements.txt
+++ b/requirements/test-requirements.txt
@@ -4,6 +4,16 @@
 #
 #    `make requirements` or `make upgrade-requirements`
 #
+aiohappyeyeballs==2.3.4
+    # via aiohttp
+aiohttp==3.10.2
+    # via
+    #   aiohttp-retry
+    #   twilio
+aiohttp-retry==2.8.3
+    # via twilio
+aiosignal==1.3.1
+    # via aiohttp
 alembic==1.7.7
     # via -r base-requirements.in
 amqp==5.1.1
@@ -15,10 +25,13 @@ asgiref==3.7.2
 asttokens==2.4.1
     # via transifex-python
 async-timeout==4.0.2
-    # via redis
+    # via
+    #   aiohttp
+    #   redis
 attrs==23.1.0
     # via
     #   -r base-requirements.in
+    #   aiohttp
     #   cattrs
     #   ddtrace
     #   jsonschema
@@ -121,7 +134,7 @@ diff-match-patch==20230430
     # via -r base-requirements.in
 dimagi-memoized==1.1.3
     # via -r base-requirements.in
-django==4.2.14
+django==4.2.16
     # via
     #   -r base-requirements.in
     #   crispy-bootstrap3to5
@@ -227,6 +240,10 @@ flaky==3.7.0
     # via -r test-requirements.in
 freezegun==1.1.0
     # via -r test-requirements.in
+frozenlist==1.4.1
+    # via
+    #   aiohttp
+    #   aiosignal
 future==0.18.3
     # via
     #   pyjwkest
@@ -302,7 +319,9 @@ httplib2==0.20.4
     #   google-api-python-client
     #   google-auth-httplib2
 idna==3.7
-    # via requests
+    # via
+    #   requests
+    #   yarl
 importlib-metadata==6.0.0
     # via
     #   markdown
@@ -339,7 +358,7 @@ kombu==5.2.4
     # via celery
 looseversion==1.0.3
     # via -r base-requirements.in
-lxml==4.9.1
+lxml==5.3.0
     # via
     #   -r base-requirements.in
     #   eulxml
@@ -362,6 +381,10 @@ msal==1.26.0
     # via -r sso-requirements.in
 msgpack==1.0.5
     # via cachecontrol
+multidict==6.0.5
+    # via
+    #   aiohttp
+    #   yarl
 nose==1.3.7
     # via
     #   -r test-requirements.in
@@ -487,7 +510,6 @@ pytz==2024.1
     # via
     #   -r base-requirements.in
     #   celery
-    #   twilio
 pyyaml==6.0
     # via -r base-requirements.in
 pyzxcvbn==0.8.0
@@ -630,7 +652,7 @@ tropo-webapi-python==0.1.3
     # via -r base-requirements.in
 turn-python==0.0.1
     # via -r base-requirements.in
-twilio==7.12.0
+twilio==9.2.3
     # via -r base-requirements.in
 typing-extensions==4.8.0
     # via
@@ -682,10 +704,12 @@ xlrd==2.0.1
     # via -r base-requirements.in
 xlwt==1.3.0
     # via -r base-requirements.in
-xmlsec==1.3.12
+xmlsec==1.3.14
     # via python3-saml
 xmltodict==0.13.0
     # via ddtrace
+yarl==1.9.4
+    # via aiohttp
 zipp==3.19.1
     # via importlib-metadata
 zope-event==5.0
diff --git a/scent.py b/scent.py
deleted file mode 100644
index cc3f7b376af1..000000000000
--- a/scent.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""Usage:
-sniffer -x --js-app_manager -x corehq.apps.app_manager:AppManagerViewTest
-
-You can get sniffer to run both js and python tests. Set which js tests you want to run with `--js-{app_name}`
-Use the nose syntax for python tests
-When you save a .js file, the js tests run,
-When you save a .py file, the python tests run.
-"""
-import os
-from subprocess import Popen
-from sniffer.api import runnable, select_runnable, file_validator
-
-
-@select_runnable('python_tests')
-@file_validator
-def python_test_files(filename):
-    return (
-        (filename.endswith('.py') or
-         filename.endswith('.json') or
-         filename.endswith('.xml'))
-        and not os.path.basename(filename).startswith('.')
-    )
-
-
-# Here we instruct the 'javascript_tests' runnable to be kicked off
-# when a .js file is changed
-@select_runnable('javascript_tests')
-@file_validator
-def js_files(filename):
-    return filename.endswith('.js') and not os.path.basename(filename).startswith('.')
-
-
-def run_test(fn):
-    process = Popen(fn)
-    try:
-        return process.wait() == 0
-    except KeyboardInterrupt:
-        process.terminate()
-        raise
-
-
-@runnable
-def javascript_tests(*args):
-    fn = ['grunt']
-    args = args[1:]
-    tests_to_run = ["mocha:{}".format(arg.split('--js-')[1]) for arg in args if arg.startswith('--js-')]
-
-    if tests_to_run:
-        fn += tests_to_run
-        return run_test(fn)
-    return True
-
-
-@runnable
-def python_tests(*args):
-    fn = ['python', 'manage.py', 'test', '--noinput', '--settings=testsettings']
-    args = args[1:]
-    tests_to_run = [arg for arg in args if not arg.startswith('--js-')]
-
-    if tests_to_run:
-        fn += tests_to_run
-        return run_test(fn)
-
-    return True
diff --git a/scripts/codechecks/hqDefine.sh b/scripts/codechecks/hqDefine.sh
index 8811f24569a8..3a248f195e8a 100755
--- a/scripts/codechecks/hqDefine.sh
+++ b/scripts/codechecks/hqDefine.sh
@@ -8,6 +8,14 @@ function list-js() {
   find corehq custom -name '*.js' | grep -v '/_design/' | grep -v 'couchapps' | grep -v '/js/vellum/'
 }
 
+function list-no-esm-js() {
+  list-js | xargs grep -L '^import.*;'
+}
+
+function list-esm-js() {
+  list-js | xargs grep -l '^import.*;'
+}
+
 function list-html() {
   find corehq custom -name '*.html' | grep -v 'vellum'
 }
@@ -19,13 +27,13 @@ function list-html-with-inline-scripts() {
 }
 
 function list-js-without-hqDefine() {
-  list-js | xargs grep -L 'hqDefine'
+  list-no-esm-js | xargs grep -L 'hqDefine'
 }
 
 # Partial indicator of RequireJS work left: how many js files don't yet use
 # the variation of hqDefine that specifies dependencies?
 function list-js-without-requirejs() {
-  list-js | xargs grep -L 'hqDefine.*\['
+  list-no-esm-js | xargs grep -L 'hqDefine.*\['
 }
 
 # The other indicator of RequireJS work left: how many HTML files still have script tags?
@@ -43,9 +51,10 @@ function percent() {
 ## Main script
 
 command=${1:-""}
-help="Pass list-script, list-hqdefine, list-requirejs, or list-requirejs-html to list the files that have yet to be migrated"
+help="Pass list-script, list-hqdefine, list-requirejs, or list-requirejs-html to list the files that have yet to be migrated. list-esm to list ESM formatted files"
 
 jsTotalCount=$(echo $(list-js | wc -l))
+noEsmJsTotalCount=$(echo $(list-no-esm-js | wc -l))
 htmlTotalCount=$(echo $(list-html | wc -l))
 
 case $command in
@@ -55,6 +64,11 @@ case $command in
     list-html-with-inline-scripts | sed 's/^/  /'
     ;;
 
+  "list-esm" )
+    echo "These files use ESM syntax:"
+    list-esm-js | sed 's/^/  /'
+    ;;
+
   "list-hqdefine" )
     echo "The following files do not use hqDefine:"
     list-js-without-hqDefine | sed 's/^/  /'
@@ -74,7 +88,7 @@ case $command in
   "static-analysis" )
     withoutHqDefineCount=$(echo $(list-js-without-hqDefine | wc -l))
     withoutRequireJsCount=$(echo $(list-js-without-requirejs | wc -l))
-    echo "$withoutHqDefineCount $(($withoutRequireJsCount - $withoutHqDefineCount)) $(($jsTotalCount - $withoutRequireJsCount))"
+    echo "$withoutHqDefineCount $(($withoutRequireJsCount - $withoutHqDefineCount)) $(($noEsmJsTotalCount - $withoutRequireJsCount))"
     ;;
 
   "")
@@ -86,14 +100,17 @@ case $command in
     echo "$(percent $unmigratedCount $htmlTotalCount) of HTML files are free of inline scripts"
 
     unmigratedCount=$(echo $(list-js-without-hqDefine | wc -l))
-    echo "$(percent $unmigratedCount $jsTotalCount) of JS files use hqDefine"
+    echo "$(percent $unmigratedCount $noEsmJsTotalCount) of non-ESM JS files use hqDefine"
 
     unmigratedCount=$(echo $(list-js-without-requirejs | wc -l))
-    echo "$(percent $unmigratedCount $jsTotalCount) of JS files specify their dependencies"
+    echo "$(percent $unmigratedCount $noEsmJsTotalCount) of non-ESM JS files specify their dependencies"
 
     unmigratedCount=$(echo $(list-html-with-external-scripts | wc -l))
     echo "$(percent $unmigratedCount $htmlTotalCount) of HTML files are free of script tags"
 
+    unmigratedCount=$(echo $(list-no-esm-js | wc -l))
+    echo "$(percent $unmigratedCount $jsTotalCount) of JS files use ESM format"
+
     echo
     echo $help
     ;;
diff --git a/settings.py b/settings.py
index b9b20795e331..988d419508a1 100755
--- a/settings.py
+++ b/settings.py
@@ -146,6 +146,7 @@
 
 MIDDLEWARE = [
     'corehq.middleware.NoCacheMiddleware',
+    'corehq.middleware.SecureCookiesMiddleware',
     'corehq.middleware.SelectiveSessionMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
@@ -171,8 +172,6 @@
     'no_exceptions.middleware.NoExceptionsMiddleware',
     'corehq.apps.locations.middleware.LocationAccessMiddleware',
     'corehq.apps.cloudcare.middleware.CloudcareMiddleware',
-    # middleware that adds cookies must come before SecureCookiesMiddleware
-    'corehq.middleware.SecureCookiesMiddleware',
     'field_audit.middleware.FieldAuditMiddleware',
 ]
 
@@ -399,7 +398,6 @@
     'custom.champ',
     'custom.covid',
     'custom.inddex',
-    'custom.onse',
     'custom.nutrition_project',
     'custom.cowin.COWINAppConfig',
     'custom.hmhb',
@@ -495,6 +493,7 @@
 DAILY_DEPLOY_EMAIL = None
 EMAIL_SUBJECT_PREFIX = '[commcarehq] '
 SAAS_REPORTING_EMAIL = None
+SOLUTIONS_AES_EMAIL = None
 
 # Return-Path is the email used to forward BOUNCE & COMPLAINT notifications
 # This email must be a REAL email address, not a mailing list, otherwise
@@ -583,6 +582,7 @@
 CELERY_REMINDER_CASE_UPDATE_QUEUE = 'reminder_case_update_queue'
 CELERY_REMINDER_CASE_UPDATE_BULK_QUEUE = 'reminder_rule_queue'  # override in localsettings
 CELERY_REPEAT_RECORD_QUEUE = 'repeat_record_queue'
+CELERY_REPEAT_RECORD_DATASOURCE_QUEUE = 'repeat_record_queue'  # override in localsettings
 CELERY_LOCATION_REASSIGNMENT_QUEUE = 'celery'
 
 # Will cause a celery task to raise a SoftTimeLimitExceeded exception if
@@ -833,6 +833,7 @@
     'custom.cowin.repeaters.BeneficiaryRegistrationRepeater',
     'custom.cowin.repeaters.BeneficiaryVaccinationRepeater',
     'corehq.motech.repeaters.expression.repeaters.CaseExpressionRepeater',
+    'corehq.motech.repeaters.expression.repeaters.FormExpressionRepeater',
     'corehq.motech.repeaters.expression.repeaters.ArcGISFormExpressionRepeater',
 ]
 
@@ -851,7 +852,7 @@
 ENABLE_PRELOGIN_SITE = False
 
 # dimagi.com urls
-PRICING_PAGE_URL = "https://www.dimagi.com/commcare/pricing/"
+PRICING_PAGE_URL = "https://www.dimagi.com/commcare-pricing/"
 
 # Sumologic log aggregator
 SUMOLOGIC_URL = None
@@ -931,8 +932,6 @@ def _pkce_required(client_id):
     'mixins': '../../../hqwebapp/less/_hq/includes/mixins',
 }
 
-BOOTSTRAP_MIGRATION_LOGS_DIR = None
-
 USER_AGENTS_CACHE = 'default'
 
 # Invoicing
@@ -1962,7 +1961,7 @@ def _pkce_required(client_id):
     'india-nutrition-project': 'custom.nutrition_project',
 
     'champ-cameroon': 'custom.champ',
-    'onse-iss': 'custom.onse',
+    'onse-iss': 'custom.onse',  # Required by self-hosted ONSE-ISS project
 
     # vectorlink domains
     'abtmali': 'custom.abt',
diff --git a/testapps/test_gunicorn/tests.py b/testapps/test_gunicorn/tests.py
index 60d291b6e420..82064e3aeee2 100644
--- a/testapps/test_gunicorn/tests.py
+++ b/testapps/test_gunicorn/tests.py
@@ -1,5 +1,6 @@
 import os
 
+import pytest
 from unittest import mock
 from deployment.gunicorn.gunicorn_conf import _child_exit, _on_starting
 from testil import eq
@@ -25,18 +26,9 @@ def setup():
     os.environ.pop('prometheus_multiproc_dir', None)
 
 
-def test_on_starting():
-    paths = [
-        None,
-        '',
-        '/not/a/real/path',
-    ]
-
-    def _test(path):
-        _on_starting(Server(), path=path)
-
-    for path in paths:
-        yield _test, path
+@pytest.mark.parametrize("path", [None, '', '/not/a/real/path'])
+def test_on_starting(path):
+    _on_starting(Server(), path=path)
 
 
 def test_on_starting_error():
diff --git a/testapps/test_pillowtop/tests/test_case_search_pillow.py b/testapps/test_pillowtop/tests/test_case_search_pillow.py
index e4af232e07d2..1eeea58fedd9 100644
--- a/testapps/test_pillowtop/tests/test_case_search_pillow.py
+++ b/testapps/test_pillowtop/tests/test_case_search_pillow.py
@@ -3,8 +3,8 @@
 
 from django.test import TestCase
 
+from corehq import privileges
 from corehq.apps.case_search.const import INDEXED_METADATA_BY_KEY
-from corehq.apps.case_search.exceptions import CaseSearchNotEnabledException
 from corehq.apps.case_search.models import CaseSearchConfig
 from corehq.apps.change_feed import topics
 from corehq.apps.change_feed.consumer.feed import (
@@ -23,7 +23,7 @@
     CaseSearchReindexerFactory,
     delete_case_search_cases,
 )
-from corehq.util.test_utils import create_and_save_a_case, flag_enabled
+from corehq.util.test_utils import create_and_save_a_case, privilege_enabled
 
 
 @es_test(requires=[case_search_adapter])
@@ -98,7 +98,7 @@ def test_sql_case_search_pillow(self):
     def _get_kafka_seq(self):
         return get_topic_offset(topics.CASE_SQL)
 
-    @flag_enabled('USH_CASE_CLAIM_UPDATES')
+    @privilege_enabled(privileges.DATA_DICTIONARY)
     def test_geopoint_property(self):
         CaseSearchConfig.objects.get_or_create(pk=self.domain, enabled=True)
         self._make_data_dictionary(gps_properties=['coords', 'short_coords', 'other_coords'])
diff --git a/webpack/appPaths.js b/webpack/appPaths.js
new file mode 100644
index 000000000000..43098a9896dd
--- /dev/null
+++ b/webpack/appPaths.js
@@ -0,0 +1,70 @@
+/* eslint-env node */
+
+const fs = require('fs');
+const path = require('path');
+
+const __BASE = path.resolve(__dirname, '..');
+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 MOTECH_PATH = path.resolve(__BASE, 'corehq', 'motech');
+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'),
+    "motech": MOTECH_PATH,
+    // motech apps:
+    "dhis2": path.resolve(MOTECH_PATH, 'dhis2'),
+    "generic_inbound": path.resolve(MOTECH_PATH, 'generic_inbound'),
+    "openmrs": path.resolve(MOTECH_PATH, 'openmrs'),
+    "repeaters": path.resolve(MOTECH_PATH, 'repeaters'),
+    // custom apps:
+    "champ": path.resolve(CUSTOM_PATH, 'champ'),
+    "inddex": path.resolve(CUSTOM_PATH, 'inddex'),
+    "mc": path.resolve(CUSTOM_PATH, 'reports', 'mc'),
+    "up_nrhm": path.resolve(CUSTOM_PATH, 'up_nrhm'),
+};
+
+// workaround for apps that have different folder names in the static directory (rare)
+const appRenames = {
+    "analytics": "analytix",
+};
+
+const hasTemplateFolder = function (dirEnt) {
+    /**
+     * Returns `true` if `dirEnt` has a `templates` folder.
+     *
+     * @type {boolean}
+     */
+    const templatePath = path.resolve(APPS_PATH, dirEnt.name, TEMPLATES_DIR);
+    try {
+        return fs.readdirSync(templatePath);
+    } catch (e) {
+        // throws an error if the templates directory does not exist
+        return false;
+    }
+};
+
+const getStandardAppPaths = function () {
+    const paths = {};
+    fs.readdirSync(APPS_PATH, {withFileTypes: true})
+        .filter(dirEnt => dirEnt.isDirectory())
+        .filter(hasTemplateFolder)
+        .forEach(dirEnt => {
+            let appName = appRenames[dirEnt.name] || dirEnt.name;
+            paths[appName] = path.resolve(APPS_PATH, dirEnt.name);
+        });
+    return paths;
+};
+
+const getAllAppPaths = function () {
+    return Object.assign(getStandardAppPaths(), nonStandardAppPaths);
+};
+
+module.exports = {
+    getAllAppPaths: getAllAppPaths,
+    TEMPLATES_DIR: TEMPLATES_DIR,
+    BUILD_ARTIFACTS_DIR: BUILD_ARTIFACTS_DIR,
+};
diff --git a/webpack/generateDetails.js b/webpack/generateDetails.js
new file mode 100644
index 000000000000..93804cecbe10
--- /dev/null
+++ b/webpack/generateDetails.js
@@ -0,0 +1,168 @@
+/* eslint-env node */
+/* eslint-disable no-useless-escape */
+// NOTE: double escapes are needed for file path delimiters in webpack regexes for cross-platform support
+
+const fs = require('fs');
+const path = require('path');
+const appPaths = require('./appPaths');
+
+const scanTemplates = function (dir, entryRegex, allAppPaths, details, isProdMode) {
+    /**
+     * This recursively scans all template files within a given directory, looking
+     * for a metch to the `entryRegex` specified above. The first group this entry regex
+     * (`match[1]`) should return the webpack entry name, eg `hqwebapp/js/some_page`.
+     *
+     * As they are discovered, entries are appended to the `details.entries` dictionary.
+     * Additionally, `details.aliases` is updated when an app alias is first found,
+     * eg `hqwebapp/js` (the first two folders in the entry name).
+     * Lastly, the (unique) application name is added to `details.appsWithEntries`
+     *
+     * @param dir - path to directory to begin scanning
+     * @param entryRegex -  regex for identifying an entry in an .html page (see examples below)
+     * @param allAppPaths (dict) - keys are all the applications being scanned
+     *                             and values are paths to each application's folder
+     * @param details (dict) - the dictionary that will be modified by this function, formatted as follows:
+     *                          {
+     *                              entries: {},
+     *                              aliases: {},
+     *                              appsWithEntries: [],
+     *                          }
+     * @param isProdMode (boolean) - `true` if this should be run in production mode, the difference
+     *                          being that entry filenames end in `.[contenthash].js`, which is necessary for
+     *                          cache busting on production.
+     */
+    const files = fs.readdirSync(dir);
+
+    files.forEach((file) => {
+        let fullPath = path.join(dir, file);
+        let stats = fs.statSync(fullPath);
+
+        if (stats.isDirectory()) {
+            // Make sure we recursively scan subdirectories
+            scanTemplates(fullPath, entryRegex, allAppPaths, details, isProdMode);
+        } else if (stats.isFile() && fullPath.endsWith('.html')) {
+            let content = fs.readFileSync(fullPath, 'utf-8');
+            let match;
+
+            // Extract all matches of the {% js_entry "path" %} tag
+            while ((match = entryRegex.exec(content)) !== null) {
+                let entryName = match[1];
+                let folders = entryName.split('/');
+                let appName = folders[0];
+                let fullEntryPath = path.join(allAppPaths[appName], 'static', `${entryName}.js`);
+
+                if (!fs.existsSync(fullEntryPath)) {
+                    console.warn(`JavaScript file not found: ${fullEntryPath}`);
+                    continue;
+                }
+                details.entries[entryName] = {
+                    import: fullEntryPath,
+                    // for cache-busting in production:
+                    filename: isProdMode ? `${entryName}.[contenthash].js` : `${entryName}.js`,
+                };
+
+                let aliasName = folders.slice(0, 2).join('/');
+                if (!(aliasName in details.aliases)) {
+                    details.aliases[aliasName] = path.join(allAppPaths[appName], 'static', aliasName);
+                }
+                if (!details.appsWithEntries.includes(appName)) {
+                    details.appsWithEntries.push(appName);
+                }
+            }
+        }
+    });
+};
+
+const getDetails = function (entryRegex, allAppPaths, isProdMode) {
+    /**
+     * Generates the details for a given `entryRegex`.
+     *
+     * @param entryRegex - regex for identifying an entry in an .html page (see examples below)
+     * @param allAppPaths (dict) - keys are all the applications being scanned for entries (all applications that
+     *                             have `template` folders). The values are paths to each application's root folder.
+     *                             eg. `"hqwebapp": "/path/to/corehq/apps/hqwebapp"`
+     * @param isProdMode (boolean) - `true` if this should be run in production mode, the difference
+     *                          being that entry filenames end in `.[contenthash].js`, which is necessary for
+     *                          cache busting on production.
+     *
+     * @type {{entries: {}, aliases: {}, appsWithEntries: []}}
+     */
+    const details = {
+        entries: {},
+        aliases: {},
+        appsWithEntries: [],
+    };
+    for (let appName in allAppPaths) {
+        scanTemplates(
+            path.join(allAppPaths[appName], appPaths.TEMPLATES_DIR),
+            entryRegex,
+            allAppPaths,
+            details,
+            isProdMode
+        );
+    }
+    return details;
+};
+
+// When run from the command line:
+if (require.main === module) {
+
+    if (!fs.existsSync(appPaths.BUILD_ARTIFACTS_DIR)) {
+        fs.mkdirSync(appPaths.BUILD_ARTIFACTS_DIR);
+    }
+
+    const isProductionMode = process.argv.includes('--prod');
+    const allAppPaths = appPaths.getAllAppPaths();
+
+    // Always build with these applications even if there are no webpack entries found within
+    // the application templates.
+    // Applications are often listed here if there are entries from other apps referencing modules in
+    // these apps, but there are no existing webpack entries from these apps (yet).
+    const alwaysIncludeApps = [
+        "analytix",
+        "hqwebapp",
+        "notifications",
+    ];
+    const aliases = {};
+    const appsWithEntries = [];
+    alwaysIncludeApps.forEach((appName) => {
+        let appDir = `${appName}/js`;
+        aliases[appDir] = path.join(allAppPaths[appName], `static/${appDir}`);
+        appsWithEntries.push(appName);
+    });
+
+    // This splits the builds into bootstrap 5 and bootstrap 3 versions
+    const defaultDetails = getDetails(
+        /{% js_entry ["']([\/\w\-]+)["'] %}/g,
+        allAppPaths,
+        isProductionMode
+    );
+    const b3Details = getDetails(
+        /{% js_entry_b3 ["']([\/\w\-]+)["'] %}/g,
+        allAppPaths,
+        isProductionMode
+    );
+
+    fs.writeFileSync(
+        path.join(appPaths.BUILD_ARTIFACTS_DIR, 'details.json'),
+        JSON.stringify({
+            entries: defaultDetails.entries,
+            b3Entries: b3Details.entries,
+            aliases: Object.assign(
+                aliases,
+                defaultDetails.aliases,
+                b3Details.aliases
+            ),
+            appsWithEntries: Object.assign(
+                appsWithEntries,
+                defaultDetails.appsWithEntries,
+                b3Details.appsWithEntries
+            ),
+            allAppPaths: allAppPaths,
+        }, null, 2)
+    );
+}
+
+module.exports = {
+    getDetails: getDetails,
+};
diff --git a/webpack/plugins.js b/webpack/plugins.js
new file mode 100644
index 000000000000..e0f0dccfe82b
--- /dev/null
+++ b/webpack/plugins.js
@@ -0,0 +1,55 @@
+/* eslint-env node */
+const path = require('path');
+const fs = require('fs');
+const appPaths = require('./appPaths');
+
+class EntryChunksPlugin {
+    /**
+     * This custom plugin creates a json file (default manifest.json), which contains
+     * all the Webpack Entries (aka Modules) with a list of all the required Chunks
+     * needed to properly load that module without javascript errors.
+     *
+     * Chunks are generated based on Cache Group Chunks, which are chunked by modules
+     * and vendors (npm_modules), and contain the common code shared between multiple
+     * entry points that can be cached to improve subsequent page load performance.
+     *
+     * `get_webpack_manifest.py` in the root directory then ingests the manifest.
+     * The data used by the `webpack_modules` template tag in `hq_shared_tags` to return
+     * a list of modules to load in `hqwebapp/partials/webpack.html`.
+     *
+     * @param options (dict) — leave blank for default settings of specify filename
+     */
+    constructor(options = {}) {
+        this.options = options;
+    }
+
+    apply(compiler) {
+        compiler.hooks.emit.tapAsync('EntryChunksPlugin', (compilation, callback) => {
+            const entrypoints = compilation.entrypoints;
+            const manifest = {};
+
+            entrypoints.forEach((entry, entryName) => {
+                manifest[entryName] = [];
+
+                entry.chunks.forEach((chunk) => {
+                    chunk.files.forEach((file) => {
+                        if (file.endsWith('.js')) {
+                            manifest[entryName].push(file);
+                        }
+                    });
+                });
+            });
+
+            fs.writeFileSync(
+                path.join(appPaths.BUILD_ARTIFACTS_DIR, this.options.filename || 'manifest.json'),
+                JSON.stringify(manifest, null, 2)
+            );
+
+            callback();
+        });
+    }
+}
+
+module.exports = {
+    EntryChunksPlugin: EntryChunksPlugin,
+};
diff --git a/webpack/utils.js b/webpack/utils.js
new file mode 100644
index 000000000000..e379d4cd5e3e
--- /dev/null
+++ b/webpack/utils.js
@@ -0,0 +1,160 @@
+/* eslint-env node */
+const path = require("path");
+const appPaths = require("./appPaths");
+const fs = require("fs");
+
+const __BASE = path.resolve(__dirname, '..');
+const SETTINGS_FILE = path.join(appPaths.BUILD_ARTIFACTS_DIR, 'settings.json');
+const DETAILS_FILE = path.join(appPaths.BUILD_ARTIFACTS_DIR, 'details.json');
+
+const fetchJsonDataOrDefault = function (filePath, defaultData) {
+    let fetchedData = defaultData;
+    if (fs.existsSync(filePath)) {
+        const content = fs.readFileSync(filePath, 'utf-8');
+        fetchedData = JSON.parse(content);
+    }
+    return fetchedData;
+};
+
+// Note: This is taken from `details.json`, which is generated by
+// `node webpack/generateDetails.js`. This script is always run prior to the webpack
+// build as part of `yarn dev` or `yarn build`.
+const DETAILS = fetchJsonDataOrDefault(DETAILS_FILE, {});
+
+// Note: `settings.json` can be generated by `./manage.py generate_webpack_settings`
+// if you have a custom `STATIC_ROOT` set in `localsettings.py`. Otherwise, the
+// default configuration is fine.
+const SETTINGS = fetchJsonDataOrDefault(SETTINGS_FILE, {
+    staticfilesPath: path.resolve(__BASE, 'staticfiles'),
+});
+
+const WEBPACK_PATH = path.join(SETTINGS.staticfilesPath, 'webpack');
+const WEBPACK_B3_PATH = path.join(SETTINGS.staticfilesPath, 'webpack_b3');
+
+const getStaticFolderForApp = function (appName) {
+    /**
+     * Returns the full path to an application's static folder.
+     * eg /path/to/corehq/apps/hqwebapp/static
+     *
+     * The full path for the application is obtained from `details.json`,
+     * which is generated by `node webpack/generateDetails.js`. This script is always
+     * run prior to the webpack build as part of `yarn dev` or `yarn build`
+     *
+     * @type {string}
+     */
+    const appPath = DETAILS.allAppPaths[appName];
+    if (!appPath) {
+        console.warn(`No path found for ${appName}`);
+    }
+    return path.join(appPath, 'static');
+};
+
+const getStaticPathForApp = function (appName, directory) {
+    /**
+     * A quick utility for generating full paths to directories within
+     * an app's static folder.
+     *
+     * Given an appName like `hqwebapp` and a directory like `hqwebapp/js`,
+     * this returns the full path to that static files directory
+     * /path/to/corehq/apps/hqwebapp/static/hqwebapp/js
+     *
+     * @type {string}
+     */
+    directory = directory || "";
+    const staticFolder = getStaticFolderForApp(appName);
+    return path.resolve(staticFolder, appName, directory);
+};
+
+const getEntries = function (otherEntry) {
+    /**
+     * Entries in Webpack are also referred to as "modules". These
+     * entries are determined by the `js_entry` or `js_entry_b3` template
+     * tags in `hq_shared_tags.py`
+     *
+     * For instance, {% js_entry `hqwebapp/js/some_page` %}
+     * Where the entry then looks something like:
+     * ```
+     * "hqwebapp/js/some_page": {
+     *     import: '/path/to/corehq/apps/hqwebapp/static/hqwebapp/js/some_page.js',
+     *     // the path of the output file that will live in `staticfiles/webpack`
+     *     filename: 'hqwebapp/js/some_page.js`,
+     * }
+     * ```
+     *
+     * The entries within `DETAILS` are taken from `details.json`, which is generated
+     * by `node webpack/generateDetails.js`. This script is always run prior to the webpack
+     * build as part of `yarn dev` or `yarn build`
+     *
+     * @type {{b3: {}}}
+     */
+    const otherEntries = {
+        'b3': DETAILS.b3Entries,
+    };
+    return otherEntries[otherEntry] || DETAILS.entries;
+};
+
+const getAllAliases = function (aliases) {
+    return Object.assign(aliases, DETAILS.aliases);
+};
+
+const getCacheGroups = function () {
+    /**
+     * Cache Groups are effectively parent "modules" containing shared code
+     * amongst the generated entries. There is a common chunk to contain the most widely
+     * shared code across the codebase, a vendor chunk which includes code from npm dependencies
+     * that changes less frequently than code within the codebase. Lastly, there are chunks
+     * for commonly shared code (if needed, based on size requirements) within each app.
+     *
+     * Cache Groups are "modules" of shared code across different entries that can be
+     * cached by the browser so the unique code for a particular entry point can be condensed.
+     * Subsequent loads of pages within HQ or pages within a particular app of HQ can rely
+     * on reading the cache of this common code rather than requesting an enormous entry
+     * point file each time.
+     *
+     * See Webpack's documentation to learn more about Code Splitting and Cache Groups:
+     * https://webpack.js.org/plugins/split-chunks-plugin/
+     *
+     * `appsWithEntries` from `DETAILS` is taken from `details.json`, which is generated
+     * by `node webpack/generateDetails.js`. This script is always run prior to the webpack
+     * build as part of `yarn dev` or `yarn build`.
+     *
+     * @type {dict} - a dict of cache group definitions
+     */
+    const cacheGroups = {
+        common: {
+            name: 'common',
+            chunks: 'all',
+            minChunks: 2,
+            priority: 2,  // if two cache groups might share a module, prioritize loading into common
+        },
+        vendor: {
+            test: /[\\/]node_modules[\\/]/,
+            name: 'vendor',
+            chunks: 'all',
+            priority: 2,
+        },
+    };
+
+    DETAILS.appsWithEntries.forEach(appName => {
+        const testExp = new RegExp("[\\\\/]" + appName + "[\\\\/]js[\\\\/]");
+        cacheGroups[appName] = {
+            test: testExp,
+            name: `${appName}/${appName}.bundle`,
+            chunks: 'all',
+            minChunks: 1,
+            // hqwebapp shares the highest priority among the modules
+            priority: (appName === 'hqwebapp') ? 1 : 0,
+        };
+    });
+    return cacheGroups;
+};
+
+module.exports = {
+    WEBPACK_PATH: WEBPACK_PATH,
+    WEBPACK_B3_PATH: WEBPACK_B3_PATH,
+    getStaticFolderForApp: getStaticFolderForApp,
+    getStaticPathForApp: getStaticPathForApp,
+    getEntries: getEntries,
+    getAllAliases: getAllAliases,
+    getCacheGroups: getCacheGroups,
+};
diff --git a/webpack/webpack.b3.common.js b/webpack/webpack.b3.common.js
new file mode 100644
index 000000000000..d06dfb42f731
--- /dev/null
+++ b/webpack/webpack.b3.common.js
@@ -0,0 +1,27 @@
+/* eslint-env node */
+const commonDefault = require("./webpack.common");
+const webpack = require('webpack');
+const utils = require('./utils');
+const hqPlugins = require('./plugins');
+
+// bootstrap 3 builds off of the default common config,
+// with some overrides specified below...
+module.exports = Object.assign({}, commonDefault, {
+    entry: utils.getEntries('b3'),
+
+    plugins: [
+        new webpack.ProvidePlugin({
+            '$': 'jquery',
+            'jQuery': 'jquery',  // needed for bootstrap 3 to work
+        }),
+        new hqPlugins.EntryChunksPlugin({
+            filename: 'manifest_b3.json',
+        }),
+    ],
+
+    optimization: {
+        splitChunks: {
+            cacheGroups: utils.getCacheGroups('b3'),
+        },
+    },
+});
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
new file mode 100644
index 000000000000..466b5343eee5
--- /dev/null
+++ b/webpack/webpack.common.js
@@ -0,0 +1,100 @@
+/* eslint-env node */
+const path = require('path');
+const webpack = require('webpack');
+const utils = require('./utils');
+const hqPlugins = require('./plugins');
+
+const aliases = {
+    "commcarehq": path.resolve(utils.getStaticPathForApp('hqwebapp', 'js/bootstrap5/'),
+        'commcarehq'),
+    "commcarehq_b3": path.resolve(utils.getStaticPathForApp('hqwebapp', 'js/bootstrap3/'),
+        'commcarehq'),
+    "jquery": "jquery/dist/jquery.min",
+
+    // todo after completing requirejs migration,
+    //  remove this file and the yarn modernizr post-install step
+    "modernizr": "hqwebapp/js/lib/modernizr",
+
+    "sentry_browser": path.resolve(utils.getStaticFolderForApp('hqwebapp'),
+        'sentry/js/sentry.browser.7.28.0.min'),
+    "sentry_captureconsole": path.resolve(utils.getStaticFolderForApp('hqwebapp'),
+        'sentry/js/sentry.captureconsole.7.28.0.min'),
+    "tempusDominus": "@eonasdan/tempus-dominus",
+    "ko.mapping": path.resolve(utils.getStaticPathForApp('hqwebapp', 'js/lib/knockout_plugins/'),
+        'knockout_mapping.ko.min'),
+};
+
+
+module.exports = {
+    entry: utils.getEntries(),
+
+    module: {
+        rules: [
+            {
+                test: /\.js$/,
+                loader: 'babel-loader',
+            },
+
+            // this rule ensures that hqDefine is renamed to define AMD module
+            // definition syntax that webpack understands
+            {
+                test: /\.js$/,
+                loader: 'string-replace-loader',
+                options: {
+                    search: /\bhqDefine\b/g,
+                    replace: 'define',
+                },
+            },
+            {
+                test: /\.js$/,
+                loader: 'string-replace-loader',
+                options: {
+                    search: /\b(es6!)?hqwebapp\/js\/bootstrap5_loader\b/g,
+                    replace: 'bootstrap5',
+                },
+            },
+
+            {
+                test: /modernizr\.js$/,
+                loader: "webpack-modernizr-loader",
+                options: {
+                    "options": [
+                        "setClasses",
+                    ],
+                    "feature-detects": [
+                        "test/svg/smil",
+                    ],
+                },
+            },
+
+            {
+                test: /sentry\.browser/,
+                loader: "exports-loader",
+                options: {
+                    type: "commonjs",
+                    exports: {
+                        syntax: "single",
+                        name: "Sentry",
+                    },
+                },
+            },
+        ],
+    },
+
+    plugins: [
+        new webpack.ProvidePlugin({
+            '$': 'jquery',
+        }),
+        new hqPlugins.EntryChunksPlugin(),
+    ],
+
+    optimization: {
+        splitChunks: {
+            cacheGroups: utils.getCacheGroups(),
+        },
+    },
+
+    resolve: {
+        alias: utils.getAllAliases(aliases),
+    },
+};
diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js
new file mode 100644
index 000000000000..b3df23b7ee1f
--- /dev/null
+++ b/webpack/webpack.dev.js
@@ -0,0 +1,34 @@
+/* eslint-env node */
+const { merge } = require('webpack-merge');
+const common = require('./webpack.common');
+const b3Common = require('./webpack.b3.common');
+const utils = require("./utils");
+
+// after the Bootstrap 5 migration is complete,
+// we can remove the list and just export one merged config
+module.exports = [
+    // this is the default webpack development config
+    merge(
+        common, {
+            mode: 'development',
+            devtool: 'inline-source-map',
+            output: {
+                filename: '[name].js',
+                path: utils.WEBPACK_PATH,
+                clean: true,
+            },
+        }),
+    // this is the Bootstrap 3 development config, which
+    // builds to the webpack_b3 directory and outputs
+    // the manifest to manifest_b3.json
+    merge(
+        b3Common, {
+            mode: 'development',
+            devtool: 'inline-source-map',
+            output: {
+                filename: '[name].js',
+                path: utils.WEBPACK_B3_PATH,
+                clean: true,
+            },
+        }),
+];
diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js
new file mode 100644
index 000000000000..62923796bbf6
--- /dev/null
+++ b/webpack/webpack.prod.js
@@ -0,0 +1,42 @@
+/* eslint-env node */
+const { merge } = require('webpack-merge');
+const common = require('./webpack.common');
+const b3Common = require('./webpack.b3.common');
+const utils = require("./utils");
+
+
+// After the Bootstrap 5 migration is complete,
+// we can remove the list and just export one merged config
+module.exports = [
+    // this is the default webpack production config
+    merge(
+        common, {
+            mode: 'production',
+            devtool: 'source-map',
+            performance: {
+                // for now we'll disable bundle size warnings until we
+                // are ready to implement recommended optimizations
+                hints: false,
+            },
+            output: {
+                filename: '[name].[contenthash].js', // cache-busting
+                path: utils.WEBPACK_PATH,
+                clean: true,
+            },
+        }),
+    // this is the Bootstrap 3 production config, which
+    // builds to the webpack_b3 directory
+    merge(
+        b3Common, {
+            mode: 'production',
+            devtool: 'source-map',
+            performance: {
+                hints: false,
+            },
+            output: {
+                filename: '[name].[contenthash].js',
+                path: utils.WEBPACK_B3_PATH,
+                clean: true,
+            },
+        }),
+];
diff --git a/yarn.lock b/yarn.lock
index 06cace17d8ec..6ab810b2407d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,14 @@
 # yarn lockfile v1
 
 
+"@ampproject/remapping@^2.2.0":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
+  integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
 "@babel/code-frame@^7.0.0":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
@@ -9,11 +17,115 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
+  dependencies:
+    "@babel/highlight" "^7.24.7"
+    picocolors "^1.0.0"
+
+"@babel/compat-data@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5"
+  integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==
+
+"@babel/core@7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77"
+  integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/helper-compilation-targets" "^7.25.2"
+    "@babel/helper-module-transforms" "^7.25.2"
+    "@babel/helpers" "^7.25.0"
+    "@babel/parser" "^7.25.0"
+    "@babel/template" "^7.25.0"
+    "@babel/traverse" "^7.25.2"
+    "@babel/types" "^7.25.2"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
+"@babel/generator@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e"
+  integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==
+  dependencies:
+    "@babel/types" "^7.25.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^2.5.1"
+
+"@babel/helper-compilation-targets@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c"
+  integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==
+  dependencies:
+    "@babel/compat-data" "^7.25.2"
+    "@babel/helper-validator-option" "^7.24.8"
+    browserslist "^4.23.1"
+    lru-cache "^5.1.1"
+    semver "^6.3.1"
+
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-module-transforms@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6"
+  integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==
+  dependencies:
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    "@babel/traverse" "^7.25.2"
+
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-string-parser@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
+  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
+
 "@babel/helper-validator-identifier@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
+
+"@babel/helper-validator-option@^7.24.8":
+  version "7.24.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d"
+  integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==
+
+"@babel/helpers@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a"
+  integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==
+  dependencies:
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
 "@babel/highlight@^7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
@@ -23,11 +135,59 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.24.7"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
+"@babel/parser@^7.25.0", "@babel/parser@^7.25.3":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
+  integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
+  dependencies:
+    "@babel/types" "^7.25.2"
+
 "@babel/standalone@^7.21.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.21.4.tgz#f1a7131775df87c526cc393c36d013acd2b3c609"
   integrity sha512-Rw4nGqH/iyVeYxARKcz7iGP+njkPsVqJ45TmXMONoGoxooWjXCAs+CUcLeAZdBGCLqgaPvHKCYvIaDT2Iq+KfA==
 
+"@babel/template@^7.25.0":
+  version "7.25.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a"
+  integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.25.0"
+    "@babel/types" "^7.25.0"
+
+"@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2":
+  version "7.25.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490"
+  integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.25.0"
+    "@babel/parser" "^7.25.3"
+    "@babel/template" "^7.25.0"
+    "@babel/types" "^7.25.2"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
+"@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2":
+  version "7.25.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
+  integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.24.8"
+    "@babel/helper-validator-identifier" "^7.24.7"
+    to-fast-properties "^2.0.0"
+
 "@ckeditor/ckeditor5-adapter-ckfinder@40.1.0":
   version "40.1.0"
   resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-adapter-ckfinder/-/ckeditor5-adapter-ckfinder-40.1.0.tgz#430bed03c73f87735dfe395ba3a8f8e500fe15e8"
@@ -353,6 +513,11 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
+"@discoveryjs/json-ext@^0.5.0":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
+
 "@eonasdan/tempus-dominus@npm:@eonasdan/tempus-dominus#6.9.4":
   version "6.9.4"
   resolved "https://registry.yarnpkg.com/@eonasdan/tempus-dominus/-/tempus-dominus-6.9.4.tgz#cf3c9d223e38df2eaf18368927634bdd140c554f"
@@ -409,6 +574,46 @@
   resolved "https://registry.yarnpkg.com/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz#291c227e93fd407a96ecd59879a35809120e432b"
   integrity sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==
 
+"@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
+  integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
+  dependencies:
+    "@jridgewell/set-array" "^1.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/set-array@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280"
+  integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==
+
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.6.tgz#9d71ca886e32502eb9362c9a74a46787c36df81a"
+  integrity sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a"
+  integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==
+
+"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+  version "0.3.25"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
+  integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@mapbox/corslite@0.0.7":
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/@mapbox/corslite/-/corslite-0.0.7.tgz#29f5b6a188ba946e514bdf0b6401ed4fbe13a39e"
@@ -457,10 +662,10 @@
   resolved "https://registry.yarnpkg.com/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz#1da1e6b3a7add3ad29909b30f438f60581b7cd80"
   integrity sha512-82V7YHcle8lhgIGqEWwtXYN5cy0QM/OHq3ypGhQTbvHR57DF0vMHMjjVSQKFfVXBe/yWCBZTyOuzvK7DFFnx5Q==
 
-"@mapbox/mapbox-gl-draw@1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.1.tgz#96dcec4d3957150de854423ac15856fde43d1452"
-  integrity sha512-g6F49KZagF9269/IoF6vZJeail6qtoc5mVF3eVRikNT7UFnY0QASfe2y53mgE99s6GrHdpV+PZuFxaL71hkMhg==
+"@mapbox/mapbox-gl-draw@1.4.3":
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-draw/-/mapbox-gl-draw-1.4.3.tgz#3f95362fdeabcffcb46f3392f24bf5914e7be817"
+  integrity sha512-03qIJgyGmm0IoTZbV/cfODru9jRGogi4LcQ3maxIJDKccq1gY3ofgt2UYPkeU143ElxitZahEythNQv1NpsLhg==
   dependencies:
     "@mapbox/geojson-area" "^0.2.2"
     "@mapbox/geojson-extent" "^1.0.1"
@@ -470,12 +675,12 @@
     lodash.isequal "^4.5.0"
     xtend "^4.0.2"
 
-"@mapbox/mapbox-gl-geocoder@5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-5.0.1.tgz#3db39280175872bfd94884275c5ee528bdff35e0"
-  integrity sha512-/OUL42eh4OBaIerhcwCpa27oD+u4a2xN8V7vEdsglwd8lCplFAxJCdwT9Kprli1TH5mTYsXyONmh03FwoWBWfA==
+"@mapbox/mapbox-gl-geocoder@5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-geocoder/-/mapbox-gl-geocoder-5.0.2.tgz#f7409023a667e4d092c2b1d640a088ce5c735cbe"
+  integrity sha512-o+2atyKKsfbiI2/iutQ/razt5O++kfi9oxwaXSfKc6m/9NudJnQm3rpGB0GagA+becq2NU4U99E9Yzv+UcMCBQ==
   dependencies:
-    "@mapbox/mapbox-sdk" "^0.13.3"
+    "@mapbox/mapbox-sdk" "^0.13.7"
     events "^3.3.0"
     lodash.debounce "^4.0.6"
     nanoid "^3.1.31"
@@ -483,7 +688,7 @@
     suggestions "^1.6.0"
     xtend "^4.0.1"
 
-"@mapbox/mapbox-sdk@^0.13.3":
+"@mapbox/mapbox-sdk@^0.13.7":
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/@mapbox/mapbox-sdk/-/mapbox-sdk-0.13.7.tgz#05e1bf287d86868623d748c19865b1fee7222642"
   integrity sha512-JZjBsAVSBv7lX7gQPOQwftBGHIUcvL/tPKFxAL+SCT7u1n+eRH052XebOTkl28pNm7Du6DpKAs1GvgUnDcFFDQ==
@@ -778,6 +983,27 @@
     "@types/node" "*"
     "@types/responselike" "*"
 
+"@types/eslint-scope@^3.7.3":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.0.tgz#51d4fe4d0316da9e9f2c80884f2c20ed5fb022ff"
+  integrity sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
 "@types/http-cache-semantics@*":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
@@ -788,6 +1014,11 @@
   resolved "https://registry.yarnpkg.com/@types/json-buffer/-/json-buffer-3.0.0.tgz#85c1ff0f0948fc159810d4b5be35bf8c20875f64"
   integrity sha512-3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ==
 
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
 "@types/keyv@*":
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
@@ -829,6 +1060,164 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
+"@vue/reactivity@~3.1.1":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.5.tgz#dbec4d9557f7c8f25c2635db1e23a78a729eb991"
+  integrity sha512-1tdfLmNjWG6t/CsPldh+foumYFo3cpyCHgBYQ34ylaMsJ+SNHQ1kApMIa8jN+i593zQuaw3AdWH0nJTARzCFhg==
+  dependencies:
+    "@vue/shared" "3.1.5"
+
+"@vue/shared@3.1.5":
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.5.tgz#74ee3aad995d0a3996a6bb9533d4d280514ede03"
+  integrity sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA==
+
+"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb"
+  integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+
+"@webassemblyjs/helper-buffer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6"
+  integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==
+
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
+
+"@webassemblyjs/helper-wasm-section@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf"
+  integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+
+"@webassemblyjs/wasm-edit@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b"
+  integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-opt" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+    "@webassemblyjs/wast-printer" "1.12.1"
+
+"@webassemblyjs/wasm-gen@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547"
+  integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5"
+  integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-buffer" "1.12.1"
+    "@webassemblyjs/wasm-gen" "1.12.1"
+    "@webassemblyjs/wasm-parser" "1.12.1"
+
+"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937"
+  integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.12.1":
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac"
+  integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==
+  dependencies:
+    "@webassemblyjs/ast" "1.12.1"
+    "@xtuc/long" "4.2.2"
+
+"@webpack-cli/configtest@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.1.1.tgz#3b2f852e91dac6e3b85fb2a314fb8bef46d94646"
+  integrity sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==
+
+"@webpack-cli/info@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.2.tgz#cc3fbf22efeb88ff62310cf885c5b09f44ae0fdd"
+  integrity sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==
+
+"@webpack-cli/serve@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.5.tgz#325db42395cd49fe6c14057f9a900e427df8810e"
+  integrity sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
 At.js@millerdev/At.js#master:
   version "1.5.3"
   resolved "https://codeload.github.com/millerdev/At.js/tar.gz/d1ed42f66d33cdf54b681cb026664d847ca0637d"
@@ -859,6 +1248,11 @@ ace-builds@1.5.0:
   resolved "https://registry.yarnpkg.com/ace-builds/-/ace-builds-1.5.0.tgz#38ad4d6a6f7b50453533ee307c877a7133c33fb1"
   integrity sha512-1BtEfIhFl/VDNRS9R1m9F8Kmeh2uJ98CxTeBE0kBjJpv5S5N2buTVWtc1BGXL9AromN7ekBjaEBaUl+ZPn4ciA==
 
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
+
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -869,6 +1263,11 @@ acorn@^8.7.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
   integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
+acorn@^8.8.2:
+  version "8.12.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
+  integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
+
 agent-base@6:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -891,7 +1290,26 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv@^6.10.0, ajv@^6.12.4:
+ajv-formats@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+  dependencies:
+    ajv "^8.0.0"
+
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv-keywords@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
+ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -911,6 +1329,23 @@ ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.0, ajv@^8.9.0:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
+  integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+
+alpinejs@3.14.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/alpinejs/-/alpinejs-3.14.1.tgz#549e056c3b75e57c0f23076a13cde09da684ba0a"
+  integrity sha512-ICar8UsnRZAYvv/fCNfNeKMXNoXGUfwHrjx7LqXd08zIP95G2d9bAOuaL97re+1mgt/HojqHsfdOLo/A5LuWgQ==
+  dependencies:
+    "@vue/reactivity" "~3.1.1"
+
 ansi-colors@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
@@ -1049,6 +1484,14 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2"
   integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==
 
+babel-loader@9.1.3:
+  version "9.1.3"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
+  integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==
+  dependencies:
+    find-cache-dir "^4.0.0"
+    schema-utils "^4.0.0"
+
 babel-plugin-transform-modules-requirejs-babel@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-modules-requirejs-babel/-/babel-plugin-transform-modules-requirejs-babel-0.1.0.tgz#492529fc07581897e0bdfdc0003165bd6fccf42c"
@@ -1102,6 +1545,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
 biginteger@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/biginteger/-/biginteger-1.0.3.tgz#111c682070b852d0677a1621fd33452aab674607"
@@ -1198,6 +1646,16 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
+browserslist@^4.21.10, browserslist@^4.23.1:
+  version "4.23.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800"
+  integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==
+  dependencies:
+    caniuse-lite "^1.0.30001646"
+    electron-to-chromium "^1.5.4"
+    node-releases "^2.0.18"
+    update-browserslist-db "^1.1.0"
+
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -1305,6 +1763,11 @@ camelcase@^6.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
+caniuse-lite@^1.0.30001646:
+  version "1.0.30001651"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz#52de59529e8b02b1aedcaaf5c05d9e23c0c28138"
+  integrity sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1323,7 +1786,7 @@ chai@4.3.6:
     pathval "^1.1.1"
     type-detect "^4.0.5"
 
-chalk@2.4.2, chalk@^2.0.0:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1375,6 +1838,11 @@ chownr@^2.0.0:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
+chrome-trace-event@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b"
+  integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
+
 ci-info@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.0.0.tgz#65466f8b280fc019b9f50a5388115d17a63a44f2"
@@ -1455,6 +1923,15 @@ cliui@^7.0.2:
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
 clone-response@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3"
@@ -1513,6 +1990,11 @@ color-support@^1.1.3:
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
+colorette@^2.0.14:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
+
 colors@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@@ -1538,7 +2020,7 @@ 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, 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==
@@ -1548,11 +2030,21 @@ commander@2.15.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
   integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==
 
+commander@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
 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"
   integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
 
+common-path-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
+  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
+
 compress-brotli@^1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/compress-brotli/-/compress-brotli-1.3.8.tgz#0c0a60c97a989145314ec381e84e26682e7b38db"
@@ -1586,6 +2078,11 @@ continuable-cache@^0.3.1:
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
   integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -1598,7 +2095,7 @@ cross-fetch@3.1.5:
   dependencies:
     node-fetch "2.6.7"
 
-cross-spawn@^7.0.0, cross-spawn@^7.0.2:
+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==
@@ -1681,7 +2178,7 @@ dateformat@~3.0.3:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
-debug@3.1.0, debug@4, debug@4.3.3, debug@4.3.4, debug@^2.6.9, debug@^3.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
+debug@3.1.0, debug@4, debug@4.3.3, debug@4.3.4, debug@^2.6.9, debug@^3.1.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -1804,6 +2301,11 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+electron-to-chromium@^1.5.4:
+  version "1.5.12"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.12.tgz#ee31756eaa2e06f2aa606f170b7ad06dd402b4e4"
+  integrity sha512-tIhPkdlEoCL1Y+PToq3zRNehUaKp3wBX/sr7aclAWdIWjvqAe/Im/H0SiCM4c1Q8BLPHCdoJTol+ZblflydehA==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -1814,6 +2316,11 @@ emoji-regex@^9.2.2:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
   integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
 
+emojis-list@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
+
 encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
@@ -1828,16 +2335,34 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+enhanced-resolve@^5.17.0:
+  version "5.17.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
+  integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
 entities@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
   integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
+entities@~3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
+
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
   integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==
 
+envinfo@^7.7.3:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.13.0.tgz#81fbb81e5da35d74e814941aeab7c325a606fb31"
+  integrity sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==
+
 eonasdan-bootstrap-datetimepicker@4.17.49:
   version "4.17.49"
   resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker/-/eonasdan-bootstrap-datetimepicker-4.17.49.tgz#5534ba581c1e7eb988dbf773e2fed8a7f48cc76a"
@@ -1874,6 +2399,11 @@ error@^7.0.0:
   dependencies:
     string-template "~0.2.1"
 
+es-module-lexer@^1.2.1:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
+  integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
+
 es6-promise@^4.0.3:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -1884,6 +2414,11 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escalade@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
+  integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
+
 escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -1894,6 +2429,14 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
+eslint-scope@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
 eslint-scope@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
@@ -1988,6 +2531,11 @@ esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
@@ -2008,7 +2556,7 @@ eventemitter3@^3.1.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
-events@^3.3.0:
+events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -2030,6 +2578,13 @@ exponential-backoff@^3.1.1:
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
+exports-loader@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-5.0.0.tgz#0e5c50baf8526237c0a2743116a3e3fa788d194f"
+  integrity sha512-W15EyyytBwd30yCCieTCqZSCUvU/o3etj2IUItSMjVQEzAf5xOQx8JL9iMo7ERnuAzIA6eapGSFWl7E9F+Wy9g==
+  dependencies:
+    source-map "^0.6.1"
+
 extend@^3.0.2, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
@@ -2081,7 +2636,12 @@ fast-levenshtein@2.0.6, fast-levenshtein@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
-fastest-levenshtein@^1.0.16:
+fast-uri@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134"
+  integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==
+
+fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
@@ -2119,6 +2679,14 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+find-cache-dir@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2"
+  integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==
+  dependencies:
+    common-path-prefix "^3.0.0"
+    pkg-dir "^7.0.0"
+
 find-up@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
@@ -2135,6 +2703,14 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
+  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
+  dependencies:
+    locate-path "^7.1.0"
+    path-exists "^5.0.0"
+
 findup-sync@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-4.0.0.tgz#956c9cdde804052b881b428512905c4a5f2cdef0"
@@ -2279,6 +2855,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -2310,6 +2891,11 @@ gaze@^1.1.0:
   dependencies:
     globule "^1.0.0"
 
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
 geojson-flatten@^1.0.4:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/geojson-flatten/-/geojson-flatten-1.1.1.tgz#601aae07ba6406281ebca683573dcda69eba04c7"
@@ -2367,6 +2953,11 @@ glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -2445,6 +3036,11 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
 globals@^13.6.0, globals@^13.9.0:
   version "13.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
@@ -2490,7 +3086,7 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.6:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
-graceful-fs@^4.2.11:
+graceful-fs@^4.2.11, graceful-fs@^4.2.4:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -2672,6 +3268,13 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
+hasown@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
+  integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+  dependencies:
+    function-bind "^1.1.2"
+
 hat@0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a"
@@ -2711,6 +3314,11 @@ hosted-git-info@^7.0.0, hosted-git-info@^7.0.1:
   dependencies:
     lru-cache "^10.0.1"
 
+htmx.org@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/htmx.org/-/htmx.org-2.0.3.tgz#83f76a53d3fc562fe839f0f57ee7cd5f75fe7b59"
+  integrity sha512-AeoJUAjkCVVajbfKX+3sVQBTCt8Ct4lif1T+z/tptTXo8+8yyq3QIMQQe/IT+R8ssfrO1I0DeX4CAronzCL6oA==
+
 http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
@@ -2806,6 +3414,14 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-local@^3.0.2:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.2.0.tgz#c3d5c745798c02a6f8b897726aba5100186ee260"
+  integrity sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -2852,6 +3468,11 @@ init-package-json@^6.0.0:
     validate-npm-package-license "^3.0.4"
     validate-npm-package-name "^5.0.0"
 
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
+
 interpret@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -2904,6 +3525,13 @@ is-cidr@^5.0.3:
   dependencies:
     cidr-regex "4.0.3"
 
+is-core-module@^2.13.0:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea"
+  integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==
+  dependencies:
+    hasown "^2.0.2"
+
 is-core-module@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
@@ -3045,10 +3673,14 @@ jackspeak@^2.3.5:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jquery-color@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jquery-color/-/jquery-color-2.2.0.tgz#2596bb782b69d9368b7840e6b3fe1e70fdd821c3"
-  integrity sha512-4VoxsLMw860EQGNT/TmP3Lbr7/1OCQlBPS4ILj7bxRApJrPQfpqzdIOTY8Ll9nGY7UHtWqDuzR7cUcS1lcWjVw==
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
 
 jquery-form@4.2.2:
   version "4.2.2"
@@ -3066,10 +3698,6 @@ jquery-textchange@jmalonzo/bower-jquery-textchange#0.2.3:
   version "0.0.0"
   resolved "https://codeload.github.com/jmalonzo/bower-jquery-textchange/tar.gz/fd7d7c0ac5116861759cd467135307dc9aab7cdc"
 
-jquery-timeago@rmm5t/jquery-timeago#1.2.0:
-  version "0.0.0"
-  resolved "https://codeload.github.com/rmm5t/jquery-timeago/tar.gz/f2afbeaf787a93f01822d062fc80a571f4ebda48"
-
 jquery-tiny-pubsub@cowboy/jquery-tiny-pubsub#~0.7.0:
   version "0.0.0-ignored"
   resolved "https://codeload.github.com/cowboy/jquery-tiny-pubsub/tar.gz/d9b4a093221f43d1119aac088258c8d0ea2b183b"
@@ -3103,7 +3731,7 @@ jquery@3.5.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
   integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
-"jquery@>= 1.7.1", jquery@>=1.10, jquery@>=1.7, jquery@>=1.7.2, jquery@>=1.8, "jquery@>=1.8.0 <4.0.0", jquery@>=1.9.0, jquery@^3.5.1:
+"jquery@>= 1.7.1", jquery@>=1.10, jquery@>=1.7, jquery@>=1.7.2, jquery@>=1.8, "jquery@>=1.8.0 <4.0.0", jquery@^3.5.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
@@ -3135,6 +3763,11 @@ jsdiff@components/jsdiff#~3.2.0:
   version "0.0.0"
   resolved "https://codeload.github.com/components/jsdiff/tar.gz/0abd2d3b90046f66e2d7d816a4d975cb1ad03b50"
 
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
 json-buffer@3.0.1, json-buffer@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -3145,6 +3778,11 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
+json-parse-even-better-errors@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
 json-parse-even-better-errors@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
@@ -3155,6 +3793,11 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
 json-schema@0.2.3, json-schema@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
@@ -3175,6 +3818,18 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
+json5@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
+  dependencies:
+    minimist "^1.2.0"
+
+json5@^2.1.2, json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -3251,16 +3906,16 @@ leaflet-fullscreen@^1.0.2:
   resolved "https://registry.yarnpkg.com/leaflet-fullscreen/-/leaflet-fullscreen-1.0.2.tgz#09c61c4bac45f63b2ee126afd87e5cd97650fc1b"
   integrity sha512-1Yxm8RZg6KlKX25+hbP2H/wnOAphH7hFcvuADJFb4QZTN7uOSN9Hsci5EZpow8vtNej9OGzu59Jxmn+0qKOO9Q==
 
-leaflet@0.7.7:
-  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-0.7.7.tgz#1e352ba54e63d076451fa363c900890cb2cf75ee"
-  integrity sha1-HjUrpU5j0HZFH6NjyQCJDLLPde4=
-
 leaflet@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.4.0.tgz#d5f56eeb2aa32787c24011e8be4c77e362ae171b"
   integrity sha512-x9j9tGY1+PDLN9pcWTx9/y6C5nezoTMB8BLK5jTakx+H7bPlnbCHfi9Hjg+Qt36sgDz/cb9lrSpNQXmk45Tvhw==
 
+leaflet@1.9.4:
+  version "1.9.4"
+  resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
+  integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
+
 less@3.10.3:
   version "3.10.3"
   resolved "https://registry.yarnpkg.com/less/-/less-3.10.3.tgz#417a0975d5eeecc52cff4bcfa3c09d35781e6792"
@@ -3429,11 +4084,41 @@ linkify-it@^3.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
+linkify-it@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
+  integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
+  dependencies:
+    uc.micro "^1.0.1"
+
 livereload-js@^2.3.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.4.0.tgz#447c31cf1ea9ab52fc20db615c5ddf678f78009c"
   integrity sha512-XPQH8Z2GDP/Hwz2PCDrh2mth4yFejwA1OZ/81Ti3LgKyhDcEjsSsqFWZojHG0va/duGd+WyosY7eXLDoOyqcPw==
 
+loader-runner@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+
+loader-utils@^1.0.0:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
+  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^1.0.1"
+
+loader-utils@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^3.0.0"
+    json5 "^2.1.2"
+
 locate-path@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
@@ -3448,6 +4133,13 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
+locate-path@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
+  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
+  dependencies:
+    p-locate "^6.0.0"
+
 lodash-es@4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -3503,6 +4195,13 @@ lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0":
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3"
   integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -3589,6 +4288,17 @@ markdown-it@12.3.2, markdown-it@^12.3.2:
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
+markdown-it@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.2.tgz#1bc22e23379a6952e5d56217fbed881e0c94d536"
+  integrity sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==
+  dependencies:
+    argparse "^2.0.1"
+    entities "~3.0.1"
+    linkify-it "^4.0.1"
+    mdurl "^1.0.1"
+    uc.micro "^1.0.5"
+
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -3620,6 +4330,11 @@ meow@^6.1.1:
     type-fest "^0.13.1"
     yargs-parser "^18.1.3"
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 micromatch@^4.0.2:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
@@ -3633,6 +4348,11 @@ mime-db@1.44.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"
   integrity sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==
 
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
 mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.27"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f"
@@ -3640,6 +4360,13 @@ mime-types@^2.1.12, mime-types@~2.1.19:
   dependencies:
     mime-db "1.44.0"
 
+mime-types@^2.1.27:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 mime@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -3681,7 +4408,7 @@ minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@0.0.8, minimist@^1.2.5, minimist@^1.2.6:
+minimist@0.0.8, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
@@ -3777,6 +4504,13 @@ mkdirp@0.5.5, mkdirp@^0.5.0, mkdirp@^0.5.4:
   dependencies:
     minimist "^1.2.5"
 
+mkdirp@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
 mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -3851,6 +4585,19 @@ modernizr@^3.12.0:
     requirejs "^2.3.6"
     yargs "^15.4.1"
 
+modernizr@^3.7.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/modernizr/-/modernizr-3.13.1.tgz#0102882d91e7546b833a6b833677a9f1a4fd1eb5"
+  integrity sha512-jc7F04Wd8ngu+fNZYMdWmho6bdiNNnt01lAEF6WAGRay7haGzjWEj5wfBC/zNgv5BySJ+h29/ERMFX+zEcijvg==
+  dependencies:
+    doctrine "^3.0.0"
+    file "^0.2.2"
+    lodash "^4.17.21"
+    markdown-it "^13.0.2"
+    mkdirp "0.5.6"
+    requirejs "^2.3.7"
+    yargs "^15.4.1"
+
 moment-timezone@^0.4.0, moment-timezone@^0.5.35:
   version "0.5.38"
   resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.38.tgz#9674a5397b8be7c13de820fd387d8afa0f725aad"
@@ -3915,6 +4662,11 @@ negotiator@^0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
 node-fetch@2.6.7:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
@@ -3938,6 +4690,11 @@ node-gyp@^10.0.0, node-gyp@^10.0.1:
     tar "^6.1.2"
     which "^4.0.0"
 
+node-releases@^2.0.18:
+  version "2.0.18"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
+  integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
+
 nopt@^7.0.0, nopt@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-7.2.0.tgz#067378c68116f602f552876194fd11f1292503d7"
@@ -4275,6 +5032,13 @@ p-limit@^3.0.2:
   dependencies:
     yocto-queue "^0.1.0"
 
+p-limit@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
+  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
+  dependencies:
+    yocto-queue "^1.0.0"
+
 p-locate@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
@@ -4289,6 +5053,13 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
+p-locate@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
+  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
+  dependencies:
+    p-limit "^4.0.0"
+
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -4375,6 +5146,11 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
+path-exists@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
+  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -4411,9 +5187,9 @@ path-scurry@^1.10.1:
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
 path-to-regexp@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24"
+  integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==
   dependencies:
     isarray "0.0.1"
 
@@ -4447,6 +5223,11 @@ phantomjs-prebuilt@^2.1.3:
     request-progress "^2.0.1"
     which "^1.2.10"
 
+picocolors@^1.0.0, picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
+
 picomatch@^2.0.4, picomatch@^2.2.1:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
@@ -4469,13 +5250,20 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@4.2.0:
+pkg-dir@4.2.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
+pkg-dir@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
+  integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
+  dependencies:
+    find-up "^6.3.0"
+
 postcss-selector-parser@^6.0.10:
   version "6.0.11"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
@@ -4732,6 +5520,13 @@ rechoir@^0.7.0:
   dependencies:
     resolve "^1.9.0"
 
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
+  dependencies:
+    resolve "^1.20.0"
+
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -4783,6 +5578,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -4793,7 +5593,7 @@ requirejs-babel7@^1.3.2:
   resolved "https://registry.yarnpkg.com/requirejs-babel7/-/requirejs-babel7-1.3.2.tgz#64ed7bb3911e5aeda4b8a755addf8d953d36c2b4"
   integrity sha512-6kV79aVK64oCy+46inv9F+xY5eE2LrBdZiX5F60+opFXoaXnIYSGh7UzAcoKDx6WTp7dJXGKcryme5RzxDEccw==
 
-requirejs@2.3.7, requirejs@^2.3.6:
+requirejs@2.3.7, requirejs@^2.3.6, requirejs@^2.3.7:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.7.tgz#0b22032e51a967900e0ae9f32762c23a87036bd0"
   integrity sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==
@@ -4808,6 +5608,13 @@ resolve-alpn@^1.0.0:
   resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
   integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
 
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
@@ -4821,6 +5628,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve@^1.10.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
@@ -4837,6 +5649,15 @@ resolve@^1.19.0, resolve@^1.9.0:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.20.0:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -4893,6 +5714,25 @@ samsam@1.x, samsam@^1.1.3:
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
   integrity sha512-1HwIYD/8UlOtFS3QO3w7ey+SdSDFE4HRNLZoZRYVQefrOY3l17epswImeB1ijgJFQJodIaHcwkp3r/myBjFVbg==
 
+schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+schema-utils@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
+  dependencies:
+    "@types/json-schema" "^7.0.9"
+    ajv "^8.9.0"
+    ajv-formats "^2.1.1"
+    ajv-keywords "^5.1.0"
+
 select2@4.1.0-rc.0:
   version "4.1.0-rc.0"
   resolved "https://registry.yarnpkg.com/select2/-/select2-4.1.0-rc.0.tgz#ba3cd3901dda0155e1c0219ab41b74ba51ea22d8"
@@ -4908,6 +5748,11 @@ select@^1.0.6:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
 semver@^7.0.0, semver@^7.1.1, semver@^7.3.5, semver@^7.3.7:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
@@ -4929,6 +5774,13 @@ serialize-javascript@6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serialize-javascript@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"
+  integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==
+  dependencies:
+    randombytes "^2.1.0"
+
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4942,6 +5794,13 @@ set-value@^4.0.1:
     is-plain-object "^2.0.4"
     is-primitive "^3.0.1"
 
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -5021,7 +5880,15 @@ socks@^2.7.1:
     ip-address "^9.0.5"
     smart-buffer "^4.2.0"
 
-source-map@~0.6.0:
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -5089,21 +5956,20 @@ ssri@^10.0.0, ssri@^10.0.5:
   dependencies:
     minipass "^7.0.3"
 
+string-replace-loader@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-3.1.0.tgz#11ac6ee76bab80316a86af358ab773193dd57a4f"
+  integrity sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ==
+  dependencies:
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
+
 string-template@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5149,7 +6015,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -5163,13 +6029,6 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -5209,7 +6068,7 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@8.1.1:
+supports-color@8.1.1, supports-color@^8.0.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -5240,6 +6099,11 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+tapable@^2.1.1, tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
 tar-fs@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
@@ -5280,6 +6144,27 @@ temporary@^0.0.8:
   dependencies:
     package ">= 1.0.0 < 1.2.0"
 
+terser-webpack-plugin@^5.3.10:
+  version "5.3.10"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199"
+  integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.20"
+    jest-worker "^27.4.5"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.1"
+    terser "^5.26.0"
+
+terser@^5.26.0:
+  version "5.31.6"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1"
+  integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
@@ -5322,6 +6207,11 @@ tiny-relative-date@^1.3.0:
   resolved "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz#fa08aad501ed730f31cc043181d995c39a935e07"
   integrity sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==
 
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -5515,6 +6405,14 @@ universalify@^0.2.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
   integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
 
+update-browserslist-db@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e"
+  integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==
+  dependencies:
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -5591,6 +6489,14 @@ walk-up-path@^3.0.1:
   resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-3.0.1.tgz#c8d78d5375b4966c717eb17ada73dbd41490e886"
   integrity sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==
 
+watchpack@^2.4.1:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da"
+  integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
 wcwidth@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -5603,6 +6509,86 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
 
+webpack-cli@5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
+  integrity sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==
+  dependencies:
+    "@discoveryjs/json-ext" "^0.5.0"
+    "@webpack-cli/configtest" "^2.1.1"
+    "@webpack-cli/info" "^2.0.2"
+    "@webpack-cli/serve" "^2.0.5"
+    colorette "^2.0.14"
+    commander "^10.0.1"
+    cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
+    fastest-levenshtein "^1.0.12"
+    import-local "^3.0.2"
+    interpret "^3.1.1"
+    rechoir "^0.8.0"
+    webpack-merge "^5.7.3"
+
+webpack-merge@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a"
+  integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==
+  dependencies:
+    clone-deep "^4.0.1"
+    flat "^5.0.2"
+    wildcard "^2.0.1"
+
+webpack-merge@^5.7.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
+  dependencies:
+    clone-deep "^4.0.1"
+    flat "^5.0.2"
+    wildcard "^2.0.0"
+
+webpack-modernizr-loader@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-modernizr-loader/-/webpack-modernizr-loader-5.0.0.tgz#6a7c07d3fac4b6e02964ee3be61819cf9ab811cc"
+  integrity sha512-D+FIZ03QtWNV536+cGp046qbJIcxPYEF0kGqP6YrM8Y1g6PqzXGdx8VYnK7VkfRuBdtqLL5rCerWYk1ncOSjJQ==
+  dependencies:
+    loader-utils "^1.0.0"
+    modernizr "^3.7.1"
+
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@5.93.0:
+  version "5.93.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
+  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^1.0.5"
+    "@webassemblyjs/ast" "^1.12.1"
+    "@webassemblyjs/wasm-edit" "^1.12.1"
+    "@webassemblyjs/wasm-parser" "^1.12.1"
+    acorn "^8.7.1"
+    acorn-import-attributes "^1.9.5"
+    browserslist "^4.21.10"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.17.0"
+    es-module-lexer "^1.2.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.11"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.2.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.3.10"
+    watchpack "^2.4.1"
+    webpack-sources "^3.2.3"
+
 websocket-driver@>=0.5.1:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
@@ -5663,6 +6649,11 @@ wide-align@^1.1.5:
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
+wildcard@^2.0.0, wildcard@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
+  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
+
 word-wrap@^1.2.3:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.5.tgz#383aeebd5c176c320d6364fb869669559bbdbac9"
@@ -5673,7 +6664,8 @@ workerpool@6.2.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
   integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -5691,15 +6683,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -5748,6 +6731,11 @@ y18n@^5.0.5:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
+yallist@^3.0.2:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
@@ -5814,6 +6802,11 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+yocto-queue@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110"
+  integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==
+
 zxcvbn@4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/zxcvbn/-/zxcvbn-4.4.2.tgz#28ec17cf09743edcab056ddd8b1b06262cc73c30"