[OE-4010] migration bugfixes