Merge 5-uc-92-activate-pre-registered-patient-2 into UC92v2

Merge these two branches which fulfill the same purpose to ensure a clean working tree.

changed milestone to %Iteration 2

added Doing label

assigned to @xc3

assigned to @xuechen5 and unassigned @xc3

merged

mentioned in commit edfd743c