Merge branch 'time_upgrade'