Merge "Do not use completeOnTimeout"