Merge branch 'dev' into 'testing'

Dev

See merge request !143
3 jobs for testing in 1 minute and 38 seconds (queued for 2 seconds)