Merge branch 'dev' into 'test'

Dev

See merge request !81
2 jobs for test in 7 minutes and 11 seconds (queued for 2 seconds)