diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js
index f3cb1fecfb34b..91416004b938f 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lRORetrys.js
@@ -1485,4 +1485,4 @@ LRORetrys.prototype.beginPostAsyncRelativeRetrySucceeded = function (options, ca
 };
 
 
-module.exports = LRORetrys;
+module.exports = LRORetrys;
\ No newline at end of file
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js
index b0cc6a272fd58..7655fc4191aa2 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROs.js
@@ -7787,4 +7787,4 @@ LROs.prototype.beginPostAsyncRetrycanceled = function (options, callback) {
 };
 
 
-module.exports = LROs;
+module.exports = LROs;
\ No newline at end of file
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js
index 9dc6656111ba1..0c25e2df3bb0c 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS.Tests/Expected/AcceptanceTests/Lro/operations/lROsCustomHeader.js
@@ -931,4 +931,4 @@ LROsCustomHeader.prototype.beginPostAsyncRetrySucceeded = function (options, cal
 };
 
 
-module.exports = LROsCustomHeader;
+module.exports = LROsCustomHeader;
\ No newline at end of file
diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs b/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs
index 95a519d366c9d..a6fbcc9e356e9 100644
--- a/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs
+++ b/AutoRest/Generators/NodeJS/Azure.NodeJS/TemplateModels/AzureMethodTemplateModel.cs
@@ -86,14 +86,7 @@ public string LongRunningOperationMethodNameInRuntime
                 string result = null;
                 if (this.IsLongRunningOperation)
                 {
-                    if (HttpMethod == HttpMethod.Post || HttpMethod == HttpMethod.Delete)
-                    {
-                        result = "getPostOrDeleteOperationResult";
-                    }
-                    else if (HttpMethod == HttpMethod.Put || HttpMethod == HttpMethod.Patch)
-                    {
-                        result = "getPutOrPatchOperationResult";
-                    }
+                    result = "getLongRunningOperationResult";
                 }
                 return result;
             }
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js
index ae1798dc5e56a..ca4413b85a00b 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/azureServiceClient.js
@@ -57,92 +57,32 @@ function AzureServiceClient(credentials, options) {
 util.inherits(AzureServiceClient, msRest.ServiceClient);
 
 /**
- * Poll Azure long running PUT operation.
+ * Poll Azure long running PUT or PATCH operation. (Deprecated, new version of the code-gen will generate code to call getLongRunningOperationResult)
  * @param {object} [resultOfInitialRequest] - Response of the initial request for the long running operation.
  * @param {object} [options]
  * @param {object} [options.customHeaders] headers that will be added to request
  */
 AzureServiceClient.prototype.getPutOrPatchOperationResult = function (resultOfInitialRequest, options, callback) {
-  var self = this;
-
-  if(!callback && typeof options === 'function') {
-    callback = options;
-    options = null;
-  }
-  if (!callback) {
-    throw new Error('Missing callback');
-  }
-  
-  if (!resultOfInitialRequest) {
-    return callback(new Error('Missing resultOfInitialRequest parameter'));
-  }
-  
-  if (resultOfInitialRequest.response.statusCode !== 200 &&
-      resultOfInitialRequest.response.statusCode !== 201 &&
-      resultOfInitialRequest.response.statusCode !== 202) {
-    return callback(new Error(util.format('Unexpected polling status code from long running operation \'%s\'', 
-      resultOfInitialRequest.response.statusCode)));
-  }
-  var pollingState = null;
-  try {
-    pollingState = new PollingState(resultOfInitialRequest, this.longRunningOperationRetryTimeout);
-  } catch (error) {
-    callback(error);
-  }
-  
-  var resourceUrl = resultOfInitialRequest.request.url;
-  this._options = options;
-  
-  async.whilst(
-    //while condition
-    function () {
-      var finished = [LroStates.Succeeded, LroStates.Failed, LroStates.Canceled].some(function (e) {
-        return pollingState.status === e;
-      });
-      return !finished;
-    },
-    //while loop body
-    function (callback) {
-      setTimeout(function () {
-        if (pollingState.azureAsyncOperationHeaderLink) {
-          self._updateStateFromAzureAsyncOperationHeader(pollingState, false, function (err) {
-            return callback(err);
-          });
-        } else if (pollingState.locationHeaderLink) {
-          self._updateStateFromLocationHeaderOnPut(pollingState, function (err) {
-            return callback(err);
-          });
-        } else {
-          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function (err) {
-            return callback(err);
-          });
-        }
-      }, pollingState.getTimeout());
-    },
-    //when done
-    function (err) {
-      if (pollingState.status === LroStates.Succeeded) {
-        if (!pollingState.resource) {
-          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function (err) {
-            return callback(err, pollingState.getOperationResponse());
-          });
-        } else {
-          return callback(null, pollingState.getOperationResponse());
-        }
-      } else {
-        return callback(pollingState.getCloudError(err));
-      }
-    });
+  return this.getLongRunningOperationResult(resultOfInitialRequest, options, callback);
 };
 
