diff --git a/changelog b/changelog
index dd50d5e63..78e982a3d 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,42 @@
+ietfdb (7.6.0) ietf; urgency=medium
+
+  Django 2.2 transition changes:
+
+  * New branch for 7.5.1.dev0
+
+  * Changed deprecated 'load staticfiles' to recommended 'load static'
+
+  * Added a warnings filter.  Removed the use request_profiler, which is 
+    not compatible with Django 2.2.
+
+  * Removed an unused parameter from submit.tests.do_submission_email().
+
+  * Updated requirements for Django 2.2.
+
+  * Fixed an issue where a session was saved without a type_id, found by 
+    the Django 2.2 checks.  The code set the value just after the first save, 
+    and then did a second save, but this is 1) more costly, and 2) keeps an 
+    invalid session object in the database for a short time.
+
+  * Fixed a place where data provider for a POST in contained None, which 
+    cannot be serialized into POST data.  Found by Django 2.2 checks.
+
+  * Django 2.2 does not wrap single queries in transactions, for 
+    performance reasons.  This caused some template tags that did database 
+    lookups to trigger exceptions.  Fixed by moving the lookups (which would 
+    not normally change between apache reloads) out from the template tag code 
+    to module scope.  Adding new groups of type 
+    ['ag','area','team','dir','program'] will now require a reload to show up 
+    in the group menu.
+
+  Other changes:
+
+  * Changed skip messages from test suites to use print() instead of
+    sys.stderr.write(), to match other output from the test runner.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  27 Jun 2020 17:33:10 +0000
+
+
 ietfdb (7.5.0) ietf; urgency=medium
 
   **Django 2.1 upgrade, CodiMD support, bluesheet support for Meetecho, and bugfixes**
diff --git a/ietf/doc/templatetags/active_groups_menu.py b/ietf/doc/templatetags/active_groups_menu.py
index 3a566091a..04ed116d4 100644
--- a/ietf/doc/templatetags/active_groups_menu.py
+++ b/ietf/doc/templatetags/active_groups_menu.py
@@ -5,9 +5,11 @@ from ietf.name.models import GroupTypeName
 
 register = template.Library()
 
+parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
+
 @register.simple_tag
 def active_groups_menu():
-    parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
+    global parents
     for p in parents:
         p.menu_url = '/%s/'%p.slug
     return render_to_string('base/menu_active_groups.html', { 'parents': parents })
diff --git a/ietf/doc/templatetags/wg_menu.py b/ietf/doc/templatetags/wg_menu.py
index b0a2296dc..4f0c0a456 100644
--- a/ietf/doc/templatetags/wg_menu.py
+++ b/ietf/doc/templatetags/wg_menu.py
@@ -43,10 +43,14 @@ area_short_names = {
     'rai':'RAI'
     }
 
+parents = Group.objects.filter(
+                models.Q(type="area") | models.Q(type="irtf", acronym="irtf"),
+                state="active"
+            ).order_by('type_id', 'acronym')
+
 @register.simple_tag
 def wg_menu():
-    parents = Group.objects.filter(models.Q(type="area") | models.Q(type="irtf", acronym="irtf"),
-                                   state="active").order_by('type_id', 'acronym')
+    global parents
 
     for p in parents:
         p.short_name = area_short_names.get(p.acronym) or p.name
diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py
index 9818f7b2a..2a37c2e3e 100644
--- a/ietf/meeting/forms.py
+++ b/ietf/meeting/forms.py
@@ -250,9 +250,11 @@ class InterimSessionModelForm(forms.ModelForm):
     def save(self, *args, **kwargs):
         """NOTE: as the baseform of an inlineformset self.save(commit=True)
         never gets called"""
-        session = super(InterimSessionModelForm, self).save(commit=kwargs.get('commit', True))
+        session = super(InterimSessionModelForm, self).save(commit=False)
         session.group = self.group
         session.type_id = 'regular'
+        if kwargs.get('commit', True) is True:
+            super(InterimSessionModelForm, self).save(commit=True)
         return session
 
     def save_agenda(self):
