Merge branch 'dev' into 'test'

Dev

See merge request !76
2 jobs for test in 7 minutes and 22 seconds (queued for 2 seconds)