HOTFIX: DDBEXTRA-136 multiple top level organisations