ref: refs/heads/9057-fix-timezone-issues
