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