324- Waterfall frfr

Upgrade for private generation and plan-specific commercial usage rights.