diff --git a/docs/subsystems/front-end-build-process.md b/docs/subsystems/front-end-build-process.md
index 10b0a90066..b580ac79bd 100644
--- a/docs/subsystems/front-end-build-process.md
+++ b/docs/subsystems/front-end-build-process.md
@@ -70,8 +70,8 @@ needs to be accessible from one of the entry points defined in
   `app` and `common` bundles.
 * If it's just used on a single standalone page (e.g. `/stats`),
   create a new entry point in `tools/webpack.assets.json`. Use the
-  `render_bundle` function in the relevant Jinja2 template to inject
-  the compiled JS and CSS.
+  `bundle` macro (defined in `templates/zerver/base.html`) in the
+  relevant Jinja2 template to inject the compiled JS and CSS.
 
 If you want to test minified files in development, look for the
 `DEBUG =` line in `zproject/settings.py` and set it to `False`.
diff --git a/templates/analytics/activity.html b/templates/analytics/activity.html
index 89c67493f8..9b9d9eda83 100644
--- a/templates/analytics/activity.html
+++ b/templates/analytics/activity.html
@@ -9,7 +9,7 @@
 
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('activity') }}
+{{ bundle('activity') }}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/analytics/stats.html b/templates/analytics/stats.html
index 38d5106ea0..51387ba928 100644
--- a/templates/analytics/stats.html
+++ b/templates/analytics/stats.html
@@ -7,14 +7,14 @@
 {% endblock %}
 
 {% block customhead %}
-{{ render_bundle('portico') }}
+{{ bundle('portico') }}
 {% endblock %}
 
 {% block content %}
 <div class="app portico-page">
 
-    {{ render_bundle('translations') }}
-    {{ render_bundle('stats') }}
+    {{ bundle('translations') }}
+    {{ bundle('stats') }}
 
     <div class="page-content">
         <div id="id_stats_errors" class="alert alert-error"></div>
diff --git a/templates/analytics/support.html b/templates/analytics/support.html
index 4fedf94c16..e10c364ba7 100644
--- a/templates/analytics/support.html
+++ b/templates/analytics/support.html
@@ -9,8 +9,8 @@
 
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('activity') }}
-{{ render_bundle('support') }}
+{{ bundle('activity') }}
+{{ bundle('support') }}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/confirmation/confirm_preregistrationuser.html b/templates/confirmation/confirm_preregistrationuser.html
index 1ee3eb5bea..9e8b987e4e 100644
--- a/templates/confirmation/confirm_preregistrationuser.html
+++ b/templates/confirmation/confirm_preregistrationuser.html
@@ -2,7 +2,7 @@
 
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('confirm-preregistrationuser') }}
+{{ bundle('confirm-preregistrationuser') }}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/corporate/billing.html b/templates/corporate/billing.html
index 4a854380a4..26fad6015f 100644
--- a/templates/corporate/billing.html
+++ b/templates/corporate/billing.html
@@ -2,8 +2,8 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
-{{ render_bundle('billing') }}
+{{ bundle('landing-page') }}
+{{ bundle('billing') }}
 <script src="https://checkout.stripe.com/checkout.js"></script>
 {% endblock %}
 
@@ -13,7 +13,7 @@
 
     {% include 'zerver/billing_nav.html' %}
 
-    {{ render_bundle('translations') }}
+    {{ bundle('translations') }}
     <div class="portico-landing billing-upgrade-page">
         <div class="hero small-hero"></div>
 
diff --git a/templates/corporate/jobs.html b/templates/corporate/jobs.html
index 0c639bf4ec..dd3d96aa33 100644
--- a/templates/corporate/jobs.html
+++ b/templates/corporate/jobs.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/corporate/upgrade.html b/templates/corporate/upgrade.html
index 7bce30e6a8..cfa10e8e00 100644
--- a/templates/corporate/upgrade.html
+++ b/templates/corporate/upgrade.html
@@ -11,8 +11,8 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
-{{ render_bundle('upgrade') }}
+{{ bundle('landing-page') }}
+{{ bundle('upgrade') }}
 <script src="https://checkout.stripe.com/checkout.js"></script>
 {% endblock %}
 
