Time change offset

This is a follow-up of #16758.

Fixes #16759.