Merge branch 'dev' into 'test'

Dev

See merge request !79
2 jobs for test in 7 minutes and 5 seconds (queued for 3 seconds)