Merge branch 'master' into 'develop'

Master

See merge request !436
4 jobs for 395-bug-for-long-competitor-series in 10 minutes and 16 seconds (queued for 1 second)