Bug 892520 - Ensure proper upgrade path
Merge pull request #10929 from lissyx/bug892520

Bug 892520 - Ensure serialization of upgrade path