Question about C1 getting rid of Brand-Specific versions

I bought a Fuji-Specific version of a C1 20 Pro license a couple of years ago, but have since started using other brands as well (specifically Panasonic). It was recently announced that C1 would be getting rid of Brand-specific versions and only selling the universal version.

So if I just upgraded my version of Fuji-Specific C1 20 Pro using the discounted price, would I then be able to edit other brands raw files? I'm also confused about them saying we would be getting free upgrades in April, specifically whether or not that would apply to all versions, or just C1 21, which I don't have

This is probably way more obvious than I'm reading it out to be, but the full version is $300, while the upgrade is $150, neither of which are small fees. Also the subscription version is off the table as they bumped the price of monthly up a LOT, so I'm trying to measure a big financial decision here regardless