Merge down from release-13 to resolve data migration problems