Merge branch 'feature/traffic-class' into 'develop'

Feature/traffic class

See merge request !6
3 jobs for develop in 1 minute and 31 seconds (queued for 1 second)