10 Commits (onboarding-dialog-fix)