* Fix some old migration scripts * Fix edge case in two-step migration from older releases
Fix #12082