diff --git a/src/CommonLibrariesForNET/AuthenticationClient.cs b/src/CommonLibrariesForNET/AuthenticationClient.cs
index 02df6e80..d8e3dac4 100644
--- a/src/CommonLibrariesForNET/AuthenticationClient.cs
+++ b/src/CommonLibrariesForNET/AuthenticationClient.cs
@@ -192,7 +192,7 @@ public async Task GetLatestVersionAsync()
             try
             {
                 string serviceURL = InstanceUrl + @"/services/data/";
-                HttpResponseMessage responseMessage = await _httpClient.GetAsync(serviceURL);
+                HttpResponseMessage responseMessage = await _httpClient.GetAsync(serviceURL).ConfigureAwait(false);
 
                 var response = await responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false);
                 if (responseMessage.IsSuccessStatusCode)
diff --git a/src/CommonLibrariesForNET/Extensions/HttpContentCompressedDataExtensions.cs b/src/CommonLibrariesForNET/Extensions/HttpContentCompressedDataExtensions.cs
index cd3af245..3be4d9ba 100644
--- a/src/CommonLibrariesForNET/Extensions/HttpContentCompressedDataExtensions.cs
+++ b/src/CommonLibrariesForNET/Extensions/HttpContentCompressedDataExtensions.cs
@@ -38,7 +38,7 @@ public static async Task<string> ReadAsDecompressedStringAsync(this HttpContent
             {
                 var responseStream = await responseContent.ReadAsStreamAsync().ConfigureAwait(false);
                 var unzippedContent = new GZipStream(responseStream, CompressionMode.Decompress);
-                content = await(new StreamReader(unzippedContent)).ReadToEndAsync();
+                content = await(new StreamReader(unzippedContent)).ReadToEndAsync().ConfigureAwait(false);
             }
             else
             {
diff --git a/src/CommonLibrariesForNET/JsonHttpClient.cs b/src/CommonLibrariesForNET/JsonHttpClient.cs
index 26d67132..e9afb656 100644
--- a/src/CommonLibrariesForNET/JsonHttpClient.cs
+++ b/src/CommonLibrariesForNET/JsonHttpClient.cs
@@ -34,14 +34,14 @@ private static ForceException ParseForceException(string responseMessage)
         public async Task<T> HttpGetAsync<T>(string urlSuffix)
         {
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
-            return await HttpGetAsync<T>(url);
+            return await HttpGetAsync<T>(url).ConfigureAwait(false);
         }
 
         public async Task<T> HttpGetAsync<T>(Uri uri)
         {
             try
             {
-                var response = await HttpGetAsync(uri);
+                var response = await HttpGetAsync(uri).ConfigureAwait(false);
                 var jToken = JToken.Parse(response);
                 if (jToken.Type == JTokenType.Array)
                 {
@@ -79,7 +79,7 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
                 }
                 try
                 {
-                    var response = await HttpGetAsync(url);
+                    var response = await HttpGetAsync(url).ConfigureAwait(false);
                     var jObject = JObject.Parse(response);
                     var jToken = jObject.GetValue(nodeName);
                     next = (jObject.GetValue("nextRecordsUrl") != null) ? jObject.GetValue("nextRecordsUrl").ToString() : null;
@@ -107,7 +107,7 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
             };
 
             var responseMessage = await HttpClient.SendAsync(request).ConfigureAwait(false);
-            var response = await responseMessage.Content.ReadAsStreamAsync();
+            var response = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false);
 
             if (responseMessage.IsSuccessStatusCode)
             {
@@ -122,7 +122,7 @@ public async Task<IList<T>> HttpGetAsync<T>(string urlSuffix, string nodeName)
         public async Task<T> HttpGetRestApiAsync<T>(string apiName)
         {
             var url = Common.FormatRestApiUrl(apiName, InstanceUrl);
-            return await HttpGetAsync<T>(url);
+            return await HttpGetAsync<T>(url).ConfigureAwait(false);
         }
 
         // POST
@@ -130,7 +130,7 @@ public async Task<T> HttpGetRestApiAsync<T>(string apiName)
         public async Task<T> HttpPostAsync<T>(object inputObject, string urlSuffix)
         {
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
-            return await HttpPostAsync<T>(inputObject, url);
+            return await HttpPostAsync<T>(inputObject, url).ConfigureAwait(false);
         }
 
         public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
@@ -145,7 +145,7 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
                    });
             try
             {
-                var response = await HttpPostAsync(json, uri);
+                var response = await HttpPostAsync(json, uri).ConfigureAwait(false);
                 return JsonConvert.DeserializeObject<T>(response);
             }
             catch (BaseHttpClientException e)
@@ -157,7 +157,7 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
         public async Task<T> HttpPostRestApiAsync<T>(string apiName, object inputObject)
         {
             var url = Common.FormatRestApiUrl(apiName, InstanceUrl);
-            return await HttpPostAsync<T>(inputObject, url);
+            return await HttpPostAsync<T>(inputObject, url).ConfigureAwait(false);
         }
 
         public async Task<T> HttpBinaryDataPostAsync<T>(string urlSuffix, object inputObject, byte[] fileContents, string headerName, string fileName)
@@ -201,7 +201,7 @@ public async Task<T> HttpBinaryDataPostAsync<T>(string urlSuffix, object inputOb
         public async Task<SuccessResponse> HttpPatchAsync(object inputObject, string urlSuffix)
         {
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
-            return await HttpPatchAsync(inputObject, url);
+            return await HttpPatchAsync(inputObject, url).ConfigureAwait(false);
         }
 
         public async Task<SuccessResponse> HttpPatchAsync(object inputObject, string urlSuffix, bool ignoreNull)
@@ -209,13 +209,13 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, string url
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
             if (ignoreNull == true)
             {
-                return await HttpPatchAsync(inputObject, url);
+                return await HttpPatchAsync(inputObject, url).ConfigureAwait(false);
             }
             else
             {
-                return await HttpPatchAsync(inputObject, url, NullValueHandling.Include);
+                return await HttpPatchAsync(inputObject, url, NullValueHandling.Include).ConfigureAwait(false);
             }
-         //   return await HttpPatchAsync(inputObject, url, ignoreNull);
+         //   return await HttpPatchAsync(inputObject, url, ignoreNull).ConfigureAwait(false);
         }
 
 
@@ -231,7 +231,7 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri)
                 });
             try
             {
-                var response = await base.HttpPatchAsync(json, uri);
+                var response = await base.HttpPatchAsync(json, uri).ConfigureAwait(false);
                 return string.IsNullOrEmpty(response) ?
                     new SuccessResponse{ Id = "", Errors = "", Success = true } :
                     JsonConvert.DeserializeObject<SuccessResponse>(response);
@@ -257,7 +257,7 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri, N
            
             try
             {
-                var response = await base.HttpPatchAsync(json, uri);
+                var response = await base.HttpPatchAsync(json, uri).ConfigureAwait(false);
                 return string.IsNullOrEmpty(response) ?
                     new SuccessResponse { Id = "", Errors = "", Success = true } :
                     JsonConvert.DeserializeObject<SuccessResponse>(response);
@@ -273,14 +273,14 @@ public async Task<SuccessResponse> HttpPatchAsync(object inputObject, Uri uri, N
         public async Task<bool> HttpDeleteAsync(string urlSuffix)
         {
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
-            return await HttpDeleteAsync(url);
+            return await HttpDeleteAsync(url).ConfigureAwait(false);
         }
 
         public new async Task<bool> HttpDeleteAsync(Uri uri)
         {
             try
             {
-                await base.HttpDeleteAsync(uri);
+                await base.HttpDeleteAsync(uri).ConfigureAwait(false);
                 return true;
             }
             catch (BaseHttpClientException e)
diff --git a/src/CommonLibrariesForNET/XmlHttpClient.cs b/src/CommonLibrariesForNET/XmlHttpClient.cs
index d9ee5713..a38247e0 100644
--- a/src/CommonLibrariesForNET/XmlHttpClient.cs
+++ b/src/CommonLibrariesForNET/XmlHttpClient.cs
@@ -26,14 +26,14 @@ public XmlHttpClient(string instanceUrl, string apiVersion, string accessToken,
         public async Task<T> HttpGetAsync<T>(string urlSuffix)
         {
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
-            return await HttpGetAsync<T>(url);
+            return await HttpGetAsync<T>(url).ConfigureAwait(false);
         }
 
         public async Task<T> HttpGetAsync<T>(Uri uri)
         {
             try
             {
-                var response = await HttpGetAsync(uri);
+                var response = await HttpGetAsync(uri).ConfigureAwait(false);
                 return DeserializeXmlString<T>(response);
             }
             catch (BaseHttpClientException e)
@@ -47,7 +47,7 @@ public async Task<T> HttpGetAsync<T>(Uri uri)
         public async Task<T> HttpPostAsync<T>(object inputObject, string urlSuffix)
         {
             var url = Common.FormatUrl(urlSuffix, InstanceUrl, ApiVersion);
-            return await HttpPostAsync<T>(inputObject, url);
+            return await HttpPostAsync<T>(inputObject, url).ConfigureAwait(false);
         }
 
         public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
@@ -55,7 +55,7 @@ public async Task<T> HttpPostAsync<T>(object inputObject, Uri uri)
             var postBody = SerializeXmlObject(inputObject);
             try
             {
-                var response = await HttpPostAsync(postBody, uri);
+                var response = await HttpPostAsync(postBody, uri).ConfigureAwait(false);
                 return DeserializeXmlString<T>(response);
             }
             catch (BaseHttpClientException e)
diff --git a/src/ForceToolkitForNET/ForceClient.cs b/src/ForceToolkitForNET/ForceClient.cs
index b30135cf..4247802f 100644
--- a/src/ForceToolkitForNET/ForceClient.cs
+++ b/src/ForceToolkitForNET/ForceClient.cs
@@ -70,14 +70,14 @@ public Task<QueryResult<T>> QueryAllAsync<T>(string query)
             if (string.IsNullOrEmpty(objectId)) throw new ArgumentNullException(nameof(objectId));
             if (string.IsNullOrEmpty(fieldName)) throw new ArgumentNullException(nameof(fieldName));
 
-            return await _jsonHttpClient.HttpGetBlobAsync($"sobjects/{objectName}/{objectId}/{fieldName}");
+            return await _jsonHttpClient.HttpGetBlobAsync($"sobjects/{objectName}/{objectId}/{fieldName}").ConfigureAwait(false);
         }
 
         public async Task<T> ExecuteRestApiAsync<T>(string apiName)
         {
             if (string.IsNullOrEmpty(apiName)) throw new ArgumentNullException("apiName");
 
-            var response = await _jsonHttpClient.HttpGetRestApiAsync<T>(apiName);
+            var response = await _jsonHttpClient.HttpGetRestApiAsync<T>(apiName).ConfigureAwait(false);
             return response;
         }
 
@@ -86,7 +86,7 @@ public async Task<T> ExecuteRestApiAsync<T>(string apiName, object inputObject)
             if (string.IsNullOrEmpty(apiName)) throw new ArgumentNullException("apiName");
             if (inputObject == null) throw new ArgumentNullException("inputObject");
 
-            var response = await _jsonHttpClient.HttpPostRestApiAsync<T>(apiName, inputObject);
+            var response = await _jsonHttpClient.HttpPostRestApiAsync<T>(apiName, inputObject).ConfigureAwait(false);
             return response;
         }
 
@@ -107,7 +107,7 @@ public async Task<T> QueryAllFieldsByIdAsync<T>(string objectName, string record
             if (string.IsNullOrEmpty(objectName)) throw new ArgumentNullException("objectName");
             if (string.IsNullOrEmpty(recordId)) throw new ArgumentNullException("recordId");
 
-            var fields = await GetFieldsCommaSeparatedListAsync(objectName);
+            var fields = await GetFieldsCommaSeparatedListAsync(objectName).ConfigureAwait(false);
             var query = string.Format("SELECT {0} FROM {1} WHERE Id = '{2}'", fields, objectName, recordId);
             var results = await QueryAsync<T>(query).ConfigureAwait(false);
 
@@ -120,7 +120,7 @@ public async Task<T> QueryAllFieldsByExternalIdAsync<T>(string objectName, strin
             if (string.IsNullOrEmpty(externalIdFieldName)) throw new ArgumentNullException("externalIdFieldName");
             if (string.IsNullOrEmpty(externalId)) throw new ArgumentNullException("externalId");
 
-            var fields = await GetFieldsCommaSeparatedListAsync(objectName);
+            var fields = await GetFieldsCommaSeparatedListAsync(objectName).ConfigureAwait(false);
             var query = string.Format("SELECT {0} FROM {1} WHERE {2} = '{3}'", fields, objectName, externalIdFieldName, externalId);
             var results = await QueryAsync<T>(query).ConfigureAwait(false);
 
@@ -261,13 +261,13 @@ public async Task<T> UserInfo<T>(string url)
             if (string.IsNullOrEmpty(url)) throw new ArgumentNullException("url");
             if (!Uri.IsWellFormedUriString(url, UriKind.Absolute)) throw new FormatException("url");
 
-            var response = await _jsonHttpClient.HttpGetAsync<T>(new Uri(url));
+            var response = await _jsonHttpClient.HttpGetAsync<T>(new Uri(url)).ConfigureAwait(false);
             return response;
         }
 
         public async Task<string> GetFieldsCommaSeparatedListAsync(string objectName)
         {
-            IDictionary<string, object> objectProperties = await DescribeAsync<ExpandoObject>(objectName);
+            IDictionary<string, object> objectProperties = await DescribeAsync<ExpandoObject>(objectName).ConfigureAwait(false);
             objectProperties.TryGetValue("fields", out object fields);
             List<string> objectDescription = new List<string>();
             foreach (ExpandoObject field in fields as IEnumerable)
@@ -288,7 +288,7 @@ public Task<T> ExecuteAnonymousAsync<T>(string apex)
         public async Task<List<BatchInfoResult>> RunJobAsync<T>(string objectName, BulkConstants.OperationType operationType,
             IEnumerable<ISObjectList<T>> recordsLists)
         {
-            return await RunJobAsync(objectName, null, operationType, recordsLists);
+            return await RunJobAsync(objectName, null, operationType, recordsLists).ConfigureAwait(false);
         }
 
         public async Task<List<BatchInfoResult>> RunJobAsync<T>(string objectName, string externalIdFieldName,
@@ -298,20 +298,20 @@ public async Task<List<BatchInfoResult>> RunJobAsync<T>(string objectName, strin
 
             if (operationType == BulkConstants.OperationType.Upsert && string.IsNullOrEmpty(externalIdFieldName)) throw new ArgumentNullException(nameof(externalIdFieldName));
 
-            var jobInfoResult = await CreateJobAsync(objectName, externalIdFieldName, operationType);
+            var jobInfoResult = await CreateJobAsync(objectName, externalIdFieldName, operationType).ConfigureAwait(false);
             var batchResults = new List<BatchInfoResult>();
             foreach (var recordList in recordsLists)
             {
-                batchResults.Add(await CreateJobBatchAsync(jobInfoResult, recordList));
+                batchResults.Add(await CreateJobBatchAsync(jobInfoResult, recordList).ConfigureAwait(false));
             }
-            await CloseJobAsync(jobInfoResult);
+            await CloseJobAsync(jobInfoResult).ConfigureAwait(false);
             return batchResults;
         }
 
         public async Task<List<BatchResultList>> RunJobAndPollAsync<T>(string objectName, BulkConstants.OperationType operationType,
             IEnumerable<ISObjectList<T>> recordsLists)
         {
-            return await RunJobAndPollAsync(objectName, null, operationType, recordsLists);
+            return await RunJobAndPollAsync(objectName, null, operationType, recordsLists).ConfigureAwait(false);
         }
 
         public async Task<List<BatchResultList>> RunJobAndPollAsync<T>(string objectName, string externalIdFieldName, BulkConstants.OperationType operationType,
@@ -320,7 +320,7 @@ public async Task<List<BatchResultList>> RunJobAndPollAsync<T>(string objectName
             const float pollingStart = 1000;
             const float pollingIncrease = 2.0f;
 
-            var batchInfoResults = await RunJobAsync(objectName, externalIdFieldName, operationType, recordsLists);
+            var batchInfoResults = await RunJobAsync(objectName, externalIdFieldName, operationType, recordsLists).ConfigureAwait(false);
 
             var currentPoll = pollingStart;
             var finishedBatchInfoResults = new List<BatchInfoResult>();
@@ -329,7 +329,7 @@ public async Task<List<BatchResultList>> RunJobAndPollAsync<T>(string objectName
                 var removeList = new List<BatchInfoResult>();
                 foreach (var batchInfoResult in batchInfoResults)
                 {
-                    var batchInfoResultNew = await PollBatchAsync(batchInfoResult);
+                    var batchInfoResultNew = await PollBatchAsync(batchInfoResult).ConfigureAwait(false);
                     if (batchInfoResultNew.State.Equals(BulkConstants.BatchState.Completed.Value()) ||
                         batchInfoResultNew.State.Equals(BulkConstants.BatchState.Failed.Value()) ||
                         batchInfoResultNew.State.Equals(BulkConstants.BatchState.NotProcessed.Value()))
@@ -343,7 +343,7 @@ public async Task<List<BatchResultList>> RunJobAndPollAsync<T>(string objectName
                     batchInfoResults.Remove(removeItem);
                 }
 
-                await Task.Delay((int)currentPoll);
+                await Task.Delay((int)currentPoll).ConfigureAwait(false);
                 currentPoll *= pollingIncrease;
             }
 
@@ -351,14 +351,14 @@ public async Task<List<BatchResultList>> RunJobAndPollAsync<T>(string objectName
             var batchResults = new List<BatchResultList>();
             foreach (var batchInfoResultComplete in finishedBatchInfoResults)
             {
-                batchResults.Add(await GetBatchResultAsync(batchInfoResultComplete));
+                batchResults.Add(await GetBatchResultAsync(batchInfoResultComplete).ConfigureAwait(false));
             }
             return batchResults;
         }
 
         public async Task<JobInfoResult> CreateJobAsync(string objectName, BulkConstants.OperationType operationType)
         {
-            return await CreateJobAsync(objectName, null, operationType);
+            return await CreateJobAsync(objectName, null, operationType).ConfigureAwait(false);
         }
 
         public async Task<JobInfoResult> CreateJobAsync(string objectName, string externalIdFieldName, BulkConstants.OperationType operationType)
@@ -375,7 +375,7 @@ public async Task<JobInfoResult> CreateJobAsync(string objectName, string extern
                 Operation = operationType.Value()
             };
 
-            return await _xmlHttpClient.HttpPostAsync<JobInfoResult>(jobInfo, "/services/async/{0}/job");
+            return await _xmlHttpClient.HttpPostAsync<JobInfoResult>(jobInfo, "/services/async/{0}/job").ConfigureAwait(false);
         }
 
         public async Task<BatchInfoResult> CreateJobBatchAsync<T>(JobInfoResult jobInfo, ISObjectList<T> recordsList)
@@ -396,7 +396,7 @@ public async Task<BatchInfoResult> CreateJobBatchAsync<T>(string jobId, ISObject
         public async Task<JobInfoResult> CloseJobAsync(JobInfoResult jobInfo)
         {
             if (jobInfo == null) throw new ArgumentNullException("jobInfo");
-            return await CloseJobAsync(jobInfo.Id);
+            return await CloseJobAsync(jobInfo.Id).ConfigureAwait(false);
         }
 
         public async Task<JobInfoResult> CloseJobAsync(string jobId)
@@ -411,7 +411,7 @@ public async Task<JobInfoResult> CloseJobAsync(string jobId)
         public async Task<JobInfoResult> PollJobAsync(JobInfoResult jobInfo)
         {
             if (jobInfo == null) throw new ArgumentNullException("jobInfo");
-            return await PollJobAsync(jobInfo.Id);
+            return await PollJobAsync(jobInfo.Id).ConfigureAwait(false);
         }
 
         public async Task<JobInfoResult> PollJobAsync(string jobId)
@@ -425,7 +425,7 @@ public async Task<JobInfoResult> PollJobAsync(string jobId)
         public async Task<BatchInfoResult> PollBatchAsync(BatchInfoResult batchInfo)
         {
             if (batchInfo == null) throw new ArgumentNullException("batchInfo");
-            return await PollBatchAsync(batchInfo.Id, batchInfo.JobId);
+            return await PollBatchAsync(batchInfo.Id, batchInfo.JobId).ConfigureAwait(false);
         }
 
         public async Task<BatchInfoResult> PollBatchAsync(string batchId, string jobId)
@@ -440,7 +440,7 @@ public async Task<BatchInfoResult> PollBatchAsync(string batchId, string jobId)
         public async Task<BatchResultList> GetBatchResultAsync(BatchInfoResult batchInfo)
         {
             if (batchInfo == null) throw new ArgumentNullException("batchInfo");
-            return await GetBatchResultAsync(batchInfo.Id, batchInfo.JobId);
+            return await GetBatchResultAsync(batchInfo.Id, batchInfo.JobId).ConfigureAwait(false);
         }
 
         public async Task<BatchResultList> GetBatchResultAsync(string batchId, string jobId)