[OE-3107] new migration and tweaks