Merge "add timeout handle"