Fix universal option inheritance during upgrades