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