See related JIRA task. This probably needs to be cherry-pick to other years (we'll see during the next campaigns).