migration improvements


Author
Date Commit Parent 505dc169