Fallback to primary before configured locale.
Merge branch 'locale_validator' into ahead