diff --git a/sdk/apimanagement/arm-apimanagement/lib/models/index.ts b/sdk/apimanagement/arm-apimanagement/lib/models/index.ts
index 881f4214f2a0..291939636a61 100644
--- a/sdk/apimanagement/arm-apimanagement/lib/models/index.ts
+++ b/sdk/apimanagement/arm-apimanagement/lib/models/index.ts
@@ -2901,8 +2901,9 @@ export interface ApiManagementServiceBaseProperties {
   /**
    * @member {boolean} [enableClientCertificate] Property only meant to be used
    * for Consumption SKU Service. This enforces a client certificate to be
-   * presented on each request to the gateway and enabled ability to
-   * authenticate the certificate in the policy. Default value: false .
+   * presented on each request to the gateway. This also enable the ability to
+   * authenticate the certificate in the policy on the gateway. Default value:
+   * false .
    */
   enableClientCertificate?: boolean;
   /**
@@ -3095,8 +3096,9 @@ export interface ApiManagementServiceResource extends ApimResource {
   /**
    * @member {boolean} [enableClientCertificate] Property only meant to be used
    * for Consumption SKU Service. This enforces a client certificate to be
-   * presented on each request to the gateway and enabled ability to
-   * authenticate the certificate in the policy. Default value: false .
+   * presented on each request to the gateway. This also enable the ability to
+   * authenticate the certificate in the policy on the gateway. Default value:
+   * false .
    */
   enableClientCertificate?: boolean;
   /**
@@ -3263,8 +3265,9 @@ export interface ApiManagementServiceUpdateParameters extends ApimResource {
   /**
    * @member {boolean} [enableClientCertificate] Property only meant to be used
    * for Consumption SKU Service. This enforces a client certificate to be
-   * presented on each request to the gateway and enabled ability to
-   * authenticate the certificate in the policy. Default value: false .
+   * presented on each request to the gateway. This also enable the ability to
+   * authenticate the certificate in the policy on the gateway. Default value:
+   * false .
    */
   enableClientCertificate?: boolean;
   /**
@@ -9763,7 +9766,7 @@ export type PolicyScopeContract = 'Tenant' | 'Product' | 'Api' | 'Operation' | '
 
 /**
  * Defines values for ExportFormat.
- * Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi3'
+ * Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi'
  * @readonly
  * @enum {string}
  */
@@ -13073,6 +13076,29 @@ export type NotificationRecipientUserListByNotificationResponse = RecipientUserC
     };
 };
 
+/**
+ * Contains response data for the checkEntityExists operation.
+ */
+export type NotificationRecipientUserCheckEntityExistsResponse = {
+  /**
+   * The parsed response body.
+   */
+  body: boolean;
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: boolean;
+    };
+};
+
 /**
  * Contains response data for the createOrUpdate operation.
  */
@@ -13111,6 +13137,29 @@ export type NotificationRecipientEmailListByNotificationResponse = RecipientEmai
     };
 };
 
+/**
+ * Contains response data for the checkEntityExists operation.
+ */
+export type NotificationRecipientEmailCheckEntityExistsResponse = {
+  /**
+   * The parsed response body.
+   */
+  body: boolean;
+  /**
+   * The underlying HTTP response.
+   */
+  _response: msRest.HttpResponse & {
+      /**
+       * The response body as text (string format)
+       */
+      bodyAsText: string;
+      /**
+       * The response body as parsed JSON or XML
+       */
+      parsedBody: boolean;
+    };
+};
+
 /**
  * Contains response data for the createOrUpdate operation.
  */
