backport of !12551 (merged)
added Normal aports:upgrade labels
marked as a Work In Progress
unmarked as a Work In Progress
merged