-
 /**
- * Poll Azure long running POST or DELETE operations.
+ * Poll Azure long running POST or DELETE operations. (Deprecated, new version of the code-gen will generate code to call getLongRunningOperationResult)
  * @param {object} [resultOfInitialRequest] - result of the initial request.
  * @param {object} [options]
  * @param {object} [options.customHeaders] headers that will be added to request
  */
 AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOfInitialRequest, options, callback) {
+  return this.getLongRunningOperationResult(resultOfInitialRequest, options, callback);
+};
+
+/**
+ * Poll Azure long running PUT, PATCH, POST or DELETE operations.
+ * @param {object} [resultOfInitialRequest] - result of the initial request.
+ * @param {object} [options]
+ * @param {object} [options.customHeaders] headers that will be added to request
+ */
+AzureServiceClient.prototype.getLongRunningOperationResult = function (resultOfInitialRequest, options, callback) {
   var self = this;
   
   if (!callback && typeof options === 'function') {
@@ -152,7 +92,7 @@ AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOf
   if (!callback) {
     throw new Error('Missing callback');
   }
-  
+
   if (!resultOfInitialRequest) {
     return callback(new Error('Missing resultOfInitialRequest parameter'));
   }
@@ -161,36 +101,51 @@ AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOf
     return callback(new Error('Missing resultOfInitialRequest.response'));
   }
   
-  if (resultOfInitialRequest.response.statusCode !== 200 &&
-      resultOfInitialRequest.response.statusCode !== 202 &&
-      resultOfInitialRequest.response.statusCode !== 204) {
-    return callback(new Error(util.format('Unexpected polling status code from long running operation \'%s\'', 
-      resultOfInitialRequest.response.statusCode)));
+  if (!resultOfInitialRequest.request) {
+    return callback(new Error('Missing resultOfInitialRequest.request'));
+  }
+  
+  if (!resultOfInitialRequest.request.method) {
+    return callback(new Error('Missing resultOfInitialRequest.request.method'));
+  }
+
+  var initialRequestMethod = resultOfInitialRequest.request.method;
+  
+  if (this._checkResponseStatusCodeFailed(resultOfInitialRequest)) {
+    return callback(new Error(util.format('Unexpected polling status code from long running operation \'%s\' for method \'%s\'',
+      resultOfInitialRequest.response.statusCode,
+	  initialRequestMethod)));
   }
   
   var pollingState = null;
+  
   try {
     pollingState = new PollingState(resultOfInitialRequest, this.longRunningOperationRetryTimeout);
   } catch (error) {
     callback(error);
   }
+  var resourceUrl = resultOfInitialRequest.request.url;
   this._options = options;
 
   async.whilst(
-    function () {
-      var finished = [LroStates.Succeeded, LroStates.Failed, LroStates.Canceled].some(function (e) {
+    function() {
+      var finished = [LroStates.Succeeded, LroStates.Failed, LroStates.Canceled].some(function(e) {
         return e === pollingState.status;
       });
       return !finished;
     },
     function (callback) {
-      setTimeout(function () {
+      setTimeout(function() {
         if (pollingState.azureAsyncOperationHeaderLink) {
-          self._updateStateFromAzureAsyncOperationHeader(pollingState, true, function (err) {
+          self._updateStateFromAzureAsyncOperationHeader(pollingState, true, function(err) {
             return callback(err);
           });
         } else if (pollingState.locationHeaderLink) {
-          self._updateStateFromLocationHeaderOnPostOrDelete(pollingState, function (err) {
+          self._updateStateFromLocationHeader(initialRequestMethod, pollingState, function(err) {
+            return callback(err);
+          });
+        } else if (initialRequestMethod === 'PUT') {
+          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function(err) {
             return callback(err);
           });
         } else {
@@ -198,15 +153,36 @@ AzureServiceClient.prototype.getPostOrDeleteOperationResult = function (resultOf
         }
       }, pollingState.getTimeout());
     },
+    //when done
     function (err) {
-      if (pollingState.status === LroStates.Succeeded ) {
-        return callback(null, pollingState.getOperationResponse());
+      if (pollingState.status === LroStates.Succeeded) {
+        if ((pollingState.azureAsyncOperationHeaderLink || !pollingState.resource) &&
+			(initialRequestMethod === 'PUT' || initialRequestMethod === 'PATCH')) {
+          self._updateStateFromGetResourceOperation(resourceUrl, pollingState, function(err) {
+            return callback(err, pollingState.getOperationResponse());
+          });
+        } else {
+          return callback(null, pollingState.getOperationResponse());
+        }
       } else {
         return callback(pollingState.getCloudError(err));
       }
     });
 };
 
+AzureServiceClient.prototype._checkResponseStatusCodeFailed = function (initialRequest) {
+  var statusCode = initialRequest.response.statusCode;
+  var method = initialRequest.request.method;
+  if (statusCode === 200 || statusCode === 202 ||
+    (statusCode === 201 && method === 'PUT') ||
+    (statusCode === 204 && (method === 'DELETE' || method === 'POST'))) {
+    return false;
+  } else {
+	  return true;
+  }
+};
+
+
 /**
  * Retrieve operation status by polling from 'azure-asyncoperation' header.
  * @param {object} [pollingState] - The object to persist current operation state.
@@ -236,8 +212,8 @@ AzureServiceClient.prototype._updateStateFromAzureAsyncOperationHeader = functio
  * Retrieve PUT operation status by polling from 'location' header.
  * @param {object} [pollingState] - The object to persist current operation state.
  */
-AzureServiceClient.prototype._updateStateFromLocationHeaderOnPut = function (pollingState, callback) {
-  this._getStatus(pollingState.locationHeaderLink, function (err, result) {
+AzureServiceClient.prototype._updateStateFromLocationHeader = function (method, pollingState, callback) {
+  this._getStatus(pollingState.locationHeaderLink, function(err, result) {
     if (err) return callback(err);
     
     pollingState.updateResponse(result.response);
@@ -246,54 +222,20 @@ AzureServiceClient.prototype._updateStateFromLocationHeaderOnPut = function (pol
     var statusCode = result.response.statusCode;
     if (statusCode === 202) {
       pollingState.status = LroStates.InProgress;
-    }
-    else if (statusCode === 200 ||
-             statusCode === 201) {
-      
-      if (!result.body) {
-        return callback(new Error('The response from long running operation does not contain a body.'));
-      }
-      
-      // In 202 pattern on PUT ProvisioningState may not be present in 
-      // the response. In that case the assumption is the status is Succeeded.
-      if (result.body.properties && result.body.properties.provisioningState) {
-        pollingState.status = result.body.properties.provisioningState;
-      }
-      else {
-        pollingState.status = LroStates.Succeeded;
-      }
-      
+    } else if (statusCode === 200 ||
+      (statusCode === 201 && method === 'PUT') ||
+      (statusCode === 204 && (method === 'DELETE' || method === 'POST'))) {
+
+      pollingState.status = LroStates.Succeeded;
+
       pollingState.error = {
         code: pollingState.Status,
         message: util.format('Long running operation failed with status \'%s\'.', pollingState.status)
       };
       pollingState.resource = result.body;
-    }
-    callback(null);
-  });
-};
-
-/**
- * Retrieve POST or DELETE operation status by polling from 'location' header.
- * @param {object} [pollingState] - The object to persist current operation state.
- */
-AzureServiceClient.prototype._updateStateFromLocationHeaderOnPostOrDelete = function (pollingState, callback) {
-  this._getStatus(pollingState.locationHeaderLink, function (err, result) {
-    if (err) return callback(err);
-    
-    pollingState.updateResponse(result.response);
-    pollingState.request = result.request;
-    
-    var statusCode = result.response.statusCode;
-    if (statusCode === 202) {
-      pollingState.status = LroStates.InProgress;
-    }
-    else if (statusCode === 200 ||
-             statusCode === 201 ||
-             statusCode === 204) {
-      pollingState.status = LroStates.Succeeded;
-      pollingState.resource = result.body;
-    }
+    } else {
+	  return callback(new Error('The response from long running operation does not have a valid status code.'));
+	}
     callback(null);
   });
 };
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js b/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js
index 87a68bf6dfc25..114eedf25c573 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/lib/pollingState.js
@@ -40,24 +40,31 @@ function PollingState(resultOfInitialRequest, retryTimeout) {
     throw deserializationError;
   }
   
-  if (this.resource && this.resource.properties && this.resource.properties.provisioningState) {
-    this.status = this.resource.properties.provisioningState;
-  } else {
-    switch (this.response.statusCode) {
-      case 202:
-        this.status = LroStates.InProgress;
-        break;
+  switch (this.response.statusCode) {
+    case 202:
+      this.status = LroStates.InProgress;
+      break;
 
-      case 204:
-      case 201:
-      case 200:
+    case 204:
+      this.status = LroStates.Succeeded;
+      break;
+    case 201:
+      if (this.resource && this.resource.properties && this.resource.properties.provisioningState) {
+        this.status = this.resource.properties.provisioningState;
+      } else {
+        this.status = LroStates.InProgress;
+      }
+      break;
+    case 200:
+      if (this.resource && this.resource.properties && this.resource.properties.provisioningState) {
+        this.status = this.resource.properties.provisioningState;
+      } else {
         this.status = LroStates.Succeeded;
-        break;
-
-      default:
-        this.status = LroStates.Failed;
-        break;
-    }
+      }
+      break;
+    default:
+      this.status = LroStates.Failed;
+      break;
   }
 }
 
diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js b/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js
index e28f44bf5ad68..8e11e689690b7 100644
--- a/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js
+++ b/ClientRuntimes/NodeJS/ms-rest-azure/test/azureServiceClientTests.js
@@ -92,9 +92,10 @@ describe('AzureServiceClient', function () {
 
     describe('Put', function () {
       resultOfInitialRequest.response.statusCode = 201;
-     
+	  resultOfInitialRequest.request.method = 'PUT';
+	  
       it('throw on not Lro related status code', function (done) {
-        client.getPutOrPatchOperationResult({ response: {statusCode: 10000}, request: { url:"http://foo" }}, function (err, result) {
+        client.getPutOrPatchOperationResult({ response: {statusCode: 10000}, request: { url:"http://foo", method:'PUT' }}, function (err, result) {
           err.message.should.containEql('Unexpected polling status code from long running operation');
           done();
         });
@@ -156,11 +157,57 @@ describe('AzureServiceClient', function () {
       });
     });
     
+	describe('Patch', function () {
+	  resultOfInitialRequest.response.statusCode = 202;
+	  resultOfInitialRequest.body.properties.provisioningState = LroStates.Succeeded;
+	  resultOfInitialRequest.request.method = 'PATCH';
+	  
+	  it('works by polling from location header', function (done) {
+	    resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
+        resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
+		client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          should.not.exist(err);
+          JSON.parse(result.body).name.should.equal(testResourceName);
+		  should.exist(result.response.randomFieldFromPollLocationHeader);
+          done();
+        });
+	  });
+	  
+	  it('works by polling from azure-asyncoperation header', function (done) {
+	    resultOfInitialRequest.response.headers['azure-asyncoperation'] = urlFromAzureAsyncOPHeader_Return200;
+		resultOfInitialRequest.response.headers['location'] = '';
+		client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          should.not.exist(err);
+          JSON.parse(result.body).name.should.equal(testResourceName);
+          done();
+        });
+	  });
+	  
+	  it('returns error if failed to poll from the azure-asyncoperation header', function (done) {
+        resultOfInitialRequest.response.headers['azure-asyncoperation'] = url_ReturnError;
+        resultOfInitialRequest.response.headers['location'] = '';
+        client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          err.message.should.containEql(testError);
+          done();
+        });
+      });
+	  
+	  it('returns error if failed to poll from the location header', function (done) {
+        resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
+        resultOfInitialRequest.response.headers['location'] = url_ReturnError;
+        client.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
+          err.message.should.containEql(testError);
+          done();
+        });
+      });
+	});
+	
     describe('Post-or-Delete', function () {
       resultOfInitialRequest.response.statusCode = 202;
-      
+      resultOfInitialRequest.body.properties.provisioningState = LroStates.Succeeded;
+	  
       it('throw on not Lro related status code', function (done) {
-        client.getPostOrDeleteOperationResult({ response: { statusCode: 201 } }, function (err, result) {
+        client.getPostOrDeleteOperationResult({ response: { statusCode: 201 }, request: {url: url_resource, method: 'POST'}}, function (err, result) {
           err.message.should.containEql('Unexpected polling status code from long running operation');
           done();
         });
@@ -169,6 +216,7 @@ describe('AzureServiceClient', function () {
       it('works by polling from the azure-asyncoperation header', function (done) {
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = urlFromAzureAsyncOPHeader_Return200;
         resultOfInitialRequest.response.headers['location'] = '';
+		resultOfInitialRequest.request.method = 'POST';
         client.getPostOrDeleteOperationResult(resultOfInitialRequest, function (err, result) {
           should.not.exist(err);
           should.exist(result.response.randomFieldFromPollAsyncOpHeader);
@@ -219,7 +267,7 @@ describe('AzureServiceClient', function () {
         negativeClient.addFilter(mockFilter({ statusCode: 200, body: badResponseBody }, badResponseBody));
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
         resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
-        negativeClient.getPutOrPatchOperationResult(resultOfInitialRequest, function (err, result) {
+        negativeClient.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
           should.exist(err);
           should.exist(err.response);
           should.exist(err.message);
@@ -234,7 +282,7 @@ describe('AzureServiceClient', function () {
         negativeClient.addFilter(mockFilter({ statusCode: 200, body: badResponseBody }, badResponseBody));
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
         resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
-        negativeClient.getPutOrPatchOperationResult(resultOfInitialRequest, negativeClient._getStatus, function (err, result) {
+        negativeClient.getLongRunningOperationResult(resultOfInitialRequest, negativeClient._getStatus, function (err, result) {
           should.exist(err);
           should.exist(err.response);
           should.exist(err.message);
@@ -249,7 +297,7 @@ describe('AzureServiceClient', function () {
         negativeClient.addFilter(mockFilter({ statusCode: 203, body: badResponseBody }, badResponseBody));
         resultOfInitialRequest.response.headers['azure-asyncoperation'] = '';
         resultOfInitialRequest.response.headers['location'] = urlFromLocationHeader_Return200;
-        negativeClient.getPutOrPatchOperationResult(resultOfInitialRequest, function (err, result) {
+        negativeClient.getLongRunningOperationResult(resultOfInitialRequest, function (err, result) {
           should.exist(err);
           should.exist(err.response);
           should.exist(err.message);