Merge branch 'dev' into 'test'

Dev

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