Merge branch 'feature/calendar-fix' into 'develop'

Feature/calendar fix

See merge request !19
4 jobs for develop in 2 minutes and 47 seconds (queued for 1 second)