Merge branch 'hotfix/lessthreads'
Now we should finally have a 30x and error handling that works.
Merge branch 'hotfix/redirect' into develop