Merge branch 'dev' into 'test'

Dev

See merge request !105
2 jobs for test in 4 minutes and 43 seconds (queued for 1 second)