Merge branch 'dev' into 'qa'

Release 3.0

See merge request !4
2 jobs for qa in 1 minute and 38 seconds (queued for 9 seconds)
latest