10 Commits (feature/neon/settings-reset-invalid-values)