diff --git a/ietf/secr/rolodex/tests.py b/ietf/secr/rolodex/tests.py
index 93e0e9e2f..4d4f0ac8f 100644
--- a/ietf/secr/rolodex/tests.py
+++ b/ietf/secr/rolodex/tests.py
@@ -61,7 +61,7 @@ class RolodexTestCase(TestCase):
         post_data = {
             'name': person.name,
             'ascii': person.ascii,
-            'ascii_short': person.ascii_short,
+            'ascii_short': person.ascii_short or '',
             'user': user.username,
             'email-0-person':person.pk,
             'email-0-address': email.address,
diff --git a/ietf/settings.py b/ietf/settings.py
index b7b1e7798..5c916a481 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -16,7 +16,7 @@ warnings.simplefilter("always", DeprecationWarning)
 warnings.filterwarnings("ignore", message="Add the `renderer` argument to the render\(\) method of", module="bootstrap3")
 warnings.filterwarnings("ignore", message="The logout\(\) view is superseded by")
 warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report")
-
+warnings.filterwarnings("ignore", message="{% load staticfiles %} is deprecated")
 
 try:
     import syslog
@@ -378,9 +378,6 @@ if DEBUG:
 
 
 MIDDLEWARE = [
-    # Must be first to measure correct request timing
-    'request_profiler.middleware.ProfilingMiddleware',
-    #
     'django.middleware.csrf.CsrfViewMiddleware',
     'corsheaders.middleware.CorsMiddleware', # see docs on CORS_REPLACE_HTTPS_REFERER before using it
     'django.middleware.common.CommonMiddleware',
@@ -429,7 +426,6 @@ INSTALLED_APPS = [
     'djangobwr',
     'form_utils',
     'oidc_provider',
-    'request_profiler',
     'simple_history',
     'tastypie',
     'widget_tweaks',
@@ -1107,7 +1103,6 @@ SILENCED_SYSTEM_CHECKS = [
 
 CHECKS_LIBRARY_PATCHES_TO_APPLY = [
     'patch/fix-unidecode-argument-warning.patch',
-    'patch/fix-request-profiler-streaming-length.patch',
     'patch/change-oidc-provider-field-sizes-228.patch',
     'patch/fix-oidc-access-token-post.patch',
     'patch/fix-jwkest-jwt-logging.patch',
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 72b64915b..338eccef9 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -1673,7 +1673,6 @@ Thank you
         q = PyQuery(r.content)
         post_button = q('[type=submit]:contains("Send Email")')
         self.assertEqual(len(post_button), 1)
-        action = post_button.parents("form").find('input[type=hidden][name="action"]').val()
         subject = post_button.parents("form").find('input[name="subject"]').val()
         frm = post_button.parents("form").find('input[name="frm"]').val()
         cc = post_button.parents("form").find('input[name="cc"]').val()
@@ -1683,7 +1682,6 @@ Thank you
         
         # post submitter info
         r = self.client.post(the_url, {
-            "action": action,
             "subject": subject,
             "frm": frm,
             "to": to,
diff --git a/ietf/templates/401.html b/ietf/templates/401.html
index 0620f5c90..b50c93f5f 100644
--- a/ietf/templates/401.html
+++ b/ietf/templates/401.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2012, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}401 Unauthorized{% endblock %}
 {% block content %}
 
diff --git a/ietf/templates/404.html b/ietf/templates/404.html
index b85786550..46a3ef625 100644
--- a/ietf/templates/404.html
+++ b/ietf/templates/404.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}404 Not Found{% endblock %}
 {% block content %}
 
diff --git a/ietf/templates/500.html b/ietf/templates/500.html
index a7338c38c..c3bf32209 100644
--- a/ietf/templates/500.html
+++ b/ietf/templates/500.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}500 Internal Server Error{% endblock %}
 {% block content %}
 
diff --git a/ietf/templates/api/index.html b/ietf/templates/api/index.html
index 1bf06a692..25e51677b 100644
--- a/ietf/templates/api/index.html
+++ b/ietf/templates/api/index.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}API Notes{% endblock %}
 {% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %}
 {% block content %}
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index bdefe9d63..035701e8e 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html> {% load ietf_filters staticfiles %}
+<!DOCTYPE html> {% load ietf_filters static %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 {% load bootstrap3 %}
diff --git a/ietf/templates/community/manage_list.html b/ietf/templates/community/manage_list.html
index 817a873fa..a7406a969 100644
--- a/ietf/templates/community/manage_list.html
+++ b/ietf/templates/community/manage_list.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'select2/select2.css' %}">
diff --git a/ietf/templates/doc/change_shepherd.html b/ietf/templates/doc/change_shepherd.html
index a771632b0..d9f23eb1b 100644
--- a/ietf/templates/doc/change_shepherd.html
+++ b/ietf/templates/doc/change_shepherd.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Change document shepherd for {{ doc.name }}-{{ doc.rev }}{% endblock %}
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index 8fa5592ed..50c50eb3e 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 8e379890f..95cff8f86 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index db87270f4..f6d01ac7f 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2016-2020, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/document_email.html b/ietf/templates/doc/document_email.html
index d089e8529..45f785e79 100644
--- a/ietf/templates/doc/document_email.html
+++ b/ietf/templates/doc/document_email.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
index 42c6c0538..613cf0bf7 100644
--- a/ietf/templates/doc/document_history.html
+++ b/ietf/templates/doc/document_history.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}History for {{ doc.name }}-{{ doc.rev }}{% endblock %}
 
diff --git a/ietf/templates/doc/document_html.html b/ietf/templates/doc/document_html.html
index 6326f990f..4a39aa0f3 100644
--- a/ietf/templates/doc/document_html.html
+++ b/ietf/templates/doc/document_html.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2016, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 41ee1d73b..b584497dd 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/document_referenced_by.html b/ietf/templates/doc/document_referenced_by.html
index 27d7d1a15..1656a113d 100644
--- a/ietf/templates/doc/document_referenced_by.html
+++ b/ietf/templates/doc/document_referenced_by.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles ietf_filters %}
+{% load origin static ietf_filters %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/document_references.html b/ietf/templates/doc/document_references.html
index 2bb603fab..17a24c5fc 100644
--- a/ietf/templates/doc/document_references.html
+++ b/ietf/templates/doc/document_references.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles ietf_filters %}
+{% load origin static ietf_filters %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/document_review.html b/ietf/templates/doc/document_review.html
index e62fbb7a7..77b653244 100644
--- a/ietf/templates/doc/document_review.html
+++ b/ietf/templates/doc/document_review.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2016-2019, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load textfilters %}
 
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index eacccc358..06bb11db9 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/downref.html b/ietf/templates/doc/downref.html
index fd5fda57d..a2551caa8 100644
--- a/ietf/templates/doc/downref.html
+++ b/ietf/templates/doc/downref.html
@@ -3,7 +3,7 @@
 {% load origin %}
 {% load bootstrap3 %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/draft/change_replaces.html b/ietf/templates/doc/draft/change_replaces.html
index be50b2e0e..1297d2cf7 100644
--- a/ietf/templates/doc/draft/change_replaces.html
+++ b/ietf/templates/doc/draft/change_replaces.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Change documents replaced by {{ doc }}{% endblock %}
diff --git a/ietf/templates/doc/drafts_for_ad.html b/ietf/templates/doc/drafts_for_ad.html
index 95ea8ceae..bdddfdb6c 100644
--- a/ietf/templates/doc/drafts_for_ad.html
+++ b/ietf/templates/doc/drafts_for_ad.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 {% load ietf_filters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/drafts_in_iesg_process.html b/ietf/templates/doc/drafts_in_iesg_process.html
index d950b515c..e015f109a 100644
--- a/ietf/templates/doc/drafts_in_iesg_process.html
+++ b/ietf/templates/doc/drafts_in_iesg_process.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 {% load textfilters %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/drafts_in_last_call.html b/ietf/templates/doc/drafts_in_last_call.html
index 13febb1aa..825513e8b 100644
--- a/ietf/templates/doc/drafts_in_last_call.html
+++ b/ietf/templates/doc/drafts_in_last_call.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/frontpage.html b/ietf/templates/doc/frontpage.html
index 3f2d12c55..2ccec635a 100644
--- a/ietf/templates/doc/frontpage.html
+++ b/ietf/templates/doc/frontpage.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}IETF Datatracker{% if server_mode != "production" %} -- Development Mode{% endif %}{% endblock %}
 
 {% block content %}
diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html
index ef1df87ce..e9a02f885 100644
--- a/ietf/templates/doc/index_active_drafts.html
+++ b/ietf/templates/doc/index_active_drafts.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}Active Internet-Drafts{% endblock %}
 
 {% block content %}
diff --git a/ietf/templates/doc/irsg_ballot_status.html b/ietf/templates/doc/irsg_ballot_status.html
index 14b4408da..ed194e1d8 100644
--- a/ietf/templates/doc/irsg_ballot_status.html
+++ b/ietf/templates/doc/irsg_ballot_status.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2019, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% load ballot_icon %}
 {% load ietf_filters %}
diff --git a/ietf/templates/doc/recent_drafts.html b/ietf/templates/doc/recent_drafts.html
index 1658d232f..b22e67370 100644
--- a/ietf/templates/doc/recent_drafts.html
+++ b/ietf/templates/doc/recent_drafts.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/relationship_help.html b/ietf/templates/doc/relationship_help.html
index 30e5aec10..829dcf26e 100644
--- a/ietf/templates/doc/relationship_help.html
+++ b/ietf/templates/doc/relationship_help.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/doc/search/search.html b/ietf/templates/doc/search/search.html
index 97e194fff..a1ba409fa 100644
--- a/ietf/templates/doc/search/search.html
+++ b/ietf/templates/doc/search/search.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block title %}Document Search{% endblock %}
 
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
index 0b7d55fae..a61b8f941 100644
--- a/ietf/templates/doc/state_help.html
+++ b/ietf/templates/doc/state_help.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{{ title }}{% endblock %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/stats/highstock.html b/ietf/templates/doc/stats/highstock.html
index 515e0d26c..7c9a02624 100644
--- a/ietf/templates/doc/stats/highstock.html
+++ b/ietf/templates/doc/stats/highstock.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block js %}
diff --git a/ietf/templates/doc/status_change/edit_relations.html b/ietf/templates/doc/status_change/edit_relations.html
index b4bae45ef..8be9152e6 100644
--- a/ietf/templates/doc/status_change/edit_relations.html
+++ b/ietf/templates/doc/status_change/edit_relations.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Edit RFCs affected by status change{% endblock %}
diff --git a/ietf/templates/doc/status_change/make_last_call.html b/ietf/templates/doc/status_change/make_last_call.html
index dc0f684e5..5887c9943 100644
--- a/ietf/templates/doc/status_change/make_last_call.html
+++ b/ietf/templates/doc/status_change/make_last_call.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block pagehead %}
diff --git a/ietf/templates/doc/status_change/start.html b/ietf/templates/doc/status_change/start.html
index 64ab4ddea..147bd1083 100644
--- a/ietf/templates/doc/status_change/start.html
+++ b/ietf/templates/doc/status_change/start.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Begin RFC status change review{% endblock %}
diff --git a/ietf/templates/doc/status_change/status_changes.html b/ietf/templates/doc/status_change/status_changes.html
index 8419fa132..fbb2ef06d 100644
--- a/ietf/templates/doc/status_change/status_changes.html
+++ b/ietf/templates/doc/status_change/status_changes.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/form.html b/ietf/templates/form.html
index a15340209..fb2521e2c 100644
--- a/ietf/templates/form.html
+++ b/ietf/templates/form.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}{{ title|striptags }}{% endblock %}
diff --git a/ietf/templates/group/active_ags.html b/ietf/templates/group/active_ags.html
index 4b6f53db0..80a660bdd 100644
--- a/ietf/templates/group/active_ags.html
+++ b/ietf/templates/group/active_ags.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_dirs.html b/ietf/templates/group/active_dirs.html
index 044a3636e..44ab88715 100644
--- a/ietf/templates/group/active_dirs.html
+++ b/ietf/templates/group/active_dirs.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_groups.html b/ietf/templates/group/active_groups.html
index 6eab00f9f..b03318f53 100644
--- a/ietf/templates/group/active_groups.html
+++ b/ietf/templates/group/active_groups.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_programs.html b/ietf/templates/group/active_programs.html
index 70e57bbf2..e3aa75579 100644
--- a/ietf/templates/group/active_programs.html
+++ b/ietf/templates/group/active_programs.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_review_dirs.html b/ietf/templates/group/active_review_dirs.html
index b444e4728..b589c1f94 100644
--- a/ietf/templates/group/active_review_dirs.html
+++ b/ietf/templates/group/active_review_dirs.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_rgs.html b/ietf/templates/group/active_rgs.html
index 1882d1985..b2bee951d 100644
--- a/ietf/templates/group/active_rgs.html
+++ b/ietf/templates/group/active_rgs.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_teams.html b/ietf/templates/group/active_teams.html
index 4c7a7d9ca..3fd871b62 100644
--- a/ietf/templates/group/active_teams.html
+++ b/ietf/templates/group/active_teams.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
index b991e8b41..4a29b854d 100644
--- a/ietf/templates/group/active_wgs.html
+++ b/ietf/templates/group/active_wgs.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles group_filters %}
+{% load origin static group_filters %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/all_photos.html b/ietf/templates/group/all_photos.html
index aff1bf0d8..22741a64b 100644
--- a/ietf/templates/group/all_photos.html
+++ b/ietf/templates/group/all_photos.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block morecss %}
 .well { max-width: 150px;}
