8.0 stage - Fix registration creation with year_id

Merged Sebastian Kennedy requested to merge 8.0-stage into 8.0

Merge request reports