Adding translation support.
Merge remote-tracking branch 'origin/000000-dev' into 000000-dev