[OE-3856] migration bugfixes