Merge branch 'multi-tenant' into 'master'

Fixing

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