[OE-3949] migration tweaks