6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit ccee06f3

Merge branch 'feature/478-prereg-tracking2' into bug/552-crash-bug-on-startup