Merge branch 'beta' into 'dev'

Dev <- Beta

See merge request !4
4 jobs for dev in 13 seconds (queued for 3 seconds)