FL-359: complete the fix with updates and slotmove