Merge remote-tracking branch 'origin/time_upgrade' into 64_and_32_bit_time_tests