Merge pull request #121043 from KoBeWi/time_freeze