Changes to support the template bundler