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

Develop 54 traffic memory problem

See merge request !71
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds