Merge branch 'dev' into 'master'

[plotterparameter] unit tests

See merge request !32
4 jobs for master in 30 minutes and 54 seconds (queued for 4 seconds)