Merge pull request #2013 from surendratiwari3/no_evapi_client_send_failed