Merge branch 'dev' into 'test'

Dev

See merge request !92
2 jobs for test in 9 minutes and 3 seconds (queued for 3 seconds)