#6595: Upgrade Task