Merge branch 'master' into 'develop-54-traffic-memory-problem'

Master

See merge request !64
3 jobs for develop-54-traffic-memory-problem
in 0 seconds, using 0 compute credits, and was queued for 0 seconds