Merge "Fix TimestampTest broken by 7e3386d4"