fix missing Locale
Merge remote-tracking branch 'origin/ormdao-experimental' into ormdao-experimental