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

Feature/trace class

See merge request !7
3 jobs for develop in 1 minute and 31 seconds