diff --git a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/CHANGELOG.md b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/CHANGELOG.md
new file mode 100644
index 000000000000..b69c0f9a2cb7
--- /dev/null
+++ b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/CHANGELOG.md
@@ -0,0 +1,9 @@
+Generated from https://github.com/Azure/azure-rest-api-specs/tree/3c764635e7d442b3e74caf593029fcd440b3ef82
+
+Code generator @microsoft.azure/autorest.go@~2.1.161
+
+## Breaking Changes
+
+- Function `NewSmartGroupsListPage` parameter(s) have been changed from `(func(context.Context, SmartGroupsList) (SmartGroupsList, error))` to `(SmartGroupsList, func(context.Context, SmartGroupsList) (SmartGroupsList, error))`
+- Function `NewOperationsListPage` parameter(s) have been changed from `(func(context.Context, OperationsList) (OperationsList, error))` to `(OperationsList, func(context.Context, OperationsList) (OperationsList, error))`
+- Function `NewAlertsListPage` parameter(s) have been changed from `(func(context.Context, AlertsList) (AlertsList, error))` to `(AlertsList, func(context.Context, AlertsList) (AlertsList, error))`
diff --git a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/alerts.go b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/alerts.go
index 31e18eeaeab0..8f80815f95bf 100644
--- a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/alerts.go
+++ b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/alerts.go
@@ -72,6 +72,7 @@ func (client AlertsClient) ChangeState(ctx context.Context, alertID string, newS
 	result, err = client.ChangeStateResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.AlertsClient", "ChangeState", resp, "Failure responding to request")
+		return
 	}
 
 	return
@@ -173,9 +174,11 @@ func (client AlertsClient) GetAll(ctx context.Context, targetResource string, ta
 	result.al, err = client.GetAllResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.AlertsClient", "GetAll", resp, "Failure responding to request")
+		return
 	}
 	if result.al.hasNextLink() && result.al.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -336,6 +339,7 @@ func (client AlertsClient) GetByID(ctx context.Context, alertID string) (result
 	result, err = client.GetByIDResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.AlertsClient", "GetByID", resp, "Failure responding to request")
+		return
 	}
 
 	return
@@ -410,6 +414,7 @@ func (client AlertsClient) GetHistory(ctx context.Context, alertID string) (resu
 	result, err = client.GetHistoryResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.AlertsClient", "GetHistory", resp, "Failure responding to request")
+		return
 	}
 
 	return
@@ -499,6 +504,7 @@ func (client AlertsClient) GetSummary(ctx context.Context, groupby AlertsSummary
 	result, err = client.GetSummaryResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.AlertsClient", "GetSummary", resp, "Failure responding to request")
+		return
 	}
 
 	return
diff --git a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/models.go b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/models.go
index d8ca6dfeac6c..932ec91c9671 100644
--- a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/models.go
+++ b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/models.go
@@ -266,8 +266,11 @@ func (page AlertsListPage) Values() []Alert {
 }
 
 // Creates a new instance of the AlertsListPage type.
-func NewAlertsListPage(getNextPage func(context.Context, AlertsList) (AlertsList, error)) AlertsListPage {
-	return AlertsListPage{fn: getNextPage}
+func NewAlertsListPage(cur AlertsList, getNextPage func(context.Context, AlertsList) (AlertsList, error)) AlertsListPage {
+	return AlertsListPage{
+		fn: getNextPage,
+		al: cur,
+	}
 }
 
 // AlertsSummary summary of alerts based on the input filters and 'groupby' parameters.
@@ -560,8 +563,11 @@ func (page OperationsListPage) Values() []Operation {
 }
 
 // Creates a new instance of the OperationsListPage type.
-func NewOperationsListPage(getNextPage func(context.Context, OperationsList) (OperationsList, error)) OperationsListPage {
-	return OperationsListPage{fn: getNextPage}
+func NewOperationsListPage(cur OperationsList, getNextPage func(context.Context, OperationsList) (OperationsList, error)) OperationsListPage {
+	return OperationsListPage{
+		fn: getNextPage,
+		ol: cur,
+	}
 }
 
 // Resource an azure resource object
@@ -932,6 +938,9 @@ func (page SmartGroupsListPage) Values() []SmartGroup {
 }
 
 // Creates a new instance of the SmartGroupsListPage type.
-func NewSmartGroupsListPage(getNextPage func(context.Context, SmartGroupsList) (SmartGroupsList, error)) SmartGroupsListPage {
-	return SmartGroupsListPage{fn: getNextPage}
+func NewSmartGroupsListPage(cur SmartGroupsList, getNextPage func(context.Context, SmartGroupsList) (SmartGroupsList, error)) SmartGroupsListPage {
+	return SmartGroupsListPage{
+		fn:  getNextPage,
+		sgl: cur,
+	}
 }
diff --git a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/operations.go b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/operations.go
index 057d95781b93..505a4b14a94a 100644
--- a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/operations.go
+++ b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/operations.go
@@ -70,9 +70,11 @@ func (client OperationsClient) List(ctx context.Context) (result OperationsListP
 	result.ol, err = client.ListResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.OperationsClient", "List", resp, "Failure responding to request")
+		return
 	}
 	if result.ol.hasNextLink() && result.ol.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
diff --git a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/smartgroups.go b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/smartgroups.go
index bee182cdf3eb..c18f6ab9af4b 100644
--- a/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/smartgroups.go
+++ b/services/alertsmanagement/mgmt/2018-05-05/alertsmanagement/smartgroups.go
@@ -72,6 +72,7 @@ func (client SmartGroupsClient) ChangeState(ctx context.Context, smartGroupID st
 	result, err = client.ChangeStateResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.SmartGroupsClient", "ChangeState", resp, "Failure responding to request")
+		return
 	}
 
 	return
@@ -160,9 +161,11 @@ func (client SmartGroupsClient) GetAll(ctx context.Context, targetResource strin
 	result.sgl, err = client.GetAllResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.SmartGroupsClient", "GetAll", resp, "Failure responding to request")
+		return
 	}
 	if result.sgl.hasNextLink() && result.sgl.IsEmpty() {
 		err = result.NextWithContext(ctx)
+		return
 	}
 
 	return
@@ -305,6 +308,7 @@ func (client SmartGroupsClient) GetByID(ctx context.Context, smartGroupID string
 	result, err = client.GetByIDResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.SmartGroupsClient", "GetByID", resp, "Failure responding to request")
+		return
 	}
 
 	return
@@ -378,6 +382,7 @@ func (client SmartGroupsClient) GetHistory(ctx context.Context, smartGroupID str
 	result, err = client.GetHistoryResponder(resp)
 	if err != nil {
 		err = autorest.NewErrorWithError(err, "alertsmanagement.SmartGroupsClient", "GetHistory", resp, "Failure responding to request")
+		return
 	}
 
 	return