Merge remote-tracking branch 'origin/64_and_32_bit_time_tests'