Lang management
Merge commit 'd77c4fbf8d6c0d3ea7a699ca03b2e07c4d65ca75'

* commit 'd77c4fbf8d6c0d3ea7a699ca03b2e07c4d65ca75':
  Lang management