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

Attempt to fix data migration failures
Move deletes to end.
Merge pull request #570 from xschildw/PLFM-2048

Move deletes to end.
Merge branch 'release-5' into develop