Merge branch 'master' into 'develop'

Master

See merge request !436
5 jobs for lukas_issue395_bug_long-competitor-series in 12 minutes and 29 seconds