diff --git a/sdk/apimanagement/arm-apimanagement/lib/operations/apiExport.ts b/sdk/apimanagement/arm-apimanagement/lib/operations/apiExport.ts
index d89f7f4fd1a7..ce3b876d5bf2 100644
--- a/sdk/apimanagement/arm-apimanagement/lib/operations/apiExport.ts
+++ b/sdk/apimanagement/arm-apimanagement/lib/operations/apiExport.ts
@@ -34,7 +34,7 @@ export class ApiExport {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param format Format in which to export the Api Details to the Storage Blob with Sas Key valid
-   * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi3'
+   * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi'
    * @param [options] The optional parameters
    * @returns Promise<Models.ApiExportGetResponse>
    */
@@ -45,7 +45,7 @@ export class ApiExport {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param format Format in which to export the Api Details to the Storage Blob with Sas Key valid
-   * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi3'
+   * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi'
    * @param callback The callback
    */
   get(resourceGroupName: string, serviceName: string, apiId: string, format: Models.ExportFormat, callback: msRest.ServiceCallback<Models.ApiExportResult>): void;
@@ -55,7 +55,7 @@ export class ApiExport {
    * @param apiId API revision identifier. Must be unique in the current API Management service
    * instance. Non-current revision has ;rev=n as a suffix where n is the revision number.
    * @param format Format in which to export the Api Details to the Storage Blob with Sas Key valid
-   * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi3'
+   * for 5 minutes. Possible values include: 'Swagger', 'Wsdl', 'Wadl', 'OpenApi'
    * @param options The optional parameters
    * @param callback The callback
    */
diff --git a/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientEmail.ts b/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientEmail.ts
index 585f631721f6..33904e45df9c 100644
--- a/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientEmail.ts
+++ b/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientEmail.ts
@@ -81,9 +81,9 @@ export class NotificationRecipientEmail {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param email Email identifier.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientEmail {
    * @param email Email identifier.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, callback: msRest.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientEmail {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, email: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class NotificationRecipientEmail {
         options
       },
       checkEntityExistsOperationSpec,
-      callback);
+      callback) as Promise<Models.NotificationRecipientEmailCheckEntityExistsResponse>;
   }
 
   /**
@@ -265,6 +265,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     204: {},
+    404: {},
     default: {
       bodyMapper: Mappers.ErrorResponse
     }
diff --git a/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientUser.ts b/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientUser.ts
index 72d486c911ce..0f5df0fb3ac3 100644
--- a/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientUser.ts
+++ b/sdk/apimanagement/arm-apimanagement/lib/operations/notificationRecipientUser.ts
@@ -81,9 +81,9 @@ export class NotificationRecipientUser {
    * 'AccountClosedPublisher', 'QuotaLimitApproachingPublisherNotificationMessage'
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param [options] The optional parameters
-   * @returns Promise<msRest.RestResponse>
+   * @returns Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<msRest.RestResponse>;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -94,7 +94,7 @@ export class NotificationRecipientUser {
    * @param userId User identifier. Must be unique in the current API Management service instance.
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<void>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, callback: msRest.ServiceCallback<boolean>): void;
   /**
    * @param resourceGroupName The name of the resource group.
    * @param serviceName The name of the API Management service.
@@ -106,8 +106,8 @@ export class NotificationRecipientUser {
    * @param options The optional parameters
    * @param callback The callback
    */
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<void>): void;
-  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<void>, callback?: msRest.ServiceCallback<void>): Promise<msRest.RestResponse> {
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<boolean>): void;
+  checkEntityExists(resourceGroupName: string, serviceName: string, notificationName: Models.NotificationName, userId: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<boolean>, callback?: msRest.ServiceCallback<boolean>): Promise<Models.NotificationRecipientUserCheckEntityExistsResponse> {
     return this.client.sendOperationRequest(
       {
         resourceGroupName,
@@ -117,7 +117,7 @@ export class NotificationRecipientUser {
         options
       },
       checkEntityExistsOperationSpec,
-      callback);
+      callback) as Promise<Models.NotificationRecipientUserCheckEntityExistsResponse>;
   }
 
   /**
@@ -265,6 +265,7 @@ const checkEntityExistsOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     204: {},
+    404: {},
     default: {
       bodyMapper: Mappers.ErrorResponse
     }