Merge branch 'lukas_issue395_bug_long-competitor-series' into 'develop'

Resolve "Bug for long competitor series"

See merge request !439
6 jobs for develop in 14 minutes and 21 seconds (queued for 3 seconds)