COMMONS-237: Code logic in Upgrade Framework is bad