diff --git a/ietf/templates/group/all_status.html b/ietf/templates/group/all_status.html
index 5fc0f31cb..dcb56c396 100644
--- a/ietf/templates/group/all_status.html
+++ b/ietf/templates/group/all_status.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 {% load ietf_filters %}
 {% load textfilters %}
diff --git a/ietf/templates/group/bofs.html b/ietf/templates/group/bofs.html
index 374118359..6c45884ab 100644
--- a/ietf/templates/group/bofs.html
+++ b/ietf/templates/group/bofs.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/change_review_secretary_settings.html b/ietf/templates/group/change_review_secretary_settings.html
index ee178d2e7..00015a935 100644
--- a/ietf/templates/group/change_review_secretary_settings.html
+++ b/ietf/templates/group/change_review_secretary_settings.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block content %}
   {% origin %}
diff --git a/ietf/templates/group/change_reviewer_settings.html b/ietf/templates/group/change_reviewer_settings.html
index 98d6d39c0..0f3ca5d03 100644
--- a/ietf/templates/group/change_reviewer_settings.html
+++ b/ietf/templates/group/change_reviewer_settings.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'bootstrap-datepicker/css/bootstrap-datepicker3.min.css' %}">
diff --git a/ietf/templates/group/chartering_groups.html b/ietf/templates/group/chartering_groups.html
index d86c57fa4..d93344b9a 100644
--- a/ietf/templates/group/chartering_groups.html
+++ b/ietf/templates/group/chartering_groups.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/concluded_groups.html b/ietf/templates/group/concluded_groups.html
index abe6b9b43..a93d51b89 100644
--- a/ietf/templates/group/concluded_groups.html
+++ b/ietf/templates/group/concluded_groups.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/edit.html b/ietf/templates/group/edit.html
index 47acfbfd9..b350973d7 100644
--- a/ietf/templates/group/edit.html
+++ b/ietf/templates/group/edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 {% load ietf_filters %}
 
