BS-10947
Fix migration + edit wizard