HOTFIX: Organization logo in preview page missing
DDBEXTRA-132: changed control flow
Merge branch 'DDBEXTRA-132-hla-flow' into develop