12.0 add fields annual plan

Merged Sebastian Kennedy requested to merge 12.0-add-fields-annual-plan into 12.0-stage

Merge request reports