Merge "Fix loop in waiter when error_ok is True"