Merge branch 'develop' into task/simplify-event-on-same-day-logic

5 jobs for task/simplify-event-on-same-day-logic in 3 minutes and 24 seconds (queued for 2 seconds)