6 Commits (feature/cn-locale-improvements)