Merge branch 'dev' into 'test'

Dev

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