Merge branch 'dev' into 'test'

Dev

See merge request !97
2 jobs for test in 8 minutes and 30 seconds (queued for 3 seconds)