[OE-3987] migration fixes