diff --git a/ietf/templates/group/edit_milestones.html b/ietf/templates/group/edit_milestones.html
index 07e4af093..ffac886a0 100644
--- a/ietf/templates/group/edit_milestones.html
+++ b/ietf/templates/group/edit_milestones.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block pagehead %}
diff --git a/ietf/templates/group/email.html b/ietf/templates/group/email.html
index 0fc7cc0a5..247f09224 100644
--- a/ietf/templates/group/email.html
+++ b/ietf/templates/group/email.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/email_open_review_assignments.html b/ietf/templates/group/email_open_review_assignments.html
index 4ac55fc46..a27a05226 100644
--- a/ietf/templates/group/email_open_review_assignments.html
+++ b/ietf/templates/group/email_open_review_assignments.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block title %}Email summary of assigned review requests for {{ group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/group/group_about_status.html b/ietf/templates/group/group_about_status.html
index 0d3bd717f..8774e1a7f 100644
--- a/ietf/templates/group/group_about_status.html
+++ b/ietf/templates/group/group_about_status.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 {% load ietf_filters %}
 {% load textfilters %}
diff --git a/ietf/templates/group/group_about_status_meeting.html b/ietf/templates/group/group_about_status_meeting.html
index ccb8d56d2..498cea648 100644
--- a/ietf/templates/group/group_about_status_meeting.html
+++ b/ietf/templates/group/group_about_status_meeting.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 {% load ietf_filters %}
 {% load textfilters %}
diff --git a/ietf/templates/group/group_base.html b/ietf/templates/group/group_base.html
index e06575ce6..eacc7b875 100644
--- a/ietf/templates/group/group_base.html
+++ b/ietf/templates/group/group_base.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/group_photos.html b/ietf/templates/group/group_photos.html
index c63a9de34..494aaf060 100644
--- a/ietf/templates/group/group_photos.html
+++ b/ietf/templates/group/group_photos.html
@@ -1,6 +1,6 @@
 {% extends "group/group_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block morecss %}
 .well { max-width: 150px;}
diff --git a/ietf/templates/group/history.html b/ietf/templates/group/history.html
index 91d393d1d..5536bf323 100644
--- a/ietf/templates/group/history.html
+++ b/ietf/templates/group/history.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/index.html b/ietf/templates/group/index.html
index acb1a70b5..9420f64cb 100644
--- a/ietf/templates/group/index.html
+++ b/ietf/templates/group/index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% load ietf_filters %}
 
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index facf1a460..5540de76a 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block title %}Manage open review requests for {{ group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/group/materials.html b/ietf/templates/group/materials.html
index 0b205132e..1d3b5f15c 100644
--- a/ietf/templates/group/materials.html
+++ b/ietf/templates/group/materials.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/reset_next_reviewer.html b/ietf/templates/group/reset_next_reviewer.html
index cbae7205d..ab984b7a0 100644
--- a/ietf/templates/group/reset_next_reviewer.html
+++ b/ietf/templates/group/reset_next_reviewer.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block content %}
 <h2>Set next reviewer in queue for {{ group.acronym }}</h2>
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index bcae4ccbf..8ce86f083 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block group_subtitle %}Review requests{% endblock %}
 
diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html
index c1edb9e7e..193e949df 100644
--- a/ietf/templates/group/reviewer_overview.html
+++ b/ietf/templates/group/reviewer_overview.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block group_subtitle %}Reviewers{% endblock %}
 
diff --git a/ietf/templates/group/stream_documents.html b/ietf/templates/group/stream_documents.html
index 6ecb76fee..bde4c9860 100644
--- a/ietf/templates/group/stream_documents.html
+++ b/ietf/templates/group/stream_documents.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/group/stream_edit.html b/ietf/templates/group/stream_edit.html
index f24965cb2..79066728a 100644
--- a/ietf/templates/group/stream_edit.html
+++ b/ietf/templates/group/stream_edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/help/state_index.html b/ietf/templates/help/state_index.html
index c5e065351..fae63936a 100644
--- a/ietf/templates/help/state_index.html
+++ b/ietf/templates/help/state_index.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/help/states.html b/ietf/templates/help/states.html
index 6faad8d6a..1e8ea82be 100644
--- a/ietf/templates/help/states.html
+++ b/ietf/templates/help/states.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/iesg/agenda_documents.html b/ietf/templates/iesg/agenda_documents.html
index 88a858209..17186a774 100644
--- a/ietf/templates/iesg/agenda_documents.html
+++ b/ietf/templates/iesg/agenda_documents.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% load ballot_icon %}
 {% load ietf_filters %}
diff --git a/ietf/templates/iesg/discusses.html b/ietf/templates/iesg/discusses.html
index 384a9499e..9b5c1615e 100644
--- a/ietf/templates/iesg/discusses.html
+++ b/ietf/templates/iesg/discusses.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% load ballot_icon %}
 {% load ietf_filters %}
diff --git a/ietf/templates/iesg/past_documents.html b/ietf/templates/iesg/past_documents.html
index 7aec253cb..4ffc3f626 100644
--- a/ietf/templates/iesg/past_documents.html
+++ b/ietf/templates/iesg/past_documents.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% load ballot_icon %}
 {% load ietf_filters %}
diff --git a/ietf/templates/iesg/photos.html b/ietf/templates/iesg/photos.html
index 852f05d97..4e8994446 100644
--- a/ietf/templates/iesg/photos.html
+++ b/ietf/templates/iesg/photos.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 {% load ietf_filters %}
 
 {% block morecss %}
diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html
index f2b3f65f9..53522b140 100644
--- a/ietf/templates/ipr/details_edit.html
+++ b/ietf/templates/ipr/details_edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters ipr_filters bootstrap3 widget_tweaks %}
 
 {% block title %}{% if form.instance %}Edit IPR #{{ form.instance.id }}{% else %}New IPR{% endif %}{% endblock %}
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
index 2f2aa5ba7..9b8124110 100644
--- a/ietf/templates/ipr/details_history.html
+++ b/ietf/templates/ipr/details_history.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters ipr_filters staticfiles %}
+{% load ietf_filters ipr_filters static %}
 
 {% block morecss %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/ipr/email.html b/ietf/templates/ipr/email.html
index 6e4780f4a..fc3ae4552 100644
--- a/ietf/templates/ipr/email.html
+++ b/ietf/templates/ipr/email.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Email submitter of {{ ipr.title }}{% endblock %}
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html
index a48401476..de3a54652 100644
--- a/ietf/templates/ipr/list.html
+++ b/ietf/templates/ipr/list.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block title %}Intellectual property rights disclosures{% endblock %}
 
diff --git a/ietf/templates/ipr/search.html b/ietf/templates/ipr/search.html
index fa354a2f9..bb7037943 100644
--- a/ietf/templates/ipr/search.html
+++ b/ietf/templates/ipr/search.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}IPR search{% endblock %}
 
 {% block content %}
diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html
index b8aeb04da..df9166c78 100644
--- a/ietf/templates/ipr/search_doc_result.html
+++ b/ietf/templates/ipr/search_doc_result.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html
index 46d377b00..d571a39e1 100644
--- a/ietf/templates/ipr/search_doctitle_result.html
+++ b/ietf/templates/ipr/search_doctitle_result.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html
index 656dde667..b770cc1b6 100644
--- a/ietf/templates/ipr/search_result.html
+++ b/ietf/templates/ipr/search_result.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html
index 216c12e43..b35a759e0 100644
--- a/ietf/templates/ipr/search_wg_result.html
+++ b/ietf/templates/ipr/search_wg_result.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/liaisons/detail_history.html b/ietf/templates/liaisons/detail_history.html
index 53388a180..353d9128e 100644
--- a/ietf/templates/liaisons/detail_history.html
+++ b/ietf/templates/liaisons/detail_history.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/liaisons/edit.html b/ietf/templates/liaisons/edit.html
index beec43670..20d2b73e6 100644
--- a/ietf/templates/liaisons/edit.html
+++ b/ietf/templates/liaisons/edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load bootstrap3 widget_tweaks %}
 
diff --git a/ietf/templates/liaisons/edit_attachment.html b/ietf/templates/liaisons/edit_attachment.html
index 1a0ca2f13..fd33dcfd1 100644
--- a/ietf/templates/liaisons/edit_attachment.html
+++ b/ietf/templates/liaisons/edit_attachment.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load bootstrap3 widget_tweaks %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Edit liaison attachment{% endblock %}
 
