Avoid timeouts on the server
Merge branch 'prod' of https://github.com/vhf/resrc into prod