Godzilla 2014 short roar3

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