Merge branch 'dev' into 'test'

Dev

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