fix ns
Merge branch 'devel' into feature/concurrent_benchmarks