Merge pull request #686 from eric-wu/quickfix

Merge patch from release-13 to resolve data migration problems