@@ -22,7 +22,7 @@
 
     {% include 'zerver/billing_nav.html' %}
 
-    {{ render_bundle('translations') }}
+    {{ bundle('translations') }}
 
     <div class="portico-landing billing-upgrade-page">
         <div class="hero small-hero"></div>
diff --git a/templates/corporate/zephyr.html b/templates/corporate/zephyr.html
index 4fb3a97b3a..5bd9119513 100644
--- a/templates/corporate/zephyr.html
+++ b/templates/corporate/zephyr.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/app/index.html b/templates/zerver/app/index.html
index 7087302d58..b2ac7fd77f 100644
--- a/templates/zerver/app/index.html
+++ b/templates/zerver/app/index.html
@@ -16,8 +16,8 @@
 {% endblock %}
 
 {% block commonjs %}
-{{ render_bundle('app', attrs='nonce="%s"' % (csp_nonce,)) }}
-{{ render_bundle('katex', attrs='nonce="%s"' % (csp_nonce,)) }}
+{{ bundle('app') }}
+{{ bundle('katex') }}
 {% endblock %}
 
 {% block customhead %}
diff --git a/templates/zerver/apps.html b/templates/zerver/apps.html
index 6476654362..6dbbc63298 100644
--- a/templates/zerver/apps.html
+++ b/templates/zerver/apps.html
@@ -5,7 +5,7 @@
 <style media="screen">
     .app.portico-page { padding-bottom: 0px; }
 </style>
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/archive/index.html b/templates/zerver/archive/index.html
index eca2b98da3..7d7417102d 100644
--- a/templates/zerver/archive/index.html
+++ b/templates/zerver/archive/index.html
@@ -11,11 +11,11 @@
         }
     </style>
 
