ticket:3 changed timezone
(cherry picked from commit e13637667b4bae7024dd7d6211cddfeb9b4a30a7)