diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
index 97190463e79..d70098dd2b1 100644
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -13831,7 +13831,7 @@
       "type": "object"
     },
     "io.k8s.api.flowcontrol.v1alpha1.FlowSchema": {
-      "description": "FlowSchema defines the schema of a group of flows. Note that a flow makes up of a set of inbound API requests with similar attributes and is identified by a pair of strings: the name of the FlowSchema and a \"flow distinguisher\".",
+      "description": "FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with similar attributes and is identified by a pair of strings: the name of the FlowSchema and a \"flow distinguisher\".",
       "properties": {
         "apiVersion": {
           "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
@@ -13929,7 +13929,7 @@
       "properties": {
         "distinguisherMethod": {
           "$ref": "#/definitions/io.k8s.api.flowcontrol.v1alpha1.FlowDistinguisherMethod",
-          "description": "`distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema. `nil` specifies that the computation always yields the empty string."
+          "description": "`distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema. `nil` specifies that the distinguisher is disabled and thus will always be the empty string."
         },
         "matchingPrecedence": {
           "description": "`matchingPrecedence` is used to choose among the FlowSchemas that match a given request.  The chosen FlowSchema is among those with the numerically lowest (which we take to be logically highest) MatchingPrecedence.  Each MatchingPrecedence value must be non-negative.",
@@ -13941,7 +13941,7 @@
           "description": "`priorityLevelConfiguration` should reference a PriorityLevelConfiguration in the cluster. If the reference cannot be resolved, the flow-schema will ignored and marked as invalid in its status. Required."
         },
         "rules": {
-          "description": "`rules` describes which requests will match this flow schema.",
+          "description": "`rules` describes which requests will match this flow schema. The flow-schema applies if any rule matches.",
           "items": {
             "$ref": "#/definitions/io.k8s.api.flowcontrol.v1alpha1.PolicyRuleWithSubjects"
           },
@@ -13970,7 +13970,7 @@
       "description": "PolicyRule holds information that describes a policy rule, but does not contain information about who the rule applies to or which namespace the rule applies to.",
       "properties": {
         "apiGroups": {
-          "description": "`apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. APIGroupAll represents all api groups.",
+          "description": "`apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. '*' represents all api groups.",
           "items": {
             "type": "string"
           },
@@ -13991,7 +13991,7 @@
           "type": "array"
         },
         "verbs": {
-          "description": "`verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule. VerbAll represents all kinds.",
+          "description": "`verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule. VerbAll represents all verbs.",
           "items": {
             "type": "string"
           },
@@ -14134,16 +14134,16 @@
       "description": "PriorityLevelConfigurationSpec is specification of a priority level",
       "properties": {
         "assuredConcurrencyShares": {
-          "description": "`assuredConcurrencyShares` is a positive number for a non-exempt priority level, representing the weight by which the priority level shares the concurrency from the global limit. The concurrency limit of an apiserver is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces the assured concurrency value (ACV) for each priority level:\n\n            ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )",
+          "description": "`assuredConcurrencyShares` is a positive number for a non-exempt priority level. The concurrency limit of an apiserver is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces the assured concurrency value (ACV) for each priority level:\n\n            ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )",
           "format": "int32",
           "type": "integer"
         },
         "exempt": {
-          "description": "`exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level. Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued) and do not detract from the concurrency available for non-exempt requests. In a more sophisticated system, the exempt priority level would be the highest priority level. The field is default to false and only those system preset priority level can be exempt.",
+          "description": "`exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level. Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued) and do not detract from the concurrency available for non-exempt requests. The field is default to false and only those system preset priority level can be exempt.",
           "type": "boolean"
         },
         "handSize": {
-          "description": "`handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal a hand of the size specified here. If empty, the hand size will the be set to 1.",
+          "description": "`handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal a hand of the size specified here. If empty, the hand size will the be set to 1. NOTE: To figure out a better value for your cluster, please refer to (#76846)[https://github.com/kubernetes/kubernetes/issues/76846#issuecomment-523700960]",
           "format": "int32",
           "type": "integer"
         },
diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD
index ad715f3a3b5..338f0d75271 100644
--- a/cmd/kube-apiserver/app/BUILD
+++ b/cmd/kube-apiserver/app/BUILD
@@ -57,7 +57,6 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/storage/etcd3/preflight:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/flowcontrol:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/term:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",
         "//staging/src/k8s.io/client-go/informers:go_default_library",
diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
index 6b07e3e6f97..dc31719fec6 100644
--- a/cmd/kube-apiserver/app/server.go
+++ b/cmd/kube-apiserver/app/server.go
@@ -52,7 +52,6 @@ import (
 	"k8s.io/apiserver/pkg/storage/etcd3/preflight"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	utilflowcontrol "k8s.io/apiserver/pkg/util/flowcontrol"
-	"k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing"
 	"k8s.io/apiserver/pkg/util/term"
 	"k8s.io/apiserver/pkg/util/webhook"
 	clientgoinformers "k8s.io/client-go/informers"
@@ -525,7 +524,7 @@ func buildGenericConfig(
 	}
 
 	if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.RequestManagement) {
-		genericConfig.RequestManagement = BuildRequestManagement(s, clientgoExternalClient, versionedInformers)
+		genericConfig.RequestManagement = BuildRequestManager(s, clientgoExternalClient, versionedInformers)
 	}
 
 	return
@@ -555,15 +554,14 @@ func BuildAuthorizer(s *options.ServerRunOptions, versionedInformers clientgoinf
 	return authorizationConfig.New()
 }
 
-// BuildRequestManagement constructs the authenticator
-func BuildRequestManagement(s *options.ServerRunOptions, extclient clientgoclientset.Interface, versionedInformer clientgoinformers.SharedInformerFactory) utilflowcontrol.Interface {
-	return utilflowcontrol.NewRequestManagementSystemWithPreservation(
+// BuildRequestManagement constructs the request manager
+func BuildRequestManager(s *options.ServerRunOptions, extclient clientgoclientset.Interface, versionedInformer clientgoinformers.SharedInformerFactory) utilflowcontrol.Interface {
+	return utilflowcontrol.NewRequestManagerWithPreservation(
 		versionedInformer,
 		extclient.FlowcontrolV1alpha1(),
 		fairqueuing.NewNoRestraintFactory( /* TODO: switch to real implementation */ ),
 		s.GenericServerRunOptions.MaxRequestsInFlight+s.GenericServerRunOptions.MaxMutatingRequestsInFlight,
 		s.GenericServerRunOptions.RequestTimeout/4,
-		nil,
 		flowcontrolbootstrap.PreservingFlowSchemas,
 		flowcontrolbootstrap.PreservingPriorityLevelConfigurations,
 	)
diff --git a/pkg/apis/flowcontrol/types.go b/pkg/apis/flowcontrol/types.go
index f59f520bbfa..2d053d04215 100644
--- a/pkg/apis/flowcontrol/types.go
+++ b/pkg/apis/flowcontrol/types.go
@@ -23,13 +23,11 @@ import (
 
 // These are valid flow-dingtinguisher methods.
 const (
-	// FlowDistinguisherMethodByUser specifies that the flow distinguisher is the username works in the request context
+	// FlowDistinguisherMethodByUserType specifies that the flow distinguisher is the username works in the request context
 	// so that the requests from the same user will enqueued into the same set of queues for processing.
 	FlowDistinguisherMethodByUserType FlowDistinguisherMethodType = "ByUser"
 
-	// FlowDistinguisherMethodByNamespace works by computing flow distinguisher with the user requested namespace. Any
-	// user requesting the namespace will be put into the same queue for processing.
-	// FlowDistinguisherMethodByNamespaceType specifies that the flow distinguisher is the namespace of the object
+	// FlowDistinguisherMethodByNamespaceType specifies that the flow distinguisher is the object's requested namespace
 	// that the request accesses.  If the object is not namespaced or the request is a non-resource request then
 	// the flow distinguisher is the empty string.
 	FlowDistinguisherMethodByNamespaceType FlowDistinguisherMethodType = "ByNamespace"
@@ -69,7 +67,7 @@ const (
 // +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// FlowSchema defines the schema of a group of flows. Note that a flow makes up of a set of inbound API requests with
+// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
 // similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
 type FlowSchema struct {
 	metav1.TypeMeta
@@ -112,9 +110,9 @@ type FlowSchemaSpec struct {
 	// MatchingPrecedence.  Each MatchingPrecedence value must be non-negative.
 	MatchingPrecedence int32
 	// `distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema.
-	// `nil` specifies that the computation always yields the empty string.
+	// `nil` specifies that the distinguisher is disabled and thus will always be the empty string.
 	DistinguisherMethod *FlowDistinguisherMethod
-	// `rules` describes which requests will match this flow schema.
+	// `rules` describes which requests will match this flow schema. The flow-schema applies if any rule matches.
 	Rules []PolicyRuleWithSubjects
 }
 
@@ -144,6 +142,27 @@ type PolicyRuleWithSubjects struct {
 	Rule PolicyRule
 }
 
+// PolicyRule holds information that describes a policy rule, but does not contain information
+// about who the rule applies to or which namespace the rule applies to.
+type PolicyRule struct {
+	// `verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule.
+	// VerbAll represents all verbs.
+	Verbs []string
+	// `apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of
+	// the enumerated resources in any API group will be allowed. '*' represents all api groups.
+	// +optional
+	APIGroups []string
+	// `resources` is a list of resources this rule applies to.  ResourceAll represents all resources.
+	// +optional
+	Resources []string
+	// `nonResourceURLs` is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
+	// Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding.
+	// Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"),  but not both.
+	// NonResourceAll represents all non-resource urls.
+	// +optional
+	NonResourceURLs []string
+}
+
 // FlowSchemaStatus represents the current state of a flow-schema.
 type FlowSchemaStatus struct {
 	// Current state of flow-schema.
@@ -204,16 +223,8 @@ type PriorityLevelConfigurationList struct {
 
 // PriorityLevelConfigurationSpec is specification of a priority level
 type PriorityLevelConfigurationSpec struct {
-	// `exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level.
-	// Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued)
-	// and do not detract from the concurrency available for non-exempt requests. In a more sophisticated system, the
-	// exempt priority level would be the highest priority level. The field is default to false and only those system
-	// preset priority level can be exempt.
-	// +optional
-	Exempt bool
-	// `assuredConcurrencyShares` is a positive number for a non-exempt priority level, representing the weight by which
-	// the priority level shares the concurrency from the global limit. The concurrency limit of an apiserver is divided
-	// among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces
+	// `assuredConcurrencyShares` is a positive number for a non-exempt priority level. The concurrency limit of an apiserver
+	// is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces
 	// the assured concurrency value (ACV) for each priority level:
 	//
 	//             ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )
@@ -223,17 +234,25 @@ type PriorityLevelConfigurationSpec struct {
 	// `queues` is a number of queues that belong to a non-exempt PriorityLevelConfiguration object. The queues exist
 	// independently at each apiserver. The value must be positive for a non-exempt priority level and setting it to 1
 	// disables shufflesharding and makes the distinguisher method irrelevant.
+	// TODO: sugguest a default or a way of deciding on a value.
 	// +optional
 	Queues int32
 	// `handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the
 	// request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal
 	// a hand of the size specified here. If empty, the hand size will the be set to 1.
+	// NOTE: To figure out a better value for your cluster, please refer to (#76846)[https://github.com/kubernetes/kubernetes/issues/76846#issuecomment-523700960]
 	// +optional
 	HandSize int32
 	// `queueLengthLimit` is a length limit applied to each queue belongs to the priority.  The value must be positive
 	// for a non-exempt priority level.
 	// +optional
 	QueueLengthLimit int32
+	// `exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level.
+	// Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued)
+	// and do not detract from the concurrency available for non-exempt requests. The field is default to false and only those system
+	// preset priority level can be exempt.
+	// +optional
+	Exempt bool
 }
 
 // PriorityLevelConfigurationConditionType is a valid value for PriorityLevelConfigurationStatusCondition.Type
@@ -282,24 +301,3 @@ type Subject struct {
 	// +optional
 	Namespace string
 }
-
-// PolicyRule holds information that describes a policy rule, but does not contain information
-// about who the rule applies to or which namespace the rule applies to.
-type PolicyRule struct {
-	// `verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule.
-	// VerbAll represents all kinds.
-	Verbs []string
-	// `apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of
-	// the enumerated resources in any API group will be allowed. APIGroupAll represents all api groups.
-	// +optional
-	APIGroups []string
-	// `resources` is a list of resources this rule applies to.  ResourceAll represents all resources.
-	// +optional
-	Resources []string
-	// `nonResourceURLs` is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
-	// Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding.
-	// Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"),  but not both.
-	// NonResourceAll represents all non-resource urls.
-	// +optional
-	NonResourceURLs []string
-}
diff --git a/pkg/apis/flowcontrol/v1alpha1/defaults.go b/pkg/apis/flowcontrol/v1alpha1/defaults.go
index 488d5f538b2..945a7c846f0 100644
--- a/pkg/apis/flowcontrol/v1alpha1/defaults.go
+++ b/pkg/apis/flowcontrol/v1alpha1/defaults.go
@@ -18,13 +18,22 @@ package v1alpha1
 
 import (
 	"k8s.io/api/flowcontrol/v1alpha1"
-	"k8s.io/kubernetes/pkg/apis/flowcontrol"
+)
+
+// Default settings for flow-schema
+const (
+	FlowSchemaDefaultMatchingPrecedence int32 = 1000
+)
+
+// Default settings for priority-level-configuration
+const (
+	PriorityLevelConfigurationDefaultHandSize int32 = 1
 )
 
 // SetDefaults_FlowSchema sets default values for flow schema
 func SetDefaults_FlowSchema(obj *v1alpha1.FlowSchema) {
 	if obj.Spec.MatchingPrecedence == 0 {
-		obj.Spec.MatchingPrecedence = flowcontrol.FlowSchemaDefaultMatchingPrecedence
+		obj.Spec.MatchingPrecedence = FlowSchemaDefaultMatchingPrecedence
 	}
 }
 
@@ -32,7 +41,7 @@ func SetDefaults_FlowSchema(obj *v1alpha1.FlowSchema) {
 func SetDefaults_PriorityLevelConfiguration(obj *v1alpha1.PriorityLevelConfiguration) {
 	if !obj.Spec.Exempt {
 		if obj.Spec.HandSize == 0 {
-			obj.Spec.HandSize = flowcontrol.PriorityLevelConfigurationDefaultHandSize
+			obj.Spec.HandSize = PriorityLevelConfigurationDefaultHandSize
 		}
 	}
 }
diff --git a/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go b/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go
index c1ef4e7a738..dc46bad3547 100644
--- a/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go
+++ b/pkg/apis/flowcontrol/v1alpha1/zz_generated.conversion.go
@@ -497,11 +497,11 @@ func Convert_flowcontrol_PriorityLevelConfigurationReference_To_v1alpha1_Priorit
 }
 
 func autoConvert_v1alpha1_PriorityLevelConfigurationSpec_To_flowcontrol_PriorityLevelConfigurationSpec(in *v1alpha1.PriorityLevelConfigurationSpec, out *flowcontrol.PriorityLevelConfigurationSpec, s conversion.Scope) error {
-	out.Exempt = in.Exempt
 	out.AssuredConcurrencyShares = in.AssuredConcurrencyShares
 	out.Queues = in.Queues
 	out.HandSize = in.HandSize
 	out.QueueLengthLimit = in.QueueLengthLimit
+	out.Exempt = in.Exempt
 	return nil
 }
 
@@ -511,11 +511,11 @@ func Convert_v1alpha1_PriorityLevelConfigurationSpec_To_flowcontrol_PriorityLeve
 }
 
 func autoConvert_flowcontrol_PriorityLevelConfigurationSpec_To_v1alpha1_PriorityLevelConfigurationSpec(in *flowcontrol.PriorityLevelConfigurationSpec, out *v1alpha1.PriorityLevelConfigurationSpec, s conversion.Scope) error {
-	out.Exempt = in.Exempt
 	out.AssuredConcurrencyShares = in.AssuredConcurrencyShares
 	out.Queues = in.Queues
 	out.HandSize = in.HandSize
 	out.QueueLengthLimit = in.QueueLengthLimit
+	out.Exempt = in.Exempt
 	return nil
 }
 
diff --git a/pkg/kubeapiserver/server/insecure_handler.go b/pkg/kubeapiserver/server/insecure_handler.go
index 45f0b8a0464..70b03301629 100644
--- a/pkg/kubeapiserver/server/insecure_handler.go
+++ b/pkg/kubeapiserver/server/insecure_handler.go
@@ -29,12 +29,12 @@ import (
 // BuildInsecureHandlerChain sets up the server to listen to http. Should be removed.
 func BuildInsecureHandlerChain(apiHandler http.Handler, c *server.Config) http.Handler {
 	handler := apiHandler
+	handler = genericapifilters.WithAudit(handler, c.AuditBackend, c.AuditPolicyChecker, c.LongRunningFunc)
 	if feature.DefaultFeatureGate.Enabled(features.RequestManagement) {
 		handler = genericfilters.WithRequestManagement(handler, c.LongRunningFunc, c.RequestManagement)
 	} else {
 		handler = genericfilters.WithMaxInFlightLimit(handler, c.MaxRequestsInFlight, c.MaxMutatingRequestsInFlight, c.LongRunningFunc)
 	}
-	handler = genericapifilters.WithAudit(handler, c.AuditBackend, c.AuditPolicyChecker, c.LongRunningFunc)
 	handler = genericapifilters.WithAuthentication(handler, server.InsecureSuperuser{}, nil, nil)
 	handler = genericfilters.WithCORS(handler, c.CorsAllowedOriginList, nil, nil, nil, "true")
 	handler = genericfilters.WithTimeoutForNonLongRunningRequests(handler, c.LongRunningFunc, c.RequestTimeout)
diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go
index 8b700137769..26be1823323 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.pb.go
@@ -655,24 +655,24 @@ func (m *PriorityLevelConfigurationSpec) MarshalTo(dAtA []byte) (int, error) {
 	_ = l
 	dAtA[i] = 0x8
 	i++
+	i = encodeVarintGenerated(dAtA, i, uint64(m.AssuredConcurrencyShares))
+	dAtA[i] = 0x10
+	i++
+	i = encodeVarintGenerated(dAtA, i, uint64(m.Queues))
+	dAtA[i] = 0x18
+	i++
+	i = encodeVarintGenerated(dAtA, i, uint64(m.HandSize))
+	dAtA[i] = 0x20
+	i++
+	i = encodeVarintGenerated(dAtA, i, uint64(m.QueueLengthLimit))
+	dAtA[i] = 0x28
+	i++
 	if m.Exempt {
 		dAtA[i] = 1
 	} else {
 		dAtA[i] = 0
 	}
 	i++
-	dAtA[i] = 0x10
-	i++
-	i = encodeVarintGenerated(dAtA, i, uint64(m.AssuredConcurrencyShares))
-	dAtA[i] = 0x18
-	i++
-	i = encodeVarintGenerated(dAtA, i, uint64(m.Queues))
-	dAtA[i] = 0x20
-	i++
-	i = encodeVarintGenerated(dAtA, i, uint64(m.HandSize))
-	dAtA[i] = 0x28
-	i++
-	i = encodeVarintGenerated(dAtA, i, uint64(m.QueueLengthLimit))
 	return i, nil
 }
 
@@ -927,11 +927,11 @@ func (m *PriorityLevelConfigurationReference) Size() (n int) {
 func (m *PriorityLevelConfigurationSpec) Size() (n int) {
 	var l int
 	_ = l
-	n += 2
 	n += 1 + sovGenerated(uint64(m.AssuredConcurrencyShares))
 	n += 1 + sovGenerated(uint64(m.Queues))
 	n += 1 + sovGenerated(uint64(m.HandSize))
 	n += 1 + sovGenerated(uint64(m.QueueLengthLimit))
+	n += 2
 	return n
 }
 
@@ -1120,11 +1120,11 @@ func (this *PriorityLevelConfigurationSpec) String() string {
 		return "nil"
 	}
 	s := strings.Join([]string{`&PriorityLevelConfigurationSpec{`,
-		`Exempt:` + fmt.Sprintf("%v", this.Exempt) + `,`,
 		`AssuredConcurrencyShares:` + fmt.Sprintf("%v", this.AssuredConcurrencyShares) + `,`,
 		`Queues:` + fmt.Sprintf("%v", this.Queues) + `,`,
 		`HandSize:` + fmt.Sprintf("%v", this.HandSize) + `,`,
 		`QueueLengthLimit:` + fmt.Sprintf("%v", this.QueueLengthLimit) + `,`,
+		`Exempt:` + fmt.Sprintf("%v", this.Exempt) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -2763,26 +2763,6 @@ func (m *PriorityLevelConfigurationSpec) Unmarshal(dAtA []byte) error {
 		}
 		switch fieldNum {
 		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Exempt", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowGenerated
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.Exempt = bool(v != 0)
-		case 2:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field AssuredConcurrencyShares", wireType)
 			}
@@ -2801,7 +2781,7 @@ func (m *PriorityLevelConfigurationSpec) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 3:
+		case 2:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field Queues", wireType)
 			}
@@ -2820,7 +2800,7 @@ func (m *PriorityLevelConfigurationSpec) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 4:
+		case 3:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field HandSize", wireType)
 			}
@@ -2839,7 +2819,7 @@ func (m *PriorityLevelConfigurationSpec) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 5:
+		case 4:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field QueueLengthLimit", wireType)
 			}
@@ -2858,6 +2838,26 @@ func (m *PriorityLevelConfigurationSpec) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
+		case 5:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Exempt", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowGenerated
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.Exempt = bool(v != 0)
 		default:
 			iNdEx = preIndex
 			skippy, err := skipGenerated(dAtA[iNdEx:])
@@ -3236,82 +3236,82 @@ func init() {
 }
 
 var fileDescriptorGenerated = []byte{
-	// 1222 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcd, 0x6e, 0x14, 0x47,
-	0x17, 0x75, 0xdb, 0x33, 0xc6, 0x53, 0x7c, 0x80, 0xbf, 0xb2, 0x14, 0x46, 0x8e, 0x34, 0x63, 0x75,
-	0x24, 0x20, 0x71, 0xd2, 0x1d, 0x23, 0x14, 0x90, 0x50, 0x84, 0x68, 0x48, 0x80, 0x30, 0x26, 0xa6,
-	0x4c, 0x88, 0x82, 0x58, 0x50, 0xee, 0xb9, 0x9e, 0xa9, 0x78, 0xfa, 0x27, 0x55, 0xd5, 0x03, 0x8e,
-	0xb2, 0x88, 0x94, 0x65, 0x36, 0x79, 0x00, 0x1e, 0x20, 0x8b, 0xbc, 0x43, 0xa2, 0x2c, 0x22, 0x16,
-	0x59, 0xb0, 0x64, 0x35, 0x82, 0xc9, 0x92, 0x37, 0x60, 0x15, 0x55, 0x75, 0x75, 0xb7, 0xe7, 0xcf,
-	0x63, 0xcb, 0x12, 0xab, 0xac, 0xec, 0xbe, 0xf7, 0x9e, 0x53, 0xb7, 0x6e, 0x9d, 0xaa, 0x33, 0xe8,
-	0xe6, 0xce, 0x25, 0xe1, 0xb0, 0xc8, 0xdd, 0x49, 0xb6, 0x80, 0x87, 0x20, 0x41, 0xb8, 0x5d, 0x08,
-	0x9b, 0x11, 0x77, 0x4d, 0x82, 0xc6, 0xcc, 0xdd, 0xee, 0x44, 0x8f, 0xfd, 0x28, 0x94, 0x3c, 0xea,
-	0xb8, 0xdd, 0x35, 0xda, 0x89, 0xdb, 0x74, 0xcd, 0x6d, 0x41, 0x08, 0x9c, 0x4a, 0x68, 0x3a, 0x31,
-	0x8f, 0x64, 0x84, 0xeb, 0x29, 0xc0, 0xa1, 0x31, 0x73, 0xf6, 0x00, 0x9c, 0x0c, 0xb0, 0xfc, 0x51,
-	0x8b, 0xc9, 0x76, 0xb2, 0xe5, 0xf8, 0x51, 0xe0, 0xb6, 0xa2, 0x56, 0xe4, 0x6a, 0xdc, 0x56, 0xb2,
-	0xad, 0xbf, 0xf4, 0x87, 0xfe, 0x2f, 0xe5, 0x5b, 0xb6, 0xf7, 0x34, 0xe0, 0x47, 0x1c, 0xdc, 0xee,
-	0xc8, 0x9a, 0xcb, 0x17, 0x8a, 0x9a, 0x80, 0xfa, 0x6d, 0x16, 0x02, 0xdf, 0x75, 0xe3, 0x9d, 0x96,
-	0x0a, 0x08, 0x37, 0x00, 0x49, 0xc7, 0xa1, 0xdc, 0x49, 0x28, 0x9e, 0x84, 0x92, 0x05, 0x30, 0x02,
-	0xf8, 0x64, 0x1a, 0x40, 0xf8, 0x6d, 0x08, 0xe8, 0x30, 0xce, 0x7e, 0x80, 0x4e, 0x7f, 0xde, 0x89,
-	0x1e, 0x5f, 0x67, 0x42, 0xb2, 0xb0, 0x95, 0x30, 0xd1, 0x06, 0xbe, 0x0e, 0xb2, 0x1d, 0x35, 0xf1,
-	0x15, 0x54, 0x92, 0xbb, 0x31, 0x54, 0xad, 0x15, 0xeb, 0x5c, 0xc5, 0x5b, 0x7d, 0xd6, 0xab, 0xcf,
-	0xf4, 0x7b, 0xf5, 0xd2, 0xbd, 0xdd, 0x18, 0xde, 0xf4, 0xea, 0xef, 0x4e, 0x80, 0xa9, 0x34, 0xd1,
-	0x40, 0xfb, 0xe9, 0x2c, 0x42, 0xaa, 0x6a, 0x53, 0x2f, 0x8d, 0x1f, 0xa1, 0x05, 0xb5, 0xdd, 0x26,
-	0x95, 0x54, 0x73, 0x1e, 0x3f, 0xff, 0xb1, 0x53, 0x1c, 0x48, 0xde, 0xb5, 0x13, 0xef, 0xb4, 0x54,
-	0x40, 0x38, 0xaa, 0xda, 0xe9, 0xae, 0x39, 0x5f, 0x6e, 0x7d, 0x0b, 0xbe, 0x5c, 0x07, 0x49, 0x3d,
-	0x6c, 0xba, 0x40, 0x45, 0x8c, 0xe4, 0xac, 0xf8, 0x2e, 0x2a, 0x89, 0x18, 0xfc, 0xea, 0xac, 0x66,
-	0x77, 0x9d, 0x29, 0xc7, 0xed, 0x14, 0xcd, 0x6d, 0xc6, 0xe0, 0x7b, 0xff, 0xcb, 0xb6, 0xa8, 0xbe,
-	0x88, 0xa6, 0xc2, 0xdf, 0xa0, 0x79, 0x21, 0xa9, 0x4c, 0x44, 0x75, 0x4e, 0x93, 0xae, 0x1d, 0x86,
-	0x54, 0x03, 0xbd, 0x93, 0x86, 0x76, 0x3e, 0xfd, 0x26, 0x86, 0xd0, 0x7e, 0x3d, 0x8b, 0x96, 0x8a,
-	0xe2, 0x6b, 0x51, 0xd8, 0x64, 0x92, 0x45, 0x21, 0xbe, 0x3c, 0x30, 0xf7, 0xb3, 0x43, 0x73, 0x3f,
-	0x3d, 0x06, 0x52, 0xcc, 0x1c, 0x37, 0xf2, 0x7e, 0x67, 0x35, 0xfc, 0xc2, 0xe0, 0xe2, 0x6f, 0x7a,
-	0xf5, 0x31, 0xa2, 0x75, 0x72, 0xa6, 0xc1, 0x16, 0x71, 0x17, 0xe1, 0x0e, 0x15, 0xf2, 0x1e, 0xa7,
-	0xa1, 0x48, 0x57, 0x62, 0x01, 0x98, 0x49, 0x7c, 0x70, 0xb0, 0xc3, 0x53, 0x08, 0x6f, 0xd9, 0x74,
-	0x81, 0x1b, 0x23, 0x6c, 0x64, 0xcc, 0x0a, 0xf8, 0x0c, 0x9a, 0xe7, 0x40, 0x45, 0x14, 0x56, 0x4b,
-	0x7a, 0x17, 0xf9, 0x08, 0x89, 0x8e, 0x12, 0x93, 0xc5, 0xef, 0xa3, 0x63, 0x01, 0x08, 0x41, 0x5b,
-	0x50, 0x2d, 0xeb, 0xc2, 0x53, 0xa6, 0xf0, 0xd8, 0x7a, 0x1a, 0x26, 0x59, 0xde, 0xfe, 0xc3, 0x42,
-	0x27, 0x8b, 0xd1, 0x35, 0x98, 0x90, 0xf8, 0xe1, 0x88, 0x20, 0x9d, 0x83, 0xed, 0x49, 0xa1, 0xb5,
-	0x1c, 0x17, 0xcd, 0x72, 0x0b, 0x59, 0x64, 0x8f, 0x18, 0x37, 0x50, 0x99, 0x49, 0x08, 0xd4, 0x41,
-	0xcc, 0x9d, 0x3b, 0x7e, 0x7e, 0xf5, 0x10, 0xc2, 0xf1, 0x4e, 0x18, 0xde, 0xf2, 0x2d, 0xc5, 0x40,
-	0x52, 0x22, 0xfb, 0xf5, 0xdc, 0xde, 0x2d, 0x28, 0x91, 0xe2, 0x5f, 0x2d, 0xb4, 0x1c, 0x73, 0x16,
-	0x71, 0x26, 0x77, 0x1b, 0xd0, 0x85, 0xce, 0xb5, 0x28, 0xdc, 0x66, 0xad, 0x84, 0x53, 0x35, 0x4b,
-	0xb3, 0xab, 0xeb, 0x53, 0x97, 0xde, 0x98, 0x48, 0x41, 0x60, 0x1b, 0x38, 0x84, 0x3e, 0x78, 0xb6,
-	0xe9, 0x69, 0x79, 0x9f, 0xe2, 0x7d, 0x7a, 0xc1, 0x5f, 0x20, 0x1c, 0x50, 0xa9, 0x66, 0xda, 0xda,
-	0xe0, 0xe0, 0x43, 0x53, 0xb1, 0x6a, 0x95, 0x96, 0x0b, 0x7d, 0xac, 0x8f, 0x54, 0x90, 0x31, 0x28,
-	0xfc, 0x93, 0x85, 0x96, 0x9a, 0xa3, 0x6f, 0x8f, 0x51, 0xe6, 0xa5, 0x03, 0x8d, 0x7a, 0xcc, 0xdb,
-	0xe5, 0x9d, 0xee, 0xf7, 0xea, 0x4b, 0x63, 0x12, 0x64, 0xdc, 0x6a, 0xf8, 0x21, 0x2a, 0xf3, 0xa4,
-	0x03, 0xa2, 0x5a, 0xd2, 0x27, 0x7c, 0x71, 0xfa, 0x98, 0xa3, 0x0e, 0xf3, 0x77, 0x49, 0xd2, 0x81,
-	0xaf, 0x99, 0x6c, 0x6f, 0x26, 0xfa, 0x0d, 0x13, 0xc5, 0x69, 0xab, 0x8c, 0x20, 0x29, 0xa9, 0xfd,
-	0x03, 0x5a, 0x1c, 0x7e, 0x4a, 0x70, 0x1b, 0x21, 0x3f, 0xbb, 0xaa, 0xa2, 0x6a, 0xe9, 0x65, 0x2f,
-	0x1c, 0x42, 0x58, 0xf9, 0x3d, 0x2f, 0x1e, 0xd2, 0x3c, 0x24, 0xc8, 0x1e, 0x6e, 0xfb, 0x2f, 0x0b,
-	0xa1, 0xa2, 0x5d, 0x5c, 0x47, 0xe5, 0x2e, 0xf0, 0xad, 0x74, 0xcd, 0x8a, 0x57, 0x51, 0xdd, 0xde,
-	0x57, 0x01, 0x92, 0xc6, 0xf1, 0x2a, 0xaa, 0xd0, 0x98, 0xdd, 0xe0, 0x51, 0x12, 0xa7, 0x8a, 0xaf,
-	0x78, 0x27, 0xfa, 0xbd, 0x7a, 0xe5, 0xea, 0xc6, 0xad, 0x34, 0x48, 0x8a, 0xbc, 0x2a, 0xe6, 0x20,
-	0xa2, 0x84, 0xfb, 0xa0, 0xde, 0xd5, 0xbc, 0x98, 0x64, 0x41, 0x52, 0xe4, 0xf1, 0xa7, 0xe8, 0x54,
-	0xa8, 0x74, 0x98, 0x7e, 0x7f, 0x45, 0x1a, 0xa2, 0x3a, 0xaf, 0x21, 0x4b, 0xfd, 0x5e, 0xfd, 0xd4,
-	0x9d, 0xc1, 0x14, 0x19, 0xae, 0xb5, 0x7f, 0xb7, 0xd0, 0x3b, 0xe3, 0xe7, 0x8e, 0xef, 0xa3, 0x05,
-	0x61, 0xfe, 0x37, 0xb3, 0x3c, 0x37, 0x75, 0x96, 0x06, 0x5c, 0xdc, 0xfc, 0x8c, 0x8d, 0xe4, 0x5c,
-	0x78, 0x1d, 0x95, 0xd4, 0x11, 0x1a, 0x1b, 0x5a, 0x3d, 0x84, 0x2c, 0x0a, 0x0b, 0x52, 0x5f, 0x44,
-	0xd3, 0xd8, 0x7f, 0xcf, 0xa2, 0x7d, 0xee, 0xdc, 0x5b, 0xb0, 0x55, 0x3a, 0x60, 0xab, 0x57, 0x8e,
-	0xf0, 0x9a, 0x4c, 0xb4, 0x59, 0x36, 0x64, 0xb3, 0x57, 0x8f, 0xb2, 0xc8, 0xfe, 0xb6, 0xfb, 0xf3,
-	0x1c, 0x7a, 0x6f, 0x32, 0xb8, 0xb0, 0xe1, 0xdb, 0x03, 0x36, 0x7c, 0x71, 0xc8, 0x86, 0xcf, 0x1e,
-	0x80, 0xe2, 0x3f, 0x5b, 0x9e, 0x6e, 0xcb, 0x2f, 0x2d, 0x54, 0x9b, 0x3c, 0xca, 0xb7, 0x60, 0xd3,
-	0x8f, 0x06, 0x6d, 0xfa, 0xf2, 0x11, 0x84, 0x37, 0xc1, 0xb6, 0x6f, 0xec, 0xa7, 0xb7, 0xdc, 0x5f,
-	0xf1, 0x0a, 0x2a, 0x85, 0x34, 0xc8, 0xf4, 0x96, 0x5f, 0x92, 0x3b, 0x34, 0x00, 0xa2, 0x33, 0xf6,
-	0x9f, 0xb3, 0xfb, 0xcd, 0x4a, 0xff, 0x1e, 0x38, 0x83, 0xe6, 0xe1, 0x09, 0x04, 0xb1, 0xd4, 0x34,
-	0x0b, 0xc5, 0x09, 0x7d, 0xa6, 0xa3, 0xc4, 0x64, 0xf1, 0x43, 0x54, 0xa5, 0x42, 0x24, 0x1c, 0x9a,
-	0xd7, 0xa2, 0xd0, 0x4f, 0xb8, 0x6a, 0x61, 0x77, 0xb3, 0x4d, 0x39, 0x08, 0x63, 0xc9, 0x2b, 0x06,
-	0x59, 0xbd, 0x3a, 0xa1, 0x8e, 0x4c, 0x64, 0x50, 0x5d, 0x7c, 0x97, 0x40, 0x02, 0xe9, 0x6d, 0x2e,
-	0x17, 0x5d, 0xdc, 0xd5, 0x51, 0x62, 0xb2, 0xf8, 0x43, 0xb4, 0xd0, 0xa6, 0x61, 0x73, 0x93, 0x7d,
-	0x0f, 0x5a, 0x51, 0xe5, 0xe2, 0xa4, 0x6e, 0x9a, 0x38, 0xc9, 0x2b, 0xf0, 0x75, 0xb4, 0xa8, 0x71,
-	0x0d, 0x08, 0x5b, 0xb2, 0xdd, 0x60, 0x01, 0x93, 0x5a, 0x5e, 0x65, 0xaf, 0x6a, 0x50, 0x8b, 0x77,
-	0x87, 0xf2, 0x64, 0x04, 0x61, 0x3f, 0xb5, 0xd0, 0xca, 0xb4, 0xb7, 0x03, 0x3f, 0x19, 0xe3, 0xb3,
-	0x47, 0xf9, 0x15, 0x75, 0x70, 0xdf, 0xfd, 0xcd, 0x42, 0xc7, 0x8c, 0xa5, 0x28, 0x45, 0xec, 0xb0,
-	0xb0, 0x39, 0xac, 0x88, 0xdb, 0x2c, 0x6c, 0x12, 0x9d, 0x51, 0x03, 0xcc, 0x5c, 0xd5, 0x3c, 0x2c,
-	0xf9, 0x00, 0x33, 0xe3, 0x25, 0x79, 0x45, 0xae, 0xb0, 0xb9, 0x49, 0x0a, 0xc3, 0x2e, 0xaa, 0xa8,
-	0xbf, 0x22, 0xa6, 0x3e, 0x98, 0x3b, 0xfe, 0x7f, 0x53, 0x56, 0xb9, 0x93, 0x25, 0x48, 0x51, 0xe3,
-	0x39, 0xcf, 0x5e, 0xd5, 0x66, 0x9e, 0xbf, 0xaa, 0xcd, 0xbc, 0x78, 0x55, 0x9b, 0xf9, 0xb1, 0x5f,
-	0xb3, 0x9e, 0xf5, 0x6b, 0xd6, 0xf3, 0x7e, 0xcd, 0x7a, 0xd1, 0xaf, 0x59, 0x2f, 0xfb, 0x35, 0xeb,
-	0x97, 0x7f, 0x6a, 0x33, 0x0f, 0x16, 0xb2, 0x11, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x2a,
-	0x2b, 0xf6, 0xcc, 0x0f, 0x00, 0x00,
+	// 1219 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0xce, 0x3a, 0x76, 0x6a, 0x4f, 0x69, 0x1b, 0x26, 0x12, 0xb5, 0x8c, 0x64, 0x47, 0x8b, 0x44,
+	0x0b, 0x81, 0x5d, 0x52, 0x55, 0xb4, 0x52, 0x85, 0xaa, 0x6e, 0x03, 0x6d, 0xa9, 0x13, 0x92, 0x49,
+	0x29, 0xa2, 0xca, 0xa1, 0x93, 0xf5, 0xc4, 0x1e, 0xe2, 0xfd, 0x60, 0x66, 0xd6, 0xad, 0x11, 0x07,
+	0x24, 0x8e, 0x5c, 0xf8, 0x01, 0xfd, 0x01, 0x1c, 0xf8, 0x0f, 0x20, 0x0e, 0x28, 0x07, 0x0e, 0x3d,
+	0xf6, 0x64, 0x35, 0xe6, 0xd8, 0x7f, 0xd0, 0x13, 0x9a, 0xd9, 0xd9, 0xdd, 0xf8, 0x3b, 0x51, 0xa4,
+	0x9e, 0x38, 0x25, 0xfb, 0xbe, 0xef, 0xf3, 0xcc, 0x3b, 0xef, 0x3c, 0x33, 0x8f, 0xc1, 0xdd, 0xfd,
+	0xeb, 0xdc, 0xa2, 0x81, 0xbd, 0x1f, 0xed, 0x12, 0xe6, 0x13, 0x41, 0xb8, 0xdd, 0x21, 0x7e, 0x23,
+	0x60, 0xb6, 0x4e, 0xe0, 0x90, 0xda, 0x7b, 0xed, 0xe0, 0x89, 0x1b, 0xf8, 0x82, 0x05, 0x6d, 0xbb,
+	0xb3, 0x8a, 0xdb, 0x61, 0x0b, 0xaf, 0xda, 0x4d, 0xe2, 0x13, 0x86, 0x05, 0x69, 0x58, 0x21, 0x0b,
+	0x44, 0x00, 0x6b, 0x31, 0xc0, 0xc2, 0x21, 0xb5, 0x8e, 0x00, 0xac, 0x04, 0x50, 0xf9, 0xb8, 0x49,
+	0x45, 0x2b, 0xda, 0xb5, 0xdc, 0xc0, 0xb3, 0x9b, 0x41, 0x33, 0xb0, 0x15, 0x6e, 0x37, 0xda, 0x53,
+	0x5f, 0xea, 0x43, 0xfd, 0x17, 0xf3, 0x55, 0xcc, 0x23, 0x0d, 0xb8, 0x01, 0x23, 0x76, 0x67, 0x64,
+	0xcd, 0xca, 0xd5, 0xac, 0xc6, 0xc3, 0x6e, 0x8b, 0xfa, 0x84, 0x75, 0xed, 0x70, 0xbf, 0x29, 0x03,
+	0xdc, 0xf6, 0x88, 0xc0, 0xe3, 0x50, 0xf6, 0x24, 0x14, 0x8b, 0x7c, 0x41, 0x3d, 0x32, 0x02, 0xf8,
+	0x74, 0x16, 0x80, 0xbb, 0x2d, 0xe2, 0xe1, 0x61, 0x9c, 0xf9, 0x08, 0x5c, 0xfc, 0xa2, 0x1d, 0x3c,
+	0x59, 0xa3, 0x5c, 0x50, 0xbf, 0x19, 0x51, 0xde, 0x22, 0x6c, 0x9d, 0x88, 0x56, 0xd0, 0x80, 0x37,
+	0x41, 0x5e, 0x74, 0x43, 0x52, 0x36, 0x96, 0x8d, 0xcb, 0x25, 0x67, 0xe5, 0xa0, 0x57, 0x9b, 0xeb,
+	0xf7, 0x6a, 0xf9, 0x07, 0xdd, 0x90, 0xbc, 0xee, 0xd5, 0xde, 0x9d, 0x00, 0x93, 0x69, 0xa4, 0x80,
+	0xe6, 0xb3, 0x1c, 0x00, 0xb2, 0x6a, 0x5b, 0x2d, 0x0d, 0x1f, 0x83, 0xa2, 0xdc, 0x6e, 0x03, 0x0b,
+	0xac, 0x38, 0xcf, 0x5e, 0xf9, 0xc4, 0xca, 0x0e, 0x24, 0xed, 0xda, 0x0a, 0xf7, 0x9b, 0x32, 0xc0,
+	0x2d, 0x59, 0x6d, 0x75, 0x56, 0xad, 0xaf, 0x76, 0xbf, 0x23, 0xae, 0x58, 0x27, 0x02, 0x3b, 0x50,
+	0x77, 0x01, 0xb2, 0x18, 0x4a, 0x59, 0xe1, 0x16, 0xc8, 0xf3, 0x90, 0xb8, 0xe5, 0x9c, 0x62, 0xb7,
+	0xad, 0x19, 0xc7, 0x6d, 0x65, 0xcd, 0x6d, 0x87, 0xc4, 0x75, 0xde, 0x4a, 0xb6, 0x28, 0xbf, 0x90,
+	0xa2, 0x82, 0xdf, 0x82, 0x05, 0x2e, 0xb0, 0x88, 0x78, 0x79, 0x5e, 0x91, 0xae, 0x9e, 0x84, 0x54,
+	0x01, 0x9d, 0xf3, 0x9a, 0x76, 0x21, 0xfe, 0x46, 0x9a, 0xd0, 0x7c, 0x95, 0x03, 0x4b, 0x59, 0xf1,
+	0xed, 0xc0, 0x6f, 0x50, 0x41, 0x03, 0x1f, 0xde, 0x18, 0x98, 0xfb, 0xa5, 0xa1, 0xb9, 0x5f, 0x1c,
+	0x03, 0xc9, 0x66, 0x0e, 0xeb, 0x69, 0xbf, 0x39, 0x05, 0xbf, 0x3a, 0xb8, 0xf8, 0xeb, 0x5e, 0x6d,
+	0x8c, 0x68, 0xad, 0x94, 0x69, 0xb0, 0x45, 0xd8, 0x01, 0xb0, 0x8d, 0xb9, 0x78, 0xc0, 0xb0, 0xcf,
+	0xe3, 0x95, 0xa8, 0x47, 0xf4, 0x24, 0x3e, 0x3c, 0xde, 0xe1, 0x49, 0x84, 0x53, 0xd1, 0x5d, 0xc0,
+	0xfa, 0x08, 0x1b, 0x1a, 0xb3, 0x02, 0x7c, 0x1f, 0x2c, 0x30, 0x82, 0x79, 0xe0, 0x97, 0xf3, 0x6a,
+	0x17, 0xe9, 0x08, 0x91, 0x8a, 0x22, 0x9d, 0x85, 0x1f, 0x80, 0x33, 0x1e, 0xe1, 0x1c, 0x37, 0x49,
+	0xb9, 0xa0, 0x0a, 0x2f, 0xe8, 0xc2, 0x33, 0xeb, 0x71, 0x18, 0x25, 0x79, 0xf3, 0x4f, 0x03, 0x9c,
+	0xcf, 0x46, 0x57, 0xa7, 0x5c, 0xc0, 0x9d, 0x11, 0x41, 0x5a, 0xc7, 0xdb, 0x93, 0x44, 0x2b, 0x39,
+	0x2e, 0xea, 0xe5, 0x8a, 0x49, 0xe4, 0x88, 0x18, 0x37, 0x41, 0x81, 0x0a, 0xe2, 0xc9, 0x83, 0x98,
+	0xbf, 0x7c, 0xf6, 0xca, 0xca, 0x09, 0x84, 0xe3, 0x9c, 0xd3, 0xbc, 0x85, 0x7b, 0x92, 0x01, 0xc5,
+	0x44, 0xe6, 0xab, 0xf9, 0xa3, 0x5b, 0x90, 0x22, 0x85, 0xbf, 0x19, 0xa0, 0x12, 0x32, 0x1a, 0x30,
+	0x2a, 0xba, 0x75, 0xd2, 0x21, 0xed, 0xdb, 0x81, 0xbf, 0x47, 0x9b, 0x11, 0xc3, 0x72, 0x96, 0x7a,
+	0x57, 0x6b, 0x33, 0x97, 0xde, 0x9c, 0x48, 0x81, 0xc8, 0x1e, 0x61, 0xc4, 0x77, 0x89, 0x63, 0xea,
+	0x9e, 0x2a, 0x53, 0x8a, 0xa7, 0xf4, 0x02, 0xbf, 0x04, 0xd0, 0xc3, 0x42, 0xce, 0xb4, 0xb9, 0xc9,
+	0x88, 0x4b, 0x1a, 0x92, 0x55, 0xa9, 0xb4, 0x90, 0xe9, 0x63, 0x7d, 0xa4, 0x02, 0x8d, 0x41, 0xc1,
+	0x9f, 0x0d, 0xb0, 0xd4, 0x18, 0x7d, 0x7b, 0xb4, 0x32, 0xaf, 0x1f, 0x6b, 0xd4, 0x63, 0xde, 0x2e,
+	0xe7, 0x62, 0xbf, 0x57, 0x5b, 0x1a, 0x93, 0x40, 0xe3, 0x56, 0x83, 0x3b, 0xa0, 0xc0, 0xa2, 0x36,
+	0xe1, 0xe5, 0xbc, 0x3a, 0xe1, 0x6b, 0xb3, 0xc7, 0x1c, 0xb4, 0xa9, 0xdb, 0x45, 0x51, 0x9b, 0x7c,
+	0x43, 0x45, 0x6b, 0x3b, 0x52, 0x6f, 0x18, 0xcf, 0x4e, 0x5b, 0x66, 0x38, 0x8a, 0x49, 0xcd, 0x1f,
+	0xc1, 0xe2, 0xf0, 0x53, 0x02, 0x5b, 0x00, 0xb8, 0xc9, 0x55, 0xe5, 0x65, 0x43, 0x2d, 0x7b, 0xf5,
+	0x04, 0xc2, 0x4a, 0xef, 0x79, 0xf6, 0x90, 0xa6, 0x21, 0x8e, 0x8e, 0x70, 0x9b, 0x7f, 0x1b, 0x00,
+	0x64, 0xed, 0xc2, 0x1a, 0x28, 0x74, 0x08, 0xdb, 0x8d, 0xd7, 0x2c, 0x39, 0x25, 0xd9, 0xed, 0x43,
+	0x19, 0x40, 0x71, 0x1c, 0xae, 0x80, 0x12, 0x0e, 0xe9, 0x1d, 0x16, 0x44, 0x61, 0xac, 0xf8, 0x92,
+	0x73, 0xae, 0xdf, 0xab, 0x95, 0x6e, 0x6d, 0xde, 0x8b, 0x83, 0x28, 0xcb, 0xcb, 0x62, 0x46, 0x78,
+	0x10, 0x31, 0x97, 0xc8, 0x77, 0x35, 0x2d, 0x46, 0x49, 0x10, 0x65, 0x79, 0xf8, 0x19, 0xb8, 0xe0,
+	0x4b, 0x1d, 0xc6, 0xdf, 0x5f, 0xa3, 0x3a, 0x2f, 0x2f, 0x28, 0xc8, 0x52, 0xbf, 0x57, 0xbb, 0xb0,
+	0x31, 0x98, 0x42, 0xc3, 0xb5, 0xe6, 0x1f, 0x06, 0x78, 0x67, 0xfc, 0xdc, 0xe1, 0x43, 0x50, 0xe4,
+	0xfa, 0x7f, 0x3d, 0xcb, 0xcb, 0x33, 0x67, 0xa9, 0xc1, 0xd9, 0xcd, 0x4f, 0xd8, 0x50, 0xca, 0x05,
+	0xd7, 0x41, 0x5e, 0x1e, 0xa1, 0xb6, 0xa1, 0x95, 0x13, 0xc8, 0x22, 0xb3, 0x20, 0xf9, 0x85, 0x14,
+	0x8d, 0xf9, 0x4f, 0x0e, 0x4c, 0xb9, 0x73, 0x6f, 0xc0, 0x56, 0xf1, 0x80, 0xad, 0xde, 0x3c, 0xc5,
+	0x6b, 0x32, 0xd1, 0x66, 0xe9, 0x90, 0xcd, 0xde, 0x3a, 0xcd, 0x22, 0xd3, 0x6d, 0xf7, 0x97, 0x79,
+	0xf0, 0xde, 0x64, 0x70, 0x66, 0xc3, 0xf7, 0x07, 0x6c, 0xf8, 0xda, 0x90, 0x0d, 0x5f, 0x3a, 0x06,
+	0xc5, 0xff, 0xb6, 0x3c, 0xdb, 0x96, 0x5f, 0x1a, 0xa0, 0x3a, 0x79, 0x94, 0x6f, 0xc0, 0xa6, 0x1f,
+	0x0f, 0xda, 0xf4, 0x8d, 0x53, 0x08, 0x6f, 0x82, 0x6d, 0xdf, 0x99, 0xa6, 0xb7, 0xd4, 0x5f, 0xe1,
+	0x32, 0xc8, 0xfb, 0xd8, 0x4b, 0xf4, 0x96, 0x5e, 0x92, 0x0d, 0xec, 0x11, 0xa4, 0x32, 0xe6, 0x5f,
+	0xb9, 0x69, 0xb3, 0x52, 0xbf, 0x07, 0x76, 0x40, 0x19, 0x73, 0x1e, 0x31, 0xd2, 0xb8, 0x1d, 0xf8,
+	0x6e, 0xc4, 0x24, 0x75, 0x77, 0xbb, 0x85, 0x19, 0xe1, 0x8a, 0xb8, 0xe0, 0x2c, 0x6b, 0xe2, 0xf2,
+	0xad, 0x09, 0x75, 0x68, 0x22, 0x83, 0x3c, 0xff, 0xef, 0x23, 0x12, 0x11, 0xae, 0x6d, 0x3b, 0x3d,
+	0xff, 0x2d, 0x15, 0x45, 0x3a, 0x0b, 0x3f, 0x02, 0xc5, 0x16, 0xf6, 0x1b, 0xdb, 0xf4, 0x87, 0x58,
+	0x95, 0x85, 0xec, 0x04, 0xee, 0xea, 0x38, 0x4a, 0x2b, 0xe0, 0x1a, 0x58, 0x54, 0xb8, 0x3a, 0xf1,
+	0x9b, 0xa2, 0x55, 0xa7, 0x1e, 0x15, 0x4a, 0x5f, 0x05, 0xa7, 0xac, 0x51, 0x8b, 0x5b, 0x43, 0x79,
+	0x34, 0x82, 0x90, 0xbd, 0x91, 0xa7, 0xc4, 0x0b, 0x85, 0x92, 0x5c, 0x31, 0xeb, 0xed, 0x73, 0x15,
+	0x45, 0x3a, 0x6b, 0x3e, 0x33, 0xc0, 0xf2, 0xac, 0xb7, 0x03, 0x3e, 0x1d, 0xe3, 0xb3, 0xa7, 0xf9,
+	0x15, 0x75, 0x7c, 0xdf, 0xfd, 0xdd, 0x00, 0x67, 0xb4, 0xa5, 0x48, 0x45, 0xec, 0x53, 0xbf, 0x31,
+	0xac, 0x88, 0xfb, 0xd4, 0x6f, 0x20, 0x95, 0x91, 0x83, 0x4e, 0x5c, 0x55, 0x3f, 0x2c, 0xe9, 0xa0,
+	0x13, 0xe3, 0x45, 0x69, 0x45, 0xaa, 0xb0, 0xf9, 0x49, 0x0a, 0x83, 0x36, 0x28, 0xc9, 0xbf, 0x3c,
+	0xc4, 0x2e, 0xd1, 0x77, 0xfc, 0x6d, 0x5d, 0x56, 0xda, 0x48, 0x12, 0x28, 0xab, 0x71, 0xac, 0x83,
+	0xc3, 0xea, 0xdc, 0xf3, 0xc3, 0xea, 0xdc, 0x8b, 0xc3, 0xea, 0xdc, 0x4f, 0xfd, 0xaa, 0x71, 0xd0,
+	0xaf, 0x1a, 0xcf, 0xfb, 0x55, 0xe3, 0x45, 0xbf, 0x6a, 0xbc, 0xec, 0x57, 0x8d, 0x5f, 0xff, 0xad,
+	0xce, 0x3d, 0x2a, 0x26, 0x23, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xe0, 0xe0, 0x7e, 0xb1, 0xcc,
+	0x0f, 0x00, 0x00,
 }
diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto
index a99c6d12fc9..9333d530905 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto
+++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/generated.proto
@@ -35,7 +35,7 @@ message FlowDistinguisherMethod {
   optional string type = 1;
 }
 
-// FlowSchema defines the schema of a group of flows. Note that a flow makes up of a set of inbound API requests with
+// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
 // similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
 message FlowSchema {
   // `metadata` is the standard object's metadata.
@@ -97,10 +97,10 @@ message FlowSchemaSpec {
   optional int32 matchingPrecedence = 2;
 
   // `distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema.
-  // `nil` specifies that the computation always yields the empty string.
+  // `nil` specifies that the distinguisher is disabled and thus will always be the empty string.
   optional FlowDistinguisherMethod distinguisherMethod = 3;
 
-  // `rules` describes which requests will match this flow schema.
+  // `rules` describes which requests will match this flow schema. The flow-schema applies if any rule matches.
   repeated PolicyRuleWithSubjects rules = 4;
 }
 
@@ -114,11 +114,11 @@ message FlowSchemaStatus {
 // about who the rule applies to or which namespace the rule applies to.
 message PolicyRule {
   // `verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule.
-  // VerbAll represents all kinds.
+  // VerbAll represents all verbs.
   repeated string verbs = 1;
 
   // `apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of
-  // the enumerated resources in any API group will be allowed. APIGroupAll represents all api groups.
+  // the enumerated resources in any API group will be allowed. '*' represents all api groups.
   // +optional
   repeated string apiGroups = 2;
 
@@ -202,40 +202,40 @@ message PriorityLevelConfigurationReference {
 
 // PriorityLevelConfigurationSpec is specification of a priority level
 message PriorityLevelConfigurationSpec {
-  // `exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level.
-  // Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued)
-  // and do not detract from the concurrency available for non-exempt requests. In a more sophisticated system, the
-  // exempt priority level would be the highest priority level. The field is default to false and only those system
-  // preset priority level can be exempt.
-  // +optional
-  optional bool exempt = 1;
-
-  // `assuredConcurrencyShares` is a positive number for a non-exempt priority level, representing the weight by which
-  // the priority level shares the concurrency from the global limit. The concurrency limit of an apiserver is divided
-  // among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces
+  // `assuredConcurrencyShares` is a positive number for a non-exempt priority level. The concurrency limit of an apiserver
+  // is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces
   // the assured concurrency value (ACV) for each priority level:
   //
   //             ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )
   //
   // +optional
-  optional int32 assuredConcurrencyShares = 2;
+  optional int32 assuredConcurrencyShares = 1;
 
   // `queues` is a number of queues that belong to a non-exempt PriorityLevelConfiguration object. The queues exist
   // independently at each apiserver. The value must be positive for a non-exempt priority level and setting it to 1
   // disables shufflesharding and makes the distinguisher method irrelevant.
+  // TODO: sugguest a default or a way of deciding on a value.
   // +optional
-  optional int32 queues = 3;
+  optional int32 queues = 2;
 
   // `handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the
   // request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal
   // a hand of the size specified here. If empty, the hand size will the be set to 1.
+  // NOTE: To figure out a better value for your cluster, please refer to (#76846)[https://github.com/kubernetes/kubernetes/issues/76846#issuecomment-523700960]
   // +optional
-  optional int32 handSize = 4;
+  optional int32 handSize = 3;
 
   // `queueLengthLimit` is a length limit applied to each queue belongs to the priority.  The value must be positive
   // for a non-exempt priority level.
   // +optional
-  optional int32 queueLengthLimit = 5;
+  optional int32 queueLengthLimit = 4;
+
+  // `exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level.
+  // Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued)
+  // and do not detract from the concurrency available for non-exempt requests. The field is default to false and only those system
+  // preset priority level can be exempt.
+  // +optional
+  optional bool exempt = 5;
 }
 
 // PriorityLevelConfigurationStatus represents the current state of a "request-priority".
diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go
index df4c9c06046..56f18176523 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types.go
@@ -23,13 +23,11 @@ import (
 
 // These are valid flow-dingtinguisher methods.
 const (
-	// FlowDistinguisherMethodByUser specifies that the flow distinguisher is the username works in the request context
+	// FlowDistinguisherMethodByUserType specifies that the flow distinguisher is the username works in the request context
 	// so that the requests from the same user will enqueued into the same set of queues for processing.
 	FlowDistinguisherMethodByUserType FlowDistinguisherMethodType = "ByUser"
 
-	// FlowDistinguisherMethodByNamespace works by computing flow distinguisher with the user requested namespace. Any
-	// user requesting the namespace will be put into the same queue for processing.
-	// FlowDistinguisherMethodByNamespaceType specifies that the flow distinguisher is the namespace of the object
+	// FlowDistinguisherMethodByNamespaceType specifies that the flow distinguisher is the object's requested namespace
 	// that the request accesses.  If the object is not namespaced or the request is a non-resource request then
 	// the flow distinguisher is the empty string.
 	FlowDistinguisherMethodByNamespaceType FlowDistinguisherMethodType = "ByNamespace"
@@ -61,7 +59,7 @@ const (
 // +genclient:nonNamespaced
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// FlowSchema defines the schema of a group of flows. Note that a flow makes up of a set of inbound API requests with
+// FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with
 // similar attributes and is identified by a pair of strings: the name of the FlowSchema and a "flow distinguisher".
 type FlowSchema struct {
 	metav1.TypeMeta `json:",inline"`
@@ -104,9 +102,9 @@ type FlowSchemaSpec struct {
 	// MatchingPrecedence.  Each MatchingPrecedence value must be non-negative.
 	MatchingPrecedence int32 `json:"matchingPrecedence" protobuf:"varint,2,opt,name=matchingPrecedence"`
 	// `distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema.
-	// `nil` specifies that the computation always yields the empty string.
+	// `nil` specifies that the distinguisher is disabled and thus will always be the empty string.
 	DistinguisherMethod *FlowDistinguisherMethod `json:"distinguisherMethod,omitempty" protobuf:"bytes,3,opt,name=distinguisherMethod"`
-	// `rules` describes which requests will match this flow schema.
+	// `rules` describes which requests will match this flow schema. The flow-schema applies if any rule matches.
 	Rules []PolicyRuleWithSubjects `json:"rules,omitempty" protobuf:"bytes,4,rep,name=rules"`
 }
 
@@ -136,6 +134,27 @@ type PolicyRuleWithSubjects struct {
 	Rule PolicyRule `json:"rule" protobuf:"bytes,2,opt,name=rule"`
 }
 
+// PolicyRule holds information that describes a policy rule, but does not contain information
+// about who the rule applies to or which namespace the rule applies to.
+type PolicyRule struct {
+	// `verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule.
+	// VerbAll represents all verbs.
+	Verbs []string `json:"verbs" protobuf:"bytes,1,rep,name=verbs"`
+	// `apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of
+	// the enumerated resources in any API group will be allowed. '*' represents all api groups.
+	// +optional
+	APIGroups []string `json:"apiGroups,omitempty" protobuf:"bytes,2,rep,name=apiGroups"`
+	// `resources` is a list of resources this rule applies to.  ResourceAll represents all resources.
+	// +optional
+	Resources []string `json:"resources,omitempty" protobuf:"bytes,3,rep,name=resources"`
+	// `nonResourceURLs` is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
+	// Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding.
+	// Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"),  but not both.
+	// NonResourceAll represents all non-resource urls.
+	// +optional
+	NonResourceURLs []string `json:"nonResourceURLs,omitempty" protobuf:"bytes,6,rep,name=nonResourceURLs"`
+}
+
 // FlowSchemaStatus represents the current state of a flow-schema.
 type FlowSchemaStatus struct {
 	// Current state of flow-schema.
@@ -196,36 +215,36 @@ type PriorityLevelConfigurationList struct {
 
 // PriorityLevelConfigurationSpec is specification of a priority level
 type PriorityLevelConfigurationSpec struct {
-	// `exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level.
-	// Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued)
-	// and do not detract from the concurrency available for non-exempt requests. In a more sophisticated system, the
-	// exempt priority level would be the highest priority level. The field is default to false and only those system
-	// preset priority level can be exempt.
-	// +optional
-	Exempt bool `json:"exempt,omitempty" protobuf:"varint,1,opt,name=exempt"`
-	// `assuredConcurrencyShares` is a positive number for a non-exempt priority level, representing the weight by which
-	// the priority level shares the concurrency from the global limit. The concurrency limit of an apiserver is divided
-	// among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces
+	// `assuredConcurrencyShares` is a positive number for a non-exempt priority level. The concurrency limit of an apiserver
+	// is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces
 	// the assured concurrency value (ACV) for each priority level:
 	//
 	//             ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )
 	//
 	// +optional
-	AssuredConcurrencyShares int32 `json:"assuredConcurrencyShares,omitempty" protobuf:"varint,2,opt,name=assuredConcurrencyShares"`
+	AssuredConcurrencyShares int32 `json:"assuredConcurrencyShares,omitempty" protobuf:"varint,1,opt,name=assuredConcurrencyShares"`
 	// `queues` is a number of queues that belong to a non-exempt PriorityLevelConfiguration object. The queues exist
 	// independently at each apiserver. The value must be positive for a non-exempt priority level and setting it to 1
 	// disables shufflesharding and makes the distinguisher method irrelevant.
+	// TODO: sugguest a default or a way of deciding on a value.
 	// +optional
-	Queues int32 `json:"queues,omitempty" protobuf:"varint,3,opt,name=queues"`
+	Queues int32 `json:"queues,omitempty" protobuf:"varint,2,opt,name=queues"`
 	// `handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the
 	// request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal
 	// a hand of the size specified here. If empty, the hand size will the be set to 1.
+	// NOTE: To figure out a better value for your cluster, please refer to (#76846)[https://github.com/kubernetes/kubernetes/issues/76846#issuecomment-523700960]
 	// +optional
-	HandSize int32 `json:"handSize,omitempty" protobuf:"varint,4,opt,name=handSize"`
+	HandSize int32 `json:"handSize,omitempty" protobuf:"varint,3,opt,name=handSize"`
 	// `queueLengthLimit` is a length limit applied to each queue belongs to the priority.  The value must be positive
 	// for a non-exempt priority level.
 	// +optional
-	QueueLengthLimit int32 `json:"queueLengthLimit,omitempty" protobuf:"varint,5,opt,name=queueLengthLimit"`
+	QueueLengthLimit int32 `json:"queueLengthLimit,omitempty" protobuf:"varint,4,opt,name=queueLengthLimit"`
+	// `exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level.
+	// Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued)
+	// and do not detract from the concurrency available for non-exempt requests. The field is default to false and only those system
+	// preset priority level can be exempt.
+	// +optional
+	Exempt bool `json:"exempt,omitempty" protobuf:"varint,5,opt,name=exempt"`
 }
 
 // PriorityLevelConfigurationConditionType is a valid value for PriorityLevelConfigurationStatusCondition.Type
@@ -274,24 +293,3 @@ type Subject struct {
 	// +optional
 	Namespace string `json:"namespace,omitempty" protobuf:"bytes,4,opt,name=namespace"`
 }
-
-// PolicyRule holds information that describes a policy rule, but does not contain information
-// about who the rule applies to or which namespace the rule applies to.
-type PolicyRule struct {
-	// `verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule.
-	// VerbAll represents all kinds.
-	Verbs []string `json:"verbs" protobuf:"bytes,1,rep,name=verbs"`
-	// `apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of
-	// the enumerated resources in any API group will be allowed. APIGroupAll represents all api groups.
-	// +optional
-	APIGroups []string `json:"apiGroups,omitempty" protobuf:"bytes,2,rep,name=apiGroups"`
-	// `resources` is a list of resources this rule applies to.  ResourceAll represents all resources.
-	// +optional
-	Resources []string `json:"resources,omitempty" protobuf:"bytes,3,rep,name=resources"`
-	// `nonResourceURLs` is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path
-	// Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding.
-	// Rules can either apply to API resources (such as "pods" or "secrets") or non-resource URL paths (such as "/api"),  but not both.
-	// NonResourceAll represents all non-resource urls.
-	// +optional
-	NonResourceURLs []string `json:"nonResourceURLs,omitempty" protobuf:"bytes,6,rep,name=nonResourceURLs"`
-}
diff --git a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go
index 1fb7f184b40..5a6d8ba6408 100644
--- a/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go
+++ b/staging/src/k8s.io/api/flowcontrol/v1alpha1/types_swagger_doc_generated.go
@@ -37,7 +37,7 @@ func (FlowDistinguisherMethod) SwaggerDoc() map[string]string {
 }
 
 var map_FlowSchema = map[string]string{
-	"":         "FlowSchema defines the schema of a group of flows. Note that a flow makes up of a set of inbound API requests with similar attributes and is identified by a pair of strings: the name of the FlowSchema and a \"flow distinguisher\".",
+	"":         "FlowSchema defines the schema of a group of flows. Note that a flow is made up of a set of inbound API requests with similar attributes and is identified by a pair of strings: the name of the FlowSchema and a \"flow distinguisher\".",
 	"metadata": "`metadata` is the standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata",
 	"spec":     "`spec` is the specification of the desired behavior of a flow-schema. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status",
 	"status":   "`status` is the current status of a flow-schema. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status",
@@ -74,8 +74,8 @@ var map_FlowSchemaSpec = map[string]string{
 	"":                           "FlowSchemaSpec describes how the flow-schema's specification looks like.",
 	"priorityLevelConfiguration": "`priorityLevelConfiguration` should reference a PriorityLevelConfiguration in the cluster. If the reference cannot be resolved, the flow-schema will ignored and marked as invalid in its status. Required.",
 	"matchingPrecedence":         "`matchingPrecedence` is used to choose among the FlowSchemas that match a given request.  The chosen FlowSchema is among those with the numerically lowest (which we take to be logically highest) MatchingPrecedence.  Each MatchingPrecedence value must be non-negative.",
-	"distinguisherMethod":        "`distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema. `nil` specifies that the computation always yields the empty string.",
-	"rules":                      "`rules` describes which requests will match this flow schema.",
+	"distinguisherMethod":        "`distinguisherMethod` defines how to compute the flow distinguisher for requests that match this schema. `nil` specifies that the distinguisher is disabled and thus will always be the empty string.",
+	"rules":                      "`rules` describes which requests will match this flow schema. The flow-schema applies if any rule matches.",
 }
 
 func (FlowSchemaSpec) SwaggerDoc() map[string]string {
@@ -93,8 +93,8 @@ func (FlowSchemaStatus) SwaggerDoc() map[string]string {
 
 var map_PolicyRule = map[string]string{
 	"":                "PolicyRule holds information that describes a policy rule, but does not contain information about who the rule applies to or which namespace the rule applies to.",
-	"verbs":           "`verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule. VerbAll represents all kinds.",
-	"apiGroups":       "`apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. APIGroupAll represents all api groups.",
+	"verbs":           "`verbs` is a list of Verbs that apply to ALL the ResourceKinds and AttributeRestrictions contained in this rule. VerbAll represents all verbs.",
+	"apiGroups":       "`apiGroups` is the name of the APIGroup that contains the resources.  If multiple API groups are specified, any action requested against one of the enumerated resources in any API group will be allowed. '*' represents all api groups.",
 	"resources":       "`resources` is a list of resources this rule applies to.  ResourceAll represents all resources.",
 	"nonResourceURLs": "`nonResourceURLs` is a set of partial urls that a user should have access to.  *s are allowed, but only as the full, final step in the path Since non-resource URLs are not namespaced, this field is only applicable for ClusterRoles referenced from a ClusterRoleBinding. Rules can either apply to API resources (such as \"pods\" or \"secrets\") or non-resource URL paths (such as \"/api\"),  but not both. NonResourceAll represents all non-resource urls.",
 }
@@ -158,11 +158,11 @@ func (PriorityLevelConfigurationReference) SwaggerDoc() map[string]string {
 
 var map_PriorityLevelConfigurationSpec = map[string]string{
 	"":                         "PriorityLevelConfigurationSpec is specification of a priority level",
-	"exempt":                   "`exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level. Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued) and do not detract from the concurrency available for non-exempt requests. In a more sophisticated system, the exempt priority level would be the highest priority level. The field is default to false and only those system preset priority level can be exempt.",
-	"assuredConcurrencyShares": "`assuredConcurrencyShares` is a positive number for a non-exempt priority level, representing the weight by which the priority level shares the concurrency from the global limit. The concurrency limit of an apiserver is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces the assured concurrency value (ACV) for each priority level:\n\n            ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )",
+	"assuredConcurrencyShares": "`assuredConcurrencyShares` is a positive number for a non-exempt priority level. The concurrency limit of an apiserver is divided among the non-exempt priority levels in proportion to their assured concurrency shares. Basically this produces the assured concurrency value (ACV) for each priority level:\n\n            ACV(l) = ceil( SCL * ACS(l) / ( sum[priority levels k] ACS(k) ) )",
 	"queues":                   "`queues` is a number of queues that belong to a non-exempt PriorityLevelConfiguration object. The queues exist independently at each apiserver. The value must be positive for a non-exempt priority level and setting it to 1 disables shufflesharding and makes the distinguisher method irrelevant.",
-	"handSize":                 "`handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal a hand of the size specified here. If empty, the hand size will the be set to 1.",
+	"handSize":                 "`handSize` is a small positive number for applying shuffle sharding. When a request arrives at an apiserver the request flow identifier’s string pair is hashed and the hash value is used to shuffle the queue indices and deal a hand of the size specified here. If empty, the hand size will the be set to 1. NOTE: To figure out a better value for your cluster, please refer to (#76846)[https://github.com/kubernetes/kubernetes/issues/76846#issuecomment-523700960]",
 	"queueLengthLimit":         "`queueLengthLimit` is a length limit applied to each queue belongs to the priority.  The value must be positive for a non-exempt priority level.",
+	"exempt":                   "`exempt` defines whether the priority level is exempted or not.  There should be at most one exempt priority level. Being exempt means that requests of that priority are not subject to concurrency limits (and thus are never queued) and do not detract from the concurrency available for non-exempt requests. The field is default to false and only those system preset priority level can be exempt.",
 }
 
 func (PriorityLevelConfigurationSpec) SwaggerDoc() map[string]string {
diff --git a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/BUILD b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/BUILD
index a17ac933a42..1489f527bbc 100644
--- a/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/BUILD
+++ b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/BUILD
@@ -4,6 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = [
         "doc.go",
+        "optionalwaitgroup.go",
         "waitgroup.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/waitgroup",
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/optionalwaitgroup.go b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/optionalwaitgroup.go
similarity index 98%
rename from staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/optionalwaitgroup.go
rename to staging/src/k8s.io/apimachinery/pkg/util/waitgroup/optionalwaitgroup.go
index b5def73ad63..9e21d657d52 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/optionalwaitgroup.go
+++ b/staging/src/k8s.io/apimachinery/pkg/util/waitgroup/optionalwaitgroup.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package fairqueuing
+package waitgroup
 
 import (
 	"sync"
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/BUILD b/staging/src/k8s.io/apiserver/pkg/server/options/BUILD
index 555cc37b308..eb2a08b84e3 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/BUILD
@@ -67,7 +67,6 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/flowcontrol:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/webhook:go_default_library",
         "//staging/src/k8s.io/apiserver/plugin/pkg/audit/buffered:go_default_library",
         "//staging/src/k8s.io/apiserver/plugin/pkg/audit/dynamic:go_default_library",
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go b/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go
index 256022cd6ea..ea3f6c54309 100644
--- a/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/recommended.go
@@ -27,7 +27,6 @@ import (
 	"k8s.io/apiserver/pkg/storage/storagebackend"
 	"k8s.io/apiserver/pkg/util/feature"
 	utilflowcontrol "k8s.io/apiserver/pkg/util/flowcontrol"
-	"k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing"
 )
 
 // RecommendedOptions contains the recommended options for running an API server.
@@ -123,13 +122,11 @@ func (o *RecommendedOptions) ApplyTo(config *server.RecommendedConfig) error {
 		return err
 	}
 	if feature.DefaultFeatureGate.Enabled(features.RequestManagement) {
-		config.RequestManagement = utilflowcontrol.NewRequestManagementSystem(
+		config.RequestManagement = utilflowcontrol.NewRequestManager(
 			config.SharedInformerFactory,
 			kubernetes.NewForConfigOrDie(config.ClientConfig).FlowcontrolV1alpha1(),
-			fairqueuing.NewNoRestraintFactory( /* TODO: switch to real implementation */ ),
 			config.MaxRequestsInFlight+config.MaxMutatingRequestsInFlight,
-			config.RequestTimeout/4,
-			nil)
+			config.RequestTimeout/4)
 	}
 
 	return nil
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/BUILD b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/BUILD
index 21c5ec862d7..ee72178b649 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/BUILD
@@ -15,8 +15,10 @@ go_library(
         "//staging/src/k8s.io/api/flowcontrol/v1alpha1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/waitgroup:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/authentication/user:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/BUILD b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/BUILD
index 2e8cc8a14fb..d2d6ac8ff3a 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/BUILD
@@ -8,13 +8,13 @@ go_library(
         "integrator.go",
         "interface.go",
         "no-restraint.go",
-        "optionalwaitgroup.go",
         "types.go",
     ],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing",
     importpath = "k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing",
     visibility = ["//visibility:public"],
     deps = [
+        "//staging/src/k8s.io/apimachinery/pkg/util/waitgroup:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/clock:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/shufflesharding:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
@@ -28,7 +28,11 @@ go_test(
         "fq_test.go",
     ],
     embed = [":go_default_library"],
-    deps = ["//staging/src/k8s.io/apiserver/pkg/util/clock:go_default_library"],
+    deps = [
+        "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/waitgroup:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/util/clock:go_default_library",
+    ],
 )
 
 filegroup(
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing.go
index 3207d960e7f..6ba320f8972 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing.go
@@ -21,6 +21,7 @@ import (
 	"sync"
 	"time"
 
+	"k8s.io/apimachinery/pkg/util/waitgroup"
 	"k8s.io/apiserver/pkg/util/clock"
 	"k8s.io/apiserver/pkg/util/shufflesharding"
 	"k8s.io/klog"
@@ -31,13 +32,13 @@ import (
 // This filter makes a QueueSetSystem for each priority level.
 type queueSetFactoryImpl struct {
 	// wg can be nil and is ignored in that case
-	wg OptionalWaitGroup
+	wg waitgroup.OptionalWaitGroup
 
 	clk clock.PassiveClock
 }
 
 // NewQueueSetFactory creates a new NewQueueSetFactory object
-func NewQueueSetFactory(clk clock.PassiveClock, wg OptionalWaitGroup) QueueSetFactory {
+func NewQueueSetFactory(clk clock.PassiveClock, wg waitgroup.OptionalWaitGroup) QueueSetFactory {
 	return &queueSetFactoryImpl{
 		wg:  wg,
 		clk: clk,
@@ -60,7 +61,8 @@ func (qsf queueSetFactoryImpl) NewQueueSet(concurrencyLimit, desiredNumQueues, q
 // https://github.com/kubernetes/enhancements/blob/master/keps/sig-api-machinery/20190228-priority-and-fairness.md
 type queueSetImpl struct {
 	lock                 sync.Mutex
-	wg                   OptionalWaitGroup
+	name                 string
+	wg                   waitgroup.OptionalWaitGroup
 	queues               []*Queue
 	clk                  clock.PassiveClock
 	vt                   float64
@@ -90,8 +92,8 @@ func initQueues(numQueues int) []*Queue {
 }
 
 // newQueueSetImpl creates a new queueSetImpl from passed in parameters and
-func newQueueSetImpl(concurrencyLimit, desiredNumQueues, queueLengthLimit int,
-	requestWaitLimit time.Duration, clk clock.PassiveClock, wg OptionalWaitGroup) *queueSetImpl {
+func newQueueSetImpl(name string, concurrencyLimit, desiredNumQueues, queueLengthLimit int,
+	requestWaitLimit time.Duration, clk clock.PassiveClock, wg waitgroup.OptionalWaitGroup) *queueSetImpl {
 	fq := &queueSetImpl{
 		wg:               wg,
 		queues:           initQueues(desiredNumQueues),
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing_test.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing_test.go
index 25fc688b09f..cdbdf0538df 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/fairqueuing_test.go
@@ -24,7 +24,8 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apiserver/pkg/util/clock"
+	"k8s.io/apimachinery/pkg/util/clock"
+	"k8s.io/apimachinery/pkg/util/waitgroup"
 )
 
 // adapted from https://github.com/tadglines/wfq/blob/master/wfq_test.go
@@ -167,7 +168,7 @@ func flowStdDevTest(t *testing.T, flows []flowDesc, expectedStdDev float64) {
 	// for i := range queues {
 	// 	fqqueues[i] = queues[i]
 	// }
-	fq := newQueueSetImpl(20000, len(flows), 20000, 5*time.Second, fc, NoWaitGroup())
+	fq := newQueueSetImpl("", 20000, len(flows), 20000, 5*time.Second, fc, waitgroup.NoWaitGroup())
 	for n := 0; n < len(flows); n++ {
 		genFlow(fq, &flows[n], n)
 	}
diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/reqmgmt.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/reqmgmt.go
index 0d0b8678028..9a9c6b14e22 100644
--- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/reqmgmt.go
+++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/reqmgmt.go
@@ -18,7 +18,6 @@ package flowcontrol
 
 import (
 	"hash/crc64"
-	"sync"
 	"sync/atomic"
 	"time"
 
@@ -30,7 +29,9 @@ import (
 	// "k8s.io/apiserver/pkg/endpoints/metrics"
 
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/util/clock"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/apimachinery/pkg/util/waitgroup"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	fq "k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing"
@@ -92,7 +93,7 @@ type priorityLevelState struct {
 // this filter
 type requestManagementSystem struct {
 	// wg is kept informed of when goroutines start or stop or begin or end waiting
-	wg fq.OptionalWaitGroup
+	wg waitgroup.OptionalWaitGroup
 
 	queueSetFactory fq.QueueSetFactory
 
@@ -129,43 +130,37 @@ type requestManagementSystem struct {
 	curState atomic.Value
 }
 
-// NewRequestManagementSystem creates a new instance of request-management system
-func NewRequestManagementSystem(
+// NewRequestManager creates a new instance of request-management system
+func NewRequestManager(
 	informerFactory kubeinformers.SharedInformerFactory,
 	flowcontrolClient rmclientv1alpha1.FlowcontrolV1alpha1Interface,
-	queueSetFactory fq.QueueSetFactory,
 	serverConcurrencyLimit int,
 	requestWaitLimit time.Duration,
-	waitGroup *sync.WaitGroup,
 ) Interface {
-	return NewRequestManagementSystemWithPreservation(
+	return NewRequestManagerWithPreservation(
 		informerFactory,
 		flowcontrolClient,
-		queueSetFactory,
 		serverConcurrencyLimit,
 		requestWaitLimit,
-		waitGroup,
 		nil, nil)
 }
 
-// NewRequestManagementSystemWithPreservation creates a new instance
+// NewRequestManagerWithPreservation creates a new instance
 // of request-management system with preservation.  The WaitGroup is
 // optional and, if supplied, is kept informed of whenever a goroutine
 // is started or stopped or begins or finishes waiting --- except that
 // the configuration controller is not fully plumbed yet.
-func NewRequestManagementSystemWithPreservation(
+func NewRequestManagerWithPreservation(
 	informerFactory kubeinformers.SharedInformerFactory,
 	flowcontrolClient rmclientv1alpha1.FlowcontrolV1alpha1Interface,
-	queueSetFactory fq.QueueSetFactory,
 	serverConcurrencyLimit int,
 	requestWaitLimit time.Duration,
-	waitGroup *sync.WaitGroup,
 	preservingFlowSchemas []*rmtypesv1alpha1.FlowSchema,
 	preservingPriorityLevels []*rmtypesv1alpha1.PriorityLevelConfiguration,
 ) Interface {
 	reqMgmt := &requestManagementSystem{
-		wg:                     fq.WrapWaitGroupPointer(waitGroup),
-		queueSetFactory:        queueSetFactory,
+		wg:                     waitgroup.NoWaitGroup(),
+		queueSetFactory:        fq.NewQueueSetFactory(&clock.RealClock{}, waitgroup.NoWaitGroup()),
 		serverConcurrencyLimit: serverConcurrencyLimit,
 		requestWaitLimit:       requestWaitLimit,
 		flowcontrolClient:      flowcontrolClient,
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 74da54da29f..6786b4cd99e 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1367,7 +1367,6 @@ k8s.io/apiserver/pkg/storage/value/encrypt/envelope
 k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1
 k8s.io/apiserver/pkg/storage/value/encrypt/identity
 k8s.io/apiserver/pkg/storage/value/encrypt/secretbox
-k8s.io/apiserver/pkg/util/clock
 k8s.io/apiserver/pkg/util/dryrun
 k8s.io/apiserver/pkg/util/feature
 k8s.io/apiserver/pkg/util/flowcontrol