diff --git a/ietf/templates/liaisons/field_help.html b/ietf/templates/liaisons/field_help.html
index bb0cfe872..6ba7bfde1 100644
--- a/ietf/templates/liaisons/field_help.html
+++ b/ietf/templates/liaisons/field_help.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/liaisons/guide_from_ietf.html b/ietf/templates/liaisons/guide_from_ietf.html
index ac46a27fe..7abbc545c 100644
--- a/ietf/templates/liaisons/guide_from_ietf.html
+++ b/ietf/templates/liaisons/guide_from_ietf.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/liaisons/guide_to_ietf.html b/ietf/templates/liaisons/guide_to_ietf.html
index 97075cff9..fcd1572a4 100644
--- a/ietf/templates/liaisons/guide_to_ietf.html
+++ b/ietf/templates/liaisons/guide_to_ietf.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/liaisons/liaison_base.html b/ietf/templates/liaisons/liaison_base.html
index 7dee3ff26..de5eefef5 100644
--- a/ietf/templates/liaisons/liaison_base.html
+++ b/ietf/templates/liaisons/liaison_base.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load ietf_filters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'bootstrap-datepicker/css/bootstrap-datepicker3.min.css' %}">
diff --git a/ietf/templates/meeting/add_session_drafts.html b/ietf/templates/meeting/add_session_drafts.html
index bdf51ee91..97308ab18 100644
--- a/ietf/templates/meeting/add_session_drafts.html
+++ b/ietf/templates/meeting/add_session_drafts.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}Add drafts to {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index ff033dd31..c4d82fc07 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load textfilters %}
 {% load htmlfilters %}
diff --git a/ietf/templates/meeting/approve_proposed_slides.html b/ietf/templates/meeting/approve_proposed_slides.html
index 8bb9af398..4e44b35fb 100644
--- a/ietf/templates/meeting/approve_proposed_slides.html
+++ b/ietf/templates/meeting/approve_proposed_slides.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}Approve Slides Proposed for {{ submission.session.meeting }} : {{ submission.session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/copy_meeting_schedule.html b/ietf/templates/meeting/copy_meeting_schedule.html
index 14c1365b5..b09391617 100644
--- a/ietf/templates/meeting/copy_meeting_schedule.html
+++ b/ietf/templates/meeting/copy_meeting_schedule.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/meeting/delete_schedule.html b/ietf/templates/meeting/delete_schedule.html
index 76254bcae..321fada29 100644
--- a/ietf/templates/meeting/delete_schedule.html
+++ b/ietf/templates/meeting/delete_schedule.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/meeting/edit_meeting_schedule.html b/ietf/templates/meeting/edit_meeting_schedule.html
index 0008653e6..27cfad07e 100644
--- a/ietf/templates/meeting/edit_meeting_schedule.html
+++ b/ietf/templates/meeting/edit_meeting_schedule.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block morecss %}
diff --git a/ietf/templates/meeting/floor-plan.html b/ietf/templates/meeting/floor-plan.html
index 8708952ec..920b44d9a 100644
--- a/ietf/templates/meeting/floor-plan.html
+++ b/ietf/templates/meeting/floor-plan.html
@@ -4,7 +4,7 @@
 
 {% load ietf_filters %}
 {% load textfilters %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}
   IETF {{ meeting.number }} meeting agenda
diff --git a/ietf/templates/meeting/important-dates.html b/ietf/templates/meeting/important-dates.html
index 0d092790c..d5035db2e 100644
--- a/ietf/templates/meeting/important-dates.html
+++ b/ietf/templates/meeting/important-dates.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2017, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block title %}IETF {{meetings.0.number}} : Important Dates{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_announce.html b/ietf/templates/meeting/interim_announce.html
index f3ae6b562..62697bef7 100644
--- a/ietf/templates/meeting/interim_announce.html
+++ b/ietf/templates/meeting/interim_announce.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
 
 {% block title %}Interim Meetings to be Announced{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_pending.html b/ietf/templates/meeting/interim_pending.html
index bb91a30cf..6cd3c045c 100644
--- a/ietf/templates/meeting/interim_pending.html
+++ b/ietf/templates/meeting/interim_pending.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
 
 {% block title %}Interim Pending{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html
index 19981dba7..58b4ceb5d 100644
--- a/ietf/templates/meeting/interim_request.html
+++ b/ietf/templates/meeting/interim_request.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks ietf_filters %}
+{% load static bootstrap3 widget_tweaks ietf_filters %}
 
 {% block title %}Interim Request{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_request_cancel.html b/ietf/templates/meeting/interim_request_cancel.html
index da93af2d9..95f8d3c21 100644
--- a/ietf/templates/meeting/interim_request_cancel.html
+++ b/ietf/templates/meeting/interim_request_cancel.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
 
 
 
diff --git a/ietf/templates/meeting/interim_request_details.html b/ietf/templates/meeting/interim_request_details.html
index c0c51f2b3..116176b20 100644
--- a/ietf/templates/meeting/interim_request_details.html
+++ b/ietf/templates/meeting/interim_request_details.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks ietf_filters %}
+{% load static bootstrap3 widget_tweaks ietf_filters %}
 
 {% block title %}Interim Request Details{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_request_edit.html b/ietf/templates/meeting/interim_request_edit.html
index 249537646..64fc2bcee 100644
--- a/ietf/templates/meeting/interim_request_edit.html
+++ b/ietf/templates/meeting/interim_request_edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
 
 {% block title %}Edit Interim Request{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_send_announcement.html b/ietf/templates/meeting/interim_send_announcement.html
index 0cbc80888..05f99961c 100644
--- a/ietf/templates/meeting/interim_send_announcement.html
+++ b/ietf/templates/meeting/interim_send_announcement.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
 
 {% block title %}Announce Interim Meeting{% endblock %}
 
diff --git a/ietf/templates/meeting/interim_session_buttons.html b/ietf/templates/meeting/interim_session_buttons.html
index 9732b1de3..33277a0be 100644
--- a/ietf/templates/meeting/interim_session_buttons.html
+++ b/ietf/templates/meeting/interim_session_buttons.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load textfilters %}
 {% origin %}
 {% with session.official_timeslotassignment as item %}
diff --git a/ietf/templates/meeting/interim_skip_announce.html b/ietf/templates/meeting/interim_skip_announce.html
index 22b287a80..e984b07d7 100644
--- a/ietf/templates/meeting/interim_skip_announce.html
+++ b/ietf/templates/meeting/interim_skip_announce.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles bootstrap3 widget_tweaks %}
+{% load static bootstrap3 widget_tweaks %}
 
 {% block title %}Interim Meetings Skip Announcement{% endblock %}
 
diff --git a/ietf/templates/meeting/landscape_edit.html b/ietf/templates/meeting/landscape_edit.html
index 91d7785e2..6b3d98f12 100644
--- a/ietf/templates/meeting/landscape_edit.html
+++ b/ietf/templates/meeting/landscape_edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load humanize %}
 
diff --git a/ietf/templates/meeting/make_schedule_official.html b/ietf/templates/meeting/make_schedule_official.html
index c762e7307..ef520c998 100644
--- a/ietf/templates/meeting/make_schedule_official.html
+++ b/ietf/templates/meeting/make_schedule_official.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
index 4bee21774..42a156d47 100644
--- a/ietf/templates/meeting/materials.html
+++ b/ietf/templates/meeting/materials.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles managed_groups %}
+{% load ietf_filters static managed_groups %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/meeting/past.html b/ietf/templates/meeting/past.html
index d758754ec..f7735f421 100644
--- a/ietf/templates/meeting/past.html
+++ b/ietf/templates/meeting/past.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/meeting/proceedings.html b/ietf/templates/meeting/proceedings.html
index 4700aae74..dee9923f2 100644
--- a/ietf/templates/meeting/proceedings.html
+++ b/ietf/templates/meeting/proceedings.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/meeting/properties_edit.html b/ietf/templates/meeting/properties_edit.html
index 19ca01aa7..1c175c868 100644
--- a/ietf/templates/meeting/properties_edit.html
+++ b/ietf/templates/meeting/properties_edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/meeting/propose_session_slides.html b/ietf/templates/meeting/propose_session_slides.html
index 3245b7b04..2fc8d22ea 100644
--- a/ietf/templates/meeting/propose_session_slides.html
+++ b/ietf/templates/meeting/propose_session_slides.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}Propose Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/request_minutes.html b/ietf/templates/meeting/request_minutes.html
index 194412f34..6b34694bc 100644
--- a/ietf/templates/meeting/request_minutes.html
+++ b/ietf/templates/meeting/request_minutes.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2018, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block morecss %}
 #id_body {height:700px;}
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index 5b0678d29..b2cbf3b7a 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/meeting/room-view.html b/ietf/templates/meeting/room-view.html
index ea577d5c8..28346bc33 100644
--- a/ietf/templates/meeting/room-view.html
+++ b/ietf/templates/meeting/room-view.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
-{% load staticfiles %}
+{% load static %}
 <html> <head>
   <link rel="stylesheet" href="{% static 'ietf/bootstrap/css/bootstrap.min.css' %}"> {% comment %} This sets box-sizing: border-box {% endcomment %}
   <link rel="stylesheet" href="{% static 'ietf/bootstrap/css/bootstrap-theme.min.css' %}">
