Merge with latest version of staging

10 jobs for !36 with OCF37-change-development-flask-server-to-production-server
in 3 minutes and 43 seconds, using 0 compute credits, and was queued for 4 seconds
merge request