Time zone fix
Merge branch 'fix_time_zone'
All tests passed