Merge branch 'master' into 'beta'

GDPR prep to beta

See merge request !79
3 jobs for beta in 3 minutes and 19 seconds (queued for 2 seconds)