BACKLOG-3649: Fix bad move from bundle-conversion