[OE-2557] fixed definitions of wrap()
Merge branch 'jira/2557' into feature/orbis