using symbol as key in locale method
Merge remote-tracking branch 'upstream/develop' into HEAD