Correct tests
Limit the maximum number of external resource fetches
Remove unused TemplateView
Merge branch 'master' into bootstrap-api-changes