templates locale 123
Merge origin/master