[OE-2540] bugfix
Merge branch 'jira/2540' into feature/orbis