Merge pull request #685 from eric-wu/release-13

Fix data migration issues with DOI and TrashCan
Merge branch 'release-13' into develop