diff --git a/sdk/graphrbac/graph/LICENSE.txt b/sdk/graphrbac/graph/LICENSE.txt
index b73b4a1293c3..ea8fb1516028 100644
--- a/sdk/graphrbac/graph/LICENSE.txt
+++ b/sdk/graphrbac/graph/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Microsoft
+Copyright (c) 2020 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/sdk/graphrbac/graph/package.json b/sdk/graphrbac/graph/package.json
index e5e3f0590c70..307d12f7d323 100644
--- a/sdk/graphrbac/graph/package.json
+++ b/sdk/graphrbac/graph/package.json
@@ -4,8 +4,8 @@
   "description": "GraphRbacManagementClient Library with typescript type definitions for node.js and browser.",
   "version": "5.0.1",
   "dependencies": {
-    "@azure/ms-rest-azure-js": "^2.0.0",
-    "@azure/ms-rest-js": "^2.0.3",
+    "@azure/ms-rest-azure-js": "^2.0.1",
+    "@azure/ms-rest-js": "^2.0.4",
     "tslib": "^1.10.0"
   },
   "keywords": [
@@ -20,11 +20,11 @@
   "module": "./esm/graphRbacManagementClient.js",
   "types": "./esm/graphRbacManagementClient.d.ts",
   "devDependencies": {
-    "typescript": "^3.1.1",
-    "rollup": "^0.66.2",
-    "rollup-plugin-node-resolve": "^3.4.0",
+    "typescript": "^3.5.3",
+    "rollup": "^1.18.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
-    "uglify-js": "^3.4.9"
+    "uglify-js": "^3.6.0"
   },
   "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/graphrbac/graph",
   "repository": {
diff --git a/sdk/graphrbac/graph/src/graphRbacManagementClientContext.ts b/sdk/graphrbac/graph/src/graphRbacManagementClientContext.ts
index 9a1813b67d06..b1fb8b10b74b 100644
--- a/sdk/graphrbac/graph/src/graphRbacManagementClientContext.ts
+++ b/sdk/graphrbac/graph/src/graphRbacManagementClientContext.ts
@@ -13,7 +13,7 @@ import * as msRest from "@azure/ms-rest-js";
 import * as msRestAzure from "@azure/ms-rest-azure-js";
 
 const packageName = "@azure/graph";
-const packageVersion = "5.0.0";
+const packageVersion = "5.0.1";
 
 export class GraphRbacManagementClientContext extends msRestAzure.AzureServiceClient {
   credentials: msRest.ServiceClientCredentials;
@@ -47,14 +47,7 @@ export class GraphRbacManagementClientContext extends msRestAzure.AzureServiceCl
     this.apiVersion = '1.6';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
-
-    // This is a manual patch to mitigate a bug in autorest.typescript
-    // https://github.com/Azure/autorest.typescript/issues/545
-    //
-    // If you are regenerating this package, and you have seen a diff that removes
-    // this comment or changes the following line. Please check to see if the bug
-    // above has been fixed. If not, please keep this change.
-    this.baseUri = options.baseUri || "https://graph.windows.net";
+    this.baseUri = options.baseUri || this.baseUri || "https://graph.windows.net";
     this.requestContentType = "application/json; charset=utf-8";
     this.credentials = credentials;
     this.tenantID = tenantID;
diff --git a/sdk/graphrbac/graph/src/models/index.ts b/sdk/graphrbac/graph/src/models/index.ts
index 96232ea07694..dec3e0fbbdc5 100644
--- a/sdk/graphrbac/graph/src/models/index.ts
+++ b/sdk/graphrbac/graph/src/models/index.ts
@@ -390,8 +390,9 @@ export interface ApplicationBase {
   errorUrl?: string;
   /**
    * Configures the groups claim issued in a user or OAuth 2.0 access token that the app expects.
+   * Possible values include: 'None', 'SecurityGroup', 'All'
    */
-  groupMembershipClaims?: any;
+  groupMembershipClaims?: GroupMembershipClaimTypes;
   /**
    * The home page of the application.
    */
@@ -575,8 +576,9 @@ export interface Application {
   errorUrl?: string;
   /**
    * Configures the groups claim issued in a user or OAuth 2.0 access token that the app expects.
+   * Possible values include: 'None', 'SecurityGroup', 'All'
    */
-  groupMembershipClaims?: any;
+  groupMembershipClaims?: GroupMembershipClaimTypes;
   /**
    * The home page of the application.
    */
@@ -1526,6 +1528,14 @@ export interface OAuth2PermissionGrantListResult extends Array<OAuth2PermissionG
   odatanextLink?: string;
 }
 
+/**
+ * Defines values for GroupMembershipClaimTypes.
+ * Possible values include: 'None', 'SecurityGroup', 'All'
+ * @readonly
+ * @enum {string}
+ */
+export type GroupMembershipClaimTypes = 'None' | 'SecurityGroup' | 'All';
+
 /**
  * Defines values for UserType.
  * Possible values include: 'Member', 'Guest'
diff --git a/sdk/graphrbac/graph/src/models/mappers.ts b/sdk/graphrbac/graph/src/models/mappers.ts
index 1eda38d650ec..22ac0abcd7d2 100644
--- a/sdk/graphrbac/graph/src/models/mappers.ts
+++ b/sdk/graphrbac/graph/src/models/mappers.ts
@@ -617,7 +617,7 @@ export const ApplicationBase: msRest.CompositeMapper = {
       groupMembershipClaims: {
         serializedName: "groupMembershipClaims",
         type: {
-          name: "Object"
+          name: "String"
         }
       },
       homepage: {
@@ -946,7 +946,7 @@ export const Application: msRest.CompositeMapper = {
       groupMembershipClaims: {
         serializedName: "groupMembershipClaims",
         type: {
-          name: "Object"
+          name: "String"
         }
       },
       homepage: {