popTimeout in all cases
Merge commit '4180e2739e251f38c29b8927821cf6ba0ecce683'