Fix based on peer review on string internationalisation & timezone
Merge commit 'da19b779c3a83c509297a749a9a6dd650421db33'

* commit 'da19b779c3a83c509297a749a9a6dd650421db33':