Merge pull request #6837 from nupplaphil/task/6822-timezone