Merge "Remember to start pending client if enumerate takes too long"