[OE-3987] migration fixes
[OE-3987] typo
Merge branch 'develop' into jira/3987