[OE-3377] - fully working admin side
Merge remote-tracking branch 'origin/jira/OE-3377' into jira/OE-3377