Refactor Upgrade => Condition, ...
Closes #7047