timezone with GMT
Merge branch 'hotfix/timezone_fix' into develop