intermediate merge to master with optimizations to address the heavy load on the webserver, and the many 502/503 errors.