Use `Time.current` instead of `Date.today`
Merge branch 'fix-time-zone-issue'