Merge branch 'develop' into 494-error-code-on-events-pages

5 jobs for 494-error-code-on-events-pages in 5 minutes and 53 seconds (queued for 1 second)