#18472 minor fixes for settings
Merge branch 'i18472' into development

Conflicts:
	config/locales/en.yml