Merge branch 'dev/parallel_tests' into 'master'

Fix compilation errors

See merge request !3
4 jobs for master
in 0 seconds and was queued for 0 seconds