Re #8895. Changing valid-to date.
Re #8895. Adding powgen geometry for this cycle.
Merge branch 'feature/8895_pg3_geom' into develop