Fix issues with tool migration stage 10.
Merge fix from next-stable.