QR fixes
Update this fix
Merge origin/develop into develop
Stage flow and registration flow fix
Merge origin/develop into develop