diff --git a/ietf/templates/meeting/room_edit.html b/ietf/templates/meeting/room_edit.html
index 93f86dd90..3a9cf30f1 100644
--- a/ietf/templates/meeting/room_edit.html
+++ b/ietf/templates/meeting/room_edit.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load humanize %}
 
diff --git a/ietf/templates/meeting/schedule_list.html b/ietf/templates/meeting/schedule_list.html
index 3ea142ea2..4a4a07817 100644
--- a/ietf/templates/meeting/schedule_list.html
+++ b/ietf/templates/meeting/schedule_list.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 
 {% block title %}IETF {{ meeting.number }} Meeting Agenda List{% endblock %}
diff --git a/ietf/templates/meeting/session_agenda_include.html b/ietf/templates/meeting/session_agenda_include.html
index 18a094698..308092886 100644
--- a/ietf/templates/meeting/session_agenda_include.html
+++ b/ietf/templates/meeting/session_agenda_include.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
-{% load staticfiles %}
+{% load static %}
 {% load textfilters %}
 {% load ietf_filters %}
           <div class="modal fade text-left" id="modal-{{ item.slug }}" tabindex="-1" role="dialog" aria-labelledby="label-{{ item.slug }}" aria-hidden="true">
diff --git a/ietf/templates/meeting/session_buttons_include.html b/ietf/templates/meeting/session_buttons_include.html
index aeb1f915f..1309f2577 100644
--- a/ietf/templates/meeting/session_buttons_include.html
+++ b/ietf/templates/meeting/session_buttons_include.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load textfilters %}
 {% origin %}
 
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 0c1ec3241..17cd98887 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin ietf_filters staticfiles %}
+{% load origin ietf_filters static %}
 
 {% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/upcoming.html b/ietf/templates/meeting/upcoming.html
index bb32da7de..a9b73895a 100644
--- a/ietf/templates/meeting/upcoming.html
+++ b/ietf/templates/meeting/upcoming.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load cache %}
-{% load ietf_filters staticfiles classname %}
+{% load ietf_filters static classname %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/meeting/upload_session_agenda.html b/ietf/templates/meeting/upload_session_agenda.html
index 1ddec4ca7..57db35fb8 100644
--- a/ietf/templates/meeting/upload_session_agenda.html
+++ b/ietf/templates/meeting/upload_session_agenda.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}{% if agenda_sp %}Revise{% else %}Upload{% endif %} Agenda for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/upload_session_bluesheets.html b/ietf/templates/meeting/upload_session_bluesheets.html
index 8698b267f..96a02e4ea 100644
--- a/ietf/templates/meeting/upload_session_bluesheets.html
+++ b/ietf/templates/meeting/upload_session_bluesheets.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}{% if bluesheet_sp %}Revise{% else %}Upload{% endif %} Bluesheets for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/upload_session_minutes.html b/ietf/templates/meeting/upload_session_minutes.html
index ba96cf761..4a27133eb 100644
--- a/ietf/templates/meeting/upload_session_minutes.html
+++ b/ietf/templates/meeting/upload_session_minutes.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}{% if minutes_sp %}Revise{% else %}Upload{% endif %} Minutes for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/upload_session_slides.html b/ietf/templates/meeting/upload_session_slides.html
index 92dd9af51..4335e6342 100644
--- a/ietf/templates/meeting/upload_session_slides.html
+++ b/ietf/templates/meeting/upload_session_slides.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles bootstrap3 %}
+{% load origin static bootstrap3 %}
 
 {% block title %}{% if slides_sp %}Revise{% else %}Upload New{% endif %} Slides for {{ session.meeting }} : {{ session.group.acronym }}{% endblock %}
 
diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html
index 647a13954..f100264e4 100644
--- a/ietf/templates/meeting/week-view.html
+++ b/ietf/templates/meeting/week-view.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}{% origin %}
-{% load staticfiles %}
+{% load static %}
 <html> <head>
   <script type="text/javascript">
 
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index 771ef8b00..4205d3f54 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/nomcom/edit_nomcom.html b/ietf/templates/nomcom/edit_nomcom.html
index d6c0c9886..0ba5f6da2 100644
--- a/ietf/templates/nomcom/edit_nomcom.html
+++ b/ietf/templates/nomcom/edit_nomcom.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block pagehead %}
diff --git a/ietf/templates/nomcom/edit_position.html b/ietf/templates/nomcom/edit_position.html
index d47d3c68b..22dde0cc1 100644
--- a/ietf/templates/nomcom/edit_position.html
+++ b/ietf/templates/nomcom/edit_position.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'select2/select2.css' %}">
   <link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
