6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 62dc5e89

Merge branch 'develop' into bug/fix-bug-with-database-not-working-in-testflight