Keeping backwardsCompatibility tidy(ish).

Jonesrequested to merge
Jones/fc-pregmod:Weather-Economy into pregmod-master

As per Kopa's suggestion.

Merge request reports