Merge branch 'multi-tenant' into 'master'

Multi tenant

See merge request !4
2 jobs for master in 1 minute and 21 seconds (queued for 4 seconds)