[ADD] Adds annual_apportionment and other minor changes

Merged Gabriel Davini requested to merge 8.0-annual_apportionment into 8.0-stage

Merge request reports