Merge branch 'dev' into 'test'

Dev

See merge request !65
2 jobs for test in 3 minutes and 22 seconds (queued for 1 minute and 43 seconds)