diff --git a/ietf/templates/nomcom/edit_topic.html b/ietf/templates/nomcom/edit_topic.html
index d9ea3cee3..020a1be0e 100644
--- a/ietf/templates/nomcom/edit_topic.html
+++ b/ietf/templates/nomcom/edit_topic.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2017, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'select2/select2.css' %}">
   <link rel="stylesheet" href="{% static 'select2-bootstrap-css/select2-bootstrap.min.css' %}">
diff --git a/ietf/templates/nomcom/eligible.html b/ietf/templates/nomcom/eligible.html
index 3c04cfd2c..679b2cd08 100644
--- a/ietf/templates/nomcom/eligible.html
+++ b/ietf/templates/nomcom/eligible.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block subtitle %} - Eligible People{% endblock %}
 
diff --git a/ietf/templates/nomcom/index.html b/ietf/templates/nomcom/index.html
index db3ba5bba..718a4c38a 100644
--- a/ietf/templates/nomcom/index.html
+++ b/ietf/templates/nomcom/index.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015-2020, All Rights Reserved #}
 {% load origin %}
-{% load ietf_filters staticfiles %}
+{% load ietf_filters static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/nomcom/new_edit_members.html b/ietf/templates/nomcom/new_edit_members.html
index 703c1636a..fcfba9007 100644
--- a/ietf/templates/nomcom/new_edit_members.html
+++ b/ietf/templates/nomcom/new_edit_members.html
@@ -3,7 +3,7 @@
 {% load origin %}
 
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static 'select2/select2.css' %}">
diff --git a/ietf/templates/nomcom/private_merge_nominee.html b/ietf/templates/nomcom/private_merge_nominee.html
index b8d8f2d92..bf4d2ca0c 100644
--- a/ietf/templates/nomcom/private_merge_nominee.html
+++ b/ietf/templates/nomcom/private_merge_nominee.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/nomcom/private_merge_person.html b/ietf/templates/nomcom/private_merge_person.html
index c1d95eca4..23ac0cbd3 100644
--- a/ietf/templates/nomcom/private_merge_person.html
+++ b/ietf/templates/nomcom/private_merge_person.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/nomcom/private_nominate.html b/ietf/templates/nomcom/private_nominate.html
index 233be0eb5..e793de82a 100644
--- a/ietf/templates/nomcom/private_nominate.html
+++ b/ietf/templates/nomcom/private_nominate.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_private_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 
 {% load bootstrap3 %}
 {% load nomcom_tags %}
diff --git a/ietf/templates/nomcom/public_nominate.html b/ietf/templates/nomcom/public_nominate.html
index 664f5710b..41ef7b1be 100644
--- a/ietf/templates/nomcom/public_nominate.html
+++ b/ietf/templates/nomcom/public_nominate.html
@@ -1,7 +1,7 @@
 {% extends "nomcom/nomcom_public_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 
 {% load bootstrap3 %}
 {% load nomcom_tags %}
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index 86d3a4cbb..78d2423ad 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -3,7 +3,7 @@
 {% load origin %}
 
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 {% load nomcom_tags %}
 
 {% block pagehead %}
diff --git a/ietf/templates/oidc_provider/authorize.html b/ietf/templates/oidc_provider/authorize.html
index f4946f209..98510f02e 100644
--- a/ietf/templates/oidc_provider/authorize.html
+++ b/ietf/templates/oidc_provider/authorize.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}404 Not Found{% endblock %}
 {% block content %}
 
diff --git a/ietf/templates/oidc_provider/error.html b/ietf/templates/oidc_provider/error.html
index ec46971eb..3be958d04 100644
--- a/ietf/templates/oidc_provider/error.html
+++ b/ietf/templates/oidc_provider/error.html
@@ -1,6 +1,6 @@
 {# Copyright The IETF Trust 2007, All Rights Reserved #}
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}404 Not Found{% endblock %}
 {% block content %}
 
diff --git a/ietf/templates/person/merge.html b/ietf/templates/person/merge.html
index 98fbd8b2b..e9c2ba8f1 100644
--- a/ietf/templates/person/merge.html
+++ b/ietf/templates/person/merge.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Merge Persons{% endblock %}
diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html
index 4893ba5ba..1238e3081 100644
--- a/ietf/templates/person/profile.html
+++ b/ietf/templates/person/profile.html
@@ -2,7 +2,7 @@
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
 {% load markup_tags %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters %}
 {% load group_filters %}
 
diff --git a/ietf/templates/registration/change_password.html b/ietf/templates/registration/change_password.html
index d7025f71b..28b6bb60b 100644
--- a/ietf/templates/registration/change_password.html
+++ b/ietf/templates/registration/change_password.html
@@ -4,7 +4,7 @@
 
 
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Change password{% endblock %}
 
