[OE-2557] case tweak
Merge branch 'jira/2557' into feature/orbis