Attempt to fix data migration failures
Merge pull request #567 from eric-wu/release-5

Attempt to fix data migration failures