[OE-2557] syncing element wrappers
[OE-2557] sync wrappers
Merge branch 'jira/2557' into feature/orbis