Fix issue #12093
Fix timezone problem

* origin/pr/12118:
  Fix issue #12093
Fix timezone problem

* origin/master:
  Fix issue #12093