Merge "fix crash in setting time zone" into main