Corrected version for migrated tools.
Merge with next-stable.