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.