diff --git a/ietf/templates/registration/change_username.html b/ietf/templates/registration/change_username.html
index 4f32ec8d7..777e7a6cb 100644
--- a/ietf/templates/registration/change_username.html
+++ b/ietf/templates/registration/change_username.html
@@ -3,7 +3,7 @@
 {% load origin %}
 
 {% load bootstrap3 %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Change username{% endblock %}
 
diff --git a/ietf/templates/registration/confirm_account.html b/ietf/templates/registration/confirm_account.html
index edbee4c97..1708652bf 100644
--- a/ietf/templates/registration/confirm_account.html
+++ b/ietf/templates/registration/confirm_account.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 
 {% load bootstrap3 %}
 
diff --git a/ietf/templates/release/stats.html b/ietf/templates/release/stats.html
index 528264d48..40f238593 100644
--- a/ietf/templates/release/stats.html
+++ b/ietf/templates/release/stats.html
@@ -3,7 +3,7 @@
 
 {% load origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block title %}Release Statistics{% endblock %}
 
diff --git a/ietf/templates/stats/document_stats.html b/ietf/templates/stats/document_stats.html
index 6e5cd124c..7d282f5cd 100644
--- a/ietf/templates/stats/document_stats.html
+++ b/ietf/templates/stats/document_stats.html
@@ -2,7 +2,7 @@
 
 {% load origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block title %}{{ stats_title }}{% endblock %}
 
diff --git a/ietf/templates/stats/index.html b/ietf/templates/stats/index.html
index a0259f7ee..23292f08e 100644
--- a/ietf/templates/stats/index.html
+++ b/ietf/templates/stats/index.html
@@ -2,7 +2,7 @@
 
 {% load origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block content %}
   {% origin %}
diff --git a/ietf/templates/stats/known_countries_list.html b/ietf/templates/stats/known_countries_list.html
index 37f4fa8cb..fe4a93d4f 100644
--- a/ietf/templates/stats/known_countries_list.html
+++ b/ietf/templates/stats/known_countries_list.html
@@ -2,7 +2,7 @@
 
 {% load origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block content %}
   {% origin %}
diff --git a/ietf/templates/stats/meeting_stats.html b/ietf/templates/stats/meeting_stats.html
index 44ade0006..d222e5456 100644
--- a/ietf/templates/stats/meeting_stats.html
+++ b/ietf/templates/stats/meeting_stats.html
@@ -2,7 +2,7 @@
 
 {% load origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block title %}{{ stats_title }}{% endblock %}
 
diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html
index f8cf2f4bf..1399901d6 100644
--- a/ietf/templates/stats/review_stats.html
+++ b/ietf/templates/stats/review_stats.html
@@ -2,7 +2,7 @@
 
 {% load origin %}{% origin %}
 
-{% load ietf_filters staticfiles bootstrap3 %}
+{% load ietf_filters static bootstrap3 %}
 
 {% block pagehead %}
   <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/submit/approvals.html b/ietf/templates/submit/approvals.html
index 661afda6c..f5fdbabfe 100644
--- a/ietf/templates/submit/approvals.html
+++ b/ietf/templates/submit/approvals.html
@@ -1,6 +1,6 @@
 {% extends "submit/submit_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/submit/edit_submission.html b/ietf/templates/submit/edit_submission.html
index 11bc46ea7..7b57ff684 100644
--- a/ietf/templates/submit/edit_submission.html
+++ b/ietf/templates/submit/edit_submission.html
@@ -1,7 +1,7 @@
 {% extends "submit/submit_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 {% load submit_tags %}
 
diff --git a/ietf/templates/submit/email.html b/ietf/templates/submit/email.html
index e28f3f552..a23385668 100644
--- a/ietf/templates/submit/email.html
+++ b/ietf/templates/submit/email.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load bootstrap3 %}
 
 {% block title %}Email related to{{ submission.name }}{% endblock %}
diff --git a/ietf/templates/submit/manual_post.html b/ietf/templates/submit/manual_post.html
index ee979341a..58640182a 100644
--- a/ietf/templates/submit/manual_post.html
+++ b/ietf/templates/submit/manual_post.html
@@ -1,6 +1,6 @@
 {% extends "submit/submit_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/submit/submission_email.html b/ietf/templates/submit/submission_email.html
index 0a812057d..475a1f8e0 100644
--- a/ietf/templates/submit/submission_email.html
+++ b/ietf/templates/submit/submission_email.html
@@ -1,6 +1,6 @@
 {% extends "submit/submit_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/ietf/templates/submit/submission_status.html b/ietf/templates/submit/submission_status.html
index bcd8eb9c1..bc36fb8f5 100644
--- a/ietf/templates/submit/submission_status.html
+++ b/ietf/templates/submit/submission_status.html
@@ -1,7 +1,7 @@
 {% extends "submit/submit_base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
 {% load origin %}
-{% load staticfiles %}
+{% load static %}
 {% load ietf_filters submit_tags %}
 
 {% block title %}Submission status of {{ submission.name }}-{{ submission.rev }}{% endblock %}
diff --git a/ietf/templates/sync/discrepancies.html b/ietf/templates/sync/discrepancies.html
index 128b35191..604e01769 100644
--- a/ietf/templates/sync/discrepancies.html
+++ b/ietf/templates/sync/discrepancies.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {# Copyright The IETF Trust 2015, All Rights Reserved #}
-{% load origin staticfiles %}
+{% load origin static %}
 
 {% block pagehead %}
 <link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
diff --git a/patch/fix-request-profiler-streaming-length.patch b/patch/fix-request-profiler-streaming-length.patch
deleted file mode 100644
index ff7942eba..000000000
--- a/patch/fix-request-profiler-streaming-length.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- request_profiler.orig/models.py	2020-06-05 14:33:10.408859604 +0200
-+++ request_profiler/models.py	2020-06-05 14:35:09.412282408 +0200
-@@ -182,7 +182,7 @@
-         """Extract values from HttpRequest and store locally."""
-         self.request = request
-         self.http_method = request.method
--        self.request_uri = request.path
-+        self.request_uri = request.path[:200]
-         self.query_string = request.META.get("QUERY_STRING", "")
-         self.http_user_agent = request.META.get("HTTP_USER_AGENT", "")[:400]
-         # we care about the domain more than the URL itself, so truncating
-@@ -190,11 +190,7 @@
-         self.http_referer = request.META.get("HTTP_REFERER", "")[:400]
-         # X-Forwarded-For is used by convention when passing through
-         # load balancers etc., as the REMOTE_ADDR is rewritten in transit
--        self.remote_addr = (
--            request.META.get("HTTP_X_FORWARDED_FOR")
--            if "HTTP_X_FORWARDED_FOR" in request.META
--            else request.META.get("REMOTE_ADDR")
--        )
-+        self.remote_addr = request.META.get("REMOTE_ADDR")
-         # these two require middleware, so may not exist
-         if hasattr(request, "session"):
-             self.session_key = request.session.session_key or ""
-@@ -207,7 +203,10 @@
-         """Extract values from HttpResponse and store locally."""
-         self.response = response
-         self.response_status_code = response.status_code
--        self.response_content_length = len(response.content)
-+        if hasattr(response, 'content'):
-+            self.response_content_length = len(response.content)
-+        else:
-+            self.response_content_length = -1
-         return self
- 
-     def stop(self):
diff --git a/requirements.txt b/requirements.txt
index 570195120..e58702ee5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,17 +9,16 @@ coverage>=4.0.1,!=4.0.2,<5.0    # Coverage 5.x moves from a json database to SQL
 #cssselect>=0.6.1               # for PyQuery
 decorator>=4.0.4
 defusedxml>=0.4.1		# for TastyPie when ussing xml; not a declared dependency
-Django>=2.1,<2.2
-django-bootstrap3>=9.1.0,<14.0	# 14.0 requires Django 2.2
+Django>=2.2,<3.0
+django-bootstrap3>=14.0
 django-csp>=3.5
 django-cors-headers>=2.4.0
 django-form-utils>=1.0.3
 django-formtools>=1.0		# instead of django.contrib.formtools in 1.8
-django-markup>=1.1,<1.5		# version 1.5 requires Django 2.2
+django-markup>=1.5
 django-oidc-provider>=0.7
 django-password-strength>=1.2.1
 django-referrer-policy>=1.0
-django-request-profiler>=0.15   # 0.15 and above requires Django 2.x
 django-simple-history>=2.3.0
 django-stubs==1.3.0		# The django-stubs version used determines the the mypy version indicated below
 django-tastypie>=0.14.2         # Django 2.1 will require 0.14.2; Django 3.0 will require 0.14.3
@@ -32,8 +31,7 @@ hashids>=1.1.0
 html2text>=2019.8.11
 html5lib>=1.0.1
 httplib2>=0.10.3
-# jsonfield 3.x and higher requires Django 2.2 or higher
-jsonfield>=1.0.3,<3.0		# for SubmissionCheck.  This is https://github.com/bradjasper/django-jsonfield/.
+jsonfield>=3.0		# for SubmissionCheck.  This is https://github.com/bradjasper/django-jsonfield/.
 jwcrypto>=0.4.0			# for signed notifications
 logging_tree>=1.8.1
 #lxml>=3.4.0                    # from PyQuery; 
@@ -61,7 +59,6 @@ requests-mock>=1.8
 rfc2html>=2.0.1
 selenium>=3.9.0
 six>=1.10.0
-sqlparse>=0.2.2
 svn>=1.0.1
 tblib>=1.3.0
 tqdm>=3.7.0