Fixed time zone calculation issue
Merge branch '2.0'