Merge "Fix PreferencesForm alias"