remove m_time_of_day_f to reduce data race
Merge remote-tracking branch 'upstream/master' into next