[master] Two additional patches for timezones and NTP