-    {{ render_bundle('translations', attrs='nonce="%s"' % (csp_nonce,)) }}
-    {{ render_bundle('katex', attrs='nonce="%s"' % (csp_nonce,)) }}
-    {{ render_bundle('portico') }}
-    {{ render_bundle('archive') }}
-    {{ render_bundle('archive-styles') }}
+    {{ bundle('translations') }}
+    {{ bundle('katex') }}
+    {{ bundle('portico') }}
+    {{ bundle('archive') }}
+    {{ bundle('archive-styles') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/atlassian.html b/templates/zerver/atlassian.html
index 6bd2963faf..736c2fa6be 100644
--- a/templates/zerver/atlassian.html
+++ b/templates/zerver/atlassian.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/base.html b/templates/zerver/base.html
index 8ee48cbfdf..4d5e8a6ba0 100644
--- a/templates/zerver/base.html
+++ b/templates/zerver/base.html
@@ -26,11 +26,16 @@
         var page_params = {debug_mode: false};
         </script>
         {% endblock %}
+
+        {% macro bundle(name) %}
+        {{ render_bundle(name, attrs='nonce="%s"' % (csp_nonce,) if csp_nonce else '') }}
+        {% endmacro %}
+
         <!-- This is a temporary block to enable webpack transition
         This allows pages requiring common files via webpack to override
         this block -->
         {% block commonjs %}
-        {{ render_bundle('common', attrs='nonce="%s"' % (csp_nonce,)) }}
+        {{ bundle('common') }}
         {% endblock %}
         {% block customhead %}
         {% endblock %}
diff --git a/templates/zerver/dev_login.html b/templates/zerver/dev_login.html
index c8f7dfea15..1f8703d1b5 100644
--- a/templates/zerver/dev_login.html
+++ b/templates/zerver/dev_login.html
@@ -2,7 +2,7 @@
 
 {# Login page. #}
 {% block portico_content %}
-{{ render_bundle('dev-login') }}
+{{ bundle('dev-login') }}
 <!-- The following empty tag has unique data-page-id so that this
 page can be easily identified in it's respective JavaScript file -->
 <div data-page-id="dev-login"></div>
diff --git a/templates/zerver/digest_base.html b/templates/zerver/digest_base.html
index a74bcf85f8..9acf1774b7 100644
--- a/templates/zerver/digest_base.html
+++ b/templates/zerver/digest_base.html
@@ -1,7 +1,7 @@
 {% extends "zerver/base.html" %}
 
 {% block porticocustomhead %}
-{{ render_bundle('portico') }}
+{{ bundle('portico') }}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/zerver/documentation_main.html b/templates/zerver/documentation_main.html
index 4b79afdb34..55a99ae60b 100644
--- a/templates/zerver/documentation_main.html
+++ b/templates/zerver/documentation_main.html
@@ -28,5 +28,5 @@
     </div>
 </div>
 
-{{ render_bundle("help") }}
+{{ bundle("help") }}
 {% endblock %}
diff --git a/templates/zerver/email_log.html b/templates/zerver/email_log.html
index 3c4226e06d..f29526c9ac 100644
--- a/templates/zerver/email_log.html
+++ b/templates/zerver/email_log.html
@@ -1,6 +1,6 @@
 {% extends "zerver/base.html" %}
 {% block content %}
-{{ render_bundle('email-log') }}
+{{ bundle('email-log') }}
 <div class="container">
     <div style="position: fixed">
         <div class="alert">
diff --git a/templates/zerver/features.html b/templates/zerver/features.html
index a5ea1a5879..55711eb1bd 100644
--- a/templates/zerver/features.html
+++ b/templates/zerver/features.html
@@ -4,7 +4,7 @@
 {% set OPEN_GRAPH_DESCRIPTION = 'First class threading on top of everything you could want from real-time chat.' %}
 
 {% block customhead %}
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/for-companies.html b/templates/zerver/for-companies.html
index 5de6e544d4..c17aab8f84 100644
--- a/templates/zerver/for-companies.html
+++ b/templates/zerver/for-companies.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/for-mystery-hunt.html b/templates/zerver/for-mystery-hunt.html
index 1eb10670e2..d6bfe2d551 100644
--- a/templates/zerver/for-mystery-hunt.html
+++ b/templates/zerver/for-mystery-hunt.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/for-open-source.html b/templates/zerver/for-open-source.html
index 6a571bbc2f..4e19b42e0d 100644
--- a/templates/zerver/for-open-source.html
+++ b/templates/zerver/for-open-source.html
@@ -9,7 +9,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/for-working-groups-and-communities.html b/templates/zerver/for-working-groups-and-communities.html
index c99b03853a..1bd5fa22e6 100644
--- a/templates/zerver/for-working-groups-and-communities.html
+++ b/templates/zerver/for-working-groups-and-communities.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/hello.html b/templates/zerver/hello.html
index f6825663e5..4d5fd0aa42 100644
--- a/templates/zerver/hello.html
+++ b/templates/zerver/hello.html
@@ -5,7 +5,7 @@
 <!-- Bootstrap 2.3.2-->
 <script src="https://stackpath.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
 
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 <style>
     .portico-page {
     padding-bottom: 0px;
diff --git a/templates/zerver/history.html b/templates/zerver/history.html
index 9a0eb53bb7..5e8fb65135 100644
--- a/templates/zerver/history.html
+++ b/templates/zerver/history.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/integrations/development/dev_panel.html b/templates/zerver/integrations/development/dev_panel.html
index ab28fcd85f..3f2ce4337d 100644
--- a/templates/zerver/integrations/development/dev_panel.html
+++ b/templates/zerver/integrations/development/dev_panel.html
@@ -3,8 +3,8 @@
 {% block customhead %}
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('integrations-dev-panel') }}
-{{ render_bundle('portico') }}
+{{ bundle('integrations-dev-panel') }}
+{{ bundle('portico') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/integrations/index.html b/templates/zerver/integrations/index.html
index 64e71e1e34..68b3857991 100644
--- a/templates/zerver/integrations/index.html
+++ b/templates/zerver/integrations/index.html
@@ -2,7 +2,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('integrations') }}
+{{ bundle('integrations') }}
 {% endblock %}
 
 {% block hello_page_container %} hello-main{% endblock %}
diff --git a/templates/zerver/login.html b/templates/zerver/login.html
index 3b511ba043..4efc695df6 100644
--- a/templates/zerver/login.html
+++ b/templates/zerver/login.html
@@ -3,7 +3,7 @@
 
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('signup') }}
+{{ bundle('signup') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/plans.html b/templates/zerver/plans.html
index 18966df194..a453e0989c 100644
--- a/templates/zerver/plans.html
+++ b/templates/zerver/plans.html
@@ -2,7 +2,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/portico.html b/templates/zerver/portico.html
index d5d4a7c189..18d67a9ee5 100644
--- a/templates/zerver/portico.html
+++ b/templates/zerver/portico.html
@@ -7,8 +7,8 @@
 #}
 
 {% block porticocustomhead %}
-{{ render_bundle('translations') }}
-{{ render_bundle('portico') }}
+{{ bundle('translations') }}
+{{ bundle('portico') }}
 {% endblock %}
 
 {% block content %}
diff --git a/templates/zerver/portico_signup.html b/templates/zerver/portico_signup.html
index e36512f93e..9435125f5c 100644
--- a/templates/zerver/portico_signup.html
+++ b/templates/zerver/portico_signup.html
@@ -4,5 +4,5 @@
 
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('signup') }}
+{{ bundle('signup') }}
 {% endblock %}
diff --git a/templates/zerver/privacy.html b/templates/zerver/privacy.html
index cf3946634e..e7795de745 100644
--- a/templates/zerver/privacy.html
+++ b/templates/zerver/privacy.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/realm_creation_failed.html b/templates/zerver/realm_creation_failed.html
index 63f9862ad9..5f53081fc9 100644
--- a/templates/zerver/realm_creation_failed.html
+++ b/templates/zerver/realm_creation_failed.html
@@ -2,7 +2,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/register.html b/templates/zerver/register.html
index 7bd4fcda33..30915e3b2b 100644
--- a/templates/zerver/register.html
+++ b/templates/zerver/register.html
@@ -8,8 +8,8 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
 
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('zxcvbn') }}
-{{ render_bundle('translations') }}
+{{ bundle('zxcvbn') }}
+{{ bundle('translations') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/reset_confirm.html b/templates/zerver/reset_confirm.html
index bf3bde65b7..29f28fae5f 100644
--- a/templates/zerver/reset_confirm.html
+++ b/templates/zerver/reset_confirm.html
@@ -1,7 +1,7 @@
 {% extends "zerver/portico_signup.html" %}
 {% block customhead %}
 {{ super() }}
-{{ render_bundle('zxcvbn') }}
+{{ bundle('zxcvbn') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/security.html b/templates/zerver/security.html
index f7764383e7..bd157a3a28 100644
--- a/templates/zerver/security.html
+++ b/templates/zerver/security.html
@@ -6,7 +6,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/team.html b/templates/zerver/team.html
index a68474c7e4..1a1dc0b136 100644
--- a/templates/zerver/team.html
+++ b/templates/zerver/team.html
@@ -9,7 +9,7 @@
 <script>
     var contributors_list = {{ contrib|safe }};
 </script>
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 {% endblock %}
 
 {% block portico_content %}
diff --git a/templates/zerver/terms.html b/templates/zerver/terms.html
index 19029f6d82..20f316de49 100644
--- a/templates/zerver/terms.html
+++ b/templates/zerver/terms.html
@@ -4,7 +4,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/templates/zerver/why-zulip.html b/templates/zerver/why-zulip.html
index bdcce0d449..883aa94340 100644
--- a/templates/zerver/why-zulip.html
+++ b/templates/zerver/why-zulip.html
@@ -9,7 +9,7 @@
 
 {% block customhead %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-{{ render_bundle('landing-page') }}
+{{ bundle('landing-page') }}
 
 {% endblock %}
 
diff --git a/tools/lib/template_parser.py b/tools/lib/template_parser.py
index 24510dc2f9..485291c955 100644
--- a/tools/lib/template_parser.py
+++ b/tools/lib/template_parser.py
@@ -336,6 +336,7 @@ def is_django_block_tag(tag):
         'for',
         'if',
         'ifequal',
+        'macro',
         'verbatim',
         'blocktrans',
         'trans',