Merge branch 'multi-tenant' into 'master'

verbose

See merge request !6
1 job for release/0.12 in 59 seconds